diff --git a/app/src/androidTest/java/cash/z/ecc/app/ScreenshotTest.kt b/app/src/androidTest/java/co/electriccoin/zcash/app/ScreenshotTest.kt similarity index 97% rename from app/src/androidTest/java/cash/z/ecc/app/ScreenshotTest.kt rename to app/src/androidTest/java/co/electriccoin/zcash/app/ScreenshotTest.kt index 513c823f..fd3183e2 100644 --- a/app/src/androidTest/java/cash/z/ecc/app/ScreenshotTest.kt +++ b/app/src/androidTest/java/co/electriccoin/zcash/app/ScreenshotTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.app +package co.electriccoin.zcash.app import android.Manifest import android.content.pm.PackageManager @@ -21,15 +21,16 @@ import androidx.test.filters.SmallTest import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import androidx.test.runner.screenshot.Screenshot -import cash.z.ecc.app.test.EccScreenCaptureProcessor import cash.z.ecc.sdk.fixture.SeedPhraseFixture import cash.z.ecc.sdk.fixture.WalletAddressFixture import cash.z.ecc.sdk.model.MonetarySeparators -import cash.z.ecc.ui.MainActivity -import cash.z.ecc.ui.R -import cash.z.ecc.ui.screen.backup.BackupTag -import cash.z.ecc.ui.screen.home.viewmodel.SecretState -import cash.z.ecc.ui.screen.restore.RestoreTag +import co.electriccoin.zcash.app.test.EccScreenCaptureProcessor +import co.electriccoin.zcash.app.test.getStringResource +import co.electriccoin.zcash.ui.MainActivity +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.screen.backup.BackupTag +import co.electriccoin.zcash.ui.screen.home.viewmodel.SecretState +import co.electriccoin.zcash.ui.screen.restore.RestoreTag import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext diff --git a/app/src/androidTest/java/cash/z/ecc/app/TargetApiTest.kt b/app/src/androidTest/java/co/electriccoin/zcash/app/TargetApiTest.kt similarity index 95% rename from app/src/androidTest/java/cash/z/ecc/app/TargetApiTest.kt rename to app/src/androidTest/java/co/electriccoin/zcash/app/TargetApiTest.kt index a540bdb7..c6261a12 100644 --- a/app/src/androidTest/java/cash/z/ecc/app/TargetApiTest.kt +++ b/app/src/androidTest/java/co/electriccoin/zcash/app/TargetApiTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.app +package co.electriccoin.zcash.app import android.app.Application import android.os.Build diff --git a/app/src/androidTest/java/cash/z/ecc/app/test/EccScreenCaptureProcessor.kt b/app/src/androidTest/java/co/electriccoin/zcash/app/test/EccScreenCaptureProcessor.kt similarity index 98% rename from app/src/androidTest/java/cash/z/ecc/app/test/EccScreenCaptureProcessor.kt rename to app/src/androidTest/java/co/electriccoin/zcash/app/test/EccScreenCaptureProcessor.kt index 6ce1827a..0f5fd922 100644 --- a/app/src/androidTest/java/cash/z/ecc/app/test/EccScreenCaptureProcessor.kt +++ b/app/src/androidTest/java/co/electriccoin/zcash/app/test/EccScreenCaptureProcessor.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.app.test +package co.electriccoin.zcash.app.test import android.os.Build import android.os.Environment diff --git a/app/src/androidTest/java/cash/z/ecc/app/test/GetStringResource.kt b/app/src/androidTest/java/co/electriccoin/zcash/app/test/GetStringResource.kt similarity index 85% rename from app/src/androidTest/java/cash/z/ecc/app/test/GetStringResource.kt rename to app/src/androidTest/java/co/electriccoin/zcash/app/test/GetStringResource.kt index 2c23e7a5..eb2d3ca7 100644 --- a/app/src/androidTest/java/cash/z/ecc/app/test/GetStringResource.kt +++ b/app/src/androidTest/java/co/electriccoin/zcash/app/test/GetStringResource.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.app +package co.electriccoin.zcash.app.test import android.content.Context import androidx.annotation.StringRes diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc6da9be..be612979 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ package="co.electriccoin.zcash"> @@ -14,7 +14,7 @@ diff --git a/app/src/main/java/cash/z/ecc/app/AppImpl.kt b/app/src/main/java/co/electriccoin/zcash/app/AppImpl.kt similarity index 89% rename from app/src/main/java/cash/z/ecc/app/AppImpl.kt rename to app/src/main/java/co/electriccoin/zcash/app/AppImpl.kt index 0f886f63..251b7488 100644 --- a/app/src/main/java/cash/z/ecc/app/AppImpl.kt +++ b/app/src/main/java/co/electriccoin/zcash/app/AppImpl.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.app +package co.electriccoin.zcash.app import android.app.Application import co.electriccoin.zcash.BuildConfig diff --git a/app/src/main/java/cash/z/ecc/app/StrictModeHelper.kt b/app/src/main/java/co/electriccoin/zcash/app/StrictModeHelper.kt similarity index 98% rename from app/src/main/java/cash/z/ecc/app/StrictModeHelper.kt rename to app/src/main/java/co/electriccoin/zcash/app/StrictModeHelper.kt index 904cca97..2b2cfaac 100644 --- a/app/src/main/java/cash/z/ecc/app/StrictModeHelper.kt +++ b/app/src/main/java/co/electriccoin/zcash/app/StrictModeHelper.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.app +package co.electriccoin.zcash.app import android.annotation.SuppressLint import android.os.Build diff --git a/docs/Architecture.md b/docs/Architecture.md index 0e7431e4..7cbf512e 100644 --- a/docs/Architecture.md +++ b/docs/Architecture.md @@ -24,7 +24,7 @@ The main entrypoints of the application are: # Modules The logical components of the app are implemented as a number of Gradle modules. - * `app` — Compiles all of the modules together into the final application. This module contains minimal actual code. Note that the Java package structure for this module is under `cash.z.ecc.app` while the Android package name is `cash.z.ecc`. + * `app` — Compiles all of the modules together into the final application. This module contains minimal actual code. Note that the Java package structure for this module is under `co.electriccoin.zcash.app` while the Android package name is `co.electriccoin.zcash`. * `build-info-lib` — Collects information from the build environment (e.g. Git SHA, Git commit count) and compiles them into the application. Can also be used for injection of API keys or other secrets. * ui * `ui-design` — Contains UI theme elements only. Besides offering modularization, this allows for hiding of some Material Design components behind our own custom components. diff --git a/ui-design-lib/src/androidTest/AndroidManifest.xml b/ui-design-lib/src/androidTest/AndroidManifest.xml index 69d385a2..ef9759d9 100644 --- a/ui-design-lib/src/androidTest/AndroidManifest.xml +++ b/ui-design-lib/src/androidTest/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="co.electriccoin.zcash.ui.design"> diff --git a/ui-design-lib/src/main/AndroidManifest.xml b/ui-design-lib/src/main/AndroidManifest.xml index 428990cf..7be28eda 100644 --- a/ui-design-lib/src/main/AndroidManifest.xml +++ b/ui-design-lib/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="co.electriccoin.zcash.ui.design"> diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/Constants.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/Constants.kt similarity index 72% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/Constants.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/Constants.kt index 0e22f712..76e578fb 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/Constants.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/Constants.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design +package co.electriccoin.zcash.ui.design /** * A tiny weight, useful for spacers to fill an empty space. diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/compat/FontCompat.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/compat/FontCompat.kt similarity index 92% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/compat/FontCompat.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/compat/FontCompat.kt index f42080a3..e2c2c860 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/compat/FontCompat.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/compat/FontCompat.kt @@ -1,10 +1,10 @@ -package cash.z.ecc.ui.design.compat +package co.electriccoin.zcash.ui.design.compat import android.content.Context import androidx.annotation.FontRes import androidx.core.content.res.ResourcesCompat -import cash.z.ecc.ui.design.R import co.electriccoin.zcash.spackle.AndroidApiVersion +import co.electriccoin.zcash.ui.design.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Button.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt similarity index 97% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Button.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt index 4cc3ff5f..0d9c76ae 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Button.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.design.theme.ZcashTheme @Preview @Composable diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Chip.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt similarity index 93% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Chip.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt index 93674f2f..7a012d00 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Chip.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Chip.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Index +import co.electriccoin.zcash.ui.design.theme.ZcashTheme @Preview @Composable diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/ChipGrid.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ChipGrid.kt similarity index 96% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/ChipGrid.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ChipGrid.kt index bb09f200..8c8746e9 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/ChipGrid.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ChipGrid.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/CommonTag.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/CommonTag.kt similarity index 64% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/CommonTag.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/CommonTag.kt index a3ab7d21..5c54ae85 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/CommonTag.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/CommonTag.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component object CommonTag { const val CHIP_LAYOUT = "chip_layout" diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/GradientSurface.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/GradientSurface.kt similarity index 84% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/GradientSurface.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/GradientSurface.kt index 57f6f1cc..0949a36e 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/GradientSurface.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/GradientSurface.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.foundation.background import androidx.compose.material3.Surface @@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.RectangleShape -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.design.theme.ZcashTheme @Composable fun GradientSurface(modifier: Modifier = Modifier, content: @Composable () -> Unit) { diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Progress.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt similarity index 85% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Progress.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt index 95c026ae..f55971b9 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Progress.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Progress.kt @@ -1,10 +1,10 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.material3.LinearProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Progress +import co.electriccoin.zcash.ui.design.theme.ZcashTheme // Eventually rename to GradientLinearProgressIndicator @Composable diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Text.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Text.kt similarity index 91% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Text.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Text.kt index 430dcaea..fd6b4aec 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/Text.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Text.kt @@ -1,10 +1,10 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.design.theme.ZcashTheme @Composable fun Header( diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/TextField.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/TextField.kt similarity index 97% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/TextField.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/TextField.kt index 4db2626c..867a8c69 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/component/TextField.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/TextField.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.component +package co.electriccoin.zcash.ui.design.component import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.text.KeyboardActions diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/ExtendedColors.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ExtendedColors.kt similarity index 93% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/ExtendedColors.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ExtendedColors.kt index 251069e7..26d79c8c 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/ExtendedColors.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ExtendedColors.kt @@ -1,11 +1,10 @@ -package cash.z.ecc.ui.design.theme +package co.electriccoin.zcash.ui.design.theme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color -import cash.z.ecc.ui.theme.ZcashTheme @Immutable data class ExtendedColors( diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/ZcashTheme.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ZcashTheme.kt similarity index 62% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/ZcashTheme.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ZcashTheme.kt index 1dee8caf..241ee4bd 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/ZcashTheme.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ZcashTheme.kt @@ -1,18 +1,17 @@ -package cash.z.ecc.ui.theme +package co.electriccoin.zcash.ui.design.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider -import cash.z.ecc.ui.design.theme.ExtendedColors -import cash.z.ecc.ui.design.theme.internal.DarkColorPalette -import cash.z.ecc.ui.design.theme.internal.DarkExtendedColorPalette -import cash.z.ecc.ui.design.theme.internal.ExtendedTypography -import cash.z.ecc.ui.design.theme.internal.LightColorPalette -import cash.z.ecc.ui.design.theme.internal.LightExtendedColorPalette -import cash.z.ecc.ui.design.theme.internal.LocalExtendedColors -import cash.z.ecc.ui.design.theme.internal.LocalExtendedTypography -import cash.z.ecc.ui.design.theme.internal.Typography +import co.electriccoin.zcash.ui.design.theme.internal.DarkColorPalette +import co.electriccoin.zcash.ui.design.theme.internal.DarkExtendedColorPalette +import co.electriccoin.zcash.ui.design.theme.internal.ExtendedTypography +import co.electriccoin.zcash.ui.design.theme.internal.LightColorPalette +import co.electriccoin.zcash.ui.design.theme.internal.LightExtendedColorPalette +import co.electriccoin.zcash.ui.design.theme.internal.LocalExtendedColors +import co.electriccoin.zcash.ui.design.theme.internal.LocalExtendedTypography +import co.electriccoin.zcash.ui.design.theme.internal.Typography @Composable fun ZcashTheme( diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/internal/Color.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt similarity index 98% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/internal/Color.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt index 2cf771e3..b233eebc 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/internal/Color.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Color.kt @@ -1,12 +1,12 @@ @file:Suppress("MagicNumber") -package cash.z.ecc.ui.design.theme.internal +package co.electriccoin.zcash.ui.design.theme.internal import androidx.compose.material3.darkColorScheme import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.staticCompositionLocalOf import androidx.compose.ui.graphics.Color -import cash.z.ecc.ui.design.theme.ExtendedColors +import co.electriccoin.zcash.ui.design.theme.ExtendedColors internal object Dark { val backgroundStart = Color(0xff243155) diff --git a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/internal/Typography.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt similarity index 94% rename from ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/internal/Typography.kt rename to ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt index 2bdea5fe..05efd0f8 100644 --- a/ui-design-lib/src/main/java/cash/z/ecc/ui/design/theme/internal/Typography.kt +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/internal/Typography.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.design.theme.internal +package co.electriccoin.zcash.ui.design.theme.internal import androidx.compose.material3.Typography import androidx.compose.runtime.Immutable @@ -10,7 +10,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.BaselineShift import androidx.compose.ui.unit.ExperimentalUnitApi import androidx.compose.ui.unit.sp -import cash.z.ecc.ui.design.R +import co.electriccoin.zcash.ui.design.R private val Rubik = FontFamily( Font(R.font.rubik_regular, FontWeight.W400), diff --git a/ui-lib/src/androidTest/AndroidManifest.xml b/ui-lib/src/androidTest/AndroidManifest.xml index 4c4408f9..0eb99368 100644 --- a/ui-lib/src/androidTest/AndroidManifest.xml +++ b/ui-lib/src/androidTest/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="co.electriccoin.zcash.ui"> diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/MainActivityCompanionTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/MainActivityCompanionTest.kt similarity index 90% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/MainActivityCompanionTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/MainActivityCompanionTest.kt index b2ae2816..ec6dc40d 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/MainActivityCompanionTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/MainActivityCompanionTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui +package co.electriccoin.zcash.ui import androidx.test.filters.SmallTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/common/ListExtTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/common/ListExtTest.kt similarity index 95% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/common/ListExtTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/common/ListExtTest.kt index 911b6277..53b50bc7 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/common/ListExtTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/common/ListExtTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.common +package co.electriccoin.zcash.ui.common import androidx.test.filters.SmallTest import org.hamcrest.CoreMatchers.equalTo diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/preference/EncryptedPreferenceKeysTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceKeysTest.kt similarity index 94% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/preference/EncryptedPreferenceKeysTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceKeysTest.kt index 8c14353e..91433120 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/preference/EncryptedPreferenceKeysTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceKeysTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.preference +package co.electriccoin.zcash.ui.preference import androidx.test.filters.SmallTest import org.hamcrest.CoreMatchers.equalTo diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/backup/model/BackupStageTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/backup/model/BackupStageTest.kt similarity index 97% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/backup/model/BackupStageTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/backup/model/BackupStageTest.kt index ef3578a0..a04b3d02 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/backup/model/BackupStageTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/backup/model/BackupStageTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup.model +package co.electriccoin.zcash.ui.screen.backup.model import androidx.test.filters.SmallTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/backup/view/BackupViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/backup/view/BackupViewTest.kt similarity index 94% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/backup/view/BackupViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/backup/view/BackupViewTest.kt index f38cd315..732a3f99 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/backup/view/BackupViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/backup/view/BackupViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup.view +package co.electriccoin.zcash.ui.screen.backup.view import androidx.compose.ui.test.assertCountEquals import androidx.compose.ui.test.hasTestTag @@ -11,13 +11,13 @@ import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.test.filters.MediumTest import cash.z.ecc.sdk.fixture.PersistableWalletFixture -import cash.z.ecc.ui.R -import cash.z.ecc.ui.screen.backup.BackupTag -import cash.z.ecc.ui.screen.backup.model.BackupStage -import cash.z.ecc.ui.screen.backup.state.BackupState -import cash.z.ecc.ui.screen.backup.state.TestChoices -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.backup.BackupTag +import co.electriccoin.zcash.ui.screen.backup.model.BackupStage +import co.electriccoin.zcash.ui.screen.backup.state.BackupState +import co.electriccoin.zcash.ui.screen.backup.state.TestChoices +import co.electriccoin.zcash.ui.test.getStringResource import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/onboarding/model/OnboardingStageTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/onboarding/model/OnboardingStageTest.kt similarity index 96% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/onboarding/model/OnboardingStageTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/onboarding/model/OnboardingStageTest.kt index 5199b938..4c88c805 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/onboarding/model/OnboardingStageTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/onboarding/model/OnboardingStageTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.onboarding.model +package co.electriccoin.zcash.ui.screen.onboarding.model import androidx.test.filters.SmallTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/onboarding/view/OnboardingViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingViewTest.kt similarity index 96% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/onboarding/view/OnboardingViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingViewTest.kt index 8263955b..5b0653cf 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/onboarding/view/OnboardingViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.onboarding.view +package co.electriccoin.zcash.ui.screen.onboarding.view import androidx.compose.ui.test.assertHasClickAction import androidx.compose.ui.test.assertIsEnabled @@ -7,11 +7,11 @@ import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.test.filters.MediumTest -import cash.z.ecc.ui.R -import cash.z.ecc.ui.screen.onboarding.model.OnboardingStage -import cash.z.ecc.ui.screen.onboarding.state.OnboardingState -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.onboarding.model.OnboardingStage +import co.electriccoin.zcash.ui.screen.onboarding.state.OnboardingState +import co.electriccoin.zcash.ui.test.getStringResource import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/profile/view/ProfileViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileViewTest.kt similarity index 96% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/profile/view/ProfileViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileViewTest.kt index b69995bc..30b0334f 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/profile/view/ProfileViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.profile.view +package co.electriccoin.zcash.ui.screen.profile.view import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.junit4.createComposeRule @@ -9,9 +9,9 @@ import androidx.compose.ui.test.performScrollTo import androidx.test.filters.MediumTest import cash.z.ecc.sdk.fixture.WalletAddressFixture import cash.z.ecc.sdk.model.WalletAddress -import cash.z.ecc.ui.R -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.test.getStringResource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/request/view/RequestViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt similarity index 97% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/request/view/RequestViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt index c63c790c..b5a985a5 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/request/view/RequestViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/request/view/RequestViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.request.view +package co.electriccoin.zcash.ui.screen.request.view import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.junit4.ComposeContentTestRule @@ -14,9 +14,9 @@ import cash.z.ecc.sdk.model.MonetarySeparators import cash.z.ecc.sdk.model.Zatoshi import cash.z.ecc.sdk.model.ZecRequest import cash.z.ecc.sdk.model.ZecRequestMessage -import cash.z.ecc.ui.R -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.test.getStringResource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/model/ParseResultTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResultTest.kt similarity index 97% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/model/ParseResultTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResultTest.kt index d4c6dc1f..1ba6d999 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/model/ParseResultTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResultTest.kt @@ -1,8 +1,7 @@ -package cash.z.ecc.ui.screen.restore.model +package co.electriccoin.zcash.ui.screen.restore.model import androidx.test.filters.SmallTest import cash.z.ecc.sdk.model.SeedPhrase -import org.hamcrest.Matchers.not import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/model/WordListTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/model/WordListTest.kt similarity index 85% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/model/WordListTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/model/WordListTest.kt index 9c4ca5d9..e33ce995 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/model/WordListTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/model/WordListTest.kt @@ -1,6 +1,6 @@ -package cash.z.ecc.ui.screen.restore.model +package co.electriccoin.zcash.ui.screen.restore.model -import cash.z.ecc.ui.screen.restore.state.WordList +import co.electriccoin.zcash.ui.screen.restore.state.WordList import org.junit.Assert.assertEquals import org.junit.Assert.assertNotEquals import org.junit.Test diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/view/RestoreViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt similarity index 94% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/view/RestoreViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt index 1047e6ca..d5d968ed 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/restore/view/RestoreViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.restore.view +package co.electriccoin.zcash.ui.screen.restore.view import android.content.Context import android.view.inputmethod.InputMethodManager @@ -19,12 +19,12 @@ import androidx.test.filters.MediumTest import cash.z.ecc.android.bip39.Mnemonics import cash.z.ecc.sdk.fixture.SeedPhraseFixture import cash.z.ecc.sdk.model.SeedPhrase -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.component.CommonTag -import cash.z.ecc.ui.screen.restore.RestoreTag -import cash.z.ecc.ui.screen.restore.state.WordList -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.component.CommonTag +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.restore.RestoreTag +import co.electriccoin.zcash.ui.screen.restore.state.WordList +import co.electriccoin.zcash.ui.test.getStringResource import org.junit.Assert.assertEquals import org.junit.Assert.assertTrue import org.junit.Rule diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/seed/view/SeedViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/seed/view/SeedViewTest.kt similarity index 92% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/seed/view/SeedViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/seed/view/SeedViewTest.kt index 3da9c858..829ce17c 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/seed/view/SeedViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/seed/view/SeedViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.seed.view +package co.electriccoin.zcash.ui.screen.seed.view import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.junit4.createComposeRule @@ -8,9 +8,9 @@ import androidx.compose.ui.test.performClick import androidx.compose.ui.test.performScrollTo import androidx.test.filters.MediumTest import cash.z.ecc.sdk.fixture.PersistableWalletFixture -import cash.z.ecc.ui.R -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.test.getStringResource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/ext/WalletAddressExtTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/ext/WalletAddressExtTest.kt similarity index 93% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/ext/WalletAddressExtTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/ext/WalletAddressExtTest.kt index 769a71fb..0e19e106 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/ext/WalletAddressExtTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/ext/WalletAddressExtTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.ext +package co.electriccoin.zcash.ui.screen.send.ext import androidx.test.core.app.ApplicationProvider import androidx.test.filters.SmallTest diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/ext/ZecSendExtTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/ext/ZecSendExtTest.kt similarity index 94% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/ext/ZecSendExtTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/ext/ZecSendExtTest.kt index a525b782..532485c6 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/ext/ZecSendExtTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/ext/ZecSendExtTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.ext +package co.electriccoin.zcash.ui.screen.send.ext import androidx.compose.runtime.saveable.SaverScope import androidx.test.filters.SmallTest diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/view/SendViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/view/SendViewTest.kt similarity index 97% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/view/SendViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/view/SendViewTest.kt index a3dca158..9818c4f9 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/send/view/SendViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/send/view/SendViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.view +package co.electriccoin.zcash.ui.screen.send.view import androidx.compose.ui.test.assertIsNotEnabled import androidx.compose.ui.test.junit4.ComposeContentTestRule @@ -16,9 +16,9 @@ import cash.z.ecc.sdk.model.Memo import cash.z.ecc.sdk.model.MonetarySeparators import cash.z.ecc.sdk.model.Zatoshi import cash.z.ecc.sdk.model.ZecSend -import cash.z.ecc.ui.R -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.test.getStringResource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Ignore diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/settings/view/SettingsViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsViewTest.kt similarity index 94% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/settings/view/SettingsViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsViewTest.kt index 4777f99b..aeedd064 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/settings/view/SettingsViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.settings.view +package co.electriccoin.zcash.ui.screen.settings.view import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.junit4.createComposeRule @@ -6,9 +6,9 @@ import androidx.compose.ui.test.onNodeWithContentDescription import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.performClick import androidx.test.filters.MediumTest -import cash.z.ecc.ui.R -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.test.getStringResource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/wallet_address/view/WalletAddressViewTest.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressViewTest.kt similarity index 96% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/wallet_address/view/WalletAddressViewTest.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressViewTest.kt index 82f0cd1d..e132733a 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/screen/wallet_address/view/WalletAddressViewTest.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressViewTest.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.wallet_address.view +package co.electriccoin.zcash.ui.screen.wallet_address.view import androidx.compose.ui.test.junit4.ComposeContentTestRule import androidx.compose.ui.test.junit4.createComposeRule @@ -8,9 +8,9 @@ import androidx.compose.ui.test.performClick import androidx.test.filters.MediumTest import cash.z.ecc.sdk.fixture.WalletAddressesFixture import cash.z.ecc.sdk.model.WalletAddresses -import cash.z.ecc.ui.R -import cash.z.ecc.ui.test.getStringResource -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.test.getStringResource import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.Assert.assertEquals diff --git a/ui-lib/src/androidTest/java/cash/z/ecc/ui/test/Global.kt b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/test/Global.kt similarity index 86% rename from ui-lib/src/androidTest/java/cash/z/ecc/ui/test/Global.kt rename to ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/test/Global.kt index c093cbe2..3be2e820 100644 --- a/ui-lib/src/androidTest/java/cash/z/ecc/ui/test/Global.kt +++ b/ui-lib/src/androidTest/java/co/electriccoin/zcash/ui/test/Global.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.test +package co.electriccoin.zcash.ui.test import android.content.Context import androidx.annotation.StringRes diff --git a/ui-lib/src/main/AndroidManifest.xml b/ui-lib/src/main/AndroidManifest.xml index 1376d00e..e0581c2f 100644 --- a/ui-lib/src/main/AndroidManifest.xml +++ b/ui-lib/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="co.electriccoin.zcash.ui"> List.first(count: Int) = subList(0, minOf(size, count)) diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/fixture/WalletSnapshotFixture.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt similarity index 88% rename from ui-lib/src/main/java/cash/z/ecc/ui/fixture/WalletSnapshotFixture.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt index 8c819992..12223d52 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/fixture/WalletSnapshotFixture.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt @@ -1,9 +1,9 @@ -package cash.z.ecc.ui.fixture +package co.electriccoin.zcash.ui.fixture import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.block.CompactBlockProcessor import cash.z.ecc.android.sdk.type.WalletBalance -import cash.z.ecc.ui.screen.home.model.WalletSnapshot +import co.electriccoin.zcash.ui.screen.home.model.WalletSnapshot @Suppress("MagicNumber") object WalletSnapshotFixture { diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/preference/EncryptedPreferenceKeys.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceKeys.kt similarity index 80% rename from ui-lib/src/main/java/cash/z/ecc/ui/preference/EncryptedPreferenceKeys.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceKeys.kt index 0e390025..eb602183 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/preference/EncryptedPreferenceKeys.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceKeys.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.preference +package co.electriccoin.zcash.ui.preference import co.electriccoin.zcash.preference.model.entry.Key diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/preference/EncryptedPreferenceSingleton.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceSingleton.kt similarity index 92% rename from ui-lib/src/main/java/cash/z/ecc/ui/preference/EncryptedPreferenceSingleton.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceSingleton.kt index de2bce4e..daa75e19 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/preference/EncryptedPreferenceSingleton.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/EncryptedPreferenceSingleton.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.preference +package co.electriccoin.zcash.ui.preference import android.content.Context import co.electriccoin.zcash.preference.AndroidPreferenceProvider diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/preference/PersistableWalletPreferenceDefault.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/PersistableWalletPreferenceDefault.kt similarity index 94% rename from ui-lib/src/main/java/cash/z/ecc/ui/preference/PersistableWalletPreferenceDefault.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/PersistableWalletPreferenceDefault.kt index e62a4201..c574141e 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/preference/PersistableWalletPreferenceDefault.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/PersistableWalletPreferenceDefault.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.preference +package co.electriccoin.zcash.ui.preference import cash.z.ecc.sdk.model.PersistableWallet import co.electriccoin.zcash.preference.api.PreferenceProvider diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/preference/StandardPreferenceKeys.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/StandardPreferenceKeys.kt similarity index 89% rename from ui-lib/src/main/java/cash/z/ecc/ui/preference/StandardPreferenceKeys.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/StandardPreferenceKeys.kt index f0bec604..ca846a79 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/preference/StandardPreferenceKeys.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/StandardPreferenceKeys.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.preference +package co.electriccoin.zcash.ui.preference import co.electriccoin.zcash.preference.model.entry.BooleanPreferenceDefault import co.electriccoin.zcash.preference.model.entry.Key diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/preference/StandardPreferenceSingleton.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/StandardPreferenceSingleton.kt similarity index 92% rename from ui-lib/src/main/java/cash/z/ecc/ui/preference/StandardPreferenceSingleton.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/StandardPreferenceSingleton.kt index 75dba28f..da5f87d8 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/preference/StandardPreferenceSingleton.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/preference/StandardPreferenceSingleton.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.preference +package co.electriccoin.zcash.ui.preference import android.content.Context import co.electriccoin.zcash.preference.AndroidPreferenceProvider diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/BackupTag.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/BackupTag.kt similarity index 78% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/BackupTag.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/BackupTag.kt index aa98543f..99c474e5 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/BackupTag.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/BackupTag.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup +package co.electriccoin.zcash.ui.screen.backup /** * These are only used for automated testing. diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/model/BackupStage.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/model/BackupStage.kt similarity index 95% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/model/BackupStage.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/model/BackupStage.kt index 42d61579..4aef1a2b 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/model/BackupStage.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/model/BackupStage.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup.model +package co.electriccoin.zcash.ui.screen.backup.model import co.electriccoin.zcash.spackle.model.Index import co.electriccoin.zcash.spackle.model.Progress diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/state/BackupState.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/state/BackupState.kt similarity index 88% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/state/BackupState.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/state/BackupState.kt index 60f5a836..e4700b61 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/state/BackupState.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/state/BackupState.kt @@ -1,6 +1,6 @@ -package cash.z.ecc.ui.screen.backup.state +package co.electriccoin.zcash.ui.screen.backup.state -import cash.z.ecc.ui.screen.backup.model.BackupStage +import co.electriccoin.zcash.ui.screen.backup.model.BackupStage import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/state/TestChoices.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/state/TestChoices.kt similarity index 89% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/state/TestChoices.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/state/TestChoices.kt index fafb354a..05b4ea36 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/state/TestChoices.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/state/TestChoices.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup.state +package co.electriccoin.zcash.ui.screen.backup.state import co.electriccoin.zcash.spackle.model.Index import kotlinx.coroutines.flow.MutableStateFlow diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/view/BackupView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt similarity index 90% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/view/BackupView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt index 1a4ac93b..53347364 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/view/BackupView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup.view +package co.electriccoin.zcash.ui.screen.backup.view import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -17,23 +17,23 @@ import androidx.compose.ui.tooling.preview.Devices import androidx.compose.ui.tooling.preview.Preview import cash.z.ecc.sdk.fixture.PersistableWalletFixture import cash.z.ecc.sdk.model.PersistableWallet -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.CHIP_GRID_ROW_SIZE -import cash.z.ecc.ui.design.component.Chip -import cash.z.ecc.ui.design.component.ChipGrid -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.Header -import cash.z.ecc.ui.design.component.NavigationButton -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.screen.backup.BackupTag -import cash.z.ecc.ui.screen.backup.model.BackupStage -import cash.z.ecc.ui.screen.backup.state.BackupState -import cash.z.ecc.ui.screen.backup.state.TestChoices -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Index +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.CHIP_GRID_ROW_SIZE +import co.electriccoin.zcash.ui.design.component.Chip +import co.electriccoin.zcash.ui.design.component.ChipGrid +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.Header +import co.electriccoin.zcash.ui.design.component.NavigationButton +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.backup.BackupTag +import co.electriccoin.zcash.ui.screen.backup.model.BackupStage +import co.electriccoin.zcash.ui.screen.backup.state.BackupState +import co.electriccoin.zcash.ui.screen.backup.state.TestChoices @Preview(device = Devices.PIXEL_4) @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/view/DropDown.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/DropDown.kt similarity index 94% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/view/DropDown.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/DropDown.kt index 20427786..182cc6a6 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/view/DropDown.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/DropDown.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.backup.view +package co.electriccoin.zcash.ui.screen.backup.view import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -24,10 +24,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.testTag import androidx.compose.ui.unit.dp -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.screen.backup.BackupTag -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Index +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.backup.BackupTag /** * @param chipIndex The index of the chip, which is displayed to the user. diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/viewmodel/BackupViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/viewmodel/BackupViewModel.kt similarity index 87% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/viewmodel/BackupViewModel.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/viewmodel/BackupViewModel.kt index 97a65264..2c84c6a4 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/backup/viewmodel/BackupViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/viewmodel/BackupViewModel.kt @@ -1,14 +1,14 @@ -package cash.z.ecc.ui.screen.backup.viewmodel +package co.electriccoin.zcash.ui.screen.backup.viewmodel import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import cash.z.ecc.android.sdk.ext.collectWith -import cash.z.ecc.ui.screen.backup.model.BackupStage -import cash.z.ecc.ui.screen.backup.state.BackupState -import cash.z.ecc.ui.screen.backup.state.TestChoices import co.electriccoin.zcash.spackle.model.Index +import co.electriccoin.zcash.ui.screen.backup.model.BackupStage +import co.electriccoin.zcash.ui.screen.backup.state.BackupState +import co.electriccoin.zcash.ui.screen.backup.state.TestChoices class BackupViewModel(application: Application, savedStateHandle: SavedStateHandle) : AndroidViewModel(application) { val backupState: BackupState = run { diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/debug/view/DesignGuide.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/debug/view/DesignGuide.kt similarity index 68% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/debug/view/DesignGuide.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/debug/view/DesignGuide.kt index ca31d56d..8ce37a3a 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/debug/view/DesignGuide.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/debug/view/DesignGuide.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.debug.view +package co.electriccoin.zcash.ui.screen.debug.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth @@ -9,19 +9,19 @@ import androidx.compose.material.icons.filled.Shield import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.Chip -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.Header -import cash.z.ecc.ui.design.component.NavigationButton -import cash.z.ecc.ui.design.component.PinkProgress -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.SecondaryButton -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.screen.onboarding.view.Callout -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Index import co.electriccoin.zcash.spackle.model.Progress +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.Chip +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.Header +import co.electriccoin.zcash.ui.design.component.NavigationButton +import co.electriccoin.zcash.ui.design.component.PinkProgress +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.SecondaryButton +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.onboarding.view.Callout @Preview @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/home/model/WalletSnapshot.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletSnapshot.kt similarity index 96% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/home/model/WalletSnapshot.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletSnapshot.kt index 0f774cdc..3799f05f 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/home/model/WalletSnapshot.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletSnapshot.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.home.model +package co.electriccoin.zcash.ui.screen.home.model import cash.z.ecc.android.sdk.Synchronizer import cash.z.ecc.android.sdk.block.CompactBlockProcessor diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/home/view/HomeView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt similarity index 85% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/home/view/HomeView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt index 8b84c28b..d7327eb9 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/home/view/HomeView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.home.view +package co.electriccoin.zcash.ui.screen.home.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -22,17 +22,17 @@ import androidx.compose.ui.tooling.preview.Preview import cash.z.ecc.android.sdk.db.entity.Transaction import cash.z.ecc.sdk.model.toZecString import cash.z.ecc.sdk.model.total -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.Header -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.fixture.WalletSnapshotFixture -import cash.z.ecc.ui.screen.home.model.WalletSnapshot -import cash.z.ecc.ui.screen.home.model.totalBalance -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.Header +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.fixture.WalletSnapshotFixture +import co.electriccoin.zcash.ui.screen.home.model.WalletSnapshot +import co.electriccoin.zcash.ui.screen.home.model.totalBalance @Preview @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/home/viewmodel/WalletViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt similarity index 93% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/home/viewmodel/WalletViewModel.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt index dc4d450f..02d2634a 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/home/viewmodel/WalletViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/viewmodel/WalletViewModel.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.home.viewmodel +package co.electriccoin.zcash.ui.screen.home.viewmodel import android.app.Application import androidx.lifecycle.AndroidViewModel @@ -13,16 +13,15 @@ import cash.z.ecc.android.sdk.db.entity.isMined import cash.z.ecc.android.sdk.db.entity.isSubmitSuccess import cash.z.ecc.android.sdk.tool.DerivationTool import cash.z.ecc.android.sdk.type.WalletBalance -import cash.z.ecc.global.WalletCoordinator import cash.z.ecc.sdk.model.PersistableWallet import cash.z.ecc.sdk.model.WalletAddresses -import cash.z.ecc.ui.common.ANDROID_STATE_FLOW_TIMEOUT_MILLIS -import cash.z.ecc.ui.preference.EncryptedPreferenceKeys -import cash.z.ecc.ui.preference.EncryptedPreferenceSingleton -import cash.z.ecc.ui.preference.StandardPreferenceKeys -import cash.z.ecc.ui.preference.StandardPreferenceSingleton -import cash.z.ecc.ui.screen.home.model.WalletSnapshot -import cash.z.ecc.work.WorkIds +import co.electriccoin.zcash.ui.common.ANDROID_STATE_FLOW_TIMEOUT_MILLIS +import co.electriccoin.zcash.ui.preference.EncryptedPreferenceKeys +import co.electriccoin.zcash.ui.preference.EncryptedPreferenceSingleton +import co.electriccoin.zcash.ui.preference.StandardPreferenceKeys +import co.electriccoin.zcash.ui.preference.StandardPreferenceSingleton +import co.electriccoin.zcash.ui.screen.home.model.WalletSnapshot +import co.electriccoin.zcash.work.WorkIds import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.SharingStarted @@ -44,7 +43,7 @@ import kotlinx.coroutines.withContext // To make this more multiplatform compatible, we need to remove the dependency on Context // for loading the preferences. class WalletViewModel(application: Application) : AndroidViewModel(application) { - private val walletCoordinator = WalletCoordinator.getInstance(application) + private val walletCoordinator = co.electriccoin.zcash.global.WalletCoordinator.getInstance(application) /* * Using the Mutex may be overkill, but it ensures that if multiple calls are accidentally made diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/model/OnboardingStage.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/model/OnboardingStage.kt similarity index 94% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/model/OnboardingStage.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/model/OnboardingStage.kt index c4334aac..6b627a93 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/model/OnboardingStage.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/model/OnboardingStage.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.onboarding.model +package co.electriccoin.zcash.ui.screen.onboarding.model import co.electriccoin.zcash.spackle.model.Index import co.electriccoin.zcash.spackle.model.Progress diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/state/OnboardingState.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/state/OnboardingState.kt similarity index 87% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/state/OnboardingState.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/state/OnboardingState.kt index 18f701d1..99eecee4 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/state/OnboardingState.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/state/OnboardingState.kt @@ -1,6 +1,6 @@ -package cash.z.ecc.ui.screen.onboarding.state +package co.electriccoin.zcash.ui.screen.onboarding.state -import cash.z.ecc.ui.screen.onboarding.model.OnboardingStage +import co.electriccoin.zcash.ui.screen.onboarding.model.OnboardingStage import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/view/OnboardingView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt similarity index 90% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/view/OnboardingView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt index 7ade72e3..b495b5dc 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/view/OnboardingView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt @@ -1,6 +1,6 @@ @file:Suppress("TooManyFunctions") -package cash.z.ecc.ui.screen.onboarding.view +package co.electriccoin.zcash.ui.screen.onboarding.view import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -26,20 +26,20 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.Header -import cash.z.ecc.ui.design.component.NavigationButton -import cash.z.ecc.ui.design.component.PinkProgress -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.SecondaryButton -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.screen.onboarding.model.OnboardingStage -import cash.z.ecc.ui.screen.onboarding.state.OnboardingState -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Progress +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.Header +import co.electriccoin.zcash.ui.design.component.NavigationButton +import co.electriccoin.zcash.ui.design.component.PinkProgress +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.SecondaryButton +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.onboarding.model.OnboardingStage +import co.electriccoin.zcash.ui.screen.onboarding.state.OnboardingState @Preview @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt similarity index 90% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt index a3b5c88a..b6515774 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/viewmodel/OnboardingViewModel.kt @@ -1,12 +1,12 @@ -package cash.z.ecc.ui.screen.onboarding.viewmodel +package co.electriccoin.zcash.ui.screen.onboarding.viewmodel import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import cash.z.ecc.android.sdk.ext.collectWith -import cash.z.ecc.ui.screen.onboarding.model.OnboardingStage -import cash.z.ecc.ui.screen.onboarding.state.OnboardingState +import co.electriccoin.zcash.ui.screen.onboarding.model.OnboardingStage +import co.electriccoin.zcash.ui.screen.onboarding.state.OnboardingState import kotlinx.coroutines.flow.MutableStateFlow /* diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/AndroidQrCodeImageGenerator.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/AndroidQrCodeImageGenerator.kt similarity index 92% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/AndroidQrCodeImageGenerator.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/AndroidQrCodeImageGenerator.kt index 2a45be30..e0a5988d 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/AndroidQrCodeImageGenerator.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/AndroidQrCodeImageGenerator.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.profile.util +package co.electriccoin.zcash.ui.screen.profile.util import android.graphics.Bitmap import android.graphics.Color diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/JvmQrCodeGenerator.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/JvmQrCodeGenerator.kt similarity index 93% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/JvmQrCodeGenerator.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/JvmQrCodeGenerator.kt index c65293aa..5fc01b4b 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/JvmQrCodeGenerator.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/JvmQrCodeGenerator.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.profile.util +package co.electriccoin.zcash.ui.screen.profile.util import com.google.zxing.BarcodeFormat import com.google.zxing.qrcode.QRCodeWriter diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/QrCodeGenerator.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/QrCodeGenerator.kt similarity index 86% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/QrCodeGenerator.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/QrCodeGenerator.kt index ae031e0d..b9670a57 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/QrCodeGenerator.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/QrCodeGenerator.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.profile.util +package co.electriccoin.zcash.ui.screen.profile.util interface QrCodeGenerator { /** diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/QrCodeImageGenerator.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/QrCodeImageGenerator.kt similarity index 74% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/QrCodeImageGenerator.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/QrCodeImageGenerator.kt index d95fc7b0..f9103d07 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/util/QrCodeImageGenerator.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/util/QrCodeImageGenerator.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.profile.util +package co.electriccoin.zcash.ui.screen.profile.util import androidx.compose.ui.graphics.ImageBitmap diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/view/ProfileView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt similarity index 90% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/view/ProfileView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt index 8c268637..2dee5048 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/profile/view/ProfileView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/view/ProfileView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.profile.view +package co.electriccoin.zcash.ui.screen.profile.view import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Column @@ -23,14 +23,14 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import cash.z.ecc.sdk.fixture.WalletAddressFixture import cash.z.ecc.sdk.model.WalletAddress -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.screen.profile.util.AndroidQrCodeImageGenerator -import cash.z.ecc.ui.screen.profile.util.JvmQrCodeGenerator -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.profile.util.AndroidQrCodeImageGenerator +import co.electriccoin.zcash.ui.screen.profile.util.JvmQrCodeGenerator import kotlinx.coroutines.runBlocking import kotlin.math.roundToInt diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/request/view/RequestView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt similarity index 91% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/request/view/RequestView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt index cc53503a..cceddd00 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/request/view/RequestView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/view/RequestView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.request.view +package co.electriccoin.zcash.ui.screen.request.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -30,12 +30,12 @@ import cash.z.ecc.sdk.model.ZecRequest import cash.z.ecc.sdk.model.ZecRequestMessage import cash.z.ecc.sdk.model.ZecString import cash.z.ecc.sdk.model.fromZecString -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TextField -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TextField +import co.electriccoin.zcash.ui.design.theme.ZcashTheme import kotlinx.coroutines.runBlocking @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/RestoreTag.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/RestoreTag.kt similarity index 85% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/RestoreTag.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/RestoreTag.kt index ebf888b3..8e3fa3db 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/RestoreTag.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/RestoreTag.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.restore +package co.electriccoin.zcash.ui.screen.restore /** * These are only used for automated testing. diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/model/ParseResult.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResult.kt similarity index 95% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/model/ParseResult.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResult.kt index b9efbf53..7af819ae 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/model/ParseResult.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/model/ParseResult.kt @@ -1,7 +1,7 @@ -package cash.z.ecc.ui.screen.restore.model +package co.electriccoin.zcash.ui.screen.restore.model import cash.z.ecc.sdk.model.SeedPhrase -import cash.z.ecc.ui.common.first +import co.electriccoin.zcash.ui.common.first import java.util.Locale internal sealed class ParseResult { diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/state/WordList.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/state/WordList.kt similarity index 92% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/state/WordList.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/state/WordList.kt index 3dfb9cca..2207a139 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/state/WordList.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/state/WordList.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.restore.state +package co.electriccoin.zcash.ui.screen.restore.state import cash.z.ecc.sdk.model.SeedPhraseValidation import kotlinx.coroutines.flow.MutableStateFlow diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/view/RestoreView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt similarity index 91% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/view/RestoreView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt index ca62d9b5..044ac6d9 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/view/RestoreView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.restore.view +package co.electriccoin.zcash.ui.screen.restore.view import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -46,23 +46,23 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import cash.z.ecc.sdk.model.SeedPhraseValidation -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.CHIP_GRID_ROW_SIZE -import cash.z.ecc.ui.design.component.Chip -import cash.z.ecc.ui.design.component.CommonTag -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.Header -import cash.z.ecc.ui.design.component.NavigationButton -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TextField -import cash.z.ecc.ui.screen.restore.RestoreTag -import cash.z.ecc.ui.screen.restore.model.ParseResult -import cash.z.ecc.ui.screen.restore.state.WordList -import cash.z.ecc.ui.screen.restore.state.wordValidation -import cash.z.ecc.ui.theme.ZcashTheme import co.electriccoin.zcash.spackle.model.Index +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.CHIP_GRID_ROW_SIZE +import co.electriccoin.zcash.ui.design.component.Chip +import co.electriccoin.zcash.ui.design.component.CommonTag +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.Header +import co.electriccoin.zcash.ui.design.component.NavigationButton +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TextField +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.restore.RestoreTag +import co.electriccoin.zcash.ui.screen.restore.model.ParseResult +import co.electriccoin.zcash.ui.screen.restore.state.WordList +import co.electriccoin.zcash.ui.screen.restore.state.wordValidation @Preview("Restore Wallet") @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/viewmodel/RestoreViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/viewmodel/RestoreViewModel.kt similarity index 91% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/viewmodel/RestoreViewModel.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/viewmodel/RestoreViewModel.kt index 4d0019b3..fa6342d6 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/restore/viewmodel/RestoreViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/viewmodel/RestoreViewModel.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.restore.viewmodel +package co.electriccoin.zcash.ui.screen.restore.viewmodel import android.app.Application import androidx.lifecycle.AndroidViewModel @@ -6,8 +6,8 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope import cash.z.ecc.android.bip39.Mnemonics import cash.z.ecc.android.sdk.ext.collectWith -import cash.z.ecc.ui.common.ANDROID_STATE_FLOW_TIMEOUT_MILLIS -import cash.z.ecc.ui.screen.restore.state.WordList +import co.electriccoin.zcash.ui.common.ANDROID_STATE_FLOW_TIMEOUT_MILLIS +import co.electriccoin.zcash.ui.screen.restore.state.WordList import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.flow diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/seed/view/SeedView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt similarity index 85% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/seed/view/SeedView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt index 9a82f7fe..5c06806e 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/seed/view/SeedView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.seed.view +package co.electriccoin.zcash.ui.screen.seed.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.rememberScrollState @@ -17,13 +17,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import cash.z.ecc.sdk.fixture.PersistableWalletFixture import cash.z.ecc.sdk.model.PersistableWallet -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.ChipGrid -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.Header -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.ChipGrid +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.Header +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme @Preview("Seed") @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/ext/WalletAddressExt.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/ext/WalletAddressExt.kt similarity index 92% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/send/ext/WalletAddressExt.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/ext/WalletAddressExt.kt index f2f71dd0..b1b68a0f 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/ext/WalletAddressExt.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/ext/WalletAddressExt.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.ext +package co.electriccoin.zcash.ui.screen.send.ext import android.content.Context import androidx.compose.runtime.Composable @@ -6,7 +6,7 @@ import androidx.compose.runtime.ReadOnlyComposable import androidx.compose.ui.platform.LocalConfiguration import androidx.compose.ui.platform.LocalContext import cash.z.ecc.sdk.model.WalletAddress -import cash.z.ecc.ui.R +import co.electriccoin.zcash.ui.R /** * How far into the address will be abbreviation look forwards and backwards. diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/ext/ZecSendExt.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/ext/ZecSendExt.kt similarity index 96% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/send/ext/ZecSendExt.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/ext/ZecSendExt.kt index d313f743..f503f0a8 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/ext/ZecSendExt.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/ext/ZecSendExt.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.ext +package co.electriccoin.zcash.ui.screen.send.ext import androidx.compose.runtime.saveable.mapSaver import cash.z.ecc.sdk.model.Memo diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/model/SendStage.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/model/SendStage.kt similarity index 50% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/send/model/SendStage.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/model/SendStage.kt index 2a7d3383..a6af5a04 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/model/SendStage.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/model/SendStage.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.model +package co.electriccoin.zcash.ui.screen.send.model enum class SendStage { Form, diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/view/SendView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt similarity index 92% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/send/view/SendView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt index 90783feb..ae2a8658 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/send/view/SendView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/view/SendView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.send.view +package co.electriccoin.zcash.ui.screen.send.view import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -35,16 +35,16 @@ import cash.z.ecc.sdk.model.ZecSendValidation import cash.z.ecc.sdk.model.ZecString import cash.z.ecc.sdk.model.new import cash.z.ecc.sdk.model.toZecString -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TextField -import cash.z.ecc.ui.screen.send.ext.ABBREVIATION_INDEX -import cash.z.ecc.ui.screen.send.ext.Saver -import cash.z.ecc.ui.screen.send.ext.abbreviated -import cash.z.ecc.ui.screen.send.model.SendStage -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TextField +import co.electriccoin.zcash.ui.design.theme.ZcashTheme +import co.electriccoin.zcash.ui.screen.send.ext.ABBREVIATION_INDEX +import co.electriccoin.zcash.ui.screen.send.ext.Saver +import co.electriccoin.zcash.ui.screen.send.ext.abbreviated +import co.electriccoin.zcash.ui.screen.send.model.SendStage @Composable @Preview diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/settings/view/SettingsView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt similarity index 85% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/settings/view/SettingsView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt index dbc203f8..26f4939e 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/settings/view/SettingsView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.ui.screen.settings.view +package co.electriccoin.zcash.ui.screen.settings.view import androidx.compose.foundation.layout.Column import androidx.compose.material.icons.Icons @@ -12,12 +12,12 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.component.DangerousButton -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.PrimaryButton -import cash.z.ecc.ui.design.component.TertiaryButton -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.component.DangerousButton +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.PrimaryButton +import co.electriccoin.zcash.ui.design.component.TertiaryButton +import co.electriccoin.zcash.ui.design.theme.ZcashTheme @Preview("Settings") @Composable diff --git a/ui-lib/src/main/java/cash/z/ecc/ui/screen/wallet_address/view/WalletAddressView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressView.kt similarity index 94% rename from ui-lib/src/main/java/cash/z/ecc/ui/screen/wallet_address/view/WalletAddressView.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressView.kt index b54793b4..f00fb974 100644 --- a/ui-lib/src/main/java/cash/z/ecc/ui/screen/wallet_address/view/WalletAddressView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/wallet_address/view/WalletAddressView.kt @@ -1,6 +1,6 @@ @file:Suppress("TooManyFunctions", "PackageNaming") -package cash.z.ecc.ui.screen.wallet_address.view +package co.electriccoin.zcash.ui.screen.wallet_address.view import androidx.compose.foundation.Image import androidx.compose.foundation.border @@ -39,13 +39,13 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import cash.z.ecc.sdk.fixture.WalletAddressesFixture import cash.z.ecc.sdk.model.WalletAddresses -import cash.z.ecc.ui.R -import cash.z.ecc.ui.design.MINIMAL_WEIGHT -import cash.z.ecc.ui.design.component.Body -import cash.z.ecc.ui.design.component.GradientSurface -import cash.z.ecc.ui.design.component.ListHeader -import cash.z.ecc.ui.design.component.ListItem -import cash.z.ecc.ui.theme.ZcashTheme +import co.electriccoin.zcash.ui.R +import co.electriccoin.zcash.ui.design.MINIMAL_WEIGHT +import co.electriccoin.zcash.ui.design.component.Body +import co.electriccoin.zcash.ui.design.component.GradientSurface +import co.electriccoin.zcash.ui.design.component.ListHeader +import co.electriccoin.zcash.ui.design.component.ListItem +import co.electriccoin.zcash.ui.design.theme.ZcashTheme import kotlinx.coroutines.runBlocking @Preview diff --git a/ui-lib/src/main/java/cash/z/ecc/work/SyncWorker.kt b/ui-lib/src/main/java/co/electriccoin/zcash/work/SyncWorker.kt similarity index 96% rename from ui-lib/src/main/java/cash/z/ecc/work/SyncWorker.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/work/SyncWorker.kt index 01239fb8..5459a530 100644 --- a/ui-lib/src/main/java/cash/z/ecc/work/SyncWorker.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/work/SyncWorker.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.work +package co.electriccoin.zcash.work import android.content.Context import androidx.annotation.Keep @@ -9,7 +9,7 @@ import androidx.work.PeriodicWorkRequest import androidx.work.PeriodicWorkRequestBuilder import androidx.work.WorkerParameters import cash.z.ecc.android.sdk.Synchronizer -import cash.z.ecc.global.WalletCoordinator +import co.electriccoin.zcash.global.WalletCoordinator import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.combine diff --git a/ui-lib/src/main/java/cash/z/ecc/work/WorkIds.kt b/ui-lib/src/main/java/co/electriccoin/zcash/work/WorkIds.kt similarity index 95% rename from ui-lib/src/main/java/cash/z/ecc/work/WorkIds.kt rename to ui-lib/src/main/java/co/electriccoin/zcash/work/WorkIds.kt index bbbf07f8..06393a3c 100644 --- a/ui-lib/src/main/java/cash/z/ecc/work/WorkIds.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/work/WorkIds.kt @@ -1,4 +1,4 @@ -package cash.z.ecc.work +package co.electriccoin.zcash.work import android.content.Context import androidx.work.ExistingPeriodicWorkPolicy