From 1b843aadd75fdbe737c1f4a8ee18e15d3c135dcb Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 4 Oct 2022 03:14:55 +0200 Subject: [PATCH] Update: Replace Material icons with Phosphor in PrefsRepos Page --- .../ui/compose/icons/phosphor/PlusCircle.kt | 60 +++++++++++++++++++ .../fdroid/ui/pages/PrefsReposPage.kt | 10 +++- 2 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/PlusCircle.kt diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/PlusCircle.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/PlusCircle.kt new file mode 100644 index 00000000..ec3b5c9c --- /dev/null +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/compose/icons/phosphor/PlusCircle.kt @@ -0,0 +1,60 @@ +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.PlusCircle: ImageVector + get() { + if (_plus_circle != null) { + return _plus_circle!! + } + _plus_circle = Builder( + name = "Plus-circle", + 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, 24.0f) + arcTo(104.0f, 104.0f, 0.0f, true, false, 232.0f, 128.0f) + arcTo(104.1f, 104.1f, 0.0f, false, false, 128.0f, 24.0f) + close() + moveTo(128.0f, 216.0f) + arcToRelative(88.0f, 88.0f, 0.0f, true, true, 88.0f, -88.0f) + arcTo(88.1f, 88.1f, 0.0f, false, true, 128.0f, 216.0f) + close() + moveTo(176.0f, 128.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, true, -8.0f, 8.0f) + lineTo(136.0f, 136.0f) + verticalLineToRelative(32.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, true, -16.0f, 0.0f) + lineTo(120.0f, 136.0f) + lineTo(88.0f, 136.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, true, 0.0f, -16.0f) + horizontalLineToRelative(32.0f) + lineTo(120.0f, 88.0f) + arcToRelative(8.0f, 8.0f, 0.0f, false, true, 16.0f, 0.0f) + verticalLineToRelative(32.0f) + horizontalLineToRelative(32.0f) + arcTo(8.0f, 8.0f, 0.0f, false, true, 176.0f, 128.0f) + close() + } + } + .build() + return _plus_circle!! + } + +private var _plus_circle: ImageVector? = null diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsReposPage.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsReposPage.kt index fd7c4fc0..5a04adb4 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsReposPage.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/pages/PrefsReposPage.kt @@ -1,9 +1,9 @@ package com.machiav3lli.fdroid.ui.pages +import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.rounded.Add +import androidx.compose.foundation.layout.width import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExtendedFloatingActionButton import androidx.compose.material3.Icon @@ -17,9 +17,12 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import com.machiav3lli.fdroid.R import com.machiav3lli.fdroid.ui.activities.PrefsActivityX import com.machiav3lli.fdroid.ui.compose.RepositoriesRecycler +import com.machiav3lli.fdroid.ui.compose.icons.Phosphor +import com.machiav3lli.fdroid.ui.compose.icons.phosphor.PlusCircle import com.machiav3lli.fdroid.ui.fragments.EditRepositorySheetX import com.machiav3lli.fdroid.ui.fragments.RepositorySheetX import com.machiav3lli.fdroid.ui.viewmodels.RepositoriesViewModelX @@ -61,9 +64,10 @@ fun PrefsReposPage(viewModel: RepositoriesViewModelX) { ) }) { Icon( - imageVector = Icons.Rounded.Add, + imageVector = Phosphor.PlusCircle, contentDescription = stringResource(id = R.string.add_repository) ) + Spacer(modifier = Modifier.width(6.dp)) Text(text = stringResource(id = R.string.add_repository)) } }