tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Mikhail Sokolov
2018-04-05 11:32:03 +07:00
parent 9ae1a2e04a 17c0a953cf
commit ca3c32dca2
4 changed files with 163 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

302
android/app/build.gradle
View File

@@ -1,14 +1,14 @@
def localProperties = new Properties() def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties') def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) { if (localPropertiesFile.exists()) {
localPropertiesFile.withInputStream { stream -> localPropertiesFile.withInputStream { stream ->
localProperties.load(stream) localProperties.load(stream)
} }
} }
def flutterRoot = localProperties.getProperty('flutter.sdk') def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) { 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' apply plugin: 'com.android.application'
@@ -18,170 +18,170 @@ android {
compileSdkVersion 27 compileSdkVersion 27
buildToolsVersion '27.0.3' buildToolsVersion '27.0.3'
lintOptions { lintOptions {
disable 'InvalidPackage' disable 'InvalidPackage'
} }
defaultConfig { defaultConfig {
targetSdkVersion 27 targetSdkVersion 27
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
applicationId "com.dinect.checker" applicationId "com.dinect.checker"
} }
buildTypes { buildTypes {
debug { debug {
debuggable true debuggable true
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
}
release {
signingConfig signingConfigs.debug
}
} }
release {
signingConfig signingConfigs.debug
}
}
flavorDimensions "checker" flavorDimensions "checker"
// Не смог разобраться, как коомбинировать flavors в flutter при запуске // Не смог разобраться, как коомбинировать flavors в flutter при запуске
productFlavors { productFlavors {
dinect { dinect {
applicationId 'com.dinect.checker.dinect' applicationId 'com.dinect.checker.dinect'
buildConfigField "String", "locale", "\"ru\"" buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\"" buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643" buildConfigField "int", "currency", "643"
buildConfigField "String", "supportPhone", "\"support@dinect.com\"" buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\"" buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\"" buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
buildConfigField "String", "appTitle", "\"Dinect\"" buildConfigField "String", "appTitle", "\"Dinect\""
buildConfigField "boolean", "showBonus", "true" 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.joys.checker.crypto'
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-crypto-int.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
buildConfigField "String", "appTitle", "\"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"
}
} }
sourceSets { dinect_INT {
applicationId 'com.dinect.checker.int'
main.jniLibs.srcDir 'jniLibs' buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
pip { buildConfigField "int", "currency", "643"
res.srcDirs = ['src/pip/res'] buildConfigField "String", "supportPhone", "\"support@dinect.com\""
manifest.srcFile 'src/pip/AndroidManifest.xml' 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.joys.checker.crypto'
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-crypto-int.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
buildConfigField "String", "appTitle", "\"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"
}
}
sourceSets {
main.jniLibs.srcDir 'jniLibs'
pip {
res.srcDirs = ['src/pip/res']
manifest.srcFile 'src/pip/AndroidManifest.xml'
}
}
} }
flutter { flutter {
source '../..' source '../..'
} }
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:27.1.0' compile 'com.android.support:appcompat-v7:27.1.0'
compile 'com.squareup.okhttp3:okhttp:3.8.1' compile 'com.squareup.okhttp3:okhttp:3.8.1'
compile 'com.squareup.okio:okio:1.13.0' compile 'com.squareup.okio:okio:1.13.0'
compile 'me.dm7.barcodescanner:zxing:1.9.8' compile 'me.dm7.barcodescanner:zxing:1.9.8'
} }

4
android/app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dinect.checker" package="com.dinect.checker"
android:versionCode="11" android:versionCode="12"
android:versionName="1.1.16"> android:versionName="1.1.17">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"

8
build-all-apks Executable file
View File

@@ -0,0 +1,8 @@
#! /bin/bash
flutter clean
flutter build apk --flavor autobonus
flutter build apk --flavor crypto
flutter build apk --flavor dinect
flutter build apk --flavor dinect_INT
flutter build apk --flavor dinect_OTE

4
lib/screens/purchase.dart
View File

@@ -456,7 +456,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} }
if (sumFocusNode.hasFocus) { if (sumFocusNode.hasFocus) {
scrollController.animateTo(100.0, duration: new Duration(seconds: 1), curve: Curves.ease); scrollController.animateTo(150.0, duration: new Duration(seconds: 1), curve: Curves.ease);
} }
}); });
@@ -470,7 +470,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} }
if (bonusFocusNode.hasFocus) { if (bonusFocusNode.hasFocus) {
scrollController.animateTo(120.0, duration: new Duration(seconds: 1), curve: Curves.ease); scrollController.animateTo(150.0, duration: new Duration(seconds: 1), curve: Curves.ease);
} }
}); });