diff --git a/android/app/src/crypto/ic_launcher-web.png b/android/app/src/crypto/ic_launcher-web.png new file mode 100644 index 0000000..f6c630e Binary files /dev/null and b/android/app/src/crypto/ic_launcher-web.png differ diff --git a/android/app/src/crypto/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/crypto/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..54dfc49 --- /dev/null +++ b/android/app/src/crypto/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/android/app/src/crypto/res/drawable/ic_launcher_background.xml b/android/app/src/crypto/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..d5fccc5 --- /dev/null +++ b/android/app/src/crypto/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/crypto/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/crypto/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/crypto/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/crypto/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/crypto/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..036d09b --- /dev/null +++ b/android/app/src/crypto/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/crypto/res/mipmap-hdpi/ic_launcher.png b/android/app/src/crypto/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..ef65a7d Binary files /dev/null and b/android/app/src/crypto/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/crypto/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/crypto/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e1393bb Binary files /dev/null and b/android/app/src/crypto/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/crypto/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/crypto/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..276aa28 Binary files /dev/null and b/android/app/src/crypto/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/crypto/res/mipmap-mdpi/ic_launcher.png b/android/app/src/crypto/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..fd6e4ce Binary files /dev/null and b/android/app/src/crypto/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/crypto/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/crypto/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e8c3cc4 Binary files /dev/null and b/android/app/src/crypto/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/crypto/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/crypto/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..e8c0743 Binary files /dev/null and b/android/app/src/crypto/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6302c3b Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a27553e Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..edade61 Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..13ce90a Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..79378fb Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..ed79c54 Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..a70bcee Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a9e7fae Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..73c080d Binary files /dev/null and b/android/app/src/crypto/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/crypto/res/values/ic_launcher_background.xml b/android/app/src/crypto/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/android/app/src/crypto/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/lib/base/base_state.dart b/lib/base/base_state.dart index ed6647f..d25534f 100644 --- a/lib/base/base_state.dart +++ b/lib/base/base_state.dart @@ -50,6 +50,8 @@ abstract class BaseState extends State { /// Возвращает контейнер с всеми виджетами экрана. Widget getScreenContent(); + bool isAutomaticallyImplyLeading(); + /// Возвращает заголовок для AppBar String getTitle() { return null; @@ -59,6 +61,7 @@ abstract class BaseState extends State { return new AppBar(title: new Container( margin: new EdgeInsets.only(left: 16.0), child: new Text(getTitle(), style: new TextStyle(fontSize: 18.0))), + automaticallyImplyLeading: isAutomaticallyImplyLeading(), backgroundColor: Resources.getPrimaryColor(app), actions: getMenuButtons()); } diff --git a/lib/screens/currencies.dart b/lib/screens/currencies.dart index d450702..634a32c 100644 --- a/lib/screens/currencies.dart +++ b/lib/screens/currencies.dart @@ -17,6 +17,7 @@ class _CurrenciesState extends SettingsBaseState { _CurrenciesState(SqliteHelper helper, String app) : super(helper, app); + bool isAutomaticallyImplyLeading() => true; @override List getOptions() { diff --git a/lib/screens/faq.dart b/lib/screens/faq.dart index 60262c0..f89dc8d 100644 --- a/lib/screens/faq.dart +++ b/lib/screens/faq.dart @@ -22,6 +22,8 @@ class EntryItem extends StatelessWidget { const EntryItem(this.entry); final Entry entry; + bool isAutomaticallyImplyLeading() => true; + Widget _buildTiles(BuildContext context, Entry root) { EdgeInsets margin = new EdgeInsets.only(left: 20.0, right: 20.0); TextStyle titleStyle = Theme.of(context).textTheme.button.copyWith( diff --git a/lib/screens/finish_registration.dart b/lib/screens/finish_registration.dart index 8193b64..9c52db9 100644 --- a/lib/screens/finish_registration.dart +++ b/lib/screens/finish_registration.dart @@ -24,6 +24,8 @@ class RegistrationScreenState extends BaseState { bool _tokenActive = false; String _merchantID = ''; + bool isAutomaticallyImplyLeading() => false; + @override Widget build(BuildContext context) { if (_merchantID == '') { helper.getMerchantID().then((result) { diff --git a/lib/screens/languages.dart b/lib/screens/languages.dart index e7d90c1..330b357 100644 --- a/lib/screens/languages.dart +++ b/lib/screens/languages.dart @@ -18,6 +18,8 @@ class LanguagesState extends SettingsBaseState { List languages = const ['ru', 'en', 'ua', 'es']; + bool isAutomaticallyImplyLeading() => true; + @override List getOptions() { diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart index 2cebabb..f109b99 100644 --- a/lib/screens/purchase.dart +++ b/lib/screens/purchase.dart @@ -37,6 +37,8 @@ class PurchaseScreenState extends BaseState { FocusNode _focusNodeSum = new FocusNode(); FocusNode _focusNodeBonus = new FocusNode(); + bool isAutomaticallyImplyLeading() => false; + PurchaseScreenState(SqliteHelper helper, String app, String userString, String card) : super(helper, app) { this.user = JSON.decode(userString); this.card = card; diff --git a/lib/screens/purchase_success.dart b/lib/screens/purchase_success.dart index dbd9e48..a51f523 100644 --- a/lib/screens/purchase_success.dart +++ b/lib/screens/purchase_success.dart @@ -41,6 +41,8 @@ class PurchaseSuccessScreenState extends BaseState { int currency; bool showBonus; + bool isAutomaticallyImplyLeading() => false; + @override String getTitle() { return StringsLocalization.carryingPurchase(); } diff --git a/lib/screens/registration.dart b/lib/screens/registration.dart index cfcab81..d5c2e28 100644 --- a/lib/screens/registration.dart +++ b/lib/screens/registration.dart @@ -25,6 +25,8 @@ class RegistrationScreenState extends BaseState { RegistrationScreenState(SqliteHelper helper, String app) : super(helper, app); FocusNode _focusNode = new FocusNode(); + bool isAutomaticallyImplyLeading() => false; + @override Widget build(BuildContext ctx) { return getMainWidget(); diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index 3de9b2c..c35e9e8 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -36,6 +36,8 @@ class SettingsState extends BaseState { bool returnToScanner; + bool isAutomaticallyImplyLeading() => true; + SettingsState(SqliteHelper helper, String app, bool returnToScanner) : super(helper, app) { this.returnToScanner = returnToScanner; } diff --git a/lib/screens/splash.dart b/lib/screens/splash.dart index 5776cc1..f5add02 100644 --- a/lib/screens/splash.dart +++ b/lib/screens/splash.dart @@ -30,6 +30,8 @@ class _SplashScreenState extends BaseState { _SplashScreenState(SqliteHelper helper, String app) : super(helper, app); bool a = false; + bool isAutomaticallyImplyLeading() => false; + @override void initState() {