diff --git a/.hgignore b/.hgignore index 04ad415..8d44ee5 100644 --- a/.hgignore +++ b/.hgignore @@ -8,24 +8,21 @@ build/ gen/ -packages pubspec.lock .flutter-plugins ios/Flutter - -android/gradle -android/gradlew -android/gradlew.bat -android/local.properties -android/app/gradle -android/app/gradlew -android/app/gradlew.bat -android/app/local.properties - -android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java - ios/.generated/ ios/Runner/GeneratedPluginRegistrant.h ios/Runner/GeneratedPluginRegistrant.m ios/Pods/ + +android/local.properties +android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +android/android.iml +android/app/app.iml +android/.idea/ +android/build/ +android/.DS_Store +android/captures +android/gradle diff --git a/android/.hgignore b/android/.hgignore deleted file mode 100644 index 62794a1..0000000 --- a/android/.hgignore +++ /dev/null @@ -1,14 +0,0 @@ -android.iml -app/app.iml -.gradle -local.properties -.idea/workspace.xml -.idea/libraries -.DS_Store -build -captures -GeneratedPluginRegistrant.java - -/gradle -gradlew -gradlew.bat diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart index efac1f4..9b2bde1 100644 --- a/lib/screens/purchase.dart +++ b/lib/screens/purchase.dart @@ -78,7 +78,7 @@ class PurchaseScreenState extends BaseState { } if (bonus.length > 0) { - if (app = 'crypto') { + if (app == 'crypto') { widgetList.add(getValueWithDescription(StringsLocalization.joys(), bonus)); } else { widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus)); @@ -130,50 +130,13 @@ class PurchaseScreenState extends BaseState { getBonusInputField() { - if (app = 'crypto') { - var bonusTextField = new EnsureVisibleWhenFocused( - focusNode: _focusNodeBonus, - child: new TextField( - focusNode: _focusNodeBonus, - keyboardType: TextInputType.number, - decoration: new InputDecoration.collapsed( - hintText: StringsLocalization.joysHint(), - hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0) - ), - controller: bonusController, - onSubmitted: (String text) { - setState(() { - bonusController.text = text; - }); - }, - textAlign: TextAlign.center, - )); - } else { - var bonusTextField = new EnsureVisibleWhenFocused( - focusNode: _focusNodeBonus, - child: new TextField( - focusNode: _focusNodeBonus, - keyboardType: TextInputType.number, - decoration: new InputDecoration.collapsed( - hintText: StringsLocalization.bonusHint(), - hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0) - ), - controller: bonusController, - onSubmitted: (String text) { - setState(() { - bonusController.text = text; - }); - }, - textAlign: TextAlign.center, - )); - } var bonusTextField = new EnsureVisibleWhenFocused( focusNode: _focusNodeBonus, child: new TextField( focusNode: _focusNodeBonus, keyboardType: TextInputType.number, decoration: new InputDecoration.collapsed( - hintText: StringsLocalization.bonusHint(), + hintText: (app != 'crypto') ? StringsLocalization.bonusHint() : StringsLocalization.joysHint(), hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0) ), controller: bonusController, @@ -202,7 +165,7 @@ class PurchaseScreenState extends BaseState { top: 5.0 ), child: new Text( - (app = 'crypto')?" ":StringsLocalization.bonusExplanation(), + (app == 'crypto') ? " " : StringsLocalization.bonusExplanation(), textAlign: TextAlign.center, overflow: TextOverflow.ellipsis, style: new TextStyle(color: greyTextColor, fontSize: 11.0), diff --git a/lib/screens/purchase_success.dart b/lib/screens/purchase_success.dart index caa8220..3e0f7c4 100644 --- a/lib/screens/purchase_success.dart +++ b/lib/screens/purchase_success.dart @@ -91,15 +91,14 @@ class PurchaseSuccessScreenState extends BaseState { if (app != 'crypto') { if (bonusPlus > 0) { - widgetList.add(getValueWithDescription(StringsLocalization.bonusPlus(), bonusPlus.toString())); - } - } - if (bonusMinus > 0) { - if (app = 'crypto') { - widgetList.add(getValueWithDescription(StringsLocalization.joysMinus(), bonusMinus.toString())); + widgetList.add(getValueWithDescription(StringsLocalization.bonusPlus(), bonusPlus.toString())); } - } else { - widgetList.add(getValueWithDescription(StringsLocalization.bonusMinus(), bonusMinus.toString())); + } + + if (bonusMinus > 0) { + widgetList.add(getValueWithDescription(app == 'crypto' + ? StringsLocalization.joysMinus() + : StringsLocalization.bonusMinus(), bonusMinus.toString())); } if (app != 'autobonus') { diff --git a/pubspec.lock b/pubspec.lock index be9f694..c8590db 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.6" + version: "1.14.5" flutter: dependency: "direct main" description: flutter