Skip to content

Commit 5988255

Browse files
committed
Update project
1 parent a6d1546 commit 5988255

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

feature/details-impl/src/commonMain/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ internal fun DetailsToolbar(
3939
Text(
4040
text = movieTitle,
4141
overflow = TextOverflow.Ellipsis,
42+
maxLines = 2,
4243
style = MaterialTheme.typography.titleLarge.copy(onContainerColor)
4344
)
4445
},

feature/search-impl/src/androidMain/kotlin/org/michaelbel/movies/search/ui/SearchHistoryHeader.kt

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
package org.michaelbel.movies.search.ui
22

33
import androidx.compose.foundation.background
4+
import androidx.compose.foundation.layout.Arrangement
5+
import androidx.compose.foundation.layout.Row
46
import androidx.compose.foundation.layout.fillMaxWidth
57
import androidx.compose.foundation.layout.height
8+
import androidx.compose.foundation.layout.padding
69
import androidx.compose.material3.MaterialTheme
710
import androidx.compose.material3.Text
811
import androidx.compose.material3.TextButton
912
import androidx.compose.runtime.Composable
13+
import androidx.compose.ui.Alignment
1014
import androidx.compose.ui.Modifier
1115
import androidx.compose.ui.res.stringResource
1216
import androidx.compose.ui.text.style.TextAlign
1317
import androidx.compose.ui.tooling.preview.Preview
1418
import androidx.compose.ui.unit.dp
15-
import androidx.constraintlayout.compose.ConstraintLayout
16-
import androidx.constraintlayout.compose.Dimension
1719
import org.michaelbel.movies.search_impl.R
1820
import org.michaelbel.movies.ui.theme.MoviesTheme
1921

@@ -22,7 +24,29 @@ internal fun SearchHistoryHeader(
2224
onClearButtonClick: () -> Unit,
2325
modifier: Modifier = Modifier
2426
) {
25-
ConstraintLayout(
27+
Row(
28+
modifier = modifier
29+
.fillMaxWidth()
30+
.padding(start = 16.dp, end = 8.dp),
31+
verticalAlignment = Alignment.CenterVertically,
32+
horizontalArrangement = Arrangement.SpaceBetween
33+
) {
34+
Text(
35+
text = stringResource(R.string.search_recent),
36+
textAlign = TextAlign.Start,
37+
style = MaterialTheme.typography.bodyMedium.copy(MaterialTheme.colorScheme.onPrimaryContainer)
38+
)
39+
40+
TextButton(
41+
onClick = onClearButtonClick
42+
) {
43+
Text(
44+
text = stringResource(R.string.search_clear)
45+
)
46+
}
47+
}
48+
49+
/*ConstraintLayout(
2650
modifier = modifier
2751
) {
2852
val (recentSearchesText, clearButton) = createRefs()
@@ -54,7 +78,7 @@ internal fun SearchHistoryHeader(
5478
text = stringResource(R.string.search_clear)
5579
)
5680
}
57-
}
81+
}*/
5882
}
5983

6084
@Preview

0 commit comments

Comments
 (0)