Skip to content

Commit bbbee39

Browse files
committed
fix: subscription screen initial page.
1 parent 95af8bb commit bbbee39

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

app/smartphone/src/main/java/com/m3u/smartphone/ui/business/foryou/components/PlaylistItem.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ internal fun PlaylistItem(
4747
val spacing = LocalSpacing.current
4848
OutlinedCard(
4949
shape = AbsoluteSmoothCornerShape(spacing.medium, 65),
50-
border = CardDefaults.outlinedCardBorder(!refreshable),
5150
colors = CardDefaults.cardColors(Color.Transparent),
5251
modifier = modifier.semantics(mergeDescendants = true) { }
5352
) {

app/smartphone/src/main/java/com/m3u/smartphone/ui/business/setting/fragments/SubscriptionsFragment.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import androidx.compose.foundation.layout.padding
2020
import androidx.compose.foundation.layout.size
2121
import androidx.compose.foundation.lazy.LazyColumn
2222
import androidx.compose.foundation.pager.HorizontalPager
23+
import androidx.compose.foundation.pager.PageSize
2324
import androidx.compose.foundation.pager.rememberPagerState
2425
import androidx.compose.material.icons.Icons
2526
import androidx.compose.material.icons.filled.MoreVert
@@ -47,6 +48,7 @@ import androidx.compose.ui.Alignment
4748
import androidx.compose.ui.Modifier
4849
import androidx.compose.ui.platform.LocalClipboardManager
4950
import androidx.compose.ui.res.stringResource
51+
import androidx.compose.ui.unit.dp
5052
import com.google.accompanist.permissions.rememberPermissionState
5153
import com.m3u.business.setting.BackingUpAndRestoringState
5254
import com.m3u.business.setting.SettingProperties
@@ -98,7 +100,10 @@ internal fun SubscriptionsFragment(
98100
state = pagerState,
99101
verticalAlignment = Alignment.Top,
100102
contentPadding = contentPadding,
101-
modifier = modifier
103+
modifier = modifier,
104+
key = { SubscriptionsFragmentPage.entries[it] },
105+
pageSize = PageSize.Fill,
106+
pageSpacing = 1.dp
102107
) { page ->
103108
when (SubscriptionsFragmentPage.entries[page]) {
104109
SubscriptionsFragmentPage.MAIN -> {
@@ -257,7 +262,6 @@ private fun MainContentImpl(
257262
ButtonGroup(
258263
overflowIndicator = { menuState ->
259264
FilledIconButton(
260-
shape = ButtonGroupDefaults.connectedLeadingButtonPressShape,
261265
onClick = {
262266
if (menuState.isExpanded) {
263267
menuState.dismiss()

0 commit comments

Comments
 (0)