bump up version to 1.0.5

matsumo0922 · Dec 14, 2023 · 71ae3f8 · 71ae3f8
1 parent e20d133
commit 71ae3f8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/app/src/main/java/caios/android/fanbox/MainActivity.kt b/app/src/main/java/caios/android/fanbox/MainActivity.kt
@@ -25,7 +25,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 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.Modifier
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
@@ -104,9 +106,8 @@ class MainActivity : FragmentActivity(), PostDownloader {
                 screenState = screenState,
                 containerColor = if (shouldUseDarkTheme) DarkDefaultColorScheme.surface else LightDefaultColorScheme.surface,
             ) {
-                val isAgreedTeams =
-                    remember(it.userData) { it.userData.isAgreedPrivacyPolicy && it.userData.isAgreedTermsOfService }
-                val isAllowedPermission = remember(it.userData, it.isLoggedIn) { isAllowedPermission() }
+                var isAgreedTeams by remember(it.userData) { mutableStateOf(it.userData.isAgreedPrivacyPolicy && it.userData.isAgreedTermsOfService)}
+                var isAllowedPermission by remember(it.userData, it.isLoggedIn) { mutableStateOf(isAllowedPermission()) }
 
                 PixiViewTheme(
                     fanboxCookie = it.fanboxCookie,
@@ -124,6 +125,12 @@ class MainActivity : FragmentActivity(), PostDownloader {
                             isAgreedTeams = isAgreedTeams,
                             isAllowedPermission = isAllowedPermission,
                             isLoggedIn = it.isLoggedIn,
+                            onCompleteWelcome = {
+                                isAgreedTeams = true
+                                isAllowedPermission = true
+
+                                viewModel.updateState()
+                            }
                         )
 
                         AnimatedVisibility(

diff --git a/app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt b/app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt
@@ -33,6 +33,7 @@ internal fun PixiViewApp(
     isAllowedPermission: Boolean,
     isLoggedIn: Boolean,
     viewModel: MainViewModel,
+    onCompleteWelcome: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val navigationType = when (windowSize) {
@@ -64,7 +65,7 @@ internal fun PixiViewApp(
                         isAgreedTeams = isAgreedTeams,
                         isAllowedPermission = isAllowedPermission,
                         isLoggedIn = isLoggedIn,
-                        onComplete = viewModel::updateState,
+                        onComplete = { onCompleteWelcome.invoke() },
                     )
                 } else {
                     IdleScreen(

diff --git a/core/datastore/src/main/res/raw/versions.json b/core/datastore/src/main/res/raw/versions.json
@@ -47,5 +47,12 @@
     "date": "2023/12/09",
     "logJp": "・スラッシュが入った文字列を検索するとクラッシュする不具合を修正\n・表示する内容がなかった場合のメッセージを改善",
     "logEn": "・Fixed a bug that caused a crash when searching for a string containing a slash.\n・Improved the message when there was no content to display."
+  },
+  {
+    "versionName": "1.0.5",
+    "versionCode": 9,
+    "date": "2023/12/15",
+    "logJp": "・タブレットや Fold などの大画面端末に対応\n・支援プラン外の投稿などの表示制限コンテンツを省く設定を追加\n・投稿を一覧表示できるグリッドモードを追加\n・投稿詳細画面を左右にスワイプすることで、前後の投稿を次々に確認できるように修正\n・ウェルカム画面から先に進めない不具合を修正",
+    "logEn": "・Support for large screen devices such as tablets and Fold.\n・Added a setting to omit display-restricted content, such as posts not covered by a support plan.\n・Grid mode has been added to display a list of posts.\n・Fixed a bug that prevented the user from proceeding to the welcome screen.\n・Fixed a bug that prevented users from proceeding from the welcome screen."
   }
 ]
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # Application
-versionName = "1.0.4"
-versionCode = "8"
+versionName = "1.1.0"
+versionCode = "9"
 
 # SDK
 minSdk = "26"