Skip to content

Commit 43bbddc

Browse files
Isira-SeneviratneIsira-Seneviratne
committed
Add theme generated from the Material Theme Builder
1 parent c98ad62 commit 43bbddc

10 files changed

Lines changed: 175 additions & 177 deletions

File tree

‎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
@@ -4,7 +4,6 @@ import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
7-
import androidx.compose.material3.MaterialTheme
87
import androidx.compose.material3.Surface
98
import androidx.compose.ui.platform.ComposeView
109
import androidx.compose.ui.platform.ViewCompositionStrategy
@@ -26,7 +25,7 @@ class RelatedItemsFragment : Fragment() {
2625
setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
2726
setContent {
2827
AppTheme {
29-
Surface(color = MaterialTheme.colorScheme.background) {
28+
Surface {
3029
RelatedItems(requireArguments().serializable<StreamInfo>(KEY_INFO)!!)
3130
}
3231
}

‎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/NoItemsMessage.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.annotation.StringRes
55
import androidx.compose.foundation.layout.Column
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.wrapContentSize
8-
import androidx.compose.material3.MaterialTheme
98
import androidx.compose.material3.Surface
109
import androidx.compose.material3.Text
1110
import androidx.compose.runtime.Composable
@@ -35,7 +34,7 @@ fun NoItemsMessage(@StringRes message: Int) {
3534
@Composable
3635
private fun NoItemsMessagePreview() {
3736
AppTheme {
38-
Surface(color = MaterialTheme.colorScheme.background) {
37+
Surface {
3938
NoItemsMessage(message = R.string.no_videos)
4039
}
4140
}

‎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(
@@ -137,16 +135,3 @@ fun StreamMenu(
137135
)
138136
}
139137
}
140-
141-
@Composable
142-
private fun StreamMenuItem(
143-
@StringRes text: Int,
144-
onClick: () -> Unit
145-
) {
146-
DropdownMenuItem(
147-
text = {
148-
Text(text = stringResource(text), color = MaterialTheme.colorScheme.onBackground)
149-
},
150-
onClick = onClick
151-
)
152-
}

‎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
@@ -92,7 +91,7 @@ private fun RelatedItemsPreview() {
9291
)
9392

9493
AppTheme {
95-
Surface(color = MaterialTheme.colorScheme.background) {
94+
Surface {
9695
RelatedItems(info)
9796
}
9897
}

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

Lines changed: 70 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,74 @@ package org.schabi.newpipe.ui.theme
22

33
import androidx.compose.ui.graphics.Color
44

5-
val md_theme_light_primary = Color(0xFFBB171C)
6-
val md_theme_light_onPrimary = Color(0xFFFFFFFF)
7-
val md_theme_light_primaryContainer = Color(0xFFFFDAD6)
8-
val md_theme_light_onPrimaryContainer = Color(0xFF410002)
9-
val md_theme_light_secondary = Color(0xFF984061)
10-
val md_theme_light_onSecondary = Color(0xFFFFFFFF)
11-
val md_theme_light_secondaryContainer = Color(0xFFFFD9E2)
12-
val md_theme_light_onSecondaryContainer = Color(0xFF3E001D)
13-
val md_theme_light_tertiary = Color(0xFF006874)
14-
val md_theme_light_onTertiary = Color(0xFFFFFFFF)
15-
val md_theme_light_tertiaryContainer = Color(0xFF97F0FF)
16-
val md_theme_light_onTertiaryContainer = Color(0xFF001F24)
17-
val md_theme_light_error = Color(0xFFBA1A1A)
18-
val md_theme_light_errorContainer = Color(0xFFFFDAD6)
19-
val md_theme_light_onError = Color(0xFFFFFFFF)
20-
val md_theme_light_onErrorContainer = Color(0xFF410002)
21-
val md_theme_light_background = Color(0xFFEEEEEE)
22-
val md_theme_light_onBackground = Color(0xFF1B1B1B)
23-
val md_theme_light_surface = Color(0xFFE53835)
24-
val md_theme_light_onSurface = Color(0xFFFFFFFF)
25-
val md_theme_light_surfaceVariant = Color(0xFFF5DDDB)
26-
val md_theme_light_onSurfaceVariant = Color(0xFF534341)
27-
val md_theme_light_outline = Color(0xFF857371)
28-
val md_theme_light_inverseOnSurface = Color(0xFFD6F6FF)
29-
val md_theme_light_inverseSurface = Color(0xFF00363F)
30-
val md_theme_light_inversePrimary = Color(0xFFFFB4AC)
31-
val md_theme_light_surfaceTint = Color(0xFFBB171C)
32-
val md_theme_light_outlineVariant = Color(0xFFD8C2BF)
33-
val md_theme_light_scrim = Color(0xFF000000)
5+
val primaryLight = Color(0xFF904A45)
6+
val onPrimaryLight = Color(0xFFFFFFFF)
7+
val primaryContainerLight = Color(0xFFFFDAD6)
8+
val onPrimaryContainerLight = Color(0xFF3B0908)
9+
val secondaryLight = Color(0xFF775653)
10+
val onSecondaryLight = Color(0xFFFFFFFF)
11+
val secondaryContainerLight = Color(0xFFFFDAD6)
12+
val onSecondaryContainerLight = Color(0xFF2C1513)
13+
val tertiaryLight = Color(0xFF725B2E)
14+
val onTertiaryLight = Color(0xFFFFFFFF)
15+
val tertiaryContainerLight = Color(0xFFFEDEA6)
16+
val onTertiaryContainerLight = Color(0xFF261900)
17+
val errorLight = Color(0xFFBA1A1A)
18+
val onErrorLight = Color(0xFFFFFFFF)
19+
val errorContainerLight = Color(0xFFFFDAD6)
20+
val onErrorContainerLight = Color(0xFF410002)
21+
val backgroundLight = Color(0xFFFFF8F7)
22+
val onBackgroundLight = Color(0xFF231918)
23+
val surfaceLight = Color(0xFFFFF8F7)
24+
val onSurfaceLight = Color(0xFF231918)
25+
val surfaceVariantLight = Color(0xFFF5DDDB)
26+
val onSurfaceVariantLight = Color(0xFF534342)
27+
val outlineLight = Color(0xFF857371)
28+
val outlineVariantLight = Color(0xFFD8C2BF)
29+
val scrimLight = Color(0xFF000000)
30+
val inverseSurfaceLight = Color(0xFF392E2D)
31+
val inverseOnSurfaceLight = Color(0xFFFFEDEB)
32+
val inversePrimaryLight = Color(0xFFFFB3AC)
33+
val surfaceDimLight = Color(0xFFE8D6D4)
34+
val surfaceBrightLight = Color(0xFFFFF8F7)
35+
val surfaceContainerLowestLight = Color(0xFFFFFFFF)
36+
val surfaceContainerLowLight = Color(0xFFFFF0EF)
37+
val surfaceContainerLight = Color(0xFFFCEAE8)
38+
val surfaceContainerHighLight = Color(0xFFF6E4E2)
39+
val surfaceContainerHighestLight = Color(0xFFF1DEDC)
3440

35-
val md_theme_dark_primary = Color(0xFFFFB4AC)
36-
val md_theme_dark_onPrimary = Color(0xFF690006)
37-
val md_theme_dark_primaryContainer = Color(0xFF93000D)
38-
val md_theme_dark_onPrimaryContainer = Color(0xFFFFDAD6)
39-
val md_theme_dark_secondary = Color(0xFFFFB1C8)
40-
val md_theme_dark_onSecondary = Color(0xFF5E1133)
41-
val md_theme_dark_secondaryContainer = Color(0xFF7B2949)
42-
val md_theme_dark_onSecondaryContainer = Color(0xFFFFD9E2)
43-
val md_theme_dark_tertiary = Color(0xFF4FD8EB)
44-
val md_theme_dark_onTertiary = Color(0xFF00363D)
45-
val md_theme_dark_tertiaryContainer = Color(0xFF004F58)
46-
val md_theme_dark_onTertiaryContainer = Color(0xFF97F0FF)
47-
val md_theme_dark_error = Color(0xFFFFB4AB)
48-
val md_theme_dark_errorContainer = Color(0xFF93000A)
49-
val md_theme_dark_onError = Color(0xFF690005)
50-
val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
51-
val md_theme_dark_background = Color(0xFF212121)
52-
val md_theme_dark_onBackground = Color(0xFFFFFFFF)
53-
val md_theme_dark_surface = Color(0xFF992521)
54-
val md_theme_dark_onSurface = Color(0xFFFFFFFF)
55-
val md_theme_dark_surfaceVariant = Color(0xFF534341)
56-
val md_theme_dark_onSurfaceVariant = Color(0xFFD8C2BF)
57-
val md_theme_dark_outline = Color(0xFFA08C8A)
58-
val md_theme_dark_inverseOnSurface = Color(0xFF001F25)
59-
val md_theme_dark_inverseSurface = Color(0xFFA6EEFF)
60-
val md_theme_dark_inversePrimary = Color(0xFFBB171C)
61-
val md_theme_dark_surfaceTint = Color(0xFFFFB4AC)
62-
val md_theme_dark_outlineVariant = Color(0xFF534341)
63-
val md_theme_dark_scrim = Color(0xFF000000)
41+
val primaryDark = Color(0xFFFFB3AC)
42+
val onPrimaryDark = Color(0xFF571E1B)
43+
val primaryContainerDark = Color(0xFF73332F)
44+
val onPrimaryContainerDark = Color(0xFFFFDAD6)
45+
val secondaryDark = Color(0xFFE7BDB8)
46+
val onSecondaryDark = Color(0xFF442927)
47+
val secondaryContainerDark = Color(0xFF5D3F3C)
48+
val onSecondaryContainerDark = Color(0xFFFFDAD6)
49+
val tertiaryDark = Color(0xFFE1C38C)
50+
val onTertiaryDark = Color(0xFF402D04)
51+
val tertiaryContainerDark = Color(0xFF584419)
52+
val onTertiaryContainerDark = Color(0xFFFEDEA6)
53+
val errorDark = Color(0xFFFFB4AB)
54+
val onErrorDark = Color(0xFF690005)
55+
val errorContainerDark = Color(0xFF93000A)
56+
val onErrorContainerDark = Color(0xFFFFDAD6)
57+
val backgroundDark = Color(0xFF1A1110)
58+
val onBackgroundDark = Color(0xFFF1DEDC)
59+
val surfaceDark = Color(0xFF1A1110)
60+
val onSurfaceDark = Color(0xFFF1DEDC)
61+
val surfaceVariantDark = Color(0xFF534342)
62+
val onSurfaceVariantDark = Color(0xFFD8C2BF)
63+
val outlineDark = Color(0xFFA08C8A)
64+
val outlineVariantDark = Color(0xFF534342)
65+
val scrimDark = Color(0xFF000000)
66+
val inverseSurfaceDark = Color(0xFFF1DEDC)
67+
val inverseOnSurfaceDark = Color(0xFF392E2D)
68+
val inversePrimaryDark = Color(0xFF904A45)
69+
val surfaceDimDark = Color(0xFF1A1110)
70+
val surfaceBrightDark = Color(0xFF423735)
71+
val surfaceContainerLowestDark = Color(0xFF140C0B)
72+
val surfaceContainerLowDark = Color(0xFF231918)
73+
val surfaceContainerDark = Color(0xFF271D1C)
74+
val surfaceContainerHighDark = Color(0xFF322827)
75+
val surfaceContainerHighestDark = Color(0xFF3D3231)

0 commit comments

Comments
 (0)