Skip to content

Commit 407d2d7

Browse files
StypoxStypox
authored
Merge pull request #11539 from Isira-Seneviratne/Compose-theme-improvements
Compose theme improvements
2 parents b109e4d + b78e0b2 commit 407d2d7

File tree

16 files changed

+246
-247
lines changed

16 files changed

+246
-247
lines changed

‎app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.schabi.newpipe.fragments.list.comments
33
import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.ViewGroup
6-
import androidx.compose.material3.MaterialTheme
76
import androidx.compose.material3.Surface
87
import androidx.core.os.bundleOf
98
import androidx.fragment.app.Fragment
@@ -20,7 +19,7 @@ class CommentsFragment : Fragment() {
2019
savedInstanceState: Bundle?
2120
) = content {
2221
AppTheme {
23-
Surface(color = MaterialTheme.colorScheme.background) {
22+
Surface {
2423
CommentSection()
2524
}
2625
}

‎app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.schabi.newpipe.fragments.list.videos
33
import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.ViewGroup
6-
import androidx.compose.material3.MaterialTheme
76
import androidx.compose.material3.Surface
87
import androidx.core.os.bundleOf
98
import androidx.fragment.app.Fragment
@@ -21,7 +20,7 @@ class RelatedItemsFragment : Fragment() {
2120
savedInstanceState: Bundle?
2221
) = content {
2322
AppTheme {
24-
Surface(color = MaterialTheme.colorScheme.background) {
23+
Surface {
2524
RelatedItems(requireArguments().serializable<StreamInfo>(KEY_INFO)!!)
2625
}
2726
}

‎app/src/main/java/org/schabi/newpipe/ui/Toolbar.kt‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.material3.Icon
1313
import androidx.compose.material3.IconButton
1414
import androidx.compose.material3.MaterialTheme
1515
import androidx.compose.material3.SearchBar
16-
import androidx.compose.material3.SearchBarDefaults
1716
import androidx.compose.material3.Text
1817
import androidx.compose.material3.TopAppBar
1918
import androidx.compose.runtime.Composable
@@ -91,14 +90,7 @@ fun Toolbar(
9190
active = true,
9291
onActiveChange = {
9392
isSearchActive = it
94-
},
95-
colors = SearchBarDefaults.colors(
96-
containerColor = MaterialTheme.colorScheme.background,
97-
inputFieldColors = SearchBarDefaults.inputFieldColors(
98-
focusedTextColor = MaterialTheme.colorScheme.onBackground,
99-
unfocusedTextColor = MaterialTheme.colorScheme.onBackground
100-
)
101-
)
93+
}
10294
) {
10395
onSearchQueryChange?.invoke(query)?.takeIf { it.isNotEmpty() }
10496
?.map { suggestionText -> SearchSuggestionItem(text = suggestionText) }

‎app/src/main/java/org/schabi/newpipe/ui/components/common/LoadingIndicator.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@ package org.schabi.newpipe.ui.components.common
33
import androidx.compose.foundation.layout.fillMaxSize
44
import androidx.compose.foundation.layout.wrapContentSize
55
import androidx.compose.material3.CircularProgressIndicator
6-
import androidx.compose.material3.MaterialTheme
76
import androidx.compose.runtime.Composable
87
import androidx.compose.ui.Alignment
98
import androidx.compose.ui.Modifier
109

1110
@Composable
1211
fun LoadingIndicator(modifier: Modifier = Modifier) {
13-
CircularProgressIndicator(
14-
modifier = modifier.fillMaxSize().wrapContentSize(Alignment.Center),
15-
color = MaterialTheme.colorScheme.primary,
16-
trackColor = MaterialTheme.colorScheme.surfaceVariant,
17-
)
12+
CircularProgressIndicator(modifier = modifier.fillMaxSize().wrapContentSize(Alignment.Center))
1813
}

‎app/src/main/java/org/schabi/newpipe/ui/components/common/Scrollbar.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.compose.foundation.lazy.LazyListState
44
import androidx.compose.material3.MaterialTheme
55
import androidx.compose.runtime.Composable
66
import androidx.compose.ui.Modifier
7+
import my.nanihadesuka.compose.LazyColumnScrollbar
78
import my.nanihadesuka.compose.ScrollbarSettings
89

910
@Composable
@@ -20,7 +21,7 @@ fun LazyColumnThemedScrollbar(
2021
indicatorContent: (@Composable (index: Int, isThumbSelected: Boolean) -> Unit)? = null,
2122
content: @Composable () -> Unit
2223
) {
23-
my.nanihadesuka.compose.LazyColumnScrollbar(
24+
LazyColumnScrollbar(
2425
state = state,
2526
modifier = modifier,
2627
settings = settings,

‎app/src/main/java/org/schabi/newpipe/ui/components/items/playlist/PlaylistListItem.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ private fun PlaylistListItemPreview() {
6464
playlist.uploaderName = "Uploader"
6565

6666
AppTheme {
67-
Surface(color = MaterialTheme.colorScheme.background) {
67+
Surface {
6868
PlaylistListItem(playlist)
6969
}
7070
}

‎app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamListItem.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ private fun StreamListItemPreview(
7878
@PreviewParameter(StreamItemPreviewProvider::class) stream: StreamInfoItem
7979
) {
8080
AppTheme {
81-
Surface(color = MaterialTheme.colorScheme.background) {
81+
Surface {
8282
StreamListItem(stream, showProgress = false, isSelected = false)
8383
}
8484
}

‎app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamMenu.kt‎

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.schabi.newpipe.ui.components.items.stream
22

3-
import androidx.annotation.StringRes
43
import androidx.compose.material3.DropdownMenu
54
import androidx.compose.material3.DropdownMenuItem
6-
import androidx.compose.material3.MaterialTheme
75
import androidx.compose.material3.Text
86
import androidx.compose.runtime.Composable
97
import androidx.compose.ui.platform.LocalContext
@@ -34,8 +32,8 @@ fun StreamMenu(
3432

3533
DropdownMenu(expanded = expanded, onDismissRequest = onDismissRequest) {
3634
if (playerHolder.isPlayQueueReady) {
37-
StreamMenuItem(
38-
text = R.string.enqueue_stream,
35+
DropdownMenuItem(
36+
text = { Text(text = stringResource(R.string.enqueue_stream)) },
3937
onClick = {
4038
onDismissRequest()
4139
SparseItemUtil.fetchItemInfoIfSparse(context, stream) {
@@ -45,8 +43,8 @@ fun StreamMenu(
4543
)
4644

4745
if (playerHolder.queuePosition < playerHolder.queueSize - 1) {
48-
StreamMenuItem(
49-
text = R.string.enqueue_next_stream,
46+
DropdownMenuItem(
47+
text = { Text(text = stringResource(R.string.enqueue_next_stream)) },
5048
onClick = {
5149
onDismissRequest()
5250
SparseItemUtil.fetchItemInfoIfSparse(context, stream) {
@@ -57,26 +55,26 @@ fun StreamMenu(
5755
}
5856
}
5957

60-
StreamMenuItem(
61-
text = R.string.start_here_on_background,
58+
DropdownMenuItem(
59+
text = { Text(text = stringResource(R.string.start_here_on_background)) },
6260
onClick = {
6361
onDismissRequest()
6462
SparseItemUtil.fetchItemInfoIfSparse(context, stream) {
6563
NavigationHelper.playOnBackgroundPlayer(context, it, true)
6664
}
6765
}
6866
)
69-
StreamMenuItem(
70-
text = R.string.start_here_on_popup,
67+
DropdownMenuItem(
68+
text = { Text(text = stringResource(R.string.start_here_on_popup)) },
7169
onClick = {
7270
onDismissRequest()
7371
SparseItemUtil.fetchItemInfoIfSparse(context, stream) {
7472
NavigationHelper.playOnPopupPlayer(context, it, true)
7573
}
7674
}
7775
)
78-
StreamMenuItem(
79-
text = R.string.download,
76+
DropdownMenuItem(
77+
text = { Text(text = stringResource(R.string.download)) },
8078
onClick = {
8179
onDismissRequest()
8280
SparseItemUtil.fetchStreamInfoAndSaveToDatabase(
@@ -89,8 +87,8 @@ fun StreamMenu(
8987
}
9088
}
9189
)
92-
StreamMenuItem(
93-
text = R.string.add_to_playlist,
90+
DropdownMenuItem(
91+
text = { Text(text = stringResource(R.string.add_to_playlist)) },
9492
onClick = {
9593
onDismissRequest()
9694
val list = listOf(StreamEntity(stream))
@@ -103,29 +101,29 @@ fun StreamMenu(
103101
}
104102
}
105103
)
106-
StreamMenuItem(
107-
text = R.string.share,
104+
DropdownMenuItem(
105+
text = { Text(text = stringResource(R.string.share)) },
108106
onClick = {
109107
onDismissRequest()
110108
ShareUtils.shareText(context, stream.name, stream.url, stream.thumbnails)
111109
}
112110
)
113-
StreamMenuItem(
114-
text = R.string.open_in_browser,
111+
DropdownMenuItem(
112+
text = { Text(text = stringResource(R.string.open_in_browser)) },
115113
onClick = {
116114
onDismissRequest()
117115
ShareUtils.openUrlInBrowser(context, stream.url)
118116
}
119117
)
120-
StreamMenuItem(
121-
text = R.string.mark_as_watched,
118+
DropdownMenuItem(
119+
text = { Text(text = stringResource(R.string.mark_as_watched)) },
122120
onClick = {
123121
onDismissRequest()
124122
streamViewModel.markAsWatched(stream)
125123
}
126124
)
127-
StreamMenuItem(
128-
text = R.string.show_channel_details,
125+
DropdownMenuItem(
126+
text = { Text(text = stringResource(R.string.show_channel_details)) },
129127
onClick = {
130128
onDismissRequest()
131129
SparseItemUtil.fetchUploaderUrlIfSparse(
@@ -138,16 +136,3 @@ fun StreamMenu(
138136
)
139137
}
140138
}
141-
142-
@Composable
143-
private fun StreamMenuItem(
144-
@StringRes text: Int,
145-
onClick: () -> Unit
146-
) {
147-
DropdownMenuItem(
148-
text = {
149-
Text(text = stringResource(text), color = MaterialTheme.colorScheme.onBackground)
150-
},
151-
onClick = onClick
152-
)
153-
}

‎app/src/main/java/org/schabi/newpipe/ui/components/video/RelatedItems.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Arrangement
55
import androidx.compose.foundation.layout.Row
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.padding
8-
import androidx.compose.material3.MaterialTheme
98
import androidx.compose.material3.Surface
109
import androidx.compose.material3.Switch
1110
import androidx.compose.material3.Text
@@ -94,7 +93,7 @@ private fun RelatedItemsPreview() {
9493
)
9594

9695
AppTheme {
97-
Surface(color = MaterialTheme.colorScheme.background) {
96+
Surface {
9897
RelatedItems(info)
9998
}
10099
}

‎app/src/main/java/org/schabi/newpipe/ui/components/video/comment/Comment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ private fun CommentPreview(
257257
@PreviewParameter(CommentPreviewProvider::class) commentsInfoItem: CommentsInfoItem
258258
) {
259259
AppTheme {
260-
Surface(color = MaterialTheme.colorScheme.background) {
260+
Surface {
261261
Comment(commentsInfoItem) {}
262262
}
263263
}
@@ -267,7 +267,7 @@ private fun CommentPreview(
267267
@Composable
268268
private fun CommentListPreview() {
269269
AppTheme {
270-
Surface(color = MaterialTheme.colorScheme.background) {
270+
Surface {
271271
Column {
272272
for (comment in CommentPreviewProvider().values) {
273273
Comment(comment) {}

0 commit comments

Comments
 (0)