From 06b58818588a7b84f7c32f3247916739272f9739 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 31 May 2020 16:14:56 +0630 Subject: [PATCH] fix ios splash --- ios/Podfile.lock | 14 +++++++++++++- lib/pages/home_page.dart | 15 +++++++++++++-- lib/pages/splash.dart | 2 +- lib/theme/theme.dart | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 543ce7e..1db0755 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -419,6 +419,10 @@ PODS: - Reachability (3.2) - shared_preferences (0.0.1): - Flutter + - shared_preferences_macos (0.0.1): + - Flutter + - shared_preferences_web (0.0.1): + - Flutter - url_launcher (0.0.1): - Flutter - url_launcher_macos (0.0.1): @@ -451,6 +455,8 @@ DEPENDENCIES: - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`) + - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`) - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) @@ -534,6 +540,10 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/permission_handler/ios" shared_preferences: :path: ".symlinks/plugins/shared_preferences/ios" + shared_preferences_macos: + :path: ".symlinks/plugins/shared_preferences_macos/ios" + shared_preferences_web: + :path: ".symlinks/plugins/shared_preferences_web/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" url_launcher_macos: @@ -592,7 +602,9 @@ SPEC CHECKSUMS: PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6 Protobuf: 2793fcd0622a00b546c60e7cbbcc493e043e9bb9 Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 - shared_preferences: 1feebfa37bb57264736e16865e7ffae7fc99b523 + shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d + shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 + shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart index 44e2fda..8efa029 100644 --- a/lib/pages/home_page.dart +++ b/lib/pages/home_page.dart @@ -385,7 +385,7 @@ class _HomePageState extends State { backgroundColor: primaryColor, title: ClipRRect( child: Image.asset("assets/logo.jpg", height: 40), - borderRadius: new BorderRadius.circular(35.0), + borderRadius: new BorderRadius.circular(30.0), ), actions: login ? [ @@ -412,7 +412,7 @@ class _HomePageState extends State { icon: Icon(Icons.tune), ), ] - : [ + : [ FlatButton( onPressed: () { Navigator.push( @@ -424,6 +424,17 @@ class _HomePageState extends State { // iconSize: 30, child: Text("Sign in",style: siginButtonStyle,), ), + IconButton( + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SigninPage()), + ); + }, + iconSize: 30, + icon: Icon(MaterialCommunityIcons.login), + ) ]), body: Container( decoration: BoxDecoration( diff --git a/lib/pages/splash.dart b/lib/pages/splash.dart index ef1fbae..47a8d7c 100644 --- a/lib/pages/splash.dart +++ b/lib/pages/splash.dart @@ -90,7 +90,7 @@ class _SplashScreenState extends State { this._loaded = mainModel.isLoaded; this._isSupport = true; this._isLogin = mainModel.isLogin(); - this._isAgree = mainModel.agreedTerm(); + // this._isAgree = mainModel.agreedTerm(); this._hasEmail = mainModel.hasEmail(); this._isOnline = mainModel.isOnline; diff --git a/lib/theme/theme.dart b/lib/theme/theme.dart index d24fa3a..0d58ff1 100644 --- a/lib/theme/theme.dart +++ b/lib/theme/theme.dart @@ -20,7 +20,7 @@ const TextStyle welcomeSubLabelStyle = const TextStyle subMenuStyle = TextStyle(fontSize: 14, color: Colors.white, fontWeight: FontWeight.w500); const TextStyle siginButtonStyle = - TextStyle(fontSize: 18, color: Colors.white, fontWeight: FontWeight.w800); + TextStyle(fontSize: 16, color: Colors.white, fontWeight: FontWeight.w500); const TextStyle labelStyleMM = TextStyle( fontSize: 13,