Redesign onboarding

greenart7c3 · Nov 25, 2024 · 151f77c · 151f77c
1 parent 50e6b35
commit 151f77c
Show file tree

Hide file tree

Showing 12 changed files with 1,035 additions and 461 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -249,4 +249,6 @@ dependencies {
     implementation libs.coil.svg
     // enables network for coil
     implementation libs.coil.okhttp
+
+    implementation libs.storage
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,6 +8,8 @@
     </queries>
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:largeHeap="true"

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt b/app/src/main/java/com/greenart7c3/nostrsigner/MainActivity.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.window.DialogProperties
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.rememberNavController
+import com.anggrayudi.storage.SimpleStorageHelper
 import com.greenart7c3.nostrsigner.service.Biometrics
 import com.greenart7c3.nostrsigner.service.IntentUtils
 import com.greenart7c3.nostrsigner.ui.AccountScreen
@@ -56,6 +57,7 @@ fun Intent.isLaunchFromHistory(): Boolean =
 
 class MainActivity : AppCompatActivity() {
     private lateinit var mainViewModel: MainViewModel
+    private val storageHelper = SimpleStorageHelper(this@MainActivity)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen()
@@ -232,7 +234,7 @@ class MainActivity : AppCompatActivity() {
                             }
                         }
 
-                        AccountScreen(accountStateViewModel, intent, packageName, appName, mainViewModel.intents, navController)
+                        AccountScreen(accountStateViewModel, intent, packageName, appName, mainViewModel.intents, navController, storageHelper)
                     }
                 }
             }

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountScreen.kt
@@ -35,6 +35,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavHostController
+import androidx.navigation.compose.rememberNavController
+import com.anggrayudi.storage.SimpleStorageHelper
 import com.greenart7c3.nostrsigner.BuildConfig
 import com.greenart7c3.nostrsigner.LocalPreferences
 import com.greenart7c3.nostrsigner.NostrSigner
@@ -59,6 +61,7 @@ fun AccountScreen(
     appName: String?,
     flow: MutableStateFlow<List<IntentData>>,
     navController: NavHostController,
+    storageHelper: SimpleStorageHelper,
 ) {
     val accountState by accountStateViewModel.accountContent.collectAsState()
     val intents by flow.collectAsState(initial = emptyList())
@@ -72,7 +75,8 @@ fun AccountScreen(
         ) { state ->
             when (state) {
                 is AccountState.LoggedOff -> {
-                    MainLoginPage(accountStateViewModel)
+                    val newNavController = rememberNavController()
+                    MainLoginPage(accountStateViewModel, storageHelper, newNavController)
                 }
                 is AccountState.LoggedIn -> {
                     LaunchedEffect(intent, intents) {
@@ -133,6 +137,7 @@ fun AccountScreen(
                         localRoute,
                         database,
                         navController,
+                        storageHelper,
                         onRemoveIntentData = {
                             val oldIntents = intents.toMutableList()
                             oldIntents.remove(it)

diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt
@@ -250,12 +250,13 @@ class AccountStateViewModel(npub: String?) : ViewModel() {
         proxyPort: Int,
         signPolicy: Int,
         seedWords: Set<String>,
+        name: String,
     ) {
         val key = seedWords.joinToString(separator = " ") { it }
         val keyPair = KeyPair(privKey = CryptoUtils.privateKeyFromMnemonic(key))
         val account = Account(
             NostrSignerInternal(keyPair),
-            name = "",
+            name = name,
             useProxy = useProxy,
             proxyPort = proxyPort,
             language = null,