Skip to content

Commit f34b283

Browse files
urFateurFate
committed
feat: new icon theme
1 parent f486826 commit f34b283

File tree

101 files changed

+1589
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+1589
-300
lines changed

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/DownloadsTabsItems.kt‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package org.shirabox.app.ui.activity.downloads
22

33
import androidx.compose.foundation.pager.PagerState
4-
import androidx.compose.material.icons.Icons
5-
import androidx.compose.material.icons.outlined.FileDownload
6-
import androidx.compose.material.icons.rounded.FileDownloadDone
7-
import androidx.compose.material.icons.rounded.Pause
84
import androidx.compose.runtime.Composable
9-
import androidx.compose.ui.graphics.vector.ImageVector
105
import org.shirabox.app.R
116
import org.shirabox.app.ui.activity.downloads.screen.DownloadsPausedScreen
127
import org.shirabox.app.ui.activity.downloads.screen.DownloadsQueryScreen
138
import org.shirabox.app.ui.activity.downloads.screen.DownloadsSavedScreen
149

1510
sealed class DownloadsTabsItems(
1611
val name: Int,
17-
val icon: ImageVector,
12+
val icon: Int,
1813
val content: @Composable (pagerState: PagerState) -> Unit
1914
) {
2015
companion object {
@@ -24,21 +19,21 @@ sealed class DownloadsTabsItems(
2419
data object QueryTab :
2520
DownloadsTabsItems(
2621
name = R.string.downloads_query,
27-
icon = Icons.Outlined.FileDownload,
22+
icon = R.drawable.download,
2823
content = { DownloadsQueryScreen(pagerState = it) }
2924
)
3025

3126
data object SuspendedTab :
3227
DownloadsTabsItems(
3328
name = R.string.downloads_suspended,
34-
icon = Icons.Rounded.Pause,
29+
icon = R.drawable.pause,
3530
content = { DownloadsPausedScreen(pagerState = it) }
3631
)
3732

3833
data object SavedTab :
3934
DownloadsTabsItems(
4035
name = R.string.downloads_saved,
41-
icon = Icons.Rounded.FileDownloadDone,
36+
icon = R.drawable.hard_drive,
4237
content = { DownloadsSavedScreen() }
4338
)
4439
}

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/presentation/DownloadsTab.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import androidx.compose.material3.Text
1111
import androidx.compose.runtime.Composable
1212
import androidx.compose.ui.Alignment
1313
import androidx.compose.ui.Modifier
14-
import androidx.compose.ui.graphics.vector.ImageVector
14+
import androidx.compose.ui.res.painterResource
1515
import androidx.compose.ui.text.font.FontWeight
1616
import androidx.compose.ui.unit.dp
1717
import androidx.compose.ui.unit.sp
1818

1919
@Composable
20-
internal fun DownloadsTab(text: String, icon: ImageVector, selected: Boolean, onClick: () -> Unit) {
20+
internal fun DownloadsTab(text: String, icon: Int, selected: Boolean, onClick: () -> Unit) {
2121
Tab(
2222
selected = selected,
2323
unselectedContentColor = MaterialTheme.colorScheme.outline,
@@ -30,7 +30,7 @@ internal fun DownloadsTab(text: String, icon: ImageVector, selected: Boolean, on
3030
) {
3131
Icon(
3232
modifier = Modifier.size(20.dp),
33-
imageVector = icon,
33+
painter = painterResource(icon),
3434
tint = if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.outline,
3535
contentDescription = "downloads"
3636
)

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/presentation/DownloadsTopBar.kt‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ import androidx.compose.foundation.layout.Arrangement
88
import androidx.compose.foundation.layout.Box
99
import androidx.compose.foundation.layout.Row
1010
import androidx.compose.foundation.layout.fillMaxWidth
11+
import androidx.compose.foundation.layout.size
1112
import androidx.compose.foundation.text.BasicTextField
12-
import androidx.compose.material.icons.Icons
13-
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
14-
import androidx.compose.material.icons.rounded.Close
15-
import androidx.compose.material.icons.rounded.MoreVert
16-
import androidx.compose.material.icons.rounded.Search
1713
import androidx.compose.material3.DropdownMenu
1814
import androidx.compose.material3.DropdownMenuItem
1915
import androidx.compose.material3.ExperimentalMaterial3Api
@@ -33,10 +29,12 @@ import androidx.compose.ui.focus.FocusRequester
3329
import androidx.compose.ui.focus.focusRequester
3430
import androidx.compose.ui.graphics.SolidColor
3531
import androidx.compose.ui.platform.LocalContext
32+
import androidx.compose.ui.res.painterResource
3633
import androidx.compose.ui.res.stringResource
3734
import androidx.compose.ui.text.TextStyle
3835
import androidx.compose.ui.text.font.FontFamily
3936
import androidx.compose.ui.text.font.FontWeight
37+
import androidx.compose.ui.unit.dp
4038
import androidx.compose.ui.unit.sp
4139
import androidx.hilt.navigation.compose.hiltViewModel
4240
import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -122,7 +120,7 @@ internal fun DownloadsTopBar(currentPage: Int, model: DownloadsViewModel = hiltV
122120
onClick = activity::finish
123121
) {
124122
Icon(
125-
imageVector = Icons.AutoMirrored.Rounded.ArrowBack,
123+
painter = painterResource(R.drawable.arrow_left),
126124
tint = MaterialTheme.colorScheme.onSurfaceVariant,
127125
contentDescription = "back"
128126
)
@@ -131,15 +129,15 @@ internal fun DownloadsTopBar(currentPage: Int, model: DownloadsViewModel = hiltV
131129
actions = {
132130
AnimatedVisibility(visible = currentPage == 2, enter = fadeIn(), exit = fadeOut()) {
133131
val vector = remember(searchMode.value) {
134-
if (searchMode.value) Icons.Rounded.Close else Icons.Rounded.Search
132+
if (searchMode.value) R.drawable.close else R.drawable.search
135133
}
136134

137135
IconButton(onClick = {
138136
searchMode.value = searchMode.value.not()
139137
coroutineScope.launch { model.offlineFlowFilter.emit("") }
140138
}) {
141139
Icon(
142-
imageVector = vector,
140+
painter = painterResource(vector),
143141
tint = MaterialTheme.colorScheme.onSurfaceVariant,
144142
contentDescription = "Search"
145143
)
@@ -149,7 +147,8 @@ internal fun DownloadsTopBar(currentPage: Int, model: DownloadsViewModel = hiltV
149147
if (currentPage < 2) {
150148
IconButton(onClick = { dropdownExpanded.value = true }) {
151149
Icon(
152-
imageVector = Icons.Rounded.MoreVert,
150+
modifier = Modifier.size(32.dp),
151+
painter = painterResource(R.drawable.dots_vertical),
153152
tint = MaterialTheme.colorScheme.onSurfaceVariant,
154153
contentDescription = "More"
155154
)

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/presentation/EnqueuedTaskItem.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.Row
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.padding
88
import androidx.compose.foundation.shape.RoundedCornerShape
9-
import androidx.compose.material.icons.Icons
10-
import androidx.compose.material.icons.outlined.Cancel
11-
import androidx.compose.material.icons.rounded.Pause
129
import androidx.compose.material3.Icon
1310
import androidx.compose.material3.IconButton
1411
import androidx.compose.material3.LinearProgressIndicator
@@ -19,6 +16,7 @@ import androidx.compose.runtime.remember
1916
import androidx.compose.ui.Alignment
2017
import androidx.compose.ui.Modifier
2118
import androidx.compose.ui.draw.clip
19+
import androidx.compose.ui.res.painterResource
2220
import androidx.compose.ui.res.stringResource
2321
import androidx.compose.ui.unit.dp
2422
import androidx.compose.ui.unit.sp
@@ -96,15 +94,15 @@ fun EnqueuedTaskItem(
9694

9795
IconButton(enabled = buttonsEnabled, onClick = onPause) {
9896
Icon(
99-
imageVector = Icons.Rounded.Pause,
97+
painter = painterResource(R.drawable.pause_filled),
10098
tint = buttonsTint,
10199
contentDescription = "pause"
102100
)
103101
}
104102

105103
IconButton(enabled = buttonsEnabled, onClick = onCancel) {
106104
Icon(
107-
imageVector = Icons.Outlined.Cancel,
105+
painter = painterResource(R.drawable.close_circle),
108106
tint = buttonsTint,
109107
contentDescription = "cancel"
110108
)

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/presentation/PausedTaskItem.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ import androidx.compose.foundation.layout.Row
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.padding
88
import androidx.compose.foundation.shape.RoundedCornerShape
9-
import androidx.compose.material.icons.Icons
10-
import androidx.compose.material.icons.outlined.Cancel
11-
import androidx.compose.material.icons.rounded.PlayArrow
129
import androidx.compose.material3.Icon
1310
import androidx.compose.material3.IconButton
1411
import androidx.compose.material3.LinearProgressIndicator
@@ -18,6 +15,7 @@ import androidx.compose.runtime.Composable
1815
import androidx.compose.ui.Alignment
1916
import androidx.compose.ui.Modifier
2017
import androidx.compose.ui.draw.clip
18+
import androidx.compose.ui.res.painterResource
2119
import androidx.compose.ui.res.stringResource
2220
import androidx.compose.ui.unit.dp
2321
import androidx.compose.ui.unit.sp
@@ -79,15 +77,15 @@ fun PausedTaskItem(
7977
) {
8078
IconButton(onClick = onResume) {
8179
Icon(
82-
imageVector = Icons.Rounded.PlayArrow,
80+
painter = painterResource(R.drawable.play_filled),
8381
tint = MaterialTheme.colorScheme.onSurfaceVariant,
8482
contentDescription = "pause"
8583
)
8684
}
8785

8886
IconButton(onClick = onCancel) {
8987
Icon(
90-
imageVector = Icons.Outlined.Cancel,
88+
painter = painterResource(R.drawable.close_circle),
9189
tint = MaterialTheme.colorScheme.onSurfaceVariant,
9290
contentDescription = "cancel"
9391
)

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/screen/DownloadsPausedScreen.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import androidx.compose.foundation.layout.size
1313
import androidx.compose.foundation.lazy.LazyColumn
1414
import androidx.compose.foundation.lazy.rememberLazyListState
1515
import androidx.compose.foundation.pager.PagerState
16-
import androidx.compose.material.icons.Icons
17-
import androidx.compose.material.icons.automirrored.rounded.PlaylistAddCheck
18-
import androidx.compose.material.icons.rounded.PlayArrow
1916
import androidx.compose.material3.ExtendedFloatingActionButton
2017
import androidx.compose.material3.HorizontalDivider
2118
import androidx.compose.material3.Icon
@@ -28,6 +25,7 @@ import androidx.compose.runtime.rememberCoroutineScope
2825
import androidx.compose.ui.Alignment
2926
import androidx.compose.ui.Modifier
3027
import androidx.compose.ui.platform.LocalContext
28+
import androidx.compose.ui.res.painterResource
3129
import androidx.compose.ui.res.stringResource
3230
import androidx.compose.ui.text.style.TextAlign
3331
import androidx.compose.ui.unit.dp
@@ -57,7 +55,7 @@ fun DownloadsPausedScreen(pagerState: PagerState, model: DownloadsViewModel = hi
5755
exit = fadeOut()
5856
) {
5957
ExtendedFloatingActionButton(
60-
icon = { Icon(Icons.Rounded.PlayArrow, "Resume All") },
58+
icon = { Icon(painter = painterResource(R.drawable.play_filled), "Resume All") },
6159
text = { Text(text = stringResource(R.string.downloads_resume)) },
6260
expanded = !listState.canScrollBackward,
6361
onClick = {
@@ -84,7 +82,7 @@ fun DownloadsPausedScreen(pagerState: PagerState, model: DownloadsViewModel = hi
8482
) {
8583
Icon(
8684
modifier = Modifier.size(64.dp),
87-
imageVector = Icons.AutoMirrored.Rounded.PlaylistAddCheck,
85+
painter = painterResource(R.drawable.inbox_check),
8886
tint = MaterialTheme.colorScheme.outline,
8987
contentDescription = "Fresh"
9088
)

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/screen/DownloadsQueryScreen.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import androidx.compose.foundation.layout.size
1313
import androidx.compose.foundation.lazy.LazyColumn
1414
import androidx.compose.foundation.lazy.rememberLazyListState
1515
import androidx.compose.foundation.pager.PagerState
16-
import androidx.compose.material.icons.Icons
17-
import androidx.compose.material.icons.automirrored.rounded.PlaylistAddCheck
18-
import androidx.compose.material.icons.filled.Pause
1916
import androidx.compose.material3.ExtendedFloatingActionButton
2017
import androidx.compose.material3.HorizontalDivider
2118
import androidx.compose.material3.Icon
@@ -29,6 +26,7 @@ import androidx.compose.runtime.remember
2926
import androidx.compose.runtime.rememberCoroutineScope
3027
import androidx.compose.ui.Alignment
3128
import androidx.compose.ui.Modifier
29+
import androidx.compose.ui.res.painterResource
3230
import androidx.compose.ui.res.stringResource
3331
import androidx.compose.ui.text.style.TextAlign
3432
import androidx.compose.ui.unit.dp
@@ -55,7 +53,7 @@ fun DownloadsQueryScreen(pagerState: PagerState, model: DownloadsViewModel = hil
5553
visible = queryState.value.isNotEmpty()
5654
) {
5755
ExtendedFloatingActionButton(
58-
icon = { Icon(Icons.Filled.Pause, "Pause") },
56+
icon = { Icon(painter = painterResource(R.drawable.pause_filled), "Pause") },
5957
text = { Text(text = stringResource(R.string.downloads_pause)) },
6058
expanded = !listState.canScrollBackward,
6159
onClick = {
@@ -84,7 +82,7 @@ fun DownloadsQueryScreen(pagerState: PagerState, model: DownloadsViewModel = hil
8482
) {
8583
Icon(
8684
modifier = Modifier.size(64.dp),
87-
imageVector = Icons.AutoMirrored.Rounded.PlaylistAddCheck,
85+
painter = painterResource(R.drawable.inbox_check),
8886
tint = MaterialTheme.colorScheme.outline,
8987
contentDescription = "Fresh"
9088
)

‎app/src/main/java/org/shirabox/app/ui/activity/downloads/screen/DownloadsSavedScreen.kt‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ import androidx.compose.foundation.layout.size
1818
import androidx.compose.foundation.lazy.LazyColumn
1919
import androidx.compose.foundation.lazy.items
2020
import androidx.compose.foundation.lazy.rememberLazyListState
21-
import androidx.compose.material.icons.Icons
22-
import androidx.compose.material.icons.filled.DeleteSweep
23-
import androidx.compose.material.icons.rounded.DeleteOutline
24-
import androidx.compose.material.icons.rounded.Hd
25-
import androidx.compose.material.icons.rounded.HighQuality
26-
import androidx.compose.material.icons.rounded.Sd
2721
import androidx.compose.material3.AlertDialog
2822
import androidx.compose.material3.Button
2923
import androidx.compose.material3.ButtonDefaults
@@ -89,7 +83,7 @@ fun DownloadsSavedScreen(model: DownloadsViewModel = hiltViewModel()) {
8983
visible = offlineEpisodesState.value.isNotEmpty()
9084
) {
9185
ExtendedFloatingActionButton(
92-
icon = { Icon(Icons.Filled.DeleteSweep, "Delete all") },
86+
icon = { Icon(painter = painterResource(R.drawable.trash_x), "Delete all") },
9387
text = { Text(text = stringResource(R.string.downloads_delete_all)) },
9488
expanded = !listState.canScrollBackward,
9589
containerColor = MaterialTheme.colorScheme.tertiaryContainer,
@@ -122,7 +116,7 @@ fun DownloadsSavedScreen(model: DownloadsViewModel = hiltViewModel()) {
122116
) {
123117
Icon(
124118
modifier = Modifier.size(64.dp),
125-
painter = painterResource(R.drawable.ic_self_improvement),
119+
painter = painterResource(R.drawable.inbox_archive),
126120
tint = MaterialTheme.colorScheme.outline,
127121
contentDescription = "Fresh"
128122
)
@@ -207,10 +201,10 @@ fun DownloadsSavedScreen(model: DownloadsViewModel = hiltViewModel()) {
207201

208202
val qualityVector = remember {
209203
when(episode.offlineVideos?.keys?.firstOrNull()) {
210-
Quality.SD -> Icons.Rounded.Sd
211-
Quality.HD -> Icons.Rounded.Hd
212-
Quality.FHD -> Icons.Rounded.HighQuality
213-
null -> Icons.Rounded.HighQuality
204+
Quality.SD -> R.drawable.badge_sd
205+
Quality.HD -> R.drawable.badge_hd
206+
Quality.FHD -> R.drawable.badge_fhd
207+
null -> R.drawable.badge_sd
214208
}
215209
}
216210

@@ -246,7 +240,7 @@ fun DownloadsSavedScreen(model: DownloadsViewModel = hiltViewModel()) {
246240

247241
Icon(
248242
modifier = Modifier.size(21.dp),
249-
imageVector = qualityVector,
243+
painter = painterResource(qualityVector),
250244
tint = MaterialTheme.colorScheme.primary,
251245
contentDescription = null
252246
)
@@ -279,7 +273,7 @@ fun DownloadsSavedScreen(model: DownloadsViewModel = hiltViewModel()) {
279273
) {
280274
Icon(
281275
modifier = Modifier.size(24.dp),
282-
imageVector = Icons.Rounded.DeleteOutline,
276+
painter = painterResource(R.drawable.trash),
283277
tint = MaterialTheme.colorScheme.error,
284278
contentDescription = "delete"
285279
)
@@ -320,7 +314,7 @@ internal fun RemovalConfirmDialog(
320314
icon = {
321315
Icon(
322316
modifier = Modifier.size(32.dp),
323-
imageVector = Icons.Filled.DeleteSweep,
317+
painter = painterResource(R.drawable.trash_x),
324318
contentDescription = "Delete sweep"
325319
)
326320
},

0 commit comments

Comments
 (0)