Texts for joys fix

.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

android/.hgignore

@@ -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

lib/screens/purchase.dart

@@ -78,7 +78,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
     }
 
     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<T> extends BaseState<PurchaseScreen> {
 
   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<T> extends BaseState<PurchaseScreen> {
             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),

lib/screens/purchase_success.dart

@@ -91,15 +91,14 @@ class PurchaseSuccessScreenState<T> extends BaseState<PurchaseSuccessScreen> {
 
     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') {

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