Skip to content

Commit 1abced9

Browse files
committed
Use normal colors for empty state view
1 parent 46b9243 commit 1abced9

3 files changed

Lines changed: 14 additions & 43 deletions

File tree

app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateComposable.kt

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.fillMaxWidth
88
import androidx.compose.foundation.layout.heightIn
99
import androidx.compose.foundation.layout.padding
10-
import androidx.compose.material3.LocalContentColor
1110
import androidx.compose.material3.LocalTextStyle
1211
import androidx.compose.material3.MaterialTheme
1312
import androidx.compose.material3.Text
1413
import androidx.compose.runtime.Composable
15-
import androidx.compose.runtime.CompositionLocalProvider
1614
import androidx.compose.ui.Alignment
1715
import androidx.compose.ui.Modifier
1816
import androidx.compose.ui.res.stringResource
@@ -23,7 +21,6 @@ import androidx.compose.ui.unit.dp
2321
import androidx.compose.ui.unit.sp
2422
import org.schabi.newpipe.R
2523
import org.schabi.newpipe.ui.theme.AppTheme
26-
import org.schabi.newpipe.ui.theme.errorHint
2724

2825
@Composable
2926
fun EmptyStateComposable(
@@ -49,26 +46,22 @@ private fun EmptyStateComposable(
4946
descriptionText: String,
5047
descriptionTextStyle: TextStyle,
5148
) {
52-
CompositionLocalProvider(
53-
LocalContentColor provides MaterialTheme.colorScheme.errorHint
49+
Column(
50+
modifier = modifier,
51+
horizontalAlignment = Alignment.CenterHorizontally,
52+
verticalArrangement = Arrangement.Center
5453
) {
55-
Column(
56-
modifier = modifier,
57-
horizontalAlignment = Alignment.CenterHorizontally,
58-
verticalArrangement = Arrangement.Center
59-
) {
60-
Text(
61-
modifier = emojiModifier,
62-
text = emojiText,
63-
style = emojiTextStyle,
64-
)
54+
Text(
55+
modifier = emojiModifier,
56+
text = emojiText,
57+
style = emojiTextStyle,
58+
)
6559

66-
Text(
67-
modifier = descriptionModifier,
68-
text = descriptionText,
69-
style = descriptionTextStyle,
70-
)
71-
}
60+
Text(
61+
modifier = descriptionModifier,
62+
text = descriptionText,
63+
style = descriptionTextStyle,
64+
)
7265
}
7366
}
7467

app/src/main/java/org/schabi/newpipe/ui/emptystate/EmptyStateUtil.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
package org.schabi.newpipe.ui.emptystate
44

55
import androidx.annotation.StringRes
6-
import androidx.compose.material3.MaterialTheme
76
import androidx.compose.material3.Text
87
import androidx.compose.runtime.MutableState
98
import androidx.compose.runtime.State
109
import androidx.compose.ui.platform.ComposeView
1110
import androidx.compose.ui.platform.ViewCompositionStrategy
1211
import androidx.compose.ui.res.stringResource
1312
import org.schabi.newpipe.ui.theme.AppTheme
14-
import org.schabi.newpipe.ui.theme.errorHint
1513
import androidx.compose.runtime.mutableStateOf as composeRuntimeMutableStateOf
1614

1715
@JvmOverloads
@@ -24,7 +22,6 @@ fun ComposeView.setEmptyStateText(
2422
AppTheme {
2523
Text(
2624
text = stringResource(id = stringRes),
27-
color = MaterialTheme.colorScheme.errorHint,
2825
)
2926
}
3027
}

app/src/main/java/org/schabi/newpipe/ui/theme/ColorExtensions.kt

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)