From b9683a4b148699a56c4d27ea5bed7e780b696a4d Mon Sep 17 00:00:00 2001 From: rushiiMachine <33725716+rushiiMachine@users.noreply.github.com> Date: Fri, 12 Jan 2024 16:23:41 -0800 Subject: [PATCH] refactor: get rid of material icon lib --- .../kotlin/com/aliucord/manager/MainActivity.kt | 5 +---- .../manager/ui/component/home/InfoCard.kt | 15 +++++++++------ .../ui/component/installer/InstallGroup.kt | 17 +++++++++-------- .../manager/ui/component/plugins/Changelog.kt | 5 ++--- .../manager/ui/component/plugins/PluginCard.kt | 2 +- .../manager/ui/navigation/AppDestination.kt | 17 +++++++++-------- .../manager/ui/navigation/BaseScreen.kt | 8 +++----- .../aliucord/manager/ui/screen/AboutScreen.kt | 7 ++----- .../aliucord/manager/ui/screen/PluginsScreen.kt | 3 ++- .../manager/ui/screen/SettingsScreen.kt | 17 +++++++++-------- app/src/main/res/drawable/ic_app_shortcut.xml | 9 +++++++++ .../main/res/drawable/ic_arrow_down_small.xml | 9 +++++++++ app/src/main/res/drawable/ic_arrow_up_small.xml | 9 +++++++++ app/src/main/res/drawable/ic_back.xml | 9 +++++++++ app/src/main/res/drawable/ic_brush.xml | 9 +++++++++ app/src/main/res/drawable/ic_bug.xml | 9 +++++++++ app/src/main/res/drawable/ic_canceled.xml | 9 +++++++++ app/src/main/res/drawable/ic_check_circle.xml | 9 +++++++++ app/src/main/res/drawable/ic_circle.xml | 9 +++++++++ app/src/main/res/drawable/ic_code.xml | 9 +++++++++ app/src/main/res/drawable/ic_copy_file.xml | 9 +++++++++ app/src/main/res/drawable/ic_delete_forever.xml | 9 +++++++++ app/src/main/res/drawable/ic_discord.xml | 2 +- app/src/main/res/drawable/ic_download.xml | 9 +++++++++ app/src/main/res/drawable/ic_extension.xml | 9 +++++++++ app/src/main/res/drawable/ic_extension_off.xml | 9 +++++++++ .../main/res/drawable/ic_extension_outlined.xml | 9 +++++++++ app/src/main/res/drawable/ic_history.xml | 9 +++++++++ app/src/main/res/drawable/ic_home.xml | 9 +++++++++ app/src/main/res/drawable/ic_launch.xml | 9 +++++++++ app/src/main/res/drawable/ic_link.xml | 9 +++++++++ app/src/main/res/drawable/ic_palette.xml | 9 +++++++++ app/src/main/res/drawable/ic_refresh.xml | 9 +++++++++ app/src/main/res/drawable/ic_settings.xml | 9 +++++++++ .../main/res/drawable/ic_settings_outlined.xml | 9 +++++++++ app/src/main/res/drawable/ic_update.xml | 9 +++++++++ gradle/libs.versions.toml | 2 -- 37 files changed, 273 insertions(+), 52 deletions(-) create mode 100644 app/src/main/res/drawable/ic_app_shortcut.xml create mode 100644 app/src/main/res/drawable/ic_arrow_down_small.xml create mode 100644 app/src/main/res/drawable/ic_arrow_up_small.xml create mode 100644 app/src/main/res/drawable/ic_back.xml create mode 100644 app/src/main/res/drawable/ic_brush.xml create mode 100644 app/src/main/res/drawable/ic_bug.xml create mode 100644 app/src/main/res/drawable/ic_canceled.xml create mode 100644 app/src/main/res/drawable/ic_check_circle.xml create mode 100644 app/src/main/res/drawable/ic_circle.xml create mode 100644 app/src/main/res/drawable/ic_code.xml create mode 100644 app/src/main/res/drawable/ic_copy_file.xml create mode 100644 app/src/main/res/drawable/ic_delete_forever.xml create mode 100644 app/src/main/res/drawable/ic_download.xml create mode 100644 app/src/main/res/drawable/ic_extension.xml create mode 100644 app/src/main/res/drawable/ic_extension_off.xml create mode 100644 app/src/main/res/drawable/ic_extension_outlined.xml create mode 100644 app/src/main/res/drawable/ic_history.xml create mode 100644 app/src/main/res/drawable/ic_home.xml create mode 100644 app/src/main/res/drawable/ic_launch.xml create mode 100644 app/src/main/res/drawable/ic_link.xml create mode 100644 app/src/main/res/drawable/ic_palette.xml create mode 100644 app/src/main/res/drawable/ic_refresh.xml create mode 100644 app/src/main/res/drawable/ic_settings.xml create mode 100644 app/src/main/res/drawable/ic_settings_outlined.xml create mode 100644 app/src/main/res/drawable/ic_update.xml diff --git a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt index 40b25da..4755f70 100644 --- a/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt +++ b/app/src/main/kotlin/com/aliucord/manager/MainActivity.kt @@ -9,7 +9,6 @@ import android.os.* import androidx.activity.ComponentActivity import androidx.activity.compose.BackHandler import androidx.activity.compose.setContent -import androidx.compose.animation.* import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.* import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen @@ -29,7 +28,6 @@ val aliucordDir = Environment.getExternalStorageDirectory().resolve("Aliucord") class MainActivity : ComponentActivity() { private val preferences: PreferencesManager by inject() - @OptIn(ExperimentalAnimationApi::class) override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen() @@ -57,9 +55,8 @@ class MainActivity : ComponentActivity() { UpdaterDialog() } - AnimatedNavHost( + NavHost( controller = navController, - transitionSpec = { _, _, _ -> fadeIn() with fadeOut() } ) { when (val dest = this.currentHostEntry.destination) { is BaseScreenDestination -> BaseScreen( diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/home/InfoCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/home/InfoCard.kt index 07a64c0..4043cc9 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/home/InfoCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/home/InfoCard.kt @@ -2,11 +2,12 @@ package com.aliucord.manager.ui.component.home import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* +import androidx.compose.material.icons.filled.Delete import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.* import androidx.compose.ui.text.font.FontWeight @@ -71,11 +72,13 @@ fun InfoCard( ) { val (icon, description) = when { currentVersion !is DiscordVersion.Existing -> - Icons.Default.Download to R.string.action_install + R.drawable.ic_download to R.string.action_install + currentVersion < supportedVersion -> - Icons.Default.Refresh to R.string.action_reinstall + R.drawable.ic_refresh to R.string.action_reinstall + else -> - Icons.Default.Update to R.string.action_update + R.drawable.ic_update to R.string.action_update } FilledTonalIconButton( @@ -91,7 +94,7 @@ fun InfoCard( verticalAlignment = Alignment.CenterVertically ) { Icon( - imageVector = icon, + painter = painterResource(icon), contentDescription = stringResource(description) ) if (currentVersion is DiscordVersion.None) { @@ -125,7 +128,7 @@ fun InfoCard( shape = ShapeDefaults.Large ) { Icon( - imageVector = Icons.Default.Launch, + painter = painterResource(R.drawable.ic_launch), contentDescription = stringResource(R.string.action_launch) ) } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallGroup.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallGroup.kt index f191e06..8c8027e 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallGroup.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/installer/InstallGroup.kt @@ -5,9 +5,6 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.* -import androidx.compose.material.icons.outlined.Circle import androidx.compose.material3.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment @@ -15,6 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.contentDescription import androidx.compose.ui.semantics.semantics @@ -95,12 +93,12 @@ fun InstallGroup( if (isCurrent) { Icon( - imageVector = Icons.Filled.KeyboardArrowUp, + painter = painterResource(R.drawable.ic_arrow_up_small), contentDescription = stringResource(R.string.action_collapse) ) } else { Icon( - imageVector = Icons.Filled.KeyboardArrowDown, + painter = painterResource(R.drawable.ic_arrow_down_small), contentDescription = stringResource(R.string.action_expand) ) } @@ -171,20 +169,23 @@ private fun StepIcon(status: InstallStatus, size: Dp) { contentDescription = context.getString(R.string.status_ongoing) } ) + InstallStatus.SUCCESSFUL -> Icon( - Icons.Filled.CheckCircle, + painter = painterResource(R.drawable.ic_check_circle), contentDescription = stringResource(R.string.status_success), tint = Color(0xFF59B463), modifier = Modifier.size(size) ) + InstallStatus.UNSUCCESSFUL -> Icon( - Icons.Filled.Cancel, + painter = painterResource(R.drawable.ic_canceled), contentDescription = stringResource(R.string.status_failed), tint = MaterialTheme.colorScheme.error, modifier = Modifier.size(size) ) + InstallStatus.QUEUED -> Icon( - Icons.Outlined.Circle, + painter = painterResource(R.drawable.ic_circle), contentDescription = stringResource(R.string.status_queued), tint = MaterialTheme.colorScheme.onSurface.copy(0.4f), modifier = Modifier.size(size) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt index 7011c9a..8405c5a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/Changelog.kt @@ -10,13 +10,12 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.ClickableText -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.History import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.platform.LocalUriHandler +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.* import androidx.compose.ui.text.font.FontWeight @@ -71,7 +70,7 @@ fun Changelog( onDismissRequest = onDismiss, icon = { Icon( - imageVector = Icons.Default.History, + painter = painterResource(R.drawable.ic_history), contentDescription = stringResource(R.string.plugins_view_changelog, plugin.manifest.name) ) }, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt index 3f9a36d..12fafa2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/component/plugins/PluginCard.kt @@ -147,8 +147,8 @@ fun PluginCard( if (plugin.manifest.changelog != null) { IconButton(modifier = Modifier.size(25.dp), onClick = onClickShowChangelog) { Icon( + painter = painterResource(R.drawable.ic_history), modifier = Modifier.fillMaxSize(), - imageVector = Icons.Default.History, contentDescription = stringResource(R.string.plugins_view_changelog, plugin.manifest.name) ) } diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt b/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt index 8f40fc2..93c93f2 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/navigation/AppDestination.kt @@ -2,6 +2,7 @@ package com.aliucord.manager.ui.navigation import android.app.Activity import android.os.Parcelable +import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.* @@ -15,8 +16,8 @@ import kotlinx.parcelize.RawValue @Parcelize sealed class BaseScreenDestination( - val selectedIcon: @RawValue ImageVector, - val unselectedIcon: @RawValue ImageVector, + @DrawableRes val selectedIcon: Int, + @DrawableRes val unselectedIcon: Int, @StringRes val label: Int ) : AppDestination @@ -24,22 +25,22 @@ sealed class BaseScreenDestination( sealed interface AppDestination : Parcelable { @Parcelize object Home : BaseScreenDestination( - Icons.Default.Home, - Icons.Outlined.Home, + R.drawable.ic_home, + R.drawable.ic_home, // TODO: get ic_home outline variant R.string.navigation_home ) @Parcelize object Plugins : BaseScreenDestination( - Icons.Default.Extension, - Icons.Outlined.Extension, + R.drawable.ic_extension, + R.drawable.ic_extension_outlined, R.string.plugins_title ) @Parcelize object Settings : BaseScreenDestination( - Icons.Default.Settings, - Icons.Outlined.Settings, + R.drawable.ic_settings, + R.drawable.ic_settings_outlined, R.string.navigation_settings ) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/navigation/BaseScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/navigation/BaseScreen.kt index 81f41a8..3130f91 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/navigation/BaseScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/navigation/BaseScreen.kt @@ -2,7 +2,6 @@ package com.aliucord.manager.ui.navigation -import androidx.compose.animation.* import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Info @@ -14,7 +13,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import com.aliucord.manager.BuildConfig import com.aliucord.manager.R -import com.aliucord.manager.ui.screen.* import kotlinx.collections.immutable.ImmutableList @Composable @@ -58,10 +56,10 @@ fun BaseScreen( selected = currentNavItem == navItem, icon = { Icon( - imageVector = if (currentNavItem == navItem) { - navItem.selectedIcon + painter = if (currentNavItem == navItem) { + painterResource(navItem.selectedIcon) } else { - navItem.unselectedIcon + painterResource(navItem.unselectedIcon) }, contentDescription = null, ) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt index b352907..bc787c1 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/AboutScreen.kt @@ -10,9 +10,6 @@ import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material.icons.filled.Link import androidx.compose.material.ripple.rememberRipple import androidx.compose.material3.* import androidx.compose.runtime.Composable @@ -47,7 +44,7 @@ fun AboutScreen( navigationIcon = { IconButton(onClick = onBackClick) { Icon( - imageVector = Icons.Default.ArrowBack, + painter = painterResource(R.drawable.ic_back), contentDescription = stringResource(R.string.navigation_back) ) } @@ -101,7 +98,7 @@ fun AboutScreen( TextButton(onClick = { uriHandler.openUri("https://aliucord.com") }) { Icon( - imageVector = Icons.Filled.Link, + painter = painterResource(R.drawable.ic_link), contentDescription = stringResource(R.string.website) ) Spacer(modifier = Modifier.width(ButtonDefaults.IconSpacing)) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/PluginsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/PluginsScreen.kt index 5b2c195..0e23286 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/PluginsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/PluginsScreen.kt @@ -18,6 +18,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp @@ -167,7 +168,7 @@ fun PluginsScreen( horizontalAlignment = Alignment.CenterHorizontally ) { Icon( - imageVector = Icons.Default.ExtensionOff, + painter = painterResource(R.drawable.ic_extension_off), contentDescription = null ) Text(stringResource(R.string.plugins_none_installed)) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt index ceb9010..122015a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.runtime.* import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @@ -46,7 +47,7 @@ fun SettingsScreen( SettingsItem( modifier = Modifier.clickable(onClick = viewModel::showThemeDialog), - icon = { Icon(Icons.Default.Style, null) }, + icon = { Icon(painterResource(R.drawable.ic_brush), null) }, text = { Text(stringResource(R.string.settings_theme)) } ) { FilledTonalButton(onClick = viewModel::showThemeDialog) { @@ -57,7 +58,7 @@ fun SettingsScreen( SettingsSwitch( label = stringResource(R.string.setting_dynamic_color), pref = preferences.dynamicColor, - icon = { Icon(Icons.Default.Palette, null) } + icon = { Icon(painterResource(R.drawable.ic_palette), null) } ) { preferences.dynamicColor = it } @@ -75,7 +76,7 @@ fun SettingsScreen( label = stringResource(R.string.setting_replace_icon), secondaryLabel = stringResource(R.string.setting_replace_icon_desc), pref = preferences.replaceIcon, - icon = { Icon(Icons.Default.AppShortcut, null) } + icon = { Icon(painterResource(R.drawable.ic_app_shortcut), null) } ) { preferences.replaceIcon = it } @@ -83,7 +84,7 @@ fun SettingsScreen( SettingsSwitch( label = stringResource(R.string.setting_keep_patched_apks), secondaryLabel = stringResource(R.string.setting_keep_patched_apks_desc), - icon = { Icon(Icons.Default.DeleteForever, null) }, + icon = { Icon(painterResource(R.drawable.ic_delete_forever), null) }, pref = preferences.keepPatchedApks, onPrefChange = { preferences.keepPatchedApks = it }, ) @@ -93,7 +94,7 @@ fun SettingsScreen( SettingsSwitch( label = stringResource(R.string.settings_developer_options), pref = preferences.devMode, - icon = { Icon(Icons.Default.Code, null) } + icon = { Icon(painterResource(R.drawable.ic_code), null) } ) { preferences.devMode = it } @@ -123,14 +124,14 @@ fun SettingsScreen( label = stringResource(R.string.setting_debuggable), secondaryLabel = stringResource(R.string.setting_debuggable_desc), pref = preferences.debuggable, - icon = { Icon(Icons.Default.BugReport, null) }, + icon = { Icon(painterResource(R.drawable.ic_bug), null) }, onPrefChange = { preferences.debuggable = it }, ) SettingsSwitch( label = stringResource(R.string.setting_hermes_replace_libcpp), secondaryLabel = stringResource(R.string.setting_hermes_replace_libcpp_desc), - icon = { Icon(Icons.Default.FileCopy, null) }, + icon = { Icon(painterResource(R.drawable.ic_copy_file), null) }, pref = preferences.hermesReplaceLibCpp, onPrefChange = { preferences.hermesReplaceLibCpp = it }, ) @@ -164,7 +165,7 @@ fun ThemeDialog( onDismissRequest = onDismissRequest, icon = { Icon( - imageVector = Icons.Default.Style, + painter = painterResource(R.drawable.ic_brush), contentDescription = stringResource(R.string.settings_theme) ) }, diff --git a/app/src/main/res/drawable/ic_app_shortcut.xml b/app/src/main/res/drawable/ic_app_shortcut.xml new file mode 100644 index 0000000..884c7e9 --- /dev/null +++ b/app/src/main/res/drawable/ic_app_shortcut.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_down_small.xml b/app/src/main/res/drawable/ic_arrow_down_small.xml new file mode 100644 index 0000000..283d53f --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_down_small.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_up_small.xml b/app/src/main/res/drawable/ic_arrow_up_small.xml new file mode 100644 index 0000000..db499f2 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_up_small.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml new file mode 100644 index 0000000..b75d1df --- /dev/null +++ b/app/src/main/res/drawable/ic_back.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_brush.xml b/app/src/main/res/drawable/ic_brush.xml new file mode 100644 index 0000000..00f4f85 --- /dev/null +++ b/app/src/main/res/drawable/ic_brush.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bug.xml b/app/src/main/res/drawable/ic_bug.xml new file mode 100644 index 0000000..b6cedeb --- /dev/null +++ b/app/src/main/res/drawable/ic_bug.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_canceled.xml b/app/src/main/res/drawable/ic_canceled.xml new file mode 100644 index 0000000..644c6ba --- /dev/null +++ b/app/src/main/res/drawable/ic_canceled.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml new file mode 100644 index 0000000..8db17ae --- /dev/null +++ b/app/src/main/res/drawable/ic_check_circle.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_circle.xml b/app/src/main/res/drawable/ic_circle.xml new file mode 100644 index 0000000..5026d40 --- /dev/null +++ b/app/src/main/res/drawable/ic_circle.xml @@ -0,0 +1,9 @@ + + + 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..836ef3c --- /dev/null +++ b/app/src/main/res/drawable/ic_code.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_copy_file.xml b/app/src/main/res/drawable/ic_copy_file.xml new file mode 100644 index 0000000..0396813 --- /dev/null +++ b/app/src/main/res/drawable/ic_copy_file.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_forever.xml b/app/src/main/res/drawable/ic_delete_forever.xml new file mode 100644 index 0000000..dea6180 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_forever.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_discord.xml b/app/src/main/res/drawable/ic_discord.xml index 53787e2..ae265d4 100644 --- a/app/src/main/res/drawable/ic_discord.xml +++ b/app/src/main/res/drawable/ic_discord.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml new file mode 100644 index 0000000..b222499 --- /dev/null +++ b/app/src/main/res/drawable/ic_download.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_extension.xml b/app/src/main/res/drawable/ic_extension.xml new file mode 100644 index 0000000..00c5ca0 --- /dev/null +++ b/app/src/main/res/drawable/ic_extension.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_extension_off.xml b/app/src/main/res/drawable/ic_extension_off.xml new file mode 100644 index 0000000..4f61bb4 --- /dev/null +++ b/app/src/main/res/drawable/ic_extension_off.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_extension_outlined.xml b/app/src/main/res/drawable/ic_extension_outlined.xml new file mode 100644 index 0000000..e50482d --- /dev/null +++ b/app/src/main/res/drawable/ic_extension_outlined.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml new file mode 100644 index 0000000..53f6334 --- /dev/null +++ b/app/src/main/res/drawable/ic_history.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml new file mode 100644 index 0000000..4bc216e --- /dev/null +++ b/app/src/main/res/drawable/ic_home.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launch.xml b/app/src/main/res/drawable/ic_launch.xml new file mode 100644 index 0000000..03192ff --- /dev/null +++ b/app/src/main/res/drawable/ic_launch.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml new file mode 100644 index 0000000..fcc6704 --- /dev/null +++ b/app/src/main/res/drawable/ic_link.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_palette.xml b/app/src/main/res/drawable/ic_palette.xml new file mode 100644 index 0000000..3a1c166 --- /dev/null +++ b/app/src/main/res/drawable/ic_palette.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml new file mode 100644 index 0000000..fa51cfb --- /dev/null +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 0000000..6bde5ee --- /dev/null +++ b/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_outlined.xml b/app/src/main/res/drawable/ic_settings_outlined.xml new file mode 100644 index 0000000..bd49332 --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_outlined.xml @@ -0,0 +1,9 @@ + + + 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..12d9fa6 --- /dev/null +++ b/app/src/main/res/drawable/ic_update.xml @@ -0,0 +1,9 @@ + + + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0c6d1f8..53e40a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,7 +37,6 @@ compose-foundation = { module = "androidx.compose.foundation:foundation", versio compose-animations = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose" } compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" } compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" } -compose-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" } compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" } # Compose debug tooling @@ -82,7 +81,6 @@ compose = [ "compose-runtime", "compose-ui", "compose-foundation", - "compose-icons", "compose-material3", "compose-animations", ]