From 6487d9631182f3b3f06846f4aa8a854ff13a527c Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 4 Oct 2022 03:02:49 +0200 Subject: [PATCH] Update: Replace painters with ImageVector in Main Pages --- .../ui/compose/icons/phosphor/CaretDown.kt | 47 ++++++++++++++++ .../ui/compose/icons/phosphor/CaretUp.kt | 48 ++++++++++++++++ .../ui/compose/icons/phosphor/FunnelSimple.kt | 56 +++++++++++++++++++ .../fdroid/ui/pages/ExplorePage.kt | 5 +- .../fdroid/ui/pages/InstalledPage.kt | 12 ++-- .../machiav3lli/fdroid/ui/pages/LatestPage.kt | 5 +- 6 files changed, 165 insertions(+), 8 deletions(-) create mode 100644 src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretDown.kt create mode 100644 src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretUp.kt create mode 100644 src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/FunnelSimple.kt diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretDown.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretDown.kt new file mode 100644 index 00000000..6ea1b911 --- /dev/null +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretDown.kt @@ -0,0 +1,47 @@ +package com.machiav3lli.fdroid.ui.compose.icons.phosphor + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType.Companion.NonZero +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap.Companion.Butt +import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.ImageVector.Builder +import androidx.compose.ui.graphics.vector.path +import androidx.compose.ui.unit.dp +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor + +val Phosphor.CaretDown: ImageVector + get() { + if (_caret_down != null) { + return _caret_down!! + } + _caret_down = Builder( + name = "Caret-down", + defaultWidth = 32.0.dp, + defaultHeight = 32.0.dp, + viewportWidth = 256.0f, + viewportHeight = 256.0f, + ).apply { + path( + fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero + ) { + moveTo(128.0f, 184.0f) + arcToRelative(8.5f, 8.5f, 0.0f, false, true, -5.7f, -2.3f) + lineToRelative(-80.0f, -80.0f) + arcTo(8.1f, 8.1f, 0.0f, false, true, 53.7f, 90.3f) + lineTo(128.0f, 164.7f) + lineToRelative(74.3f, -74.4f) + arcToRelative(8.1f, 8.1f, 0.0f, false, true, 11.4f, 11.4f) + lineToRelative(-80.0f, 80.0f) + arcTo(8.5f, 8.5f, 0.0f, false, true, 128.0f, 184.0f) + close() + } + } + .build() + return _caret_down!! + } + +private var _caret_down: ImageVector? = null diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretUp.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretUp.kt new file mode 100644 index 00000000..01214041 --- /dev/null +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/CaretUp.kt @@ -0,0 +1,48 @@ +package com.machiav3lli.fdroid.ui.compose.icons.phosphor + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType.Companion.NonZero +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap.Companion.Butt +import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.ImageVector.Builder +import androidx.compose.ui.graphics.vector.path +import androidx.compose.ui.unit.dp +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor + +val Phosphor.CaretUp: ImageVector + get() { + if (_caret_up != null) { + return _caret_up!! + } + _caret_up = Builder( + name = "Caret-up", + defaultWidth = 32.0.dp, + defaultHeight = 32.0.dp, + viewportWidth = 256.0f, + viewportHeight = 256.0f, + ).apply { + path( + fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero + ) { + moveTo(208.0f, 168.0f) + arcToRelative(8.5f, 8.5f, 0.0f, false, true, -5.7f, -2.3f) + lineTo(128.0f, 91.3f) + lineTo(53.7f, 165.7f) + arcToRelative(8.1f, 8.1f, 0.0f, false, true, -11.4f, -11.4f) + lineToRelative(80.0f, -80.0f) + arcToRelative(8.1f, 8.1f, 0.0f, false, true, 11.4f, 0.0f) + lineToRelative(80.0f, 80.0f) + arcToRelative(8.1f, 8.1f, 0.0f, false, true, 0.0f, 11.4f) + arcTo(8.5f, 8.5f, 0.0f, false, true, 208.0f, 168.0f) + close() + } + } + .build() + return _caret_up!! + } + +private var _caret_up: ImageVector? = null diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/FunnelSimple.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/FunnelSimple.kt new file mode 100644 index 00000000..b1dbcab1 --- /dev/null +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/FunnelSimple.kt @@ -0,0 +1,56 @@ +package com.machiav3lli.fdroid.ui.compose.icons.phosphor + +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.PathFillType.Companion.NonZero +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.StrokeCap.Companion.Butt +import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.ImageVector.Builder +import androidx.compose.ui.graphics.vector.path +import androidx.compose.ui.unit.dp +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor + +val Phosphor.FunnelSimple: ImageVector + get() { + if (_funnel_simple != null) { + return _funnel_simple!! + } + _funnel_simple = Builder( + name = "Funnel-simple", + defaultWidth = 32.0.dp, + defaultHeight = 32.0.dp, + viewportWidth = 256.0f, + viewportHeight = 256.0f, + ).apply { + path( + fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f, + strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f, + pathFillType = NonZero + ) { + moveTo(200.0f, 128.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, true, -8.0f, 8.0f) + lineTo(64.0f, 136.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, true, 0.0f, -16.0f) + lineTo(192.0f, 120.0f) + arcTo(8.0f, 8.0f, 0.0f, false, true, 200.0f, 128.0f) + close() + moveTo(232.0f, 72.0f) + lineTo(24.0f, 72.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, false, 0.0f, 16.0f) + lineTo(232.0f, 88.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, false, 0.0f, -16.0f) + close() + moveTo(152.0f, 168.0f) + lineTo(104.0f, 168.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, false, 0.0f, 16.0f) + horizontalLineToRelative(48.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, false, 0.0f, -16.0f) + close() + } + } + .build() + return _funnel_simple!! + } + +private var _funnel_simple: ImageVector? = null diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt index 4008762b..d76a0d15 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/ExplorePage.kt @@ -25,7 +25,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.machiav3lli.fdroid.R @@ -34,6 +33,8 @@ import com.machiav3lli.fdroid.entity.Section import com.machiav3lli.fdroid.ui.activities.MainActivityX import com.machiav3lli.fdroid.ui.compose.ProductsVerticalRecycler import com.machiav3lli.fdroid.ui.compose.components.CategoryChip +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.FunnelSimple import com.machiav3lli.fdroid.ui.compose.theme.AppTheme import com.machiav3lli.fdroid.ui.navigation.NavItem import com.machiav3lli.fdroid.ui.viewmodels.MainNavFragmentViewModelX @@ -109,7 +110,7 @@ fun ExplorePage(viewModel: MainNavFragmentViewModelX) { icon = { Icon( modifier = Modifier.size(18.dp), - painter = painterResource(id = R.drawable.ic_sort), + imageVector = Phosphor.FunnelSimple, contentDescription = stringResource(id = R.string.sort_filter) ) }, diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt index e7a4afbe..f46220b0 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/InstalledPage.kt @@ -29,7 +29,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -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 @@ -39,6 +38,11 @@ import com.machiav3lli.fdroid.database.entity.Product import com.machiav3lli.fdroid.ui.activities.MainActivityX import com.machiav3lli.fdroid.ui.compose.ProductsHorizontalRecycler import com.machiav3lli.fdroid.ui.compose.ProductsVerticalRecycler +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.CaretDown +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.CaretUp +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.Download +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.FunnelSimple import com.machiav3lli.fdroid.ui.compose.theme.AppTheme import com.machiav3lli.fdroid.ui.navigation.NavItem import com.machiav3lli.fdroid.ui.viewmodels.MainNavFragmentViewModelX @@ -118,7 +122,7 @@ fun InstalledPage(viewModel: MainNavFragmentViewModelX) { Spacer(modifier = Modifier.width(8.dp)) Icon( modifier = Modifier.size(18.dp), - painter = painterResource(id = if (updatesVisible) R.drawable.ic_arrow_up else R.drawable.ic_arrow_down), + imageVector = if (updatesVisible) Phosphor.CaretUp else Phosphor.CaretDown, contentDescription = stringResource(id = R.string.updates) ) } @@ -141,7 +145,7 @@ fun InstalledPage(viewModel: MainNavFragmentViewModelX) { icon = { Icon( modifier = Modifier.size(18.dp), - painter = painterResource(id = R.drawable.ic_download), + imageVector = Phosphor.Download, contentDescription = stringResource(id = R.string.update_all) ) }, @@ -177,7 +181,7 @@ fun InstalledPage(viewModel: MainNavFragmentViewModelX) { icon = { Icon( modifier = Modifier.size(18.dp), - painter = painterResource(id = R.drawable.ic_sort), + imageVector = Phosphor.FunnelSimple, contentDescription = stringResource(id = R.string.sort_filter) ) }, diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt index 0da17b0b..c126bf75 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/LatestPage.kt @@ -23,7 +23,6 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.machiav3lli.fdroid.R @@ -31,6 +30,8 @@ import com.machiav3lli.fdroid.content.Preferences import com.machiav3lli.fdroid.ui.activities.MainActivityX import com.machiav3lli.fdroid.ui.compose.ProductsHorizontalRecycler import com.machiav3lli.fdroid.ui.compose.components.ProductsListItem +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.FunnelSimple import com.machiav3lli.fdroid.ui.compose.theme.AppTheme import com.machiav3lli.fdroid.ui.navigation.NavItem import com.machiav3lli.fdroid.ui.viewmodels.MainNavFragmentViewModelX @@ -118,7 +119,7 @@ fun LatestPage(viewModel: MainNavFragmentViewModelX) { icon = { Icon( modifier = Modifier.size(18.dp), - painter = painterResource(id = R.drawable.ic_sort), + imageVector = Phosphor.FunnelSimple, contentDescription = stringResource(id = R.string.sort_filter) ) },