Слияние с default

android/app/build.gradle

@@ -1,14 +1,14 @@
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
-  localPropertiesFile.withInputStream { stream ->
-    localProperties.load(stream)
-  }
+    localPropertiesFile.withInputStream { stream ->
+        localProperties.load(stream)
+    }
 }
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-  throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 apply plugin: 'com.android.application'
@@ -18,170 +18,170 @@ android {
   compileSdkVersion 27
   buildToolsVersion '27.0.3'
 
-  lintOptions {
-    disable 'InvalidPackage'
-  }
+    lintOptions {
+        disable 'InvalidPackage'
+    }
 
-  defaultConfig {
+    defaultConfig {
     targetSdkVersion 27
-    testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    applicationId "com.dinect.checker"
-  }
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        applicationId "com.dinect.checker"
+    }
 
-  buildTypes {
-    debug {
-      debuggable true
-      signingConfig signingConfigs.debug
+    buildTypes {
+        debug {
+            debuggable true
+            signingConfig signingConfigs.debug
+        }
+        release {
+            signingConfig signingConfigs.debug
+        }
     }
-    release {
-      signingConfig signingConfigs.debug
-    }
-  }
 
   flavorDimensions "checker"
 
-  // Не смог разобраться, как коомбинировать flavors в flutter при запуске
+    // Не смог разобраться, как коомбинировать flavors в flutter при запуске
 
-  productFlavors {
+    productFlavors {
 
-    dinect {
-      applicationId 'com.dinect.checker.dinect'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"dinect\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
-      buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
-      buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
-      buildConfigField "String", "appTitle", "\"Dinect\""
-      buildConfigField "boolean", "showBonus", "true"
+        dinect {
+            applicationId 'com.dinect.checker.dinect'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"dinect\""
+            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", "\"Dinect\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+		dinect_INT {
+            applicationId 'com.dinect.checker.int'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"dinect\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+            buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
+            buildConfigField "String", "appTitle", "\"Dinect (INT)\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+        dinect_OTE {
+            applicationId 'com.dinect.checker.ote'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"dinect\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+            buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-ote.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
+            buildConfigField "String", "appTitle", "\"Dinect (OTE)\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+        dinect_TESTING {
+            applicationId 'com.dinect.checker.testing'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"dinect\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+            buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-testing.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
+            buildConfigField "String", "appTitle", "\"Dinect (TESTING)\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+        dinect_STAGING {
+            applicationId 'com.dinect.checker.staging'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"dinect\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+            buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-staging.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
+            buildConfigField "String", "appTitle", "\"Dinect (STAGING)\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+        autobonus {
+            applicationId 'com.dinect.checker.autoclub'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"autobonus\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"8-800-234-6064\""
+            buildConfigField "String", "supportUrl", "\"https://www.auto-club.biz\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-autoclub.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
+            buildConfigField "String", "appTitle", "\"Autobonus\""
+            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/\""
+            buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
+            buildConfigField "String", "appTitle", "\"PIP\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+        crypto {
+            applicationId 'com.dinect.checker.crypto'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"crypto\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+            buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-crypto-int.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
+            buildConfigField "String", "appTitle", "\"Crypto Joys\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
+
+        develop {
+            applicationId 'com.dinect.develop'
+            buildConfigField "String", "locale", "\"ru\""
+            buildConfigField "String", "flavor", "\"dinect\""
+            buildConfigField "int", "currency", "643"
+            buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+            buildConfigField "String", "supportUrl", "\"http://dinect.com/\""
+            buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
+            buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
+            buildConfigField "String", "appTitle", "\"dinect (develop)\""
+            buildConfigField "boolean", "showBonus", "true"
+        }
     }
 
-    dinect_INT {
-      applicationId 'com.dinect.checker.int'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"dinect\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
-      buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
-      buildConfigField "String", "appTitle", "\"Dinect (INT)\""
-      buildConfigField "boolean", "showBonus", "true"
+    sourceSets {
+
+        main.jniLibs.srcDir 'jniLibs'
+
+        pip {
+            res.srcDirs = ['src/pip/res']
+            manifest.srcFile 'src/pip/AndroidManifest.xml'
+        }
+
     }
-
-    dinect_OTE {
-      applicationId 'com.dinect.checker.ote'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"dinect\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
-      buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-ote.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
-      buildConfigField "String", "appTitle", "\"Dinect (OTE)\""
-      buildConfigField "boolean", "showBonus", "true"
-    }
-
-    dinect_TESTING {
-      applicationId 'com.dinect.checker.testing'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"dinect\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
-      buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-testing.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
-      buildConfigField "String", "appTitle", "\"Dinect (TESTING)\""
-      buildConfigField "boolean", "showBonus", "true"
-    }
-
-    dinect_STAGING {
-      applicationId 'com.dinect.checker.staging'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"dinect\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
-      buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-staging.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
-      buildConfigField "String", "appTitle", "\"Dinect (STAGING)\""
-      buildConfigField "boolean", "showBonus", "true"
-    }
-
-    autobonus {
-      applicationId 'com.dinect.checker.autoclub'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"autobonus\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-234-6064\""
-      buildConfigField "String", "supportUrl", "\"https://www.auto-club.biz\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-autoclub.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
-      buildConfigField "String", "appTitle", "\"Autobonus\""
-      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/\""
-      buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
-      buildConfigField "String", "appTitle", "\"PIP\""
-      buildConfigField "boolean", "showBonus", "true"
-    }
-
-    crypto {
-      applicationId 'com.dinect.checker.crypto'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"crypto\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
-      buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
-      buildConfigField "String", "appTitle", "\"Dinect Crypto\""
-      buildConfigField "boolean", "showBonus", "true"
-    }
-
-    develop {
-      applicationId 'com.dinect.develop'
-      buildConfigField "String", "locale", "\"ru\""
-      buildConfigField "String", "flavor", "\"dinect\""
-      buildConfigField "int", "currency", "643"
-      buildConfigField "String", "supportPhone", "\"8 800 555 35 35\""
-      buildConfigField "String", "supportUrl", "\"http://yandex.ru/\""
-      buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
-      buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
-      buildConfigField "String", "appTitle", "\"dinect (develop)\""
-      buildConfigField "boolean", "showBonus", "true"
-    }
-  }
-
-  sourceSets {
-
-    main.jniLibs.srcDir 'jniLibs'
-
-    pip {
-      res.srcDirs = ['src/pip/res']
-      manifest.srcFile 'src/pip/AndroidManifest.xml'
-    }
-
-  }
 }
 
 flutter {
-  source '../..'
+    source '../..'
 }
 
 dependencies {
-  compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile fileTree(include: ['*.jar'], dir: 'libs')
   compile 'com.android.support:appcompat-v7:27.1.0'
-  compile 'com.squareup.okhttp3:okhttp:3.8.1'
-  compile 'com.squareup.okio:okio:1.13.0'
-  compile 'me.dm7.barcodescanner:zxing:1.9.8'
+    compile 'com.squareup.okhttp3:okhttp:3.8.1'
+    compile 'com.squareup.okio:okio:1.13.0'
+    compile 'me.dm7.barcodescanner:zxing:1.9.8'
 }

android/app/src/crypto/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">Dinect Crypto</string>
+    <string name="app_name">Crypto</string>
 </resources>

assets/values-en/strings.xml

@@ -110,5 +110,7 @@ Our website:
   <string name="common_guide">
 To improve barcode scanning quality, adjust the distance between the camera and the barcode so that the border around the barcode (if any) is not visible. Otherwise the vertical lines of the border could be wrongly considered as part of the code.
   </string>
-
+  <string name="Joys">Joys on account</string>
+  <string name="Joys_minus">Joys was charged</string>
+  <string name="Joys_hint">Joys to charge</string>
 </resources>

assets/values-ru/strings.xml

@@ -98,9 +98,9 @@
   <string name="support_guide">
 Рекомендуйте покупателям установить мобильное приложение дисконтной системы и получайте новых лояльных покупателей.
 
-При некорректной работе приложения просьба сразу обратиться по телефону нашей технической поддержки.
+При некорректной работе приложения просьба сразу обратиться в нашу техническую поддержку.
 
-Телефон:
+Связь с техподдержкой:
 %s
 Наш сайт:
 %s
@@ -109,5 +109,7 @@
   <string name="common_guide">
 Для эффективного считывания штрих-кода карты участника системы лояльности необходимо камеру сканера поднести так, чтобы в неё не попадали вертикальные полосы рамки (если они есть). Они расцениваются сканером как часть штрих-кода.
  </string>
-
+  <string name="Joys">Joys на счету</string>
+  <string name="Joys_minus">Joys было списано</string>
+  <string name="Joys_hint">Joys списать</string>
 </resources>

assets/values-ua/strings.xml

@@ -111,5 +111,7 @@
   <string name="common_guide">
 Для ефективного зчитування штрих-коду карти учасника системи лояльності необхідно камеру сканера піднести так, щоб в неї не потрапляли вертикальні смуги рамки. Вони розцінюються сканером як частина штрих-коду.
 </string>
-
+  <string name="Joys">Joys на рахунку</string>
+  <string name="Joys_minus">Joys списано</string>
+  <string name="Joys_hint">Скільки Joys списати?</string>
 </resources>

ios/Runner/AppDelegate.m

@@ -23,7 +23,7 @@
                @"locale" : @"ru",
                @"flavor" : @"dinect",
                @"currency" : @643,
-               @"supportPhone" : @"8-800-77-55-032",
+               @"supportPhone" : @"support@dinect.com",
                @"supportUrl" : @"http://www.dinect.com",
                @"endPoint" : @"https://pos-api.dinect.com/20130701/",
                @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
@@ -34,7 +34,7 @@
                @"locale" : @"ru",
                @"flavor" : @"dinect",
                @"currency" : @643,
-               @"supportPhone" : @"8 800 555 35 35",
+               @"supportPhone" : @"support@dinect.com",
                @"supportUrl" : @"http://yandex.ru",
                @"endPoint" : @"https://pos-api-int.dinect.com/20130701/",
                @"appToken" : @"9fec83cdca38c357e6b65dbb17514cdd36bf2a08",
@@ -51,6 +51,17 @@
                @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
                @"appTitle" : @"Autobonus",
                @"showBonus" : @NO,
+       },
+	   @"com.dinect.checker.dinect" : @{
+               @"locale" : @"ru",
+               @"flavor" : @"crypto",
+               @"currency" : @643,
+               @"supportPhone" : @"support@dinect.com",
+               @"supportUrl" : @"http://www.dinect.com",
+               @"endPoint" : @"https://pos-api.dinect.com/20130701/",
+               @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
+               @"appTitle" : @"Crypto",
+               @"showBonus" : @YES,
        },
        @"com.dinect.checker.pip" : @{
                @"locale" : @"ua",

lib/resources.dart

@@ -17,7 +17,7 @@ class Resources {
       case 'pip': return new Color(0xff008794);
       case 'autobonus': return new Color(0xffeb0004);
       case 'dinect': return new Color(0xff3daee3);
-      case 'crypto': return new Color(0xffffc34d);
+      case 'crypto': return new Color(0xff0f3d87);
       default: return new Color(0xffffffff);
     }
   }
@@ -27,9 +27,9 @@ class Resources {
       case 'pip': return new Color(0xfff49935);
       case 'autobonus': return new Color(0xffeb0004);
       case 'dinect': return new Color(0xff33cc99);
-      case 'dinect': return new Color(0xff33cc99);
-      case 'crypto': return new Color(0xff0f3d87);
+      case 'crypto': return new Color(0xffffc34d);
       default: return new Color(0xffffffff);
+	  
     }
   }
 }

pubspec.yaml

@@ -34,7 +34,8 @@ flutter:
     - assets/autobonus_splash.png
     - assets/pip_splash.png
     - assets/dinect_splash.png
-
+    - assets/crypto_splash.png
+    
     - assets/settings.png
     - assets/settings_arrow.png
     - assets/help.png