Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ fun IntroScene(
fontWeight = FontWeight.W600,
fontSize = 18.sp,
lineHeight = 21.6.sp,
color = Color.Black.copy(alpha = 0.5f)
)
}
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext
Expand Down Expand Up @@ -66,6 +68,7 @@ import com.dimension.maskbook.wallet.ui.scenes.wallets.UnlockWalletDialog
import com.dimension.maskbook.wallet.ui.scenes.wallets.WalletQrcodeScene
import com.dimension.maskbook.wallet.ui.scenes.wallets.collectible.CollectibleDetailScene
import com.dimension.maskbook.wallet.ui.scenes.wallets.common.MultiChainWalletDialog
import com.dimension.maskbook.wallet.ui.scenes.wallets.common.WalletIntroHostLegalDispatcher
import com.dimension.maskbook.wallet.ui.scenes.wallets.create.CreateOrImportWalletScene
import com.dimension.maskbook.wallet.ui.scenes.wallets.create.CreateType
import com.dimension.maskbook.wallet.ui.scenes.wallets.intro.LegalScene
Expand Down Expand Up @@ -214,12 +217,14 @@ fun TokenDetail(
fun SwitchWalletAdd(
navController: NavController,
) {
var type by remember { mutableStateOf<String?>(null) }
WalletIntroHostLegalDispatcher(navController, type)
WalletSwitchAddModal(
onCreate = {
navController.navigate(WalletRoute.WalletIntroHostLegal(CreateType.CREATE.name))
type = CreateType.CREATE.name
},
onImport = {
navController.navigate(WalletRoute.WalletIntroHostLegal(CreateType.IMPORT.name))
type = CreateType.IMPORT.name
},
)
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
/*
* Mask-Android
*
* Copyright (C) 2022 DimensionDev and Contributors
*
* This file is part of Mask-Android.
*
* Mask-Android is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Mask-Android is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Mask-Android. If not, see <http://www.gnu.org/licenses/>.
*/
package com.dimension.maskbook.wallet.ui.scenes.wallets.common

import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.navigation.NavController
import com.dimension.maskbook.common.ext.observeAsState
import com.dimension.maskbook.common.viewmodel.BiometricEnableViewModel
import com.dimension.maskbook.setting.export.SettingServices
import com.dimension.maskbook.wallet.route.WalletRoute
import kotlinx.coroutines.delay
import org.koin.androidx.compose.get
import org.koin.androidx.compose.getViewModel

@Composable
fun WalletIntroHostLegalDispatcher(
navController: NavController,
originType: String?,
) {
if (originType.isNullOrBlank()) {
return
}
var enabled by remember {
mutableStateOf(false)
}
LaunchedEffect(originType) {
delay(10)
enabled = true
}
val type = originType.split(" ").first()
val repo = get<SettingServices>()
val password by repo.paymentPassword.observeAsState(initial = null)
val enableBiometric by repo.biometricEnabled.observeAsState(initial = false)
val shouldShowLegalScene by repo.shouldShowLegalScene.observeAsState(initial = true)
val biometricEnableViewModel: BiometricEnableViewModel = getViewModel()
val context = LocalContext.current

val next: () -> Unit = {
val route = if (password.isNullOrEmpty()) {
WalletRoute.WalletIntroHostPassword(type)
} else if (!enableBiometric && biometricEnableViewModel.isSupported(context)) {
WalletRoute.WalletIntroHostFaceId(type)
} else {
WalletRoute.CreateOrImportWallet(type)
}
navController.navigate(route)
}

if (enabled) {
enabled = false
if (!shouldShowLegalScene) {
next()
} else {
navController.navigate(WalletRoute.WalletIntroHostLegal(type))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,16 @@ package com.dimension.maskbook.wallet.ui.scenes.wallets.intro

import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.text.buildAnnotatedString
import androidx.navigation.NavController
import androidx.paging.compose.collectAsLazyPagingItems
import com.dimension.maskbook.common.ext.observeAsState
import com.dimension.maskbook.wallet.route.WalletRoute
import com.dimension.maskbook.wallet.ui.scenes.wallets.common.WalletIntroHostLegalDispatcher
import com.dimension.maskbook.wallet.ui.scenes.wallets.create.CreateType
import com.dimension.maskbook.wallet.ui.scenes.wallets.management.WalletBalancesScene
import com.dimension.maskbook.wallet.viewmodel.wallets.WalletBalancesViewModel
Expand All @@ -54,12 +58,14 @@ fun WalletIntroHost(navController: NavController) {
val currentDWebData = dWebData

if (currentWallet == null) {
var type by remember { mutableStateOf<String?>(null) }
WalletIntroHostLegalDispatcher(navController, type)
WalletIntroScene(
onCreate = {
navController.navigate(WalletRoute.WalletIntroHostLegal(CreateType.CREATE.name))
type = "${CreateType.CREATE.name} ${System.currentTimeMillis()}"
},
onImport = {
navController.navigate(WalletRoute.WalletIntroHostLegal(CreateType.IMPORT.name))
type = "${CreateType.IMPORT.name} ${System.currentTimeMillis()}"
},
onConnect = {
navController.navigate(WalletRoute.SwitchWalletAddWalletConnect)
Expand Down