Merge pull request #158 from zcash/task/final-preparations
Updated product name and removed local dependency.
This commit is contained in:
commit
484f0d2368
|
@ -10,7 +10,7 @@ apply plugin: 'com.google.firebase.crashlytics'
|
||||||
|
|
||||||
archivesBaseName = 'zcash-android-wallet'
|
archivesBaseName = 'zcash-android-wallet'
|
||||||
group = 'cash.z.ecc.android'
|
group = 'cash.z.ecc.android'
|
||||||
version = '1.0.0-alpha28'
|
version = '1.0.0-alpha29'
|
||||||
|
|
||||||
android {
|
android {
|
||||||
ndkVersion "21.1.6352462"
|
ndkVersion "21.1.6352462"
|
||||||
|
@ -21,7 +21,7 @@ android {
|
||||||
applicationId 'cash.z.ecc.android'
|
applicationId 'cash.z.ecc.android'
|
||||||
minSdkVersion Deps.minSdkVersion
|
minSdkVersion Deps.minSdkVersion
|
||||||
targetSdkVersion Deps.targetSdkVersion
|
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.
|
// 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"
|
versionName = "$version"
|
||||||
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
|
||||||
|
@ -42,23 +42,21 @@ android {
|
||||||
matchingFallbacks = ['zcashmainnet', 'release']
|
matchingFallbacks = ['zcashmainnet', 'release']
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
signingConfigs {
|
||||||
// TODO: delete this test code
|
placeholder {
|
||||||
variantFilter { variant ->
|
storeFile file("${rootProject.projectDir}/placeholder.keystore")
|
||||||
def names = variant.flavors*.name
|
keyAlias "androiddebugkey"
|
||||||
// To check for a certain build type, use variant.buildType.name == "<buildType>"
|
keyPassword "android"
|
||||||
if (names.contains("zcashtestnet") || names.contains("Zcashtestnet") || variant.buildType.name == "release") {
|
storePassword "android"
|
||||||
// Gradle ignores any variants that satisfy the conditions above.
|
|
||||||
setIgnore(true)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled true
|
minifyEnabled false
|
||||||
shrinkResources true
|
shrinkResources false
|
||||||
useProguard false
|
useProguard false
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
signingConfig signingConfigs.placeholder
|
||||||
}
|
}
|
||||||
debug {
|
debug {
|
||||||
minifyEnabled false
|
minifyEnabled false
|
||||||
|
@ -71,14 +69,7 @@ android {
|
||||||
// matchingFallbacks = ['debug', 'release', 'zcashtestnet']
|
// matchingFallbacks = ['debug', 'release', 'zcashtestnet']
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
signingConfigs {
|
|
||||||
debug {
|
|
||||||
// storeFile file("debug.keystore")
|
|
||||||
// keyAlias "androiddebugkey"
|
|
||||||
// keyPassword "android"
|
|
||||||
// storePassword "android"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
|
@ -86,7 +77,6 @@ android {
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = "1.8"
|
jvmTarget = "1.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
kapt {
|
kapt {
|
||||||
arguments {
|
arguments {
|
||||||
arg 'dagger.fastInit', 'enabled'
|
arg 'dagger.fastInit', 'enabled'
|
||||||
|
@ -107,7 +97,6 @@ dependencies {
|
||||||
implementation project(':feedback')
|
implementation project(':feedback')
|
||||||
implementation project(':mnemonic')
|
implementation project(':mnemonic')
|
||||||
implementation project(':lockbox')
|
implementation project(':lockbox')
|
||||||
implementation project(':chipsinputlayout')
|
|
||||||
|
|
||||||
// Zcash
|
// Zcash
|
||||||
implementation Deps.Zcash.ANDROID_WALLET_PLUGINS
|
implementation Deps.Zcash.ANDROID_WALLET_PLUGINS
|
||||||
|
@ -160,6 +149,7 @@ dependencies {
|
||||||
|
|
||||||
// Misc.
|
// Misc.
|
||||||
implementation Deps.Misc.LOTTIE
|
implementation Deps.Misc.LOTTIE
|
||||||
|
implementation Deps.Misc.CHIPS
|
||||||
|
|
||||||
// Tests
|
// Tests
|
||||||
testImplementation Deps.Test.COROUTINES_TEST
|
testImplementation Deps.Test.COROUTINES_TEST
|
||||||
|
@ -169,4 +159,4 @@ dependencies {
|
||||||
androidTestImplementation Deps.Test.Android.ESPRESSO
|
androidTestImplementation Deps.Test.Android.ESPRESSO
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultTasks 'clean', 'installZcashmainnetDebug'
|
defaultTasks 'clean', 'installZcashmainnetRelease'
|
|
@ -231,7 +231,7 @@ class MainActivity : AppCompatActivity() {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
fun copyText(textToCopy: String, label: String = "zECC Wallet Text") {
|
fun copyText(textToCopy: String, label: String = "ECC Wallet Text") {
|
||||||
clipboard.setPrimaryClip(
|
clipboard.setPrimaryClip(
|
||||||
ClipData.newPlainText(label, textToCopy)
|
ClipData.newPlainText(label, textToCopy)
|
||||||
)
|
)
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:paddingStart="32dp"
|
android:paddingStart="32dp"
|
||||||
android:paddingEnd="32dp"
|
android:paddingEnd="32dp"
|
||||||
android:text="Welcome to the zECC Wallet!"
|
android:text="Welcome to the ECC Wallet!"
|
||||||
android:textColor="@color/zcashWhite"
|
android:textColor="@color/zcashWhite"
|
||||||
app:layout_constraintBottom_toTopOf="@id/guideline_buttons"
|
app:layout_constraintBottom_toTopOf="@id/guideline_buttons"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
|
|
@ -180,7 +180,7 @@
|
||||||
android:paddingBottom="8dp"
|
android:paddingBottom="8dp"
|
||||||
android:paddingStart="16dp"
|
android:paddingStart="16dp"
|
||||||
android:paddingTop="8dp"
|
android:paddingTop="8dp"
|
||||||
android:text="zECC App"
|
android:text="ECC Wallet"
|
||||||
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
|
||||||
android:textColor="@color/selector_button_text_light"
|
android:textColor="@color/selector_button_text_light"
|
||||||
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
|
app:layout_constraintEnd_toEndOf="@id/guideline_content_end"
|
||||||
|
|
|
@ -171,7 +171,7 @@
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:paddingStart="32dp"
|
android:paddingStart="32dp"
|
||||||
android:paddingEnd="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:textColor="@color/text_light"
|
||||||
android:textSize="18dp"
|
android:textSize="18dp"
|
||||||
app:layout_constraintBottom_toTopOf="@id/sad_checkbox"
|
app:layout_constraintBottom_toTopOf="@id/sad_checkbox"
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name">zECC Wallet</string>
|
<string name="app_name">ECC Wallet</string>
|
||||||
<string name="receive_address_title">Your Shielded Address</string>
|
<string name="receive_address_title">Your Shielded Address</string>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -29,4 +29,4 @@ task clean(type: Delete) {
|
||||||
delete rootProject.buildDir
|
delete rootProject.buildDir
|
||||||
}
|
}
|
||||||
|
|
||||||
defaultTasks 'clean', 'installZcashmainnetDebug'
|
defaultTasks 'clean', 'installZcashmainnetRelease'
|
|
@ -86,6 +86,7 @@ object Deps {
|
||||||
}
|
}
|
||||||
object Misc {
|
object Misc {
|
||||||
const val LOTTIE = "com.airbnb.android:lottie:3.1.0"
|
const val LOTTIE = "com.airbnb.android:lottie:3.1.0"
|
||||||
|
const val CHIPS = "com.github.gmale:chips-input-layout:2.3.1"
|
||||||
object Plugins {
|
object Plugins {
|
||||||
const val SECURE_STORAGE = "de.adorsys.android:securestoragelibrary:1.2.2"
|
const val SECURE_STORAGE = "de.adorsys.android:securestoragelibrary:1.2.2"
|
||||||
const val QR_SCANNER = "com.google.zxing:core:3.2.1"
|
const val QR_SCANNER = "com.google.zxing:core:3.2.1"
|
||||||
|
|
Binary file not shown.
|
@ -1,3 +1,2 @@
|
||||||
rootProject.name='Zcash Wallet'
|
rootProject.name='Zcash Wallet'
|
||||||
include ':app', ':qrecycler', ':feedback', ':mnemonic', ':lockbox', ':chipsinputlayout'
|
include ':app', ':qrecycler', ':feedback', ':mnemonic', ':lockbox'
|
||||||
project(":chipsinputlayout").projectDir = file("../../clones/chips-input-layout/library")
|
|
Loading…
Reference in New Issue