Skip to content

Commit

Permalink
fixed notification icon, fixed onboarding icons position
Browse files Browse the repository at this point in the history
  • Loading branch information
Oleg Didenko committed Dec 9, 2020
1 parent 443f56c commit c50753a
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 57 deletions.
Binary file modified android/app/src/main/res/drawable/app_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion lib/src/helpers/notification.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
108 changes: 55 additions & 53 deletions lib/src/screens/onboarding_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,67 +20,69 @@ class _OnBoardingScreenState extends State<OnBoardingScreen> {
return Scaffold(
body: Stack(
children: <Widget>[
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,
)),
),
],
],
),
),
],
),
Expand Down

0 comments on commit c50753a

Please sign in to comment.