diff --git a/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PreferenceBookmarkedPosts.kt b/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PreferenceBookmarkedPosts.kt index 736ebcd9..76c1df53 100644 --- a/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PreferenceBookmarkedPosts.kt +++ b/core/datastore/src/main/java/caios/android/fanbox/core/datastore/PreferenceBookmarkedPosts.kt @@ -49,6 +49,11 @@ class PreferenceBookmarkedPosts @Inject constructor( _data.tryEmit(posts.map { it.id }) } + fun clear() { + accountFile.delete() + _data.tryEmit(emptyList()) + } + fun get(): List { if (!accountFile.exists()) return emptyList() diff --git a/core/datastore/src/main/res/raw/versions.json b/core/datastore/src/main/res/raw/versions.json index 893907b8..27bf8b42 100644 --- a/core/datastore/src/main/res/raw/versions.json +++ b/core/datastore/src/main/res/raw/versions.json @@ -54,5 +54,12 @@ "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." + }, + { + "versionName": "1.1.1", + "versionCode": 10, + "date": "2023/12/15", + "logJp": "・支援中タブが表示できない問題を修正", + "logEn": "・Fixed an issue where the support tab could not be displayed." } ] diff --git a/core/repository/src/main/java/caios/android/fanbox/core/repository/FanboxRepository.kt b/core/repository/src/main/java/caios/android/fanbox/core/repository/FanboxRepository.kt index 04bda0f6..c1ac95ac 100644 --- a/core/repository/src/main/java/caios/android/fanbox/core/repository/FanboxRepository.kt +++ b/core/repository/src/main/java/caios/android/fanbox/core/repository/FanboxRepository.kt @@ -54,6 +54,7 @@ import caios.android.fanbox.core.repository.paging.CreatorPostsPagingSource import caios.android.fanbox.core.repository.paging.HomePostsPagingSource import caios.android.fanbox.core.repository.paging.SearchCreatorsPagingSource import caios.android.fanbox.core.repository.paging.SearchPostsPagingSource +import caios.android.fanbox.core.repository.paging.SupportedPostsPagingSource import caios.android.fanbox.core.repository.utils.parse import caios.android.fanbox.core.repository.utils.requireSuccess import caios.android.fanbox.core.repository.utils.translate @@ -215,6 +216,7 @@ class FanboxRepositoryImpl( if (it) { CoroutineScope(ioDispatcher).launch { fanboxCookiePreference.save("") + bookmarkedPostsPreference.clear() _logoutTrigger.send(OffsetDateTime.now()) } } else { @@ -341,7 +343,7 @@ class FanboxRepositoryImpl( config = PagingConfig(pageSize = loadSize), initialKey = null, pagingSourceFactory = { - HomePostsPagingSource(this, isHideRestricted) + SupportedPostsPagingSource(this, isHideRestricted) }, ) .flow diff --git a/feature/setting/src/main/java/caios/android/fanbox/feature/setting/top/SettingTopScreen.kt b/feature/setting/src/main/java/caios/android/fanbox/feature/setting/top/SettingTopScreen.kt index 90ff2d4a..2d4f503d 100644 --- a/feature/setting/src/main/java/caios/android/fanbox/feature/setting/top/SettingTopScreen.kt +++ b/feature/setting/src/main/java/caios/android/fanbox/feature/setting/top/SettingTopScreen.kt @@ -81,7 +81,18 @@ internal fun SettingTopRoute( onClickFollowTabDefaultHome = viewModel::setFollowTabDefaultHome, onClickHideAdultContents = viewModel::setHideAdultContents, onClickOverrideAdultContents = viewModel::setOverrideAdultContents, - onClickGridMode = viewModel::setGridMode, + onClickGridMode = { + if (it) { + if (uiState.userData.hasPrivilege) { + viewModel.setGridMode(true) + } else { + ToastUtil.show(context, R.string.billing_plus_toast_require_plus) + navigateToBillingPlus.invoke() + } + } else { + viewModel.setGridMode(false) + } + }, onClickHideRestricted = { if (it) { if (uiState.userData.hasPrivilege) { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 882eb367..51ef3a76 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] # Application -versionName = "1.1.0" -versionCode = "9" +versionName = "1.1.1" +versionCode = "10" # SDK minSdk = "26" diff --git a/media/google_play/GooglePlay_2.png b/media/google_play/GooglePlay_2.png index 6b259298..83e83201 100644 Binary files a/media/google_play/GooglePlay_2.png and b/media/google_play/GooglePlay_2.png differ diff --git a/media/google_play/GooglePlay_3.png b/media/google_play/GooglePlay_3.png index 0a5717d3..5659cd0e 100644 Binary files a/media/google_play/GooglePlay_3.png and b/media/google_play/GooglePlay_3.png differ diff --git a/media/google_play/GooglePlay_4.png b/media/google_play/GooglePlay_4.png index 3486a2e8..8a1d7aaa 100644 Binary files a/media/google_play/GooglePlay_4.png and b/media/google_play/GooglePlay_4.png differ diff --git a/media/google_play/GooglePlay_5.png b/media/google_play/GooglePlay_5.png index 166df892..325499c2 100644 Binary files a/media/google_play/GooglePlay_5.png and b/media/google_play/GooglePlay_5.png differ diff --git a/media/google_play/screenshots.png b/media/google_play/screenshots.png index 6bd0b395..e8c6016b 100644 Binary files a/media/google_play/screenshots.png and b/media/google_play/screenshots.png differ