Skip to content

Commit 1db4222

Browse files
#31 - PR's suggestions
1 parent 6a532f1 commit 1db4222

File tree

7 files changed

+32
-26
lines changed

7 files changed

+32
-26
lines changed

core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/resources/Colors.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import androidx.compose.material3.lightColorScheme
55
import androidx.compose.ui.graphics.Color
66

77
object Colors {
8-
val DarkDeepGray = Color(android.graphics.Color.parseColor("#262626"))
8+
val DarkDeepGray = Color(0xFF262626)
99

1010
val LightColors = lightColorScheme(
1111
primary = Color(0xFFE50914),

core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/IconWithText.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,15 @@ import androidx.compose.ui.unit.sp
1717

1818
@Composable
1919
fun IconWithText(
20-
imageVector: ImageVector, imageColor: Color, text: String, textColor: Color
20+
imageVector: ImageVector,
21+
imageColor: Color,
22+
text: String,
23+
textColor: Color,
24+
modifier: Modifier = Modifier
2125
) {
2226
Column(
2327
horizontalAlignment = Alignment.CenterHorizontally,
28+
modifier = modifier
2429
) {
2530
Icon(
2631
imageVector = imageVector,

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsScreen.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.codandotv.streamplayerapp.feature_list_streams.detail.presentation.screens
22

33
import android.annotation.SuppressLint
4-
import androidx.compose.foundation.Image
54
import androidx.compose.foundation.layout.*
65
import androidx.compose.material.icons.Icons
76
import androidx.compose.material.icons.filled.*
@@ -13,7 +12,6 @@ import androidx.compose.ui.Alignment
1312
import androidx.compose.ui.Modifier
1413
import androidx.compose.ui.graphics.Color
1514
import androidx.compose.ui.platform.LocalLifecycleOwner
16-
import androidx.compose.ui.res.painterResource
1715
import androidx.compose.ui.res.stringResource
1816
import androidx.compose.ui.text.font.FontWeight
1917
import androidx.compose.ui.unit.dp
@@ -38,7 +36,7 @@ fun DetailStreamScreen(
3836
}
3937

4038
val lifecycleOwner = LocalLifecycleOwner.current
41-
lifecycle(lifecycleOwner, viewModel, disposable)
39+
Lifecycle(lifecycleOwner, viewModel, disposable)
4240

4341
Box(modifier = Modifier.fillMaxSize()) {
4442
when (val uiState = uiStateRemember.value) {
@@ -127,7 +125,7 @@ private fun SetupDetailScreen(
127125
}
128126

129127
@Composable
130-
private fun lifecycle(
128+
private fun Lifecycle(
131129
lifecycleOwner: LifecycleOwner, viewModel: DetailStreamViewModel, disposable: () -> Unit
132130
) {
133131
DisposableEffect(lifecycleOwner) {

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamActionOption.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ import com.codandotv.streamplayerapp.core_shared_ui.widget.IconWithText
1616
import com.codandotv.streamplayerapp.feature_list_streams.R
1717

1818
@Composable
19-
fun DetailStreamActionOption() {
19+
fun DetailStreamActionOption(
20+
modifier: Modifier = Modifier.fillMaxWidth()
21+
) {
2022
Row(
21-
modifier = Modifier
22-
.fillMaxWidth(),
23+
modifier = modifier,
2324
horizontalArrangement = Arrangement.SpaceEvenly
2425
) {
2526
IconWithText(

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamButtonAction.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ import androidx.compose.ui.unit.sp
1515
@Composable
1616
fun DetailStreamButtonAction(
1717
buttonsColors: ButtonColors,
18-
imageVector : ImageVector,
19-
imageVectorColor : Color,
20-
text : String,
21-
textColor : Color,
18+
imageVector: ImageVector,
19+
imageVectorColor: Color,
20+
text: String,
21+
textColor: Color,
22+
modifier: Modifier = Modifier.fillMaxWidth(),
2223
onClick: () -> Unit,
2324
) {
2425
Button(
2526
onClick = { },
2627
shape = RoundedCornerShape(4.dp),
27-
modifier = Modifier
28-
.fillMaxWidth(),
29-
colors = buttonsColors
28+
modifier = modifier,
29+
colors = buttonsColors,
3030
) {
3131
Row(
3232
verticalAlignment = Alignment.CenterVertically

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamImagePreview.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,18 @@ import com.codandotv.streamplayerapp.feature_list_streams.R
1919
import com.codandotv.streamplayerapp.feature_list_streams.detail.presentation.screens.DetailStreamsUIState.DetailStreamsLoadedUIState
2020

2121
@Composable
22-
fun DetailStreamImagePreview(uiState: DetailStreamsLoadedUIState) {
22+
fun DetailStreamImagePreview(
23+
uiState: DetailStreamsLoadedUIState,
24+
modifier: Modifier = Modifier
25+
.fillMaxWidth()
26+
.aspectRatio(16f / 9f)
27+
) {
2328
Box(contentAlignment = Alignment.Center) {
2429
AsyncImage(
2530
model = uiState.detailStream.url,
2631
contentScale = ContentScale.FillBounds,
2732
contentDescription = uiState.detailStream.tagline,
28-
modifier = Modifier
29-
.fillMaxWidth()
30-
.aspectRatio(16f / 9f)
33+
modifier = modifier
3134
)
3235
Box(
3336
modifier = Modifier

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamRowHeader.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.codandotv.streamplayerapp.feature_list_streams.detail.presentation.widget
22

33
import androidx.compose.foundation.Image
4-
import androidx.compose.foundation.layout.Row
5-
import androidx.compose.foundation.layout.fillMaxWidth
6-
import androidx.compose.foundation.layout.offset
7-
import androidx.compose.foundation.layout.size
4+
import androidx.compose.foundation.layout.*
85
import androidx.compose.material3.MaterialTheme
96
import androidx.compose.material3.Text
107
import androidx.compose.runtime.Composable
@@ -20,10 +17,12 @@ import androidx.compose.ui.unit.sp
2017
import com.codandotv.streamplayerapp.feature_list_streams.R
2118

2219
@Composable
23-
fun DetailStreamRowHeader() {
20+
fun DetailStreamRowHeader(
21+
modifier: Modifier = Modifier.fillMaxWidth()
22+
) {
2423
Row(
2524
verticalAlignment = Alignment.CenterVertically,
26-
modifier = Modifier.fillMaxWidth()
25+
modifier = modifier
2726
) {
2827
Image(
2928
painter = painterResource(id = R.drawable.netflix_detail),

0 commit comments

Comments
 (0)