Skip to content
This repository has been archived by the owner on Jan 31, 2025. It is now read-only.

Bump up version to 1.1.0 #8

Merged
merged 3 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions app/src/main/java/caios/android/fanbox/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [detekt] <detekt.SpacingAroundCurly> reported by reviewdog 🐶
Missing spacing before "}"

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [detekt] <detekt.Wrapping> reported by reviewdog 🐶
Missing newline after "{"

var isAllowedPermission by remember(it.userData, it.isLoggedIn) { mutableStateOf(isAllowedPermission()) }

PixiViewTheme(
fanboxCookie = it.fanboxCookie,
Expand All @@ -124,6 +125,12 @@ class MainActivity : FragmentActivity(), PostDownloader {
isAgreedTeams = isAgreedTeams,
isAllowedPermission = isAllowedPermission,
isLoggedIn = it.isLoggedIn,
onCompleteWelcome = {
isAgreedTeams = true
isAllowedPermission = true

viewModel.updateState()
}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ [detekt] <detekt.TrailingCommaOnCallSite> reported by reviewdog 🐶
Missing trailing comma before ")"

)

AnimatedVisibility(
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/caios/android/fanbox/ui/PixiViewApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ internal fun PixiViewApp(
isAllowedPermission: Boolean,
isLoggedIn: Boolean,
viewModel: MainViewModel,
onCompleteWelcome: () -> Unit,
modifier: Modifier = Modifier,
) {
val navigationType = when (windowSize) {
Expand Down Expand Up @@ -64,7 +65,7 @@ internal fun PixiViewApp(
isAgreedTeams = isAgreedTeams,
isAllowedPermission = isAllowedPermission,
isLoggedIn = isLoggedIn,
onComplete = viewModel::updateState,
onComplete = { onCompleteWelcome.invoke() },
)
} else {
IdleScreen(
Expand Down
7 changes: 7 additions & 0 deletions core/datastore/src/main/res/raw/versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
]
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
# Application
versionName = "1.0.4"
versionCode = "8"
versionName = "1.1.0"
versionCode = "9"

# SDK
minSdk = "26"
Expand Down
Loading