Skip to content

Commit 4549d57

Browse files
committed
feat: update version to 2.2.5, improve status bar handling, and enhance error logging
1 parent 2579db3 commit 4549d57

5 files changed

Lines changed: 34 additions & 17 deletions

File tree

core/resources/src/commonMain/composeResources/files/versions.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,5 +215,12 @@
215215
"date": "2025/02/05",
216216
"logJp": "・サブスクリプションに継続加入しているにも関わらず、アプリ起動直後に解約された旨のダイアログが出る不具合を修正\n・軽微なUIの修正",
217217
"logEn": "・Fixed an issue where a dialogue box would appear stating that a subscription had been cancelled immediately after launching the app, even if the subscription was still active.\n・Minor UI fixes"
218+
},
219+
{
220+
"versionName": "2.2.5",
221+
"versionCode": 61,
222+
"date": "2025/04/17",
223+
"logJp": "・一部投稿画面が表示できない問題の修正\n・軽微なUIの修正",
224+
"logEn": "・Fixed an issue where some posting screens could not be displayed.\n・Minor UI fixes"
218225
}
219226
]

feature/creator/src/commonMain/kotlin/me/matsumo/fanbox/feature/creator/top/CreatorTopScreen.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ import androidx.compose.foundation.layout.Box
99
import androidx.compose.foundation.layout.Column
1010
import androidx.compose.foundation.layout.Spacer
1111
import androidx.compose.foundation.layout.WindowInsets
12+
import androidx.compose.foundation.layout.asPaddingValues
1213
import androidx.compose.foundation.layout.fillMaxSize
1314
import androidx.compose.foundation.layout.fillMaxWidth
1415
import androidx.compose.foundation.layout.heightIn
1516
import androidx.compose.foundation.layout.navigationBarsPadding
1617
import androidx.compose.foundation.layout.padding
18+
import androidx.compose.foundation.layout.statusBars
1719
import androidx.compose.foundation.layout.statusBarsPadding
1820
import androidx.compose.foundation.lazy.grid.rememberLazyGridState
1921
import androidx.compose.foundation.lazy.rememberLazyListState
@@ -56,6 +58,7 @@ import com.svenjacobs.reveal.RevealState
5658
import com.svenjacobs.reveal.rememberRevealState
5759
import com.svenjacobs.reveal.revealable
5860
import com.svenjacobs.reveal.shapes.balloon.Arrow
61+
import io.github.aakira.napier.Napier
5962
import kotlinx.collections.immutable.ImmutableList
6063
import kotlinx.collections.immutable.toImmutableList
6164
import kotlinx.coroutines.delay
@@ -245,6 +248,9 @@ private fun CreatorTopScreen(
245248
val pagerState = rememberPagerState(initialPage = if (isPosts) 0 else 1) { 2 }
246249
val scope = rememberCoroutineScope()
247250

251+
val insets = WindowInsets.statusBars.asPaddingValues()
252+
val topInset = insets.calculateTopPadding()
253+
248254
val postsGridState = rememberLazyGridState()
249255
val plansListState = rememberLazyListState()
250256

@@ -292,7 +298,7 @@ private fun CreatorTopScreen(
292298
modifier = Modifier.fillMaxSize(),
293299
state = state,
294300
toolbarModifier = Modifier
295-
.heightIn(min = topAppBarHeight + 4.dp)
301+
.heightIn(min = topInset + topAppBarHeight)
296302
.verticalScroll(rememberScrollState()),
297303
toolbar = {
298304
Spacer(
@@ -399,6 +405,7 @@ private fun CreatorTopScreen(
399405
.statusBarsPadding()
400406
.onGloballyPositioned {
401407
topAppBarHeight = with(density) { it.size.height.toDp() }
408+
Napier.d { "topAppBarHeight: $topAppBarHeight" }
402409
},
403410
title = creatorDetail.user?.name.orEmpty(),
404411
isShowTitle = state.toolbarState.progress == 0f,

feature/post/src/commonMain/kotlin/me/matsumo/fanbox/feature/post/detail/PostDetailViewModel.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.asStateFlow
1010
import kotlinx.coroutines.flow.collectLatest
1111
import kotlinx.coroutines.flow.first
1212
import kotlinx.coroutines.launch
13+
import me.matsumo.fanbox.core.common.util.recordException
1314
import me.matsumo.fanbox.core.common.util.suspendRunCatching
1415
import me.matsumo.fanbox.core.model.ScreenState
1516
import me.matsumo.fanbox.core.model.TranslationState
@@ -71,7 +72,9 @@ class PostDetailViewModel(
7172
_screenState.value = suspendRunCatching {
7273
val postDetail = fanboxRepository.getPostDetail(postId)
7374
val creatorDetail = fanboxRepository.getCreatorDetailCached(postDetail.user!!.creatorId!!)
74-
val comments = fanboxRepository.getPostComment(postId)
75+
val comments = runCatching { fanboxRepository.getPostComment(postId) }
76+
.onFailure { recordException(it) }
77+
.getOrElse { PageOffsetInfo(emptyList(), null) }
7578

7679
PostDetailUiState(
7780
userData = userDataRepository.userData.first(),

gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
# Application
3-
versionName = "2.2.4"
4-
versionCode = "60"
3+
versionName = "2.2.5"
4+
versionCode = "62"
55

66
# SDK
77
minSdk = "26"
@@ -12,12 +12,12 @@ compileSdk = "35"
1212
gradle = "8.8.1"
1313

1414
# Kotlin
15-
kotlin = "2.1.10"
15+
kotlin = "2.1.20"
1616

1717
# KotlinX
1818
kotlinxCoroutines = "1.7.3"
1919
kotlinxDatetime = "0.6.1"
20-
kotlinxSerializationJson = "1.8.0"
20+
kotlinxSerializationJson = "1.8.1"
2121
kotlinxImmutable = "0.3.8"
2222

2323
# KMP
@@ -33,25 +33,25 @@ calf = "0.5.5"
3333
adaptive = "1.0.1"
3434

3535
# AndroidX
36-
androidxCore = "1.15.0"
36+
androidxCore = "1.16.0"
3737
androidxCoreSplash = "1.0.1"
3838
androidxAppCompat = "1.7.0"
39-
androidxActivity = "1.10.0"
39+
androidxActivity = "1.10.1"
4040
androidxFragment = "1.8.6"
4141
androidxPreference = "1.2.1"
42-
androidxDataStore = "1.1.2"
42+
androidxDataStore = "1.1.4"
4343
androidxPalette = "1.0.0"
4444
androidxAnnotation = "1.9.1"
45-
androidxMedia3 = "1.5.1"
46-
androidxCompose = "2025.02.00"
45+
androidxMedia3 = "1.6.1"
46+
androidxCompose = "2025.04.00"
4747

4848
# Google
4949
playReview = "2.0.2"
5050
playUpdate = "2.1.0"
5151
playServiceAds = "23.6.0"
5252
playServiceOss = "17.1.0"
5353
material = "1.12.0"
54-
ksp = "2.1.10-1.0.29"
54+
ksp = "2.1.20-2.0.0"
5555
gms = "4.4.2"
5656

5757
# Billing
@@ -61,7 +61,7 @@ billing = "6.1.0"
6161
koin = "4.0.0"
6262

6363
# matsumo
64-
fankt = "0.0.11"
64+
fankt = "0.0.13"
6565

6666
# OpenAI
6767
openai = "4.0.1"

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@
501501
CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements;
502502
CODE_SIGN_IDENTITY = "Apple Development";
503503
CODE_SIGN_STYLE = Automatic;
504-
CURRENT_PROJECT_VERSION = 60;
504+
CURRENT_PROJECT_VERSION = 62;
505505
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
506506
DEVELOPMENT_TEAM = P2KMSDQ33M;
507507
ENABLE_PREVIEWS = YES;
@@ -528,7 +528,7 @@
528528
"$(inherited)",
529529
"@executable_path/Frameworks",
530530
);
531-
MARKETING_VERSION = 2.2.4;
531+
MARKETING_VERSION = 2.2.5;
532532
OTHER_LDFLAGS = (
533533
"$(inherited)",
534534
"-framework",
@@ -559,7 +559,7 @@
559559
CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements;
560560
CODE_SIGN_IDENTITY = "Apple Development";
561561
CODE_SIGN_STYLE = Automatic;
562-
CURRENT_PROJECT_VERSION = 60;
562+
CURRENT_PROJECT_VERSION = 62;
563563
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
564564
DEVELOPMENT_TEAM = P2KMSDQ33M;
565565
ENABLE_PREVIEWS = YES;
@@ -586,7 +586,7 @@
586586
"$(inherited)",
587587
"@executable_path/Frameworks",
588588
);
589-
MARKETING_VERSION = 2.2.4;
589+
MARKETING_VERSION = 2.2.5;
590590
OTHER_LDFLAGS = (
591591
"$(inherited)",
592592
"-framework",

0 commit comments

Comments
 (0)