認証機能のバグを直しました

nekomoti22 · nekomoti22 · commit 9824e5403c77 · 2025-04-03T23:11:01.000+09:00
diff --git a/app/src/main/java/com/example/runningavater/MyAppNavHost.kt b/app/src/main/java/com/example/runningavater/MyAppNavHost.kt
@@ -61,7 +61,7 @@ fun MyAppNavHost(
     val startDestination = getStartDestination(context)
     Scaffold(
         bottomBar = {
-            if (currentDestination?.route?.startsWith("initialFlow") != true) {
+            if (currentDestination?.route?.startsWith("initialFlow") != true && currentDestination?.route?.startsWith("authentication") != true) {
                 MainBottomBar(currentDestination, navController)
             }
         },
@@ -123,13 +123,13 @@ private fun MainBottomBar(
                     }
                 },
                 colors =
-                    NavigationBarItemDefaults.colors(
-                        selectedIconColor = Color.White,
-                        selectedTextColor = Color.White,
-                        unselectedIconColor = Color.White.copy(alpha = 0.5f),
-                        unselectedTextColor = Color.White.copy(alpha = 0.5f),
-                        indicatorColor = Color.White.copy(alpha = 0.3f),
-                    ),
+                NavigationBarItemDefaults.colors(
+                    selectedIconColor = Color.White,
+                    selectedTextColor = Color.White,
+                    unselectedIconColor = Color.White.copy(alpha = 0.5f),
+                    unselectedTextColor = Color.White.copy(alpha = 0.5f),
+                    indicatorColor = Color.White.copy(alpha = 0.3f),
+                ),
             )
         }
     }
diff --git a/app/src/main/java/com/example/runningavater/authentication/AuthenticationErrorDialog.kt b/app/src/main/java/com/example/runningavater/authentication/AuthenticationErrorDialog.kt
@@ -0,0 +1,41 @@
+package com.example.runningavater.authentication
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.vector.ImageVector
+
+@Composable
+fun AuthenticationErrorDialog(
+    onDismissRequest: () -> Unit,
+    onConfirmation: () -> Unit,
+    dialogTitle: String,
+    dialogText: String,
+    icon: ImageVector,
+) {
+    AlertDialog(
+        icon = {
+            Icon(icon, contentDescription = "Example Icon")
+        },
+        title = {
+            Text(text = dialogTitle)
+        },
+        text = {
+            Text(text = dialogText)
+        },
+        onDismissRequest = {
+            onDismissRequest()
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    onConfirmation()
+                }
+            ) {
+                Text("設定へ")
+            }
+        },
+    )
+}
diff --git a/app/src/main/java/com/example/runningavater/authentication/AuthenticationScreen.kt b/app/src/main/java/com/example/runningavater/authentication/AuthenticationScreen.kt
@@ -10,44 +10,95 @@ import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
 import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
 import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
 import androidx.biometric.BiometricPrompt
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Info
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.navigation.NavController
 
+@Composable
+fun LifecycleResumeEffect(onResume: () -> Unit) {
+    // 現在の画面のLifecycleOwnerを取得
+    val lifecycleOwner = LocalLifecycleOwner.current
+    DisposableEffect(lifecycleOwner) {
+        // LifecycleEventObserverでLifecycleのイベントを監視する
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                // onResumeになったときに呼び出される
+                onResume()
+            }
+        }
+        // 監視を開始
+        lifecycleOwner.lifecycle.addObserver(observer)
+
+        // Composableが破棄されるときに呼び出される
+        onDispose {
+            lifecycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+}
+
+
 @Composable
 fun AuthenticationScreen(
     navController: NavController,
     modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
-    LaunchedEffect(key1 = Unit) {
+    val openAlertDialog = remember { mutableStateOf(false) }
+    when {
+        openAlertDialog.value -> {
+            AuthenticationErrorDialog(
+                onDismissRequest = { openAlertDialog.value = false },
+                onConfirmation = {
+                    openAlertDialog.value = false
+                    println("Confirmation registered") // Add logic here to handle confirmation.
+                },
+                dialogTitle = "端末のパスワードを設定してください",
+                dialogText = "本サービスは、端末のパスワードを設定していただくと利用可能になります。",
+                icon = Icons.Default.Info
+            )
+        }
+    }
+    LifecycleResumeEffect {
         when (BiometricManager.from(context).canAuthenticate(BIOMETRIC_STRONG or BIOMETRIC_WEAK or DEVICE_CREDENTIAL)) {
             BiometricManager.BIOMETRIC_SUCCESS -> { // 生体認証が利用可能
                 showAuthenticationDialog(context, navController)
             }
 
+
             BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> { // 生体情報が端末に登録されていない
                 val enrollIntent =
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                        Intent(Settings.ACTION_BIOMETRIC_ENROLL).apply {
+                        val enrollIntent = Intent(Settings.ACTION_BIOMETRIC_ENROLL).apply {
                             putExtra(
                                 Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED,
-                                BIOMETRIC_STRONG or DEVICE_CREDENTIAL,
+                                BIOMETRIC_STRONG or DEVICE_CREDENTIAL
                             )
                         }
+                        context.startActivity(enrollIntent)
                     } else {
-                        TODO("VERSION.SDK_INT < R")
+                        // Android 10 以下
+                        showToast(context, "端末のパスワードを設定してください")
+                        val securityIntent = Intent(Settings.ACTION_SECURITY_SETTINGS).apply {
+                            addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        }
+                        context.startActivity(securityIntent)
                     }
-                context.startActivity(enrollIntent)
             }
 
             BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE, BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> { // 生体認証ハードウェアが利用不可
-                TODO("ダイアログを表示")
+                showToast(context, "お使いの端末は対応本サービスを利用できません。")
             }
 
             else -> throw IllegalStateException("ここには入らないはず。")
@@ -56,6 +107,10 @@ fun AuthenticationScreen(
     CircularProgressIndicator()
 }
 
+fun showToast(context: android.content.Context, message: String) {
+    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+}
+
 fun showAuthenticationDialog(
     context: Context,
     navController: NavController,
diff --git a/app/src/main/java/com/example/runningavater/settings/ProfileScreen.kt b/app/src/main/java/com/example/runningavater/settings/ProfileScreen.kt
@@ -12,6 +12,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material3.Button
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -30,6 +33,7 @@ import androidx.navigation.NavHostController
 import coil.compose.rememberAsyncImagePainter
 import coil.request.ImageRequest
 import com.example.runningavater.R
+import com.example.runningavater.authentication.AuthenticationErrorDialog
 
 @Composable
 fun ProfileScreen(navController: NavHostController) {
@@ -45,6 +49,21 @@ fun ProfileScreen(
     profileImageUri: Uri?,
     onImageSelected: (Uri) -> Unit,
 ) {
+    val openAlertDialog = remember { mutableStateOf(false) }
+    when {
+        openAlertDialog.value -> {
+            AuthenticationErrorDialog(
+                onDismissRequest = { openAlertDialog.value = false },
+                onConfirmation = {
+                    openAlertDialog.value = false
+                    println("Confirmation registered") // Add logic here to handle confirmation.
+                },
+                dialogTitle = "Alert dialog example",
+                dialogText = "This is an example of an alert dialog with buttons.",
+                icon = Icons.Default.Info
+            )
+        }
+    }
     val launcher =
         rememberLauncherForActivityResult(
             contract = ActivityResultContracts.GetContent(),
@@ -56,31 +75,32 @@ fun ProfileScreen(
 
     Column(
         modifier =
-            Modifier
-                .fillMaxSize()
-                .padding(16.dp),
+        Modifier
+            .fillMaxSize()
+            .padding(16.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Box(
             modifier =
-                Modifier
-                    .size(100.dp)
-                    .padding(8.dp)
-                    .clickable {
-                        launcher.launch("image/*")
-                    }.background(Color.Gray, shape = CircleShape),
+            Modifier
+                .size(100.dp)
+                .padding(8.dp)
+                .clickable {
+                    launcher.launch("image/*")
+                }
+                .background(Color.Gray, shape = CircleShape),
             contentAlignment = Alignment.Center,
         ) {
             if (profileImageUri != null) {
                 Image(
                     painter =
-                        rememberAsyncImagePainter(
-                            model =
-                                ImageRequest
-                                    .Builder(LocalContext.current)
-                                    .data(profileImageUri)
-                                    .build(),
-                        ),
+                    rememberAsyncImagePainter(
+                        model =
+                        ImageRequest
+                            .Builder(LocalContext.current)
+                            .data(profileImageUri)
+                            .build(),
+                    ),
                     contentDescription = "Profile Image",
                     modifier = Modifier.size(100.dp),
                 )
@@ -98,5 +118,8 @@ fun ProfileScreen(
             fontWeight = FontWeight.Bold,
             modifier = Modifier.padding(top = 16.dp),
         )
+        Button(
+            onClick = { openAlertDialog.value = true }
+        ) { }
     }
 }
diff --git a/app/src/main/java/com/example/runningavater/settings/SettingsScreen.kt b/app/src/main/java/com/example/runningavater/settings/SettingsScreen.kt

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ fun MyAppNavHost(`
`61`	`61`	`val startDestination = getStartDestination(context)`
`62`	`62`	`Scaffold(`
`63`	`63`	`bottomBar = {`
`64`		`- if (currentDestination?.route?.startsWith("initialFlow") != true) {`
	`64`	`+ if (currentDestination?.route?.startsWith("initialFlow") != true && currentDestination?.route?.startsWith("authentication") != true) {`
`65`	`65`	`MainBottomBar(currentDestination, navController)`
`66`	`66`	`}`
`67`	`67`	`},`
`@@ -123,13 +123,13 @@ private fun MainBottomBar(`
`123`	`123`	`}`
`124`	`124`	`},`
`125`	`125`	`colors =`
`126`		`- NavigationBarItemDefaults.colors(`
`127`		`- selectedIconColor = Color.White,`
`128`		`- selectedTextColor = Color.White,`
`129`		`- unselectedIconColor = Color.White.copy(alpha = 0.5f),`
`130`		`- unselectedTextColor = Color.White.copy(alpha = 0.5f),`
`131`		`- indicatorColor = Color.White.copy(alpha = 0.3f),`
`132`		`- ),`
	`126`	`+ NavigationBarItemDefaults.colors(`
	`127`	`+ selectedIconColor = Color.White,`
	`128`	`+ selectedTextColor = Color.White,`
	`129`	`+ unselectedIconColor = Color.White.copy(alpha = 0.5f),`
	`130`	`+ unselectedTextColor = Color.White.copy(alpha = 0.5f),`
	`131`	`+ indicatorColor = Color.White.copy(alpha = 0.3f),`
	`132`	`+ ),`
`133`	`133`	`)`
`134`	`134`	`}`
`135`	`135`	`}`