feat: improve onboarding
This commit is contained in:
@@ -25,7 +25,7 @@ import kotlinx.coroutines.flow.SharingStarted
|
||||
import kotlinx.coroutines.flow.stateIn
|
||||
import com.bitcointxoko.gudariwallet.security.EncryptedSecretStore
|
||||
import com.bitcointxoko.gudariwallet.service.WalletNotificationService
|
||||
import com.bitcointxoko.gudariwallet.ui.OnboardingScreen
|
||||
import com.bitcointxoko.gudariwallet.ui.onboarding.OnboardingScreen
|
||||
import com.bitcointxoko.gudariwallet.ui.WalletScreen
|
||||
import com.bitcointxoko.gudariwallet.ui.WalletViewModel
|
||||
import com.bitcointxoko.gudariwallet.ui.WalletViewModelFactory
|
||||
@@ -37,8 +37,6 @@ import kotlinx.coroutines.flow.MutableSharedFlow
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import cafe.adriel.lyricist.ProvideStrings
|
||||
import cafe.adriel.lyricist.rememberStrings
|
||||
import com.bitcointxoko.gudariwallet.i18n.AppStrings
|
||||
|
||||
class MainActivity : AppCompatActivity() {
|
||||
|
||||
@@ -129,23 +127,26 @@ class MainActivity : AppCompatActivity() {
|
||||
LaunchedEffect(Unit) {
|
||||
WalletNotificationService.start(this@MainActivity)
|
||||
requestNotificationPermissionIfNeeded()
|
||||
promptBatteryOptimizationIfNeeded()
|
||||
// promptBatteryOptimizationIfNeeded()
|
||||
}
|
||||
WalletScreen(
|
||||
vm = vm,
|
||||
nfcVm = nfcVm,
|
||||
pendingPaymentHash = pendingPaymentHash,
|
||||
pendingPaymentUri = pendingPaymentUri,
|
||||
lyricist = lyricist // ← pass down
|
||||
lyricist = lyricist
|
||||
)
|
||||
} else {
|
||||
OnboardingScreen(
|
||||
secretStore = secretStore,
|
||||
onComplete = { }
|
||||
secretStore = secretStore,
|
||||
onRequestNotificationPermission = { requestNotificationPermissionIfNeeded() }, // ← new
|
||||
onComplete = {
|
||||
// WalletNotificationService.start(this@MainActivity)
|
||||
// No permission/battery calls here — handled in-flow
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
} // end ProvideStrings
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user