diff --git a/android/app/build.gradle b/android/app/build.gradle index cbaab32..80ef9ef 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -28,15 +28,28 @@ android { minSdkVersion 16 applicationId "com.dinect.checker" } - + signingConfigs { + debug { + storeFile file("../../debug.keystore") + keyAlias 'androiddebugkey' + keyPassword 'android' + storePassword 'android' + } + release { + storeFile file("../../dinect-release-key.keystore") + storePassword 'df3bsfb6ale' + keyAlias 'key0' + keyPassword 'vquyc4b8smdk2' + } + } buildTypes { debug { debuggable true signingConfig signingConfigs.debug } release { - signingConfig signingConfigs.debug minifyEnabled false + signingConfig signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -123,21 +136,21 @@ android { buildConfigField "boolean", "showBonus", "false" } - pip { - applicationId 'com.dinect.checker.pip' - buildConfigField "String", "locale", "\"ua\"" - buildConfigField "String", "flavor", "\"pip\"" - buildConfigField "int", "currency", "980" - buildConfigField "String", "supportPhone", "\"+38 080 030 9997\\n+38 044 390 1697\"" - buildConfigField "String", "supportUrl", "\"http://discount.kiev.ua/\"" - buildConfigField "String", "endpoint", "\"https://pos-api.discount.kiev.ua/20130701/\"" + crypto { + applicationId 'digital.joys.checker.app' + buildConfigField "String", "locale", "\"ru\"" + buildConfigField "String", "flavor", "\"crypto\"" + buildConfigField "int", "currency", "643" + buildConfigField "String", "supportPhone", "\"support@joys.digital\"" + buildConfigField "String", "supportUrl", "\"https://joys.digital/\"" + buildConfigField "String", "endpoint", "\"https://pos.api.joys.digital/20130701/\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" - buildConfigField "String", "appTitle", "\"PIP\"" - buildConfigField "boolean", "showBonus", "true" + buildConfigField "String", "appTitle", "\"POSapp Joys\"" + buildConfigField "boolean", "showBonus", "false" } - crypto { - applicationId 'digital.joys.checker' + crypto_INT { + applicationId 'digital.joys.checker.int' buildConfigField "String", "locale", "\"ru\"" buildConfigField "String", "flavor", "\"crypto\"" buildConfigField "int", "currency", "643" @@ -145,8 +158,8 @@ android { buildConfigField "String", "supportUrl", "\"https://joys.digital/\"" buildConfigField "String", "endpoint", "\"https://pos-api-crypto-int.dinect.com/20130701/\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" - buildConfigField "String", "appTitle", "\"POSapp Joys\"" - buildConfigField "boolean", "showBonus", "true" + buildConfigField "String", "appTitle", "\"POSapp Joys (INT)\"" + buildConfigField "boolean", "showBonus", "false" } develop { @@ -162,17 +175,17 @@ android { buildConfigField "boolean", "showBonus", "true" } - biohacker { - applicationId 'ru.fivefit.biochecker' + racib { + applicationId 'digital.joys.checker.racib' buildConfigField "String", "locale", "\"ru\"" - buildConfigField "String", "flavor", "\"biohacker\"" + buildConfigField "String", "flavor", "\"racib\"" buildConfigField "int", "currency", "643" buildConfigField "String", "supportPhone", "\"support@dinect.com\"" buildConfigField "String", "supportUrl", "\"http://www.dinect.com\"" buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" - buildConfigField "String", "appTitle", "\"BioChecker\"" - buildConfigField "boolean", "showBonus", "true" + buildConfigField "String", "appTitle", "\"Racib\"" + buildConfigField "boolean", "showBonus", "false" } } compileOptions { diff --git a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java index 30352e3..17cf6ea 100644 --- a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java +++ b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java @@ -170,7 +170,7 @@ public class ScannerActivity extends AppCompatActivity implements @Override public void onClick(View v) { - if (!"crypto".equals(BuildConfig.FLAVOR)) { + if (!"crypto".equals(BuildConfig.FLAVOR) || !"racib".equals(BuildConfig.FLAVOR)) { if (mSearchType == SearchType.CARD) { resetSearchType(SearchType.PHONE_NUMBER, R.drawable.ic_phone, "enter_phone"); } else { diff --git a/build-all-apks.bat b/build-all-apks.bat index 89b72f9..7423ea1 100644 --- a/build-all-apks.bat +++ b/build-all-apks.bat @@ -2,7 +2,8 @@ echo on call flutter clean call flutter build apk --flavor autobonus call flutter build apk --flavor crypto +call flutter build apk --flavor crypto_int call flutter build apk --flavor dinect call flutter build apk --flavor dinect_INT call flutter build apk --flavor dinect_OTE -call flutter build apk --flavor biohacker +call flutter build apk --flavor racib diff --git a/debug.keystore b/debug.keystore new file mode 100644 index 0000000..ad8b442 Binary files /dev/null and b/debug.keystore differ diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m index a2ccbb5..eee90c8 100644 --- a/ios/Runner/AppDelegate.m +++ b/ios/Runner/AppDelegate.m @@ -85,26 +85,15 @@ @"appTitle" : @"POSapp Joys INT", @"showBonus" : @YES, }, - @"com.dinect.checker.pip" : @{ - @"locale" : @"ua", - @"flavor" : @"pip", - @"currency" : @980, - @"supportPhone" : @"+38 080 030 9997\n+38 044 390 1697", - @"supportUrl" : @"http://discount.kiev.ua/", - @"endPoint" : @"https://pos-api.discount.kiev.ua/20130701/", - @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f", - @"appTitle" : @"PIP", - @"showBonus" : @YES, - }, - @"ru.fivefit.biochecker" : @{ + @"digital.joys.checker.racib" : @{ @"locale" : @"ru", - @"flavor" : @"biohacker", + @"flavor" : @"racib", @"currency" : @643, @"supportPhone" : @"support@dinect.com", @"supportUrl" : @"http://www.dinect.com", @"endPoint" : @"https://pos-api.dinect.com/20130701/", @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f", - @"appTitle" : @"BioChecker", + @"appTitle" : @"Racib", @"showBonus" : @YES, }, }; diff --git a/lib/resources.dart b/lib/resources.dart index 39768dd..7d8504a 100644 --- a/lib/resources.dart +++ b/lib/resources.dart @@ -13,7 +13,7 @@ class Resources { case 'autobonus': return new Color(0xffeb0004); case 'dinect': return new Color(0xff3daee3); case 'crypto': return new Color(0xff0f3d87); - case 'biohacker': return new Color(0xff464646); + case 'racib': return new Color(0xff464646); default: return new Color(0xffffffff); } } @@ -23,7 +23,7 @@ class Resources { case 'autobonus': return new Color(0xffeb0004); case 'dinect': return new Color(0xff33cc99); case 'crypto': return new Color(0xffffc34d); - case 'biohacker': return new Color(0xffff6134); + case 'racib': return new Color(0xffff6134); default: return new Color(0xffffffff); } } diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart index 2140b76..c7309b5 100644 --- a/lib/screens/purchase.dart +++ b/lib/screens/purchase.dart @@ -45,6 +45,7 @@ class PurchaseScreenState extends BaseState { void initState() { loading = true; requestAsyncData(user); + loading = false; buildFocusNode(); scrollController = new ScrollController(); super.initState(); @@ -74,11 +75,8 @@ class PurchaseScreenState extends BaseState { )); widgetList.add(getValueWithDescription(StringsLocalization.card(), card)); - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { widgetList.add(getValueWithDescription(StringsLocalization.reward(), loyalty)); - } - - if (app != 'crypto') { if (bonus.length > 0) { widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus)); } @@ -87,7 +85,7 @@ class PurchaseScreenState extends BaseState { widgetList.add(getHintLabel()); widgetList.add(getInputField()); // Нельзя добавить еще одно поле таким же способом - if ((app != 'autobonus') || (app != 'crypto')) { + if ((app != 'autobonus') || (app != 'crypto') || (app != 'racib')) { if (this.loyalityType == 'bonus') { widgetList.add(getBonusInputField()); @@ -133,7 +131,7 @@ class PurchaseScreenState extends BaseState { var bonusTextField = new TextField( keyboardType: TextInputType.number, decoration: new InputDecoration.collapsed( - hintText: (app != 'crypto') ? StringsLocalization.bonusHint() : StringsLocalization.joysHint(), + hintText: StringsLocalization.bonusHint(), hintStyle: new TextStyle(color: greyTextColor, fontSize: 16.0) ), focusNode: bonusFocusNode, @@ -163,7 +161,7 @@ class PurchaseScreenState extends BaseState { top: 5.0 ), child: new Text( - (app == 'crypto') ? " " : StringsLocalization.bonusExplanation(), + 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 d497d38..ea99793 100644 --- a/lib/screens/purchase_success.dart +++ b/lib/screens/purchase_success.dart @@ -91,7 +91,7 @@ class PurchaseSuccessScreenState extends BaseState { widgetList.add(getValueWithDescription(StringsLocalization.buyer(), username)); widgetList.add(getSuccessMessage()); - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { if (bonusPlus > 0) { widgetList.add(getValueWithDescription(StringsLocalization.bonusPlus(), bonusPlus.toString())); } @@ -103,11 +103,11 @@ class PurchaseSuccessScreenState extends BaseState { if (app != 'autobonus') { widgetList.add(getValueWithDescription(StringsLocalization.discountRate(), '${details['discount']}%')); - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { widgetList.add(getValueWithDescription(StringsLocalization.discountSum(), '${details['sum_discount']}')); } } - if (app != 'crypto' && this.coupons.length > 0) { + if ((app != 'crypto' || app != 'racib') && this.coupons.length > 0) { widgetList.add(getItemTitle(StringsLocalization.couponsUsed())); this.coupons.forEach((couponItem) { widgetList.add(getItemToggle( @@ -165,7 +165,7 @@ class PurchaseSuccessScreenState extends BaseState { getMessageTitle() { if (currency != null) { - if (app != 'crypto') { + if (app != 'crypto' || app != 'racib') { return StringsLocalization.paymentCompleted(sum, currency); } else { return StringsLocalization.purchaseCompleted(sum, currency); diff --git a/pubspec.lock b/pubspec.lock index 23f48b0..9f407d6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -129,7 +129,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "1.5.3+2" + version: "1.5.3" typed_data: dependency: transitive description: