zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#729] Androidx updates

This commit is contained in:
Carter Jernigan 2023-01-17 14:13:46 -05:00 committed by Carter Jernigan
parent 405a230f6e
commit 5d59420fb1
18 changed files with 21 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gradle.properties
View File

@ -112,27 +112,28 @@ JGIT_VERSION=6.1.0.202203080745-r
KTLINT_VERSION=0.48.0
PLAY_PUBLISHER_PLUGIN_VERSION=3.7.0
ACCOMPANIST_PERMISSIONS_VERSION=0.25.1
ACCOMPANIST_PERMISSIONS_VERSION=0.28.0
ANDROIDX_ACTIVITY_VERSION=1.6.1
ANDROIDX_ANNOTATION_VERSION=1.5.0
ANDROIDX_APPCOMPAT_VERSION=1.5.1
ANDROIDX_CAMERA_VERSION=1.3.0-alpha01
ANDROIDX_APPCOMPAT_VERSION=1.6.0
ANDROIDX_CAMERA_VERSION=1.3.0-alpha02
ANDROIDX_COMPOSE_COMPILER_VERSION=1.4.0-alpha02
ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.1.0-alpha02
ANDROIDX_COMPOSE_VERSION=1.3.1
ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.1.0-alpha04
ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION=1.3.1
ANDROIDX_COMPOSE_VERSION=1.3.3
ANDROIDX_CONSTRAINTLAYOUT_VERSION=1.0.1
ANDROIDX_CORE_VERSION=1.9.0
ANDROIDX_ESPRESSO_VERSION=3.5.0
ANDROIDX_LIFECYCLE_VERSION=2.6.0-alpha03
ANDROIDX_ESPRESSO_VERSION=3.5.1
ANDROIDX_LIFECYCLE_VERSION=2.6.0-alpha04
ANDROIDX_NAVIGATION_COMPOSE_VERSION=2.5.3
ANDROIDX_PROFILE_INSTALLER_VERSION=1.3.0-alpha02
ANDROIDX_PROFILE_INSTALLER_VERSION=1.3.0-alpha03
ANDROIDX_SECURITY_CRYPTO_VERSION=1.1.0-alpha04
ANDROIDX_SPLASH_SCREEN_VERSION=1.0.0
ANDROIDX_TEST_JUNIT_VERSION=1.1.4
ANDROIDX_TEST_JUNIT_VERSION=1.1.5
ANDROIDX_TEST_ORCHESTRATOR_VERSION=1.4.2
ANDROIDX_TEST_CORE_VERSION=1.5.0
ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.0-alpha08
ANDROIDX_TEST_RUNNER_VERSION=1.5.1
ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.0-alpha09
ANDROIDX_TEST_RUNNER_VERSION=1.5.2
ANDROIDX_STARTUP_VERSION=1.1.1
ANDROIDX_TEST_SERVICE_VERSION=1.4.2
ANDROIDX_UI_AUTOMATOR_VERSION=2.2.0-alpha1

5
settings.gradle.kts
View File

@ -149,6 +149,7 @@ dependencyResolutionManagement {
val androidxCameraVersion = extra["ANDROIDX_CAMERA_VERSION"].toString()
val androidxComposeCompilerVersion = extra["ANDROIDX_COMPOSE_COMPILER_VERSION"].toString()
val androidxComposeMaterial3Version = extra["ANDROIDX_COMPOSE_MATERIAL3_VERSION"].toString()
val androidxComposeMaterialIconsVersion = extra["ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION"].toString()
val androidxComposeVersion = extra["ANDROIDX_COMPOSE_VERSION"].toString()
val androidxConstraintLayoutVersion = extra["ANDROIDX_CONSTRAINTLAYOUT_VERSION"].toString()
val androidxCoreVersion = extra["ANDROIDX_CORE_VERSION"].toString()
@ -196,8 +197,8 @@ dependencyResolutionManagement {
library("androidx-camera-view", "androidx.camera:camera-view:$androidxCameraVersion")
library("androidx-compose-foundation", "androidx.compose.foundation:foundation:$androidxComposeVersion")
library("androidx-compose-material3", "androidx.compose.material3:material3:$androidxComposeMaterial3Version")
library("androidx-compose-material-icons-core", "androidx.compose.material:material-icons-core:$androidxComposeVersion")
library("androidx-compose-material-icons-extended", "androidx.compose.material:material-icons-extended:$androidxComposeVersion")
library("androidx-compose-material-icons-core", "androidx.compose.material:material-icons-core:$androidxComposeMaterialIconsVersion")
library("androidx-compose-material-icons-extended", "androidx.compose.material:material-icons-extended:$androidxComposeMaterialIconsVersion")
library("androidx-compose-tooling", "androidx.compose.ui:ui-tooling:$androidxComposeVersion")
library("androidx-compose-ui", "androidx.compose.ui:ui:$androidxComposeVersion")
library("androidx-compose-ui-fonts", "androidx.compose.ui:ui-text-google-fonts:$androidxComposeVersion")

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/MainActivity.kt
View File

@ -12,7 +12,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavHostController
@ -78,7 +77,6 @@ class MainActivity : ComponentActivity() {
}
}
@OptIn(ExperimentalLifecycleComposeApi::class)
private fun setupUiContent() {
setContent {
Override(configurationOverrideFlow) {
@ -106,7 +104,6 @@ class MainActivity : ComponentActivity() {
}
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun MainContent() {
when (val secretState = walletViewModel.secretState.collectAsStateWithLifecycle().value) {

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/address/AndroidWalletAddresses.kt
View File

@ -5,7 +5,6 @@ package co.electriccoin.zcash.ui.screen.address
import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.MainActivity
import co.electriccoin.zcash.ui.screen.address.view.WalletAddresses
@ -18,7 +17,6 @@ internal fun MainActivity.WrapWalletAddresses(
WrapWalletAddresses(this, goBack)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapWalletAddresses(
activity: ComponentActivity,

6
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/backup/view/BackupView.kt
View File

@ -37,7 +37,6 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cash.z.ecc.sdk.fixture.PersistableWalletFixture
import cash.z.ecc.sdk.model.PersistableWallet
@ -79,7 +78,7 @@ fun ComposablePreview() {
/**
* @param onComplete Callback when the user has completed the backup test.
*/
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLifecycleComposeApi::class)
@OptIn(ExperimentalMaterial3Api::class)
@Composable
@Suppress("LongParameterList")
fun BackupWallet(
@ -124,7 +123,6 @@ fun BackupWallet(
}
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
fun BackupMainContent(
paddingValues: PaddingValues,
@ -218,7 +216,7 @@ private data class TestChoice(val originalIndex: Index, val word: String)
* - It is possible for the same word to appear twice in the word choices
* - The test answer ordering is not randomized, to ensure it can never be in the correct order to start with
*/
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun TestInProgress(
splitSeedPhrase: List<String>,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/AndroidHome.kt
View File

@ -6,7 +6,6 @@ import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.spackle.EmulatorWtfUtil
import co.electriccoin.zcash.spackle.FirebaseTestLabUtil
@ -35,7 +34,6 @@ internal fun MainActivity.WrapHome(
)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun WrapHome(
activity: ComponentActivity,

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/AndroidOnboarding.kt
View File

@ -8,7 +8,6 @@ import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cash.z.ecc.android.sdk.model.ZcashNetwork
import cash.z.ecc.sdk.fixture.SeedPhraseFixture
@ -31,7 +30,6 @@ internal fun MainActivity.WrapOnboarding() {
WrapOnboarding(this)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun WrapOnboarding(
activity: ComponentActivity
@ -95,7 +93,6 @@ internal fun WrapOnboarding(
}
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapRestore(activity: ComponentActivity) {
val walletViewModel by activity.viewModels<WalletViewModel>()

7
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/onboarding/view/OnboardingView.kt
View File

@ -35,7 +35,6 @@ 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 androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.R
import co.electriccoin.zcash.ui.design.component.Body
@ -70,7 +69,7 @@ fun ComposablePreview() {
* @param onImportWallet Callback when the user decides to import an existing wallet.
* @param onCreateWallet Callback when the user decides to create a new wallet.
*/
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLifecycleComposeApi::class)
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun Onboarding(
onboardingState: OnboardingState,
@ -96,7 +95,7 @@ fun Onboarding(
}
@Composable
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLifecycleComposeApi::class)
@OptIn(ExperimentalMaterial3Api::class)
private fun OnboardingTopAppBar(
onboardingState: OnboardingState,
isDebugMenuEnabled: Boolean,
@ -150,7 +149,7 @@ private fun DebugMenu(onFixtureWallet: () -> Unit) {
* @param onImportWallet Callback when the user decides to import an existing wallet.
* @param onCreateWallet Callback when the user decides to create a new wallet.
*/
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
fun OnboardingMainContent(
paddingValues: PaddingValues,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/profile/AndroidProfile.kt
View File

@ -5,7 +5,6 @@ package co.electriccoin.zcash.ui.screen.profile
import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cash.z.ecc.sdk.model.WalletAddresses
import co.electriccoin.zcash.ui.MainActivity
@ -35,7 +34,6 @@ internal fun MainActivity.WrapProfile(
)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
@Suppress("LongParameterList")
internal fun WrapProfile(

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/request/AndroidRequest.kt
View File

@ -7,7 +7,6 @@ import android.content.Intent
import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cash.z.ecc.sdk.model.ZecRequest
import co.electriccoin.zcash.ui.MainActivity
@ -23,7 +22,6 @@ internal fun MainActivity.WrapRequest(
WrapRequest(this, goBack)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapRequest(
activity: ComponentActivity,

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/restore/view/RestoreView.kt
View File

@ -52,7 +52,6 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cash.z.ecc.sdk.model.SeedPhraseValidation
import co.electriccoin.zcash.spackle.model.Index
@ -187,7 +186,7 @@ private fun RestoreTopAppBar(onBack: () -> Unit, onClear: () -> Unit) {
// TODO [#672] Implement custom seed phrase pasting for wallet import
// TODO [#672] https://github.com/zcash/secant-android-wallet/issues/672
@OptIn(ExperimentalLifecycleComposeApi::class)
@Suppress("UNUSED_PARAMETER", "LongParameterList")
@Composable
private fun RestoreMainContent(

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/scan/AndroidScan.kt
View File

@ -8,7 +8,6 @@ import androidx.compose.material3.SnackbarHostState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.lifecycleScope
import co.electriccoin.zcash.ui.MainActivity
@ -30,7 +29,6 @@ internal fun MainActivity.WrapScanValidator(
)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapScanValidator(
activity: ComponentActivity,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/AndroidSeed.kt
View File

@ -5,7 +5,6 @@ package co.electriccoin.zcash.ui.screen.seed
import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.MainActivity
import co.electriccoin.zcash.ui.screen.backup.copyToClipboard
@ -20,7 +19,6 @@ internal fun MainActivity.WrapSeed(
WrapSeed(this, goBack)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapSeed(
activity: ComponentActivity,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/send/AndroidSend.kt
View File

@ -6,7 +6,6 @@ import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import cash.z.ecc.sdk.send
import co.electriccoin.zcash.ui.MainActivity
@ -22,7 +21,6 @@ internal fun MainActivity.WrapSend(
WrapSend(this, goBack)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapSend(
activity: ComponentActivity,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/AndroidSettings.kt
View File

@ -5,7 +5,6 @@ package co.electriccoin.zcash.ui.screen.settings
import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.MainActivity
import co.electriccoin.zcash.ui.screen.home.viewmodel.WalletViewModel
@ -24,7 +23,6 @@ internal fun MainActivity.WrapSettings(
)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapSettings(
activity: ComponentActivity,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/support/AndroidSupport.kt
View File

@ -9,7 +9,6 @@ import androidx.compose.material3.SnackbarHostState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.MainActivity
import co.electriccoin.zcash.ui.R
@ -27,7 +26,6 @@ internal fun MainActivity.WrapSupport(
WrapSupport(this, goBack)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun WrapSupport(
activity: ComponentActivity,

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/update/AndroidUpdate.kt
View File

@ -9,7 +9,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.MainActivity
import co.electriccoin.zcash.ui.R
@ -27,7 +26,6 @@ internal fun MainActivity.WrapCheckForUpdate() {
WrapCheckForUpdate(this)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapCheckForUpdate(activity: ComponentActivity) {
// TODO [#382]: https://github.com/zcash/secant-android-wallet/issues/382
@ -55,7 +53,6 @@ private fun WrapCheckForUpdate(activity: ComponentActivity) {
}
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapUpdate(
activity: ComponentActivity,

2
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/warning/AndroidNotEnoughSpace.kt
View File

@ -6,7 +6,6 @@ import androidx.activity.ComponentActivity
import androidx.activity.viewModels
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.electriccoin.zcash.ui.MainActivity
import co.electriccoin.zcash.ui.screen.warning.view.NotEnoughSpaceView
@ -17,7 +16,6 @@ fun MainActivity.WrapNotEnoughSpace() {
WrapNotEnoughSpace(this)
}
@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
private fun WrapNotEnoughSpace(activity: ComponentActivity) {
val storageCheckViewModel by activity.viewModels<StorageCheckViewModel>()