Skip to content

Commit 64fd53d

Browse files
committed
- upgraded all the dependencies
1 parent d72f381 commit 64fd53d

File tree

5 files changed

+46
-62
lines changed

5 files changed

+46
-62
lines changed

ios/Runner.xcodeproj/project.pbxproj

+1-13
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
8981BC204AA6763F48392668 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 887069A31D31C9BF9D217F54 /* libPods-Runner.a */; };
15-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1713
9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; };
1814
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
1915
97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; };
@@ -29,8 +25,6 @@
2925
dstPath = "";
3026
dstSubfolderSpec = 10;
3127
files = (
32-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
33-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3428
);
3529
name = "Embed Frameworks";
3630
runOnlyForDeploymentPostprocessing = 0;
@@ -41,7 +35,6 @@
4135
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
4236
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4337
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
44-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
4538
4FA17A1567654C183BDA1E63 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4639
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
4740
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -50,7 +43,6 @@
5043
887069A31D31C9BF9D217F54 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
5144
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
5245
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
53-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
5446
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
5547
97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
5648
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -65,8 +57,6 @@
6557
isa = PBXFrameworksBuildPhase;
6658
buildActionMask = 2147483647;
6759
files = (
68-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
69-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
7060
8981BC204AA6763F48392668 /* libPods-Runner.a in Frameworks */,
7161
);
7262
runOnlyForDeploymentPostprocessing = 0;
@@ -85,9 +75,7 @@
8575
9740EEB11CF90186004384FC /* Flutter */ = {
8676
isa = PBXGroup;
8777
children = (
88-
3B80C3931E831B6300D905FE /* App.framework */,
8978
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
90-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9179
9740EEB21CF90195004384FC /* Debug.xcconfig */,
9280
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
9381
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -248,7 +236,7 @@
248236
);
249237
runOnlyForDeploymentPostprocessing = 0;
250238
shellPath = /bin/sh;
251-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
239+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
252240
};
253241
641FA095A70B88123015AA6E /* [CP] Check Pods Manifest.lock */ = {
254242
isa = PBXShellScriptBuildPhase;

lib/main.dart

+6-11
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,19 @@ class MyApp extends StatelessWidget {
4444
// with Hot Reload than creating it directly in the `build` function.
4545
final ThemeStore _themeStore = ThemeStore(appComponent.getRepository());
4646
final PostStore _postStore = PostStore(appComponent.getRepository());
47-
final LanguageStore _languageStore = LanguageStore(appComponent.getRepository());
47+
final LanguageStore _languageStore =
48+
LanguageStore(appComponent.getRepository());
4849

4950
@override
5051
Widget build(BuildContext context) {
5152
return MultiProvider(
5253
providers: [
53-
Provider<ThemeStore>.value(value: _themeStore),
54-
Provider<PostStore>.value(value: _postStore),
55-
Provider<LanguageStore>.value(value: _languageStore),
54+
Provider<ThemeStore>(create: (_) => _themeStore),
55+
Provider<PostStore>(create: (_) => _postStore),
56+
Provider<LanguageStore>(create: (_) => _languageStore),
5657
],
5758
child: Observer(
59+
name: 'global-observer',
5860
builder: (context) {
5961
return MaterialApp(
6062
debugShowCheckedModeBanner: false,
@@ -75,13 +77,6 @@ class MyApp extends StatelessWidget {
7577
// Built-in localization of basic text for Cupertino widgets
7678
GlobalCupertinoLocalizations.delegate,
7779
],
78-
// Returns a locale which will be used by the app
79-
localeResolutionCallback: (locale, supportedLocales) =>
80-
// Check if the current device locale is supported
81-
supportedLocales.firstWhere(
82-
(supportedLocale) =>
83-
supportedLocale.languageCode == locale.languageCode,
84-
orElse: () => supportedLocales.first),
8580
home: SplashScreen(),
8681
);
8782
},

lib/ui/login/login.dart

+15-21
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ class _LoginScreenState extends State<LoginScreen> {
3232
//focus node:-----------------------------------------------------------------
3333
FocusNode _passwordFocusNode;
3434

35-
//form key:-------------------------------------------------------------------
36-
final _formKey = GlobalKey<FormState>();
37-
3835
//stores:---------------------------------------------------------------------
3936
final _store = FormStore();
4037

@@ -109,24 +106,21 @@ class _LoginScreenState extends State<LoginScreen> {
109106
}
110107

111108
Widget _buildRightSide() {
112-
return Form(
113-
key: _formKey,
114-
child: SingleChildScrollView(
115-
child: Padding(
116-
padding: const EdgeInsets.symmetric(horizontal: 24.0),
117-
child: Column(
118-
mainAxisSize: MainAxisSize.max,
119-
crossAxisAlignment: CrossAxisAlignment.stretch,
120-
mainAxisAlignment: MainAxisAlignment.center,
121-
children: <Widget>[
122-
AppIconWidget(image: 'assets/icons/ic_appicon.png'),
123-
SizedBox(height: 24.0),
124-
_buildUserIdField(),
125-
_buildPasswordField(),
126-
_buildForgotPasswordButton(),
127-
_buildSignInButton()
128-
],
129-
),
109+
return SingleChildScrollView(
110+
child: Padding(
111+
padding: const EdgeInsets.symmetric(horizontal: 24.0),
112+
child: Column(
113+
mainAxisSize: MainAxisSize.max,
114+
crossAxisAlignment: CrossAxisAlignment.stretch,
115+
mainAxisAlignment: MainAxisAlignment.center,
116+
children: <Widget>[
117+
AppIconWidget(image: 'assets/icons/ic_appicon.png'),
118+
SizedBox(height: 24.0),
119+
_buildUserIdField(),
120+
_buildPasswordField(),
121+
_buildForgotPasswordButton(),
122+
_buildSignInButton()
123+
],
130124
),
131125
),
132126
);

lib/ui/splash/splash.dart

+10-3
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,36 @@ class SplashScreen extends StatefulWidget {
1414
class _SplashScreenState extends State<SplashScreen> {
1515
@override
1616
void initState() {
17+
print('inside initState()');
1718
super.initState();
1819
startTimer();
1920
}
2021

2122
@override
2223
Widget build(BuildContext context) {
24+
print('inside build()');
25+
2326
return Material(
2427
child: Center(child: AppIconWidget(image: 'assets/icons/ic_appicon.png')),
2528
);
2629
}
2730

2831
startTimer() {
29-
var _duration = Duration(milliseconds: 5000);
32+
print('inside startTimer()');
33+
var _duration = Duration(milliseconds: 2000);
3034
return Timer(_duration, navigate);
3135
}
3236

3337
navigate() async {
38+
print('inside navigate()');
39+
3440
SharedPreferences preferences = await SharedPreferences.getInstance();
3541

42+
print('inside if');
3643
if (preferences.getBool(Preferences.is_logged_in) ?? false) {
37-
Navigator.of(context).pushReplacementNamed(Routes.home);
44+
Navigator.of(context).pushNamed(Routes.home);
3845
} else {
39-
Navigator.of(context).pushReplacementNamed(Routes.login);
46+
Navigator.of(context).pushNamed(Routes.login);
4047
}
4148
}
4249
}

pubspec.yaml

+14-14
Original file line numberDiff line numberDiff line change
@@ -25,34 +25,34 @@ dependencies:
2525
cupertino_icons: ^0.1.3
2626

2727
# The following adds the shared pref as a dependency in your application
28-
shared_preferences: ^0.5.6
28+
shared_preferences: ^0.5.8
2929

3030
# A composable, Future-based library for making HTTP requests.
31-
http: ^0.12.0+4
31+
http: ^0.12.1
3232

3333
# The following adds the launcher icon support to your application.
3434
# run below mentioned commands to generate launcher icons
3535
# flutter packages get
3636
# flutter packages pub run flutter_launcher_icons:main
37-
flutter_launcher_icons: ^0.7.4
37+
flutter_launcher_icons: ^0.7.5
3838

3939
# Flogs, a powerful logging framework
4040
f_logs: ^1.2.2
4141

4242
# MobX is a library for reactively managing the state of your applications. Use the power of
4343
# observables, actions, and reactions to supercharge your Dart and Flutter apps.
44-
mobx: ^0.4.0+1
45-
flutter_mobx: ^0.3.6
46-
mobx_codegen: ^0.4.0+1
44+
mobx: ^1.2.1+1
45+
flutter_mobx: ^1.1.0+1
46+
mobx_codegen: ^1.1.0+1
4747

4848
# An helper to easily exposes a value using InheritedWidget without having to write one.
49-
provider: ^4.0.1
49+
provider: ^4.3.0
5050

5151
# String validation and sanitization for Dart. Dart 2-compatible version of validator
52-
validators: ^2.0.0+1
52+
validators: ^2.0.1
5353

5454
# A powerful Http client for Dart
55-
dio: 3.0.8
55+
dio: 3.0.9
5656

5757
flushbar: ^1.10.4
5858

@@ -67,17 +67,17 @@ dependencies:
6767
ref: 7c3cbf6
6868

6969
dependency_overrides:
70-
source_gen: 0.9.4+7
71-
analyzer: ^0.39.4
70+
source_gen: 0.9.5
71+
analyzer: ^0.39.12
7272
intl: ^0.16.1
7373

7474

7575
dev_dependencies:
7676
flutter_test:
7777
sdk: flutter
7878

79-
json_serializable: ^3.2.5
80-
build_runner: ^1.7.3
79+
json_serializable: ^3.3.0
80+
build_runner: ^1.10.0
8181
inject_generator:
8282
git:
8383
url: https://github.com/google/inject.dart.git
@@ -90,7 +90,7 @@ flutter_icons:
9090
ios: true
9191

9292

93-
# For information on the generic Dart part of this file, see the
93+
# For information on the generic Dart art of this file, see the
9494
# following page: https://www.dartlang.org/tools/pub/pubspec
9595

9696
# The following section is specific to Flutter.

0 commit comments

Comments
 (0)