Update: scoped storage 대응

Author: jisungbin

data-github/src/main/kotlin/io/github/jisungbin/gitmessengerbot/data/github/repo/GithubRepoRepositoryImpl.kt

@@ -11,7 +11,6 @@ package io.github.jisungbin.gitmessengerbot.data.github.repo
 
 import io.github.jisungbin.gitmessengerbot.common.constant.GithubConstant
 import io.github.jisungbin.gitmessengerbot.common.core.Storage
-import io.github.jisungbin.gitmessengerbot.common.exception.DataGithubException
 import io.github.jisungbin.gitmessengerbot.common.extension.toModel
 import io.github.jisungbin.gitmessengerbot.data.github.api.GithubRepoService
 import io.github.jisungbin.gitmessengerbot.data.github.mapper.toDomain
@@ -31,7 +30,7 @@ import retrofit2.Retrofit
 class GithubRepoRepositoryImpl(retrofit: Retrofit) : GithubRepoRepository {
     private val api = retrofit.create(GithubRepoService::class.java)
     private val githubData: GithubData = Storage.read(GithubConstant.DataPath, null)?.toModel()
-        ?: throw DataGithubException("GithubConfig.DataPath 데이터가 null 이에요.")
+        ?: /*throw DataGithubException("GithubConfig.DataPath 데이터가 null 이에요.")*/ GithubData() // TODO: null 대응 (ScopedStorage 대응)
 
     override suspend fun getFileContent(
         repoName: String,

presentation/src/main/kotlin/io/github/jisungbin/gitmessengerbot/activity/main/MainActivity.kt

@@ -119,7 +119,7 @@ class MainActivity : ComponentActivity() {
 
         if (Storage.isScoped) {
             AlertDialog.Builder(this)
-                .setMessage(R.string.activity_main_dialog_android_11_notice_title)
+                .setTitle(R.string.activity_main_dialog_android_11_notice_title)
                 .setMessage(R.string.activity_main_dialog_android_11_notice_message)
                 .setPositiveButton(R.string.close, null)
                 .show()

presentation/src/main/kotlin/io/github/jisungbin/gitmessengerbot/activity/main/dashboard/script/header.kt

@@ -66,7 +66,6 @@ import io.github.jisungbin.gitmessengerbot.activity.imageviewer.ImageViewActivit
 import io.github.jisungbin.gitmessengerbot.common.constant.GithubConstant
 import io.github.jisungbin.gitmessengerbot.common.constant.IntentConstant
 import io.github.jisungbin.gitmessengerbot.common.core.Storage
-import io.github.jisungbin.gitmessengerbot.common.exception.PresentationException
 import io.github.jisungbin.gitmessengerbot.common.extension.toModel
 import io.github.jisungbin.gitmessengerbot.domain.github.model.user.GithubData
 import io.github.jisungbin.gitmessengerbot.theme.colors
@@ -115,9 +114,9 @@ fun Header(searchField: MutableState<TextFieldValue>) {
 
     val app by AppConfig.app.collectAsState()
     val backgroundService = Intent(context, BackgroundService::class.java)
-    val githubJson = Storage.read(GithubConstant.DataPath, null)
-        ?: throw PresentationException("GithubConfig.DataPath의 값이 null 이에요.")
-    val githubData: GithubData = githubJson.toModel()
+    val githubJson =
+        Storage.read(GithubConstant.DataPath, null) // TODO: null 처리 (ScopedStorage 대응해서)
+    val githubData: GithubData = githubJson?.toModel() ?: GithubData(userName = "User")
     var searching by remember { mutableStateOf(false) }
 
     ConstraintLayout(
@@ -208,6 +207,7 @@ fun Header(searchField: MutableState<TextFieldValue>) {
                                 style = TextStyle(fontFamily = defaultFontFamily, fontSize = 15.sp)
                             )
                             Switch(
+                                modifier = Modifier.height(20.dp),
                                 checked = app.power,
                                 colors = SwitchDefaults.colors(
                                     checkedThumbColor = Color.White,
@@ -240,7 +240,10 @@ fun Header(searchField: MutableState<TextFieldValue>) {
                                 text = Bot.getAllScripts().size.toString(),
                                 style = TextStyle(fontFamily = defaultFontFamily, fontSize = 25.sp)
                             )
-                            Text(text = "개", style = TextStyle(fontFamily = defaultFontFamily, fontSize = 15.sp))
+                            Text(
+                                text = "개",
+                                style = TextStyle(fontFamily = defaultFontFamily, fontSize = 15.sp)
+                            )
                         }
                     }
                     MenuBox(
@@ -255,7 +258,10 @@ fun Header(searchField: MutableState<TextFieldValue>) {
                                 text = Bot.getRunnableScripts().size.toString(),
                                 style = TextStyle(fontFamily = defaultFontFamily, fontSize = 25.sp)
                             )
-                            Text(text = "개", style = TextStyle(fontFamily = defaultFontFamily, fontSize = 15.sp))
+                            Text(
+                                text = "개",
+                                style = TextStyle(fontFamily = defaultFontFamily, fontSize = 15.sp)
+                            )
                         }
                     }
                     MenuBox(