diff --git a/app/build.gradle b/app/build.gradle index 10ff3f8..56b0a83 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ apply plugin: 'com.google.gms.google-services' archivesBaseName = 'zcash-android-wallet' group = 'cash.z.ecc.android' -version = '1.0.0-alpha34' +version = Deps.versionName android { ndkVersion "21.1.6352462" @@ -17,16 +17,16 @@ android { buildToolsVersion Deps.buildToolsVersion viewBinding.enabled = true defaultConfig { - applicationId 'cash.z.ecc.android' + applicationId Deps.packageName minSdkVersion Deps.minSdkVersion targetSdkVersion Deps.targetSdkVersion - versionCode = 1_00_00_034 - // last digits are alpha(0XX) beta(2XX) rc(4XX) release(8XX) dev(9XX). Ex: 1_08_04_401 is an release candidate build of version 1.8.4 and 1_08_04_800 would be the final release. - versionName = "$version" + versionCode = Deps.versionCode + versionName = Deps.versionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' testInstrumentationRunnerArguments clearPackageData: 'true' multiDexEnabled true resValue 'string', 'bugsnag_api_key', "${(project.findProperty('BUGSNAG_API_KEY') ?: System.getenv('BUGSNAG_API_KEY')) ?: ''}" + resValue 'string', 'file_authority', "${Deps.packageName}.fileprovider" // this setting allows using color resources in vector drawables, rather than hardcoded values (note: only works when minApi is 21) // per https://google.github.io/android-gradle-dsl/current/com.android.build.gradle.internal.dsl.VectorDrawablesOptions.html: If set to an empty collection, all special handling of vector drawables will be disabled. @@ -68,10 +68,15 @@ android { useProguard false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } -// mock { -// initWith debug -// matchingFallbacks = ['debug', 'release', 'zcashtestnet'] -// } + // builds for testing only in the wallet team, typically unfinished features + // this flavor can be installed alongside the others + qa { + initWith debug + debuggable false + applicationIdSuffix ".internal" + resValue 'string', 'file_authority', "${Deps.packageName}.internal.fileprovider" + matchingFallbacks = ['debug'] + } } compileOptions { @@ -80,6 +85,9 @@ android { } kotlinOptions { jvmTarget = "1.8" + freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" +// freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.ObsoleteCoroutinesApi" +// freeCompilerArgs += "-Xopt-in=kotlinx.coroutines.FlowPreview" } kapt { arguments { @@ -94,7 +102,10 @@ android { } applicationVariants.all { variant -> variant.outputs.all { - outputFileName = "$archivesBaseName-v${defaultConfig.versionName}-${variant.buildType.name}.apk" + if (variant.buildType.name == "qa") { + it.versionNameOverride = "${Deps.versionName}-QA" + } + outputFileName = "$archivesBaseName-v${Deps.versionName}-${variant.buildType.name}.apk" } } } @@ -165,8 +176,12 @@ dependencies { testImplementation Deps.Test.COROUTINES_TEST testImplementation Deps.Test.JUNIT testImplementation Deps.Test.MOKITO + testImplementation Deps.Test.MOKITO_KOTLIN + testImplementation Deps.Test.COROUTINES_TEST + testImplementation Deps.Zcash.Sdk.TESTNET + androidTestImplementation Deps.Test.Android.JUNIT androidTestImplementation Deps.Test.Android.ESPRESSO } -defaultTasks 'clean', 'installZcashmainnetRelease' \ No newline at end of file +defaultTasks 'clean', 'assembleZcashmainnetRelease' \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json index 656dec6..54ac63d 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -63,6 +63,35 @@ ] } } + }, + { + "client_info": { + "mobilesdk_app_id": "1:000000000000:android:8888888888888888888888", + "android_client_info": { + "package_name": "cash.z.ecc.android.internal" + } + }, + "oauth_client": [ + { + "client_id": "dummy.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "dummy" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [ + { + "client_id": "dummy.apps.googleusercontent.com", + "client_type": 3 + } + ] + } + } } ], "configuration_version": "1" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7b5fa4f..11970a3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable-v24/ic_launcher_background.xml index 4cde782..912b679 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_background.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_background.xml @@ -15,8 +15,8 @@ android:centerX="54" android:centerY="36.01165" android:type="radial"> - - + + diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index f36afca..8e348e2 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -45,7 +45,7 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8786138..87ffa07 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -57,6 +57,9 @@ + #FF3F3F4F + #FF000000 + #FFB900 @color/zcashBlack_dark #282828 @color/zcashBlack_87 diff --git a/app/src/qa/res/mipmap-hdpi/ic_launcher.png b/app/src/qa/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..b424d50 Binary files /dev/null and b/app/src/qa/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/qa/res/mipmap-hdpi/ic_launcher_round.png b/app/src/qa/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..900868d Binary files /dev/null and b/app/src/qa/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/qa/res/mipmap-mdpi/ic_launcher.png b/app/src/qa/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..7a075f4 Binary files /dev/null and b/app/src/qa/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/qa/res/mipmap-mdpi/ic_launcher_round.png b/app/src/qa/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..a325a0d Binary files /dev/null and b/app/src/qa/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/qa/res/mipmap-xhdpi/ic_launcher.png b/app/src/qa/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..f6a9c4c Binary files /dev/null and b/app/src/qa/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/qa/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/qa/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..cd38ced Binary files /dev/null and b/app/src/qa/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/qa/res/mipmap-xxhdpi/ic_launcher.png b/app/src/qa/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..cdd597a Binary files /dev/null and b/app/src/qa/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/qa/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/qa/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..9cc974d Binary files /dev/null and b/app/src/qa/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/qa/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/qa/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4c865bd Binary files /dev/null and b/app/src/qa/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/qa/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/qa/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..020a355 Binary files /dev/null and b/app/src/qa/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/qa/res/values/colors.xml b/app/src/qa/res/values/colors.xml new file mode 100644 index 0000000..279a45f --- /dev/null +++ b/app/src/qa/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #FFB900 + #664B00 + #FF000000 + diff --git a/app/src/qa/res/values/strings.xml b/app/src/qa/res/values/strings.xml new file mode 100644 index 0000000..a04a322 --- /dev/null +++ b/app/src/qa/res/values/strings.xml @@ -0,0 +1,3 @@ + + ECC (QA) + diff --git a/build.gradle b/build.gradle index e7046b0..680b7a7 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { allprojects { repositories { - mavenLocal() +// mavenLocal() google() jcenter() maven { url 'https://jitpack.io' } diff --git a/qrecycler/src/main/res/values/strings.xml b/qrecycler/src/main/res/values/strings.xml index 2ec784d..8542005 100644 --- a/qrecycler/src/main/res/values/strings.xml +++ b/qrecycler/src/main/res/values/strings.xml @@ -1,3 +1,2 @@ - QRecycler