From 1ec3cf780a59487f983354f25a1bc84da0b6afb2 Mon Sep 17 00:00:00 2001 From: kalarina Date: Sat, 31 Oct 2026 09:58:49 +0200 Subject: [PATCH] Use filled Material Symbols icons --- .../cc/skysparkle/sparkledns/AboutScreen.kt | 5 +++-- .../skysparkle/sparkledns/ActivityScreen.kt | 13 ++++++++++-- .../skysparkle/sparkledns/BlocklistScreen.kt | 2 +- .../skysparkle/sparkledns/SettingsScreen.kt | 15 +++++++++++-- app/src/main/res/drawable/ic_add.xml | 8 +++---- app/src/main/res/drawable/ic_alert.xml | 8 +++---- app/src/main/res/drawable/ic_android.xml | 10 --------- app/src/main/res/drawable/ic_back.xml | 9 ++++---- app/src/main/res/drawable/ic_check.xml | 8 +++---- app/src/main/res/drawable/ic_chevron.xml | 10 +++------ app/src/main/res/drawable/ic_close.xml | 10 ++++----- app/src/main/res/drawable/ic_code.xml | 10 +++++++++ app/src/main/res/drawable/ic_copy.xml | 10 +++++++++ app/src/main/res/drawable/ic_copyright.xml | 8 +++---- app/src/main/res/drawable/ic_delete.xml | 8 +++---- app/src/main/res/drawable/ic_delete_sweep.xml | 10 +++++++++ app/src/main/res/drawable/ic_donate.xml | 21 +++++-------------- app/src/main/res/drawable/ic_expand.xml | 8 +++---- app/src/main/res/drawable/ic_filter.xml | 10 +++++++++ app/src/main/res/drawable/ic_group_audio.xml | 8 +++---- app/src/main/res/drawable/ic_group_games.xml | 8 +++---- app/src/main/res/drawable/ic_group_images.xml | 8 +++---- app/src/main/res/drawable/ic_group_maps.xml | 8 +++---- app/src/main/res/drawable/ic_group_news.xml | 8 +++---- .../res/drawable/ic_group_productivity.xml | 8 +++---- app/src/main/res/drawable/ic_group_social.xml | 8 +++---- app/src/main/res/drawable/ic_group_system.xml | 8 +++---- app/src/main/res/drawable/ic_group_video.xml | 8 +++---- app/src/main/res/drawable/ic_notification.xml | 8 +++---- app/src/main/res/drawable/ic_policy.xml | 12 ++++------- app/src/main/res/drawable/ic_privacy.xml | 8 +++---- app/src/main/res/drawable/ic_refresh.xml | 8 +++---- app/src/main/res/drawable/ic_search.xml | 8 +++---- .../main/res/drawable/ic_shield_search.xml | 10 --------- app/src/main/res/drawable/ic_speed.xml | 10 +++++++++ app/src/main/res/drawable/ic_swap.xml | 10 +++++++++ app/src/main/res/drawable/ic_tab_apps.xml | 8 +++---- app/src/main/res/drawable/ic_tab_block.xml | 8 +++---- app/src/main/res/drawable/ic_tab_home.xml | 8 +++---- app/src/main/res/drawable/ic_tab_info.xml | 8 +++---- app/src/main/res/drawable/ic_tab_monitor.xml | 8 +++---- app/src/main/res/drawable/ic_tab_settings.xml | 13 +++--------- app/src/main/res/drawable/ic_update.xml | 10 +++++++++ 43 files changed, 218 insertions(+), 174 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_android.xml create mode 100644 app/src/main/res/drawable/ic_code.xml create mode 100644 app/src/main/res/drawable/ic_copy.xml create mode 100644 app/src/main/res/drawable/ic_delete_sweep.xml create mode 100644 app/src/main/res/drawable/ic_filter.xml delete mode 100644 app/src/main/res/drawable/ic_shield_search.xml create mode 100644 app/src/main/res/drawable/ic_speed.xml create mode 100644 app/src/main/res/drawable/ic_swap.xml create mode 100644 app/src/main/res/drawable/ic_update.xml diff --git a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt index 5a8cd0c..f14977a 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/AboutScreen.kt @@ -73,6 +73,7 @@ private val Frameworks = listOf( OpenSourceItem("AndroidX Activity", "The Android Open Source Project", APACHE_2, APACHE_2_URL, "https://developer.android.com/jetpack/androidx/releases/activity"), OpenSourceItem("OkHttp", "Square, Inc.", APACHE_2, APACHE_2_URL, "https://square.github.io/okhttp/"), OpenSourceItem("Okio", "Square, Inc.", APACHE_2, APACHE_2_URL, "https://square.github.io/okio/"), + OpenSourceItem("Material Symbols", "Google", APACHE_2, APACHE_2_URL, "https://github.com/google/material-design-icons"), OpenSourceItem( "Android HttpEngine (Cronet)", "The Chromium Authors", "BSD 3-Clause", "https://chromium.googlesource.com/chromium/src/+/main/LICENSE", "https://developer.android.com/reference/android/net/http/HttpEngine", @@ -155,13 +156,13 @@ private fun AboutContent(modifier: Modifier, onOpenLicenses: () -> Unit) { } OutlinedButton(onClick = { openUrl(context, PRIVACY_POLICY) }, modifier = Modifier.fillMaxWidth()) { - Icon(painterResource(R.drawable.ic_shield_search), contentDescription = null, modifier = Modifier.size(18.dp)) + Icon(painterResource(R.drawable.ic_policy), contentDescription = null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) Text(stringResource(R.string.about_privacy_policy)) } OutlinedButton(onClick = { openUrl(context, SOURCE_CODE) }, modifier = Modifier.fillMaxWidth()) { - Icon(painterResource(R.drawable.ic_android), contentDescription = null, modifier = Modifier.size(18.dp)) + Icon(painterResource(R.drawable.ic_code), contentDescription = null, modifier = Modifier.size(18.dp)) Spacer(Modifier.width(8.dp)) Text(stringResource(R.string.about_source)) } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt index ea288ee..b43ad68 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/ActivityScreen.kt @@ -3,6 +3,7 @@ package cc.skysparkle.sparkledns import android.content.ClipData import android.content.ClipboardManager import android.widget.Toast +import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.compose.foundation.Canvas import androidx.compose.foundation.background @@ -203,7 +204,7 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { enabled = entries.isNotEmpty(), ) { Icon( - painterResource(R.drawable.ic_delete), + painterResource(R.drawable.ic_delete_sweep), contentDescription = stringResource(R.string.mon_clear), tint = Palette.Fg2, modifier = Modifier.size(20.dp), @@ -222,7 +223,7 @@ fun ActivityScreen(bottomPadding: Dp, modifier: Modifier = Modifier) { Box { IconButton(onClick = { filterMenu = true }) { Icon( - painterResource(R.drawable.ic_tab_settings), + painterResource(R.drawable.ic_filter), contentDescription = stringResource(R.string.filter), tint = if (filter == ActivityFilter.ALL) Palette.Fg2 else Palette.Accent, modifier = Modifier.size(18.dp), @@ -457,6 +458,7 @@ private fun QueryRow( if (blockedByMe) { DropdownMenuItem( text = { Text(stringResource(R.string.mon_unblock)) }, + leadingIcon = { MenuIcon(R.drawable.ic_check) }, onClick = { menu = false onUnblock() @@ -465,6 +467,7 @@ private fun QueryRow( } else if (entry.status != QueryStatus.BLOCKED) { DropdownMenuItem( text = { Text(stringResource(R.string.mon_block)) }, + leadingIcon = { MenuIcon(R.drawable.ic_tab_block) }, onClick = { menu = false onBlock() @@ -473,6 +476,7 @@ private fun QueryRow( } DropdownMenuItem( text = { Text(stringResource(R.string.copy)) }, + leadingIcon = { MenuIcon(R.drawable.ic_copy) }, onClick = { menu = false onCopy() @@ -482,6 +486,11 @@ private fun QueryRow( } } +@Composable +private fun MenuIcon(@DrawableRes icon: Int) { + Icon(painterResource(icon), contentDescription = null, tint = Palette.Fg2, modifier = Modifier.size(20.dp)) +} + // First letter of the main part of a domain: "a" for app-measurement.com, "g" for www.google.com private fun initialOf(domain: String): String { val parts = domain.split('.').filter { it.isNotEmpty() } diff --git a/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt index 30e030c..7ac8360 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/BlocklistScreen.kt @@ -382,7 +382,7 @@ private fun UpdatesRow(interval: UpdateInterval, wifiOnly: Boolean, onClick: () .padding(horizontal = 14.dp, vertical = 10.dp), verticalAlignment = Alignment.CenterVertically, ) { - Icon(painterResource(R.drawable.ic_refresh), contentDescription = null, tint = Palette.Accent, modifier = Modifier.size(20.dp)) + Icon(painterResource(R.drawable.ic_update), contentDescription = null, tint = Palette.Accent, modifier = Modifier.size(20.dp)) Spacer(Modifier.width(12.dp)) Column(Modifier.weight(1f)) { Text(stringResource(R.string.auto_update), color = Palette.Fg, fontSize = 14.sp, fontWeight = FontWeight.Bold) diff --git a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt index 0ecd57d..9007e5c 100644 --- a/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt +++ b/app/src/main/java/cc/skysparkle/sparkledns/SettingsScreen.kt @@ -1,5 +1,6 @@ package cc.skysparkle.sparkledns +import androidx.annotation.DrawableRes import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.background @@ -195,7 +196,11 @@ fun SettingsScreen( modifier = Modifier .weight(1f) .height(48.dp), - ) { Text(stringResource(if (testing) R.string.testing else R.string.test), maxLines = 1) } + ) { + Icon(painterResource(R.drawable.ic_speed), contentDescription = null, modifier = Modifier.size(18.dp)) + Spacer(Modifier.width(8.dp)) + Text(stringResource(if (testing) R.string.testing else R.string.test), maxLines = 1) + } // Remembers the last name so the button keeps its label while it animates out val lastSwitch = remember { arrayOf("") } @@ -214,6 +219,8 @@ fun SettingsScreen( .fillMaxWidth() .height(48.dp), ) { + Icon(painterResource(R.drawable.ic_swap), contentDescription = null, modifier = Modifier.size(18.dp)) + Spacer(Modifier.width(8.dp)) Text( stringResource(R.string.switch_to, lastSwitch[0]), maxLines = 1, @@ -237,6 +244,7 @@ fun SettingsScreen( SectionLabel(stringResource(R.string.settings_general), Modifier.padding(top = 8.dp)) Column(Modifier.fillMaxWidth().appCard()) { NavRow( + icon = R.drawable.ic_tab_apps, title = stringResource(R.string.settings_apps), subtitle = if (excludedCount > 0) stringResource(R.string.apps_count, excludedCount) else stringResource(R.string.settings_apps_desc), @@ -244,6 +252,7 @@ fun SettingsScreen( ) ListDivider() NavRow( + icon = R.drawable.ic_tab_info, title = stringResource(R.string.tab_about), subtitle = "${stringResource(R.string.about_version)} ${BuildConfig.VERSION_NAME}", onClick = onOpenAbout, @@ -322,7 +331,7 @@ private fun ServerRow( } @Composable -private fun NavRow(title: String, subtitle: String, onClick: () -> Unit) { +private fun NavRow(@DrawableRes icon: Int, title: String, subtitle: String, onClick: () -> Unit) { Row( modifier = Modifier .fillMaxWidth() @@ -331,6 +340,8 @@ private fun NavRow(title: String, subtitle: String, onClick: () -> Unit) { .padding(start = 16.dp, end = 12.dp, top = 10.dp, bottom = 10.dp), verticalAlignment = Alignment.CenterVertically, ) { + Icon(painterResource(icon), contentDescription = null, tint = Palette.Accent, modifier = Modifier.size(24.dp)) + Spacer(Modifier.width(14.dp)) Column(Modifier.weight(1f)) { Text(title, color = Palette.Fg, fontSize = 15.sp, fontWeight = FontWeight.Bold) Text(subtitle, color = Palette.Fg3, fontSize = 12.sp, maxLines = 1, overflow = TextOverflow.Ellipsis) diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index 4388a1c..4bc3dc6 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 11.5 12.5 H 6 v -1 h 5.5 V 6 h 1 v 5.5 H 18 v 1 h -5.5 V 18 h -1 z" /> diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml index 6728aa1..6d171d3 100644 --- a/app/src/main/res/drawable/ic_alert.xml +++ b/app/src/main/res/drawable/ic_alert.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 12 16.462 q .262 0 .439 -.177 q .176 -.177 .176 -.439 q 0 -.261 -.177 -.438 T 12 15.23 t -.438 .177 t -.177 .438 t .177 .439 t .438 .177 m -.5 -3.308 h 1 v -6 h -1 z M 12.003 21 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" /> diff --git a/app/src/main/res/drawable/ic_android.xml b/app/src/main/res/drawable/ic_android.xml deleted file mode 100644 index 5675502..0000000 --- a/app/src/main/res/drawable/ic_android.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml index 4da4f61..cee4e0e 100644 --- a/app/src/main/res/drawable/ic_back.xml +++ b/app/src/main/res/drawable/ic_back.xml @@ -1,11 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="m 6.921 12.5 l 5.793 5.792 L 12 19 l -7 -7 l 7 -7 l .714 .708 L 6.92 11.5 H 19 v 1 z" /> diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml index b34c577..b6ab841 100644 --- a/app/src/main/res/drawable/ic_check.xml +++ b/app/src/main/res/drawable/ic_check.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="m 10.562 15.908 l 6.396 -6.396 l -.708 -.708 l -5.688 5.688 l -2.85 -2.85 l -.708 .708 z M 12.003 21 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" /> diff --git a/app/src/main/res/drawable/ic_chevron.xml b/app/src/main/res/drawable/ic_chevron.xml index 9ff3c2a..00204c0 100644 --- a/app/src/main/res/drawable/ic_chevron.xml +++ b/app/src/main/res/drawable/ic_chevron.xml @@ -1,14 +1,10 @@ + + android:fillColor="#FFFFFFFF" + android:pathData="m 13.292 12 l -4.6 -4.6 l .708 -.708 L 14.708 12 L 9.4 17.308 l -.708 -.708 z" /> diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml index e6fed10..31b9897 100644 --- a/app/src/main/res/drawable/ic_close.xml +++ b/app/src/main/res/drawable/ic_close.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="#FFFFFFFF" + android:pathData="m 6.4 18.308 l -.708 -.708 l 5.6 -5.6 l -5.6 -5.6 l .708 -.708 l 5.6 5.6 l 5.6 -5.6 l .708 .708 l -5.6 5.6 l 5.6 5.6 l -.708 .708 l -5.6 -5.6 z" /> diff --git a/app/src/main/res/drawable/ic_code.xml b/app/src/main/res/drawable/ic_code.xml new file mode 100644 index 0000000..41d2618 --- /dev/null +++ b/app/src/main/res/drawable/ic_code.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml new file mode 100644 index 0000000..b712a0a --- /dev/null +++ b/app/src/main/res/drawable/ic_copy.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_copyright.xml b/app/src/main/res/drawable/ic_copyright.xml index a8d7f2a..90ea3d1 100644 --- a/app/src/main/res/drawable/ic_copyright.xml +++ b/app/src/main/res/drawable/ic_copyright.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 10 15.5 h 4 q .213 0 .356 -.144 T 14.5 15 v -1.5 h -1 v 1 h -3 v -5 h 3 v 1 h 1 V 9 q 0 -.214 -.144 -.357 T 14 8.5 h -4 q -.213 0 -.356 .144 T 9.5 9 v 6 q 0 .213 .144 .356 T 10 15.5 m 2.003 5.5 q -1.867 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" /> diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml index 554271d..d730343 100644 --- a/app/src/main/res/drawable/ic_delete.xml +++ b/app/src/main/res/drawable/ic_delete.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 7.616 20 q -.691 0 -1.153 -.462 T 6 18.384 V 6 H 5 V 5 h 4 v -.77 h 6 V 5 h 4 v 1 h -1 v 12.385 q 0 .69 -.462 1.153 T 16.384 20 z m 2.192 -3 h 1 V 8 h -1 z m 3.384 0 h 1 V 8 h -1 z" /> diff --git a/app/src/main/res/drawable/ic_delete_sweep.xml b/app/src/main/res/drawable/ic_delete_sweep.xml new file mode 100644 index 0000000..b1f967d --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_sweep.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_donate.xml b/app/src/main/res/drawable/ic_donate.xml index 32e2a69..da3b259 100644 --- a/app/src/main/res/drawable/ic_donate.xml +++ b/app/src/main/res/drawable/ic_donate.xml @@ -1,21 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> - - + android:fillColor="#FFFFFFFF" + android:pathData="M 6.385 19.583 v -6.737 h 2.08 q .137 0 .283 .028 t .283 .078 l 6.021 2.21 q .446 .163 .736 .536 q .289 .373 .289 .839 q 0 .275 -.18 .446 t -.443 .17 h -1.202 q -.51 0 -.995 -.06 t -.951 -.226 l -1.792 -.644 l -.287 .744 l 1.964 .675 q .472 .16 .976 .22 q .504 .061 1.021 .061 h 5.158 q .685 0 1.17 .45 T 21 19.5 l -6.994 2.308 z m -4 1.417 v -8.154 h 3 V 21 z m 13.307 -8.615 l -3.765 -3.608 q -.66 -.635 -1.101 -1.422 q -.442 -.788 -.442 -1.709 q 0 -1.106 .77 -1.876 T 13.032 3 q .819 0 1.49 .443 t 1.171 1.076 q .5 -.633 1.172 -1.076 q .67 -.443 1.49 -.443 q 1.106 0 1.876 .77 T 21 5.646 q 0 .921 -.438 1.709 t -1.099 1.422 z" /> diff --git a/app/src/main/res/drawable/ic_expand.xml b/app/src/main/res/drawable/ic_expand.xml index 766ca6d..7c822dc 100644 --- a/app/src/main/res/drawable/ic_expand.xml +++ b/app/src/main/res/drawable/ic_expand.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 12 14.708 L 6.692 9.4 l .708 -.708 l 4.6 4.6 l 4.6 -4.6 l .708 .708 z" /> diff --git a/app/src/main/res/drawable/ic_filter.xml b/app/src/main/res/drawable/ic_filter.xml new file mode 100644 index 0000000..cac63b1 --- /dev/null +++ b/app/src/main/res/drawable/ic_filter.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_group_audio.xml b/app/src/main/res/drawable/ic_group_audio.xml index 2fa316e..b370eb8 100644 --- a/app/src/main/res/drawable/ic_group_audio.xml +++ b/app/src/main/res/drawable/ic_group_audio.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 8.077 20 H 5.616 q -.691 0 -1.153 -.462 T 4 18.384 V 12 q 0 -1.664 .626 -3.118 T 6.34 6.34 t 2.542 -1.714 T 12 4 t 3.118 .626 T 17.66 6.34 t 1.714 2.542 T 20 12 v 6.385 q 0 .69 -.462 1.152 T 18.384 20 h -2.461 v -6.154 H 19 V 12 q 0 -2.925 -2.037 -4.962 T 12 5 T 7.038 7.038 T 5 12 v 1.846 h 3.077 z" /> diff --git a/app/src/main/res/drawable/ic_group_games.xml b/app/src/main/res/drawable/ic_group_games.xml index 3b5658f..291339d 100644 --- a/app/src/main/res/drawable/ic_group_games.xml +++ b/app/src/main/res/drawable/ic_group_games.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 4.512 18 q -.762 0 -1.18 -.551 t -.32 -1.23 L 4.1 8.604 q .167 -1.132 .991 -1.868 Q 5.916 6 7.05 6 h 9.9 q 1.135 0 1.959 .736 t .991 1.868 l 1.089 7.615 q .098 .679 -.32 1.23 t -1.18 .551 q -.333 0 -.6 -.101 t -.508 -.341 L 15.823 15 H 8.177 l -2.558 2.558 q -.24 .24 -.507 .341 t -.6 .101 M 17 12.808 q .329 0 .568 -.24 t .24 -.568 t -.24 -.568 t -.568 -.24 t -.568 .24 t -.24 .568 t .24 .568 t .568 .24 m -2 -3 q .329 0 .568 -.24 t .24 -.568 t -.24 -.568 t -.568 -.24 t -.568 .24 t -.24 .568 t .24 .568 t .568 .24 m -6.942 2.884 h .884 v -1.75 h 1.75 v -.884 h -1.75 v -1.75 h -.884 v 1.75 h -1.75 v .884 h 1.75 z" /> diff --git a/app/src/main/res/drawable/ic_group_images.xml b/app/src/main/res/drawable/ic_group_images.xml index 9ca86e2..7b5e60b 100644 --- a/app/src/main/res/drawable/ic_group_images.xml +++ b/app/src/main/res/drawable/ic_group_images.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 5.616 20 q -.691 0 -1.153 -.462 T 4 18.384 V 5.616 q 0 -.691 .463 -1.153 T 5.616 4 h 12.769 q .69 0 1.153 .463 T 20 5.616 v 12.769 q 0 .69 -.462 1.153 T 18.384 20 z M 7.5 16.5 h 9.154 l -2.827 -3.77 l -2.615 3.308 l -1.75 -2.115 z" /> diff --git a/app/src/main/res/drawable/ic_group_maps.xml b/app/src/main/res/drawable/ic_group_maps.xml index 0edf84e..219f6cb 100644 --- a/app/src/main/res/drawable/ic_group_maps.xml +++ b/app/src/main/res/drawable/ic_group_maps.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="m 15 19.923 l -6 -2.1 l -3.958 1.53 q -.384 .143 -.713 -.083 T 4 18.634 V 6.404 q 0 -.268 .13 -.489 t .378 -.307 L 9 4.077 l 6 2.1 l 3.958 -1.53 q .384 -.143 .713 .054 t .329 .588 v 12.384 q 0 .287 -.159 .498 q -.158 .212 -.426 .298 z m -.5 -1.22 v -11.7 l -5 -1.745 v 11.7 z" /> diff --git a/app/src/main/res/drawable/ic_group_news.xml b/app/src/main/res/drawable/ic_group_news.xml index 3a75797..d07afea 100644 --- a/app/src/main/res/drawable/ic_group_news.xml +++ b/app/src/main/res/drawable/ic_group_news.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 5.616 20 q -.691 0 -1.153 -.462 T 4 18.384 V 5.616 q 0 -.691 .463 -1.153 T 5.616 4 h 9.961 L 20 8.423 v 9.962 q 0 .69 -.462 1.153 T 18.384 20 z M 7.5 16 h 9 v -1 h -9 z m 0 -3.5 h 9 v -1 h -9 z M 15 9 h 4 l -4 -4 z M 7.5 9 H 12 V 8 H 7.5 z" /> diff --git a/app/src/main/res/drawable/ic_group_productivity.xml b/app/src/main/res/drawable/ic_group_productivity.xml index bb26dce..2025804 100644 --- a/app/src/main/res/drawable/ic_group_productivity.xml +++ b/app/src/main/res/drawable/ic_group_productivity.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 4.616 20 q -.691 0 -1.153 -.462 T 3 18.384 V 14.5 h 7 V 16 h 4 v -1.5 h 7 v 3.885 q 0 .69 -.462 1.152 T 19.385 20 z M 11 15 v -2 h 2 v 2 z m -8 -1.5 V 8.616 q 0 -.691 .463 -1.153 T 4.615 7 H 9 V 5.615 q 0 -.69 .463 -1.153 T 10.616 4 h 2.769 q .69 0 1.153 .462 T 15 5.615 V 7 h 4.385 q .69 0 1.152 .463 T 21 8.616 V 13.5 h -7 V 12 h -4 v 1.5 z M 10 7 h 4 V 5.615 q 0 -.23 -.192 -.423 T 13.385 5 h -2.77 q -.23 0 -.423 .192 T 10 5.615 z" /> diff --git a/app/src/main/res/drawable/ic_group_social.xml b/app/src/main/res/drawable/ic_group_social.xml index 1a4ecb0..729251b 100644 --- a/app/src/main/res/drawable/ic_group_social.xml +++ b/app/src/main/res/drawable/ic_group_social.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 7.23 16.23 q -.326 0 -.547 -.22 q -.221 -.222 -.221 -.549 v -1 h 11.75 l .634 .635 V 6 h 1 q .327 0 .548 .221 t .222 .548 v 12.539 l -3.078 -3.077 z m -3.845 -.691 V 3.769 q 0 -.327 .22 -.548 Q 3.828 3 4.155 3 h 11.923 q .327 0 .548 .221 t .221 .548 v 7.923 q 0 .327 -.221 .549 q -.221 .22 -.548 .22 H 6.462 z" /> diff --git a/app/src/main/res/drawable/ic_group_system.xml b/app/src/main/res/drawable/ic_group_system.xml index ba9a82a..ca29119 100644 --- a/app/src/main/res/drawable/ic_group_system.xml +++ b/app/src/main/res/drawable/ic_group_system.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 2.692 17.02 q .206 -2.272 1.398 -4.173 q 1.192 -1.9 3.176 -3.02 l -1.562 -2.7 q -.131 -.206 -.066 -.408 q .066 -.202 .277 -.327 q .2 -.106 .393 -.04 q .192 .065 .319 .256 l 1.565 2.715 q 1.82 -.764 3.808 -.764 t 3.808 .764 l 1.565 -2.715 q .127 -.19 .32 -.256 q .192 -.066 .391 .04 q .212 .125 .278 .327 q .065 .202 -.066 .408 l -1.561 2.7 q 1.983 1.12 3.175 3.02 q 1.192 1.901 1.398 4.172 z m 5.08 -2.328 q .445 0 .75 -.307 q .305 -.308 .305 -.753 t -.308 -.75 t -.752 -.305 t -.75 .308 t -.306 .752 q 0 .446 .308 .75 t .753 .305 m 8.462 0 q .445 0 .75 -.307 q .304 -.308 .304 -.753 t -.307 -.75 t -.753 -.305 t -.75 .308 t -.305 .752 t .307 .75 t .753 .305" /> diff --git a/app/src/main/res/drawable/ic_group_video.xml b/app/src/main/res/drawable/ic_group_video.xml index d9d944d..c57069c 100644 --- a/app/src/main/res/drawable/ic_group_video.xml +++ b/app/src/main/res/drawable/ic_group_video.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="m 4.616 5 l 1.5 3 h 3 l -1.5 -3 h 2 l 1.5 3 h 3 l -1.5 -3 h 2 l 1.5 3 h 3 l -1.5 -3 h 1.769 q .69 0 1.153 .463 T 21 6.616 v 10.769 q 0 .69 -.462 1.153 T 19.385 19 H 4.615 q -.69 0 -1.152 -.462 T 3 17.384 V 6.616 q 0 -.691 .463 -1.153 T 4.615 5" /> diff --git a/app/src/main/res/drawable/ic_notification.xml b/app/src/main/res/drawable/ic_notification.xml index 7bcd52f..a153f3b 100644 --- a/app/src/main/res/drawable/ic_notification.xml +++ b/app/src/main/res/drawable/ic_notification.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 10.98 14.5 h 2.04 l -.556 -3.09 q .442 -.154 .73 -.543 T 13.48 10 q 0 -.613 -.434 -1.047 q -.433 -.434 -1.047 -.434 t -1.047 .434 T 10.519 10 q 0 .479 .288 .867 t .73 .542 z M 12 20.962 q -3.014 -.895 -5.007 -3.651 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 3.454 -1.993 6.21 T 12 20.963" /> diff --git a/app/src/main/res/drawable/ic_policy.xml b/app/src/main/res/drawable/ic_policy.xml index 16b3b11..3ab9cbc 100644 --- a/app/src/main/res/drawable/ic_policy.xml +++ b/app/src/main/res/drawable/ic_policy.xml @@ -1,14 +1,10 @@ + - + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 12 20.962 q -3.014 -.895 -5.007 -3.651 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 1.498 -.422 2.88 t -1.14 2.674 l -2.95 -2.95 q .237 -.379 .375 -.814 Q 15 12.454 15 12 q 0 -1.246 -.877 -2.123 T 12 9 t -2.123 .877 T 9 12 t .877 2.123 T 12 15 q .487 0 .941 -.147 q .455 -.147 .828 -.441 l 3.071 3.065 q -1.011 1.167 -2.18 2.11 T 12 20.962 M 12 14 q -.825 0 -1.412 -.587 T 10 12 t .588 -1.412 T 12 10 t 1.413 .588 T 14 12 t -.587 1.413 T 12 14" /> diff --git a/app/src/main/res/drawable/ic_privacy.xml b/app/src/main/res/drawable/ic_privacy.xml index 51631ef..f7a999f 100644 --- a/app/src/main/res/drawable/ic_privacy.xml +++ b/app/src/main/res/drawable/ic_privacy.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 10.95 14.858 L 15.908 9.9 l -.714 -.713 l -4.244 4.244 l -2.138 -2.139 l -.714 .714 z M 12 20.96 q -3.013 -.894 -5.007 -3.65 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 3.454 -1.993 6.21 T 12 20.963" /> diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 7e71b97..51815df 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 12.077 19 q -2.931 0 -4.966 -2.033 q -2.034 -2.034 -2.034 -4.964 t 2.034 -4.966 T 12.077 5 q 1.783 0 3.339 .847 q 1.555 .847 2.507 2.365 V 5 h 1 v 5.23 h -5.23 v -1 h 3.7 q -.782 -1.495 -2.198 -2.363 T 12.077 6 q -2.5 0 -4.25 1.75 T 6.077 12 t 1.75 4.25 t 4.25 1.75 q 1.925 0 3.475 -1.1 t 2.175 -2.9 h 1.062 q -.662 2.246 -2.514 3.623 T 12.077 19" /> diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index e36163c..cd3b346 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="m 19.485 20.154 l -6.262 -6.262 q -.75 .639 -1.725 .989 t -1.96 .35 q -2.402 0 -4.066 -1.663 T 3.808 9.503 T 5.47 5.436 t 4.064 -1.667 t 4.068 1.664 T 15.268 9.5 q 0 1.042 -.369 2.017 t -.97 1.668 l 6.262 6.261 z M 9.539 14.23 q 1.99 0 3.36 -1.37 t 1.37 -3.361 t -1.37 -3.36 t -3.36 -1.37 t -3.361 1.37 t -1.37 3.36 t 1.37 3.36 t 3.36 1.37" /> diff --git a/app/src/main/res/drawable/ic_shield_search.xml b/app/src/main/res/drawable/ic_shield_search.xml deleted file mode 100644 index 518164c..0000000 --- a/app/src/main/res/drawable/ic_shield_search.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_speed.xml b/app/src/main/res/drawable/ic_speed.xml new file mode 100644 index 0000000..889381a --- /dev/null +++ b/app/src/main/res/drawable/ic_speed.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_swap.xml b/app/src/main/res/drawable/ic_swap.xml new file mode 100644 index 0000000..149d788 --- /dev/null +++ b/app/src/main/res/drawable/ic_swap.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/src/main/res/drawable/ic_tab_apps.xml b/app/src/main/res/drawable/ic_tab_apps.xml index 105a146..5727e8e 100644 --- a/app/src/main/res/drawable/ic_tab_apps.xml +++ b/app/src/main/res/drawable/ic_tab_apps.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 6 19.23 q -.508 0 -.87 -.36 T 4.77 18 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m -12 -6 q -.508 0 -.87 -.36 T 4.77 12 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 t -.36 -.87 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m -12 -6 q -.508 0 -.87 -.36 T 4.77 6 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 T 10.77 6 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36 m 6 0 q -.508 0 -.87 -.36 T 16.77 6 t .36 -.87 t .87 -.36 t .87 .36 t .36 .87 t -.36 .87 t -.87 .36" /> diff --git a/app/src/main/res/drawable/ic_tab_block.xml b/app/src/main/res/drawable/ic_tab_block.xml index 3bf98d9..94001e8 100644 --- a/app/src/main/res/drawable/ic_tab_block.xml +++ b/app/src/main/res/drawable/ic_tab_block.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 7.5 12.5 h 9 v -1 h -9 z m 4.503 8.5 q -1.866 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" /> diff --git a/app/src/main/res/drawable/ic_tab_home.xml b/app/src/main/res/drawable/ic_tab_home.xml index 7bcd52f..7112c7c 100644 --- a/app/src/main/res/drawable/ic_tab_home.xml +++ b/app/src/main/res/drawable/ic_tab_home.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 12 20.962 q -3.014 -.895 -5.007 -3.651 T 5 11.1 V 5.692 l 7 -2.615 l 7 2.615 V 11.1 q 0 3.454 -1.993 6.21 T 12 20.963" /> diff --git a/app/src/main/res/drawable/ic_tab_info.xml b/app/src/main/res/drawable/ic_tab_info.xml index 89ff164..bb2b71a 100644 --- a/app/src/main/res/drawable/ic_tab_info.xml +++ b/app/src/main/res/drawable/ic_tab_info.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 11.5 16.5 h 1 V 11 h -1 z m .5 -6.923 q .262 0 .439 -.177 t .176 -.439 t -.177 -.438 T 12 8.346 t -.438 .177 t -.177 .439 t .177 .438 t .438 .177 M 12.003 21 q -1.867 0 -3.51 -.708 q -1.643 -.709 -2.859 -1.924 t -1.925 -2.856 T 3 12.003 t .709 -3.51 Q 4.417 6.85 5.63 5.634 t 2.857 -1.925 T 11.997 3 t 3.51 .709 q 1.643 .708 2.859 1.922 t 1.925 2.857 t .709 3.509 t -.708 3.51 t -1.924 2.859 t -2.856 1.925 t -3.509 .709" /> diff --git a/app/src/main/res/drawable/ic_tab_monitor.xml b/app/src/main/res/drawable/ic_tab_monitor.xml index de23f97..018054d 100644 --- a/app/src/main/res/drawable/ic_tab_monitor.xml +++ b/app/src/main/res/drawable/ic_tab_monitor.xml @@ -1,10 +1,10 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M 7.73 16.5 h 1 V 12 h -1 z m 7.54 0 h 1 V 7 h -1 z m -3.77 0 h 1 V 14 h -1 z m 0 -4.5 h 1 v -2 h -1 z m -5.884 8 q -.691 0 -1.153 -.462 T 4 18.384 V 5.616 q 0 -.691 .463 -1.153 T 5.616 4 h 12.769 q .69 0 1.153 .463 T 20 5.616 v 12.769 q 0 .69 -.462 1.153 T 18.384 20 z" /> diff --git a/app/src/main/res/drawable/ic_tab_settings.xml b/app/src/main/res/drawable/ic_tab_settings.xml index 1a4dbe0..c50176d 100644 --- a/app/src/main/res/drawable/ic_tab_settings.xml +++ b/app/src/main/res/drawable/ic_tab_settings.xml @@ -1,17 +1,10 @@ + - + android:fillColor="#FFFFFFFF" + android:pathData="m 10.135 21 l -.362 -2.892 q -.479 -.145 -1.035 -.454 q -.557 -.31 -.947 -.664 l -2.668 1.135 l -1.865 -3.25 l 2.306 -1.739 q -.045 -.27 -.073 -.558 q -.03 -.288 -.03 -.559 q 0 -.252 .03 -.53 q .028 -.278 .073 -.626 L 3.258 9.126 l 1.865 -3.212 L 7.771 7.03 q .448 -.373 .97 -.673 q .52 -.3 1.013 -.464 L 10.134 3 h 3.732 l .361 2.912 q .575 .202 1.016 .463 t .909 .654 l 2.725 -1.115 l 1.865 3.211 l -2.382 1.796 q .082 .31 .092 .569 t .01 .51 q 0 .233 -.02 .491 q -.019 .259 -.088 .626 l 2.344 1.758 l -1.865 3.25 l -2.681 -1.154 q -.467 .393 -.94 .673 t -.985 .445 L 13.866 21 z m 1.838 -6.5 q 1.046 0 1.773 -.727 T 14.473 12 t -.727 -1.773 t -1.773 -.727 q -1.052 0 -1.776 .727 T 9.473 12 t .724 1.773 t 1.776 .727" /> diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml new file mode 100644 index 0000000..2cf875e --- /dev/null +++ b/app/src/main/res/drawable/ic_update.xml @@ -0,0 +1,10 @@ + + + +