Упрощена работа с локалью, базовый url и токен приложения вынесены в build.gradle, добавлен конфиг для разработки и тестирования, исправлена проблема с переходом на экран сканера если локаль не выбиралась в настройках

This commit is contained in:
kifio
2017-09-23 23:19:32 +03:00
parent 808d5a39e5
commit 40fed84275
15 changed files with 277 additions and 255 deletions

View File

@@ -49,6 +49,8 @@ android {
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\""
}
pip {
@@ -58,6 +60,19 @@ android {
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\""
}
develop {
applicationId 'com.dinect.develop'
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"autobonus\""
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\""
}
}
@@ -79,7 +94,7 @@ flutter {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.squareup.okhttp3:okhttp:3.8.1'
compile 'com.squareup.okio:okio:1.13.0'