diff --git a/app/build.gradle b/app/build.gradle index b91de34..52d6772 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ apply plugin: 'com.google.firebase.crashlytics' archivesBaseName = 'zcash-android-wallet' group = 'cash.z.ecc.android' -version = '1.0.0-alpha28' +version = '1.0.0-alpha29' android { ndkVersion "21.1.6352462" @@ -21,7 +21,7 @@ android { applicationId 'cash.z.ecc.android' minSdkVersion Deps.minSdkVersion targetSdkVersion Deps.targetSdkVersion - versionCode = 1_00_00_025 + versionCode = 1_00_00_029 // 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" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -42,23 +42,21 @@ android { matchingFallbacks = ['zcashmainnet', 'release'] } } - - // TODO: delete this test code - variantFilter { variant -> - def names = variant.flavors*.name - // To check for a certain build type, use variant.buildType.name == "" - if (names.contains("zcashtestnet") || names.contains("Zcashtestnet") || variant.buildType.name == "release") { - // Gradle ignores any variants that satisfy the conditions above. - setIgnore(true) + signingConfigs { + placeholder { + storeFile file("${rootProject.projectDir}/placeholder.keystore") + keyAlias "androiddebugkey" + keyPassword "android" + storePassword "android" } } - buildTypes { release { - minifyEnabled true - shrinkResources true + minifyEnabled false + shrinkResources false useProguard false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.placeholder } debug { minifyEnabled false @@ -71,14 +69,7 @@ android { // matchingFallbacks = ['debug', 'release', 'zcashtestnet'] // } } - signingConfigs { - debug { -// storeFile file("debug.keystore") -// keyAlias "androiddebugkey" -// keyPassword "android" -// storePassword "android" - } - } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -86,7 +77,6 @@ android { kotlinOptions { jvmTarget = "1.8" } - kapt { arguments { arg 'dagger.fastInit', 'enabled' @@ -107,7 +97,6 @@ dependencies { implementation project(':feedback') implementation project(':mnemonic') implementation project(':lockbox') - implementation project(':chipsinputlayout') // Zcash implementation Deps.Zcash.ANDROID_WALLET_PLUGINS @@ -160,6 +149,7 @@ dependencies { // Misc. implementation Deps.Misc.LOTTIE + implementation Deps.Misc.CHIPS // Tests testImplementation Deps.Test.COROUTINES_TEST @@ -169,4 +159,4 @@ dependencies { androidTestImplementation Deps.Test.Android.ESPRESSO } -defaultTasks 'clean', 'installZcashmainnetDebug' \ No newline at end of file +defaultTasks 'clean', 'installZcashmainnetRelease' \ No newline at end of file diff --git a/app/src/main/java/cash/z/ecc/android/ui/MainActivity.kt b/app/src/main/java/cash/z/ecc/android/ui/MainActivity.kt index 55f049b..d58dbca 100644 --- a/app/src/main/java/cash/z/ecc/android/ui/MainActivity.kt +++ b/app/src/main/java/cash/z/ecc/android/ui/MainActivity.kt @@ -231,7 +231,7 @@ class MainActivity : AppCompatActivity() { return false } - fun copyText(textToCopy: String, label: String = "zECC Wallet Text") { + fun copyText(textToCopy: String, label: String = "ECC Wallet Text") { clipboard.setPrimaryClip( ClipData.newPlainText(label, textToCopy) ) diff --git a/app/src/main/res/layout/fragment_landing.xml b/app/src/main/res/layout/fragment_landing.xml index 92f5a5a..4a00293 100644 --- a/app/src/main/res/layout/fragment_landing.xml +++ b/app/src/main/res/layout/fragment_landing.xml @@ -49,7 +49,7 @@ android:gravity="center" android:paddingStart="32dp" android:paddingEnd="32dp" - android:text="Welcome to the zECC Wallet!" + android:text="Welcome to the ECC Wallet!" android:textColor="@color/zcashWhite" app:layout_constraintBottom_toTopOf="@id/guideline_buttons" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index d49117a..dafabe2 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -180,7 +180,7 @@ android:paddingBottom="8dp" android:paddingStart="16dp" android:paddingTop="8dp" - android:text="zECC App" + android:text="ECC Wallet" android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" android:textColor="@color/selector_button_text_light" app:layout_constraintEnd_toEndOf="@id/guideline_content_end" diff --git a/app/src/main/res/layout/fragment_send_memo.xml b/app/src/main/res/layout/fragment_send_memo.xml index 5a3616b..7029d35 100644 --- a/app/src/main/res/layout/fragment_send_memo.xml +++ b/app/src/main/res/layout/fragment_send_memo.xml @@ -171,7 +171,7 @@ android:gravity="center" android:paddingStart="32dp" android:paddingEnd="32dp" - android:text="Your privacy is protected, if you use your wallet to store your funds. Using the zECC wallet to pass funds through a z-address could compromise your privacy." + android:text="Your privacy is protected, if you use your wallet to store your funds. Using the ECC Wallet to pass funds through a z-address could compromise your privacy." android:textColor="@color/text_light" android:textSize="18dp" app:layout_constraintBottom_toTopOf="@id/sad_checkbox" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f8fb643..d0493aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - zECC Wallet + ECC Wallet Your Shielded Address diff --git a/build.gradle b/build.gradle index 2f44100..86d5621 100644 --- a/build.gradle +++ b/build.gradle @@ -29,4 +29,4 @@ task clean(type: Delete) { delete rootProject.buildDir } -defaultTasks 'clean', 'installZcashmainnetDebug' \ No newline at end of file +defaultTasks 'clean', 'installZcashmainnetRelease' \ No newline at end of file diff --git a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt index d091f1b..5e1e8b7 100644 --- a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt +++ b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt @@ -86,6 +86,7 @@ object Deps { } object Misc { const val LOTTIE = "com.airbnb.android:lottie:3.1.0" + const val CHIPS = "com.github.gmale:chips-input-layout:2.3.1" object Plugins { const val SECURE_STORAGE = "de.adorsys.android:securestoragelibrary:1.2.2" const val QR_SCANNER = "com.google.zxing:core:3.2.1" diff --git a/placeholder.keystore b/placeholder.keystore new file mode 100644 index 0000000..2d3e2f2 Binary files /dev/null and b/placeholder.keystore differ diff --git a/settings.gradle b/settings.gradle index 7878096..85c0088 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ rootProject.name='Zcash Wallet' -include ':app', ':qrecycler', ':feedback', ':mnemonic', ':lockbox', ':chipsinputlayout' -project(":chipsinputlayout").projectDir = file("../../clones/chips-input-layout/library") +include ':app', ':qrecycler', ':feedback', ':mnemonic', ':lockbox' \ No newline at end of file