From 1bda85c1c40e46adc214b501a39701cd9fe4af62 Mon Sep 17 00:00:00 2001 From: Kevin Gorham Date: Wed, 10 Jun 2020 17:09:20 -0400 Subject: [PATCH] Updated product name and removed local dependency. --- app/build.gradle | 38 +++++++----------- .../cash/z/ecc/android/ui/MainActivity.kt | 2 +- app/src/main/res/layout/fragment_landing.xml | 2 +- app/src/main/res/layout/fragment_profile.xml | 2 +- .../main/res/layout/fragment_send_memo.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- build.gradle | 2 +- .../java/cash/z/ecc/android/Dependencies.kt | 1 + placeholder.keystore | Bin 0 -> 2473 bytes settings.gradle | 3 +- 10 files changed, 22 insertions(+), 32 deletions(-) create mode 100644 placeholder.keystore 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 0000000000000000000000000000000000000000..2d3e2f2c799c45405c8e961d82dfc0db0e50d44f GIT binary patch literal 2473 zcmY+Ec{mh`8pdbL7)!EDj58EM*=sB#O2~4Ah(t|B!q^)zwu>wcjrCZvXF8U#g=}NX z5M?*Al_4Rrjb+GWiyGIx&%Nh7=a27szvq45@B8zIz;hL`0YL~n*L?_=JmETF?<9}| zn1|=O3C44o9@|C;JbTDLBKC)1JiFVmjX9nNkQ4vA;^79e<>A4H2t0TXAqV09zkU2% z6fC$r))kCZkZ@W!oWJR~)->XZid|;|0Xi(ecyKSvlEW}M$FCnNS(J(v03G(9p{YoZ88{fG zzIAKYR(qt8rr+pwbpmJ^x~|>7V4<#)7%B4$XqcJz*#ep%oTZ6f96cw z`K{Oj@qr25%0oIV<2|>!f7RsF?bV6h2krq!)9~6zask@CGUzeAay9-lrF?MSa-vyt zY#V-I`VYd|=5v#{$W?yhfdOsA{FOs?s-{8SYMeA%NJOVSC`C(%yxwia%s32fWWo z7y8nhzU-9e-MhgrKK=5P#sYn8J?^m{%dBo@)1sn<`o7*JrJd4p03`=vO4g~h-&TB) z-z}uv-uy{N8P`Y6jTAtR3Lq}V*D706?25g?JK*)EU1;m>ow@eRr{+e4)3Xj($&@`y zr%~?Q+{0e2a7_x6dU;FlB`}*`;0^Z`lC#sLSCv1~uxqro(O;Fw{lpp(MHs-iEofgT zs>AoiM@@qF-SV8%wt62&n?GV$h6$c0hK3vJ)N&s+`geAFv<|Z^YAYXA?q!S5I^Ot~OJ4_d^e6(H*31XzLZyn%IPYR*gTA98^1DB+SnC8-(5eWJ z9JYn4eg(&?;+*72GUi^t&Un)J3!e|Vui8xl{mf{YzFLzrsx*nLSd^M4Y{Mac*to$_ zfmt-fy9qTQXS1@8vXm~W#C$Ng7HH0C;_p%9UA7U+o~ldY7Y!h(y&ddrdvTfB zL;Lc1Tlp43=`U1r2`Wp7i2)n{UH}XL2Y3WJS%z9os%c5{zjIq`(vG(p0~qD4DMn3qt*W z$64HKdj0cEXwBteG*-7{dd# z&o2beNsiCFp*!G|6e?BCZzWy|ZMy_7IRz%~+sT9)hEAcTT}zaq&;bAMM-Y5;4dCW{ zg^>Nv9gGyV-QDbt7kYLLV{4r3w|;|-_3RB>bzH`dRvc-luVQ4&-2k4d%zefnCSF3f zzjdUex*_GhMDBM+5t3p_r>eo>tz6~j&PIqZTTSgZ4|;5CW;zwiR#5}b_%eF(-bE}Y zy7iFuD}AyUjnS^FqQ%WRiToZ(G3%5X*d~{0b@<#+F|i&y0%=hn5qdh5kyo4R1CJGV zJ3{5&InSXNNzP-B=e`rpg5;nx1oUlqpPaofl;%{Di4^u2TS~B?ZK86i?|xdx)2*ln z{aMq|3^{qHMHyZT71-jbdu`B~a++i@Qs0*5^yOdHwt*Rqp(mAG#X1N-pMO2;%o9AN z==+@xq+XmI*2egM7x zK}{flGw^>)hjps}Wx_-8)7g{oG2x7C|{pYJg>d}LiQueAI-btgN6C2@hVIqzw zbSpBqb~JK)l9-IpMw~@(LD&^|L2M%I0I;B2z5BO!alGz(sVk)jF~I|}fQdd>@EEm$ Zu8P(tMV-_vbNw^Qw#lS=HV}}I_ist#ptb-2 literal 0 HcmV?d00001 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