From c50753aa1bedcb9b983241fa4975caaa6370dc5a Mon Sep 17 00:00:00 2001 From: Oleg Didenko Date: Thu, 10 Dec 2020 01:16:29 +0300 Subject: [PATCH] fixed notification icon, fixed onboarding icons position --- .../app/src/main/res/drawable/app_icon.png | Bin 3194 -> 3067 bytes ios/Flutter/flutter_export_environment.sh | 5 +- lib/src/helpers/notification.dart | 2 +- lib/src/screens/onboarding_screen.dart | 108 +++++++++--------- 4 files changed, 58 insertions(+), 57 deletions(-) diff --git a/android/app/src/main/res/drawable/app_icon.png b/android/app/src/main/res/drawable/app_icon.png index 67265ba57d51351d69d2646c542c59fa5638fb03..d2e71849e2e5e29e85cdc5951f5017a0f4851b6e 100644 GIT binary patch literal 3067 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 literal 3194 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 diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh index d64b2b1..9a03eac 100755 --- a/ios/Flutter/flutter_export_environment.sh +++ b/ios/Flutter/flutter_export_environment.sh @@ -2,15 +2,14 @@ # This is a generated file; do not edit or check into version control. export "FLUTTER_ROOT=/Users/diaglyonok/developement/flutter" export "FLUTTER_APPLICATION_PATH=/Users/diaglyonok/developement/Projects/eyehelper" -export "FLUTTER_TARGET=/Users/diaglyonok/developement/Projects/eyehelper/lib/main.dart" +export "FLUTTER_TARGET=lib/main.dart" export "FLUTTER_BUILD_DIR=build" export "SYMROOT=${SOURCE_ROOT}/../build/ios" export "OTHER_LDFLAGS=$(inherited) -framework Flutter" export "FLUTTER_FRAMEWORK_DIR=/Users/diaglyonok/developement/flutter/bin/cache/artifacts/engine/ios" export "FLUTTER_BUILD_NAME=1.0.0" export "FLUTTER_BUILD_NUMBER=1" -export "DART_DEFINES=flutter.inspector.structuredErrors%3Dtrue" export "DART_OBFUSCATION=false" -export "TRACK_WIDGET_CREATION=true" +export "TRACK_WIDGET_CREATION=false" export "TREE_SHAKE_ICONS=false" export "PACKAGE_CONFIG=.packages" diff --git a/lib/src/helpers/notification.dart b/lib/src/helpers/notification.dart index d5c12ed..f762657 100644 --- a/lib/src/helpers/notification.dart +++ b/lib/src/helpers/notification.dart @@ -193,7 +193,7 @@ class NotificationsHelper { _channelName, _channelDescription, vibrationPattern: _vibrationPattern, - color: const Color.fromARGB(255, 255, 0, 0), + //color: const Color.fromARGB(255, 255, 0, 0), ); final iOSPlatformChannelSpecifics = new IOSNotificationDetails(); diff --git a/lib/src/screens/onboarding_screen.dart b/lib/src/screens/onboarding_screen.dart index 8a96526..a4d9ed5 100644 --- a/lib/src/screens/onboarding_screen.dart +++ b/lib/src/screens/onboarding_screen.dart @@ -20,67 +20,69 @@ class _OnBoardingScreenState extends State { return Scaffold( body: Stack( children: [ - FancyOnBoarding( - key: key, - onDoneButtonPressed: () { - FastPreferences().prefs.setBool(FastPreferences.wasOnboardingShown, true); - Navigator.of(context).pop(); - }, - onSkipButtonPressed: () { - Navigator.of(context).pop(); - }, - pageIndexChanged: (index) { - setState(() { - currentIndex = index; - }); - }, - pageList: [ - PageModel( + SafeArea( + child: FancyOnBoarding( + key: key, + onDoneButtonPressed: () { + FastPreferences().prefs.setBool(FastPreferences.wasOnboardingShown, true); + Navigator.of(context).pop(); + }, + onSkipButtonPressed: () { + Navigator.of(context).pop(); + }, + pageIndexChanged: (index) { + setState(() { + currentIndex = index; + }); + }, + pageList: [ + PageModel( + color: Colors.white, + heroAssetPath: 'assets/work_onb.png', + title: Text( + Localizer.getLocaleById(LocaleId.onb_title1, context), + style: Theme.of(context).textTheme.title.copyWith( + color: Theme.of(context).accentColor, + ), + ), + body: Text( + Localizer.getLocaleById(LocaleId.onb_subtitle1, context), + textAlign: TextAlign.center, + style: Theme.of(context).textTheme.body1.copyWith( + color: Theme.of(context).primaryColor, + ), + )), + PageModel( + color: Colors.white, + heroAssetPath: 'assets/exercises_onb.png', + title: Text(Localizer.getLocaleById(LocaleId.onb_title2, context), + style: Theme.of(context).textTheme.title.copyWith( + color: Theme.of(context).accentColor, + )), + body: Text( + Localizer.getLocaleById(LocaleId.onb_subtitle2, context), + textAlign: TextAlign.center, + style: Theme.of(context).textTheme.body1.copyWith( + color: Theme.of(context).primaryColor, + ), + )), + PageModel( color: Colors.white, - heroAssetPath: 'assets/work_onb.png', + heroAssetPath: 'assets/notif_onb.png', title: Text( - Localizer.getLocaleById(LocaleId.onb_title1, context), + Localizer.getLocaleById(LocaleId.onb_title3, context), style: Theme.of(context).textTheme.title.copyWith( color: Theme.of(context).accentColor, ), ), - body: Text( - Localizer.getLocaleById(LocaleId.onb_subtitle1, context), - textAlign: TextAlign.center, - style: Theme.of(context).textTheme.body1.copyWith( - color: Theme.of(context).primaryColor, - ), - )), - PageModel( - color: Colors.white, - heroAssetPath: 'assets/exercises_onb.png', - title: Text(Localizer.getLocaleById(LocaleId.onb_title2, context), - style: Theme.of(context).textTheme.title.copyWith( - color: Theme.of(context).accentColor, + body: Text(Localizer.getLocaleById(LocaleId.onb_subtitle3, context), + textAlign: TextAlign.center, + style: Theme.of(context).textTheme.body1.copyWith( + color: Theme.of(context).primaryColor, )), - body: Text( - Localizer.getLocaleById(LocaleId.onb_subtitle2, context), - textAlign: TextAlign.center, - style: Theme.of(context).textTheme.body1.copyWith( - color: Theme.of(context).primaryColor, - ), - )), - PageModel( - color: Colors.white, - heroAssetPath: 'assets/notif_onb.png', - title: Text( - Localizer.getLocaleById(LocaleId.onb_title3, context), - style: Theme.of(context).textTheme.title.copyWith( - color: Theme.of(context).accentColor, - ), ), - body: Text(Localizer.getLocaleById(LocaleId.onb_subtitle3, context), - textAlign: TextAlign.center, - style: Theme.of(context).textTheme.body1.copyWith( - color: Theme.of(context).primaryColor, - )), - ), - ], + ], + ), ), ], ),