Skip to content

Commit

Permalink
fix some sizing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@DatL4g
DatL4g committed Mar 15, 2024
1 parent a2c78c1 commit 8765532
Show file tree
Hide file tree
Showing 7 changed files with 71 additions and 35 deletions.
13 changes: 3 additions & 10 deletions ...c/commonMain/kotlin/dev/datlag/burningseries/shared/ui/custom/DefaultCollapsingToolbar.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import kotlin.math.abs
@Composable
fun DefaultCollapsingToolbar(
state: CollapsingToolbarScaffoldState = rememberCollapsingToolbarScaffoldState(),
forceExpand: Boolean = false,
expandedBody: @Composable CollapsingToolbarScope.(CollapsingToolbarScaffoldState) -> Unit,
title: @Composable (CollapsingToolbarScaffoldState) -> Unit,
navigationIcon: (@Composable (CollapsingToolbarScaffoldState) -> Unit)? = null,
Expand All @@ -31,7 +32,6 @@ fun DefaultCollapsingToolbar(
val reversedProgress by remember {
derivedStateOf { (abs(1F - state.toolbarState.progress)) }
}
var expanded by remember { mutableStateOf(false) }

CollapsingToolbarScaffold(
modifier = Modifier.fillMaxSize(),
Expand Down Expand Up @@ -60,16 +60,9 @@ fun DefaultCollapsingToolbar(
content()
}

if (!expanded) {
rememberCoroutineScope().launchMain {
LaunchedEffect(forceExpand) {
if (forceExpand) {
state.toolbarState.expand(0)
repeat(5) {
withIOContext {
delay(20)
}
state.toolbarState.expand(0)
}
expanded = true
}
}
}
3 changes: 2 additions & 1 deletion ...c/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialComponent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ interface InitialComponent : Component {

data class PagerItem(
val label: StringResource,
val icon: ImageVector
val unselectedIcon: ImageVector,
val selectedIcon: ImageVector
)
}
22 changes: 17 additions & 5 deletions .../src/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@ private fun CompactScreen(
NavigationBarItem(
selected = selectedPage == index,
icon = {
NavIcon(item)
NavIcon(
selected = selectedPage == index,
item = item
)
},
onClick = {
component.selectPage(index)
Expand Down Expand Up @@ -118,7 +121,10 @@ private fun MediumScreen(
NavigationRailItem(
selected = selectedPage == index,
icon = {
NavIcon(item)
NavIcon(
selected = selectedPage == index,
item = item
)
},
onClick = {
component.selectPage(index)
Expand Down Expand Up @@ -165,7 +171,10 @@ private fun ExpandedScreen(
NavigationDrawerItem(
selected = selectedPage == index,
icon = {
NavIcon(item)
NavIcon(
selected = selectedPage == index,
item = item
)
},
onClick = {
component.selectPage(index)
Expand All @@ -189,9 +198,12 @@ private fun ExpandedScreen(
}

@Composable
private fun NavIcon(item: InitialComponent.PagerItem) {
private fun NavIcon(
selected: Boolean,
item: InitialComponent.PagerItem
) {
Icon(
imageVector = item.icon,
imageVector = if (selected) item.selectedIcon else item.unselectedIcon,
contentDescription = stringResource(item.label),
modifier = Modifier.size(24.dp)
)
Expand Down
19 changes: 13 additions & 6 deletions ...onMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/InitialScreenComponent.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
import androidx.compose.material.icons.filled.Home
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.outlined.Favorite
import androidx.compose.material.icons.outlined.FavoriteBorder
import androidx.compose.material.icons.outlined.Home
import androidx.compose.material.icons.outlined.Search
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import com.arkivanov.decompose.ComponentContext
Expand Down Expand Up @@ -31,16 +35,19 @@ class InitialScreenComponent(

override val pagerItems: List<InitialComponent.PagerItem> = listOf(
InitialComponent.PagerItem(
SharedRes.strings.home,
Icons.Default.Home
label = SharedRes.strings.home,
unselectedIcon = Icons.Outlined.Home,
selectedIcon = Icons.Filled.Home
),
InitialComponent.PagerItem(
SharedRes.strings.favorites,
Icons.Default.Favorite
label = SharedRes.strings.favorites,
unselectedIcon = Icons.Outlined.FavoriteBorder,
selectedIcon = Icons.Filled.Favorite
),
InitialComponent.PagerItem(
SharedRes.strings.search,
Icons.Default.Search
label = SharedRes.strings.search,
unselectedIcon = Icons.Outlined.Search,
selectedIcon = Icons.Filled.Search
)
)

Expand Down
22 changes: 17 additions & 5 deletions ...nMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/favorite/FavoriteScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.min
import com.arkivanov.decompose.extensions.compose.subscribeAsState
import dev.datlag.burningseries.shared.SharedRes
import dev.datlag.burningseries.shared.common.header
Expand Down Expand Up @@ -58,20 +60,30 @@ private fun DefaultView(component: FavoriteComponent) {
@Composable
private fun ExpandedView(component: FavoriteComponent) {
val childState by component.child.subscribeAsState()
var rowWidth by remember { mutableIntStateOf(-1) }

Row(
modifier = Modifier.onSizeChanged {
rowWidth = it.width
},
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
val modifier = if (childState.child?.configuration != null) {
Modifier.weight(1F).widthIn(min = 100.dp, max = 700.dp)
val colOne = if (rowWidth > 600) {
val third = remember(rowWidth) { rowWidth.toFloat() / 3F }
if (third >= 200F) {
Modifier.widthIn(max = third.dp)
} else {
Modifier.weight(1F)
}
} else {
Modifier.fillMaxWidth()
Modifier.weight(1F)
}
MainView(component, modifier)

MainView(component, colOne)

childState.child?.also { (_, instance) ->
Box(
modifier = Modifier.weight(2F)
modifier = Modifier.defaultMinSize(minWidth = 400.dp)
) {
instance.render()
}
Expand Down
24 changes: 16 additions & 8 deletions ...rc/commonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/home/HomeScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ import androidx.compose.material3.*
import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
Expand Down Expand Up @@ -91,20 +90,29 @@ private fun DefaultView(home: Home, component: HomeComponent) {
@Composable
private fun ExpandedView(home: Home, component: HomeComponent) {
val childState by component.child.subscribeAsState()
var rowWidth by remember { mutableIntStateOf(-1) }

Row(
modifier = Modifier.onSizeChanged {
rowWidth = it.width
},
horizontalArrangement = Arrangement.spacedBy(16.dp)
) {
val modifier = if (childState.child?.configuration != null) {
Modifier.weight(1F).widthIn(min = 100.dp, max = 700.dp)
val colOne = if (rowWidth > 600) {
val third = remember(rowWidth) { rowWidth.toFloat() / 3F }
if (third >= 200F) {
Modifier.widthIn(max = third.dp)
} else {
Modifier.weight(1F)
}
} else {
Modifier.fillMaxWidth()
Modifier.weight(1F)
}
MainView(home, component, modifier)
MainView(home, component, colOne)

childState.child?.also { (_, instance) ->
Box(
modifier = Modifier.weight(2F)
modifier = Modifier.defaultMinSize(minWidth = 400.dp)
) {
instance.render()
}
Expand Down
3 changes: 3 additions & 0 deletions ...ommonMain/kotlin/dev/datlag/burningseries/shared/ui/screen/initial/series/SeriesScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ private fun CompactScreen(component: SeriesComponent) {
val title by component.title.collectAsStateWithLifecycle()
val coverHref by component.coverHref.collectAsStateWithLifecycle()
val commonHref by component.commonHref.collectAsStateWithLifecycle()
var expand by remember { mutableStateOf(false) }

DefaultCollapsingToolbar(
forceExpand = expand,
expandedBody = { state ->
val scope = rememberCoroutineScope()

Expand All @@ -149,6 +151,7 @@ private fun CompactScreen(component: SeriesComponent) {
.parallax(0.5F)
.diagonalShape(-10F, DiagonalShape.POSITION.BOTTOM),
onSuccess = { success ->
expand = true
SchemeTheme.update(commonHref, success.painter, scope)
}
)
Expand Down

0 comments on commit 8765532

Please sign in to comment.