From 7865ddcbfa62410e8c8f6f93c697affc12145255 Mon Sep 17 00:00:00 2001 From: Yogesh Choudhary Paliyal Date: Sun, 3 Mar 2024 16:30:52 +0530 Subject: [PATCH] feat: add icons for credentials backup and imports (#812) * feat: add icons for credentials backup and imports * fix: spotless --- .../keypass/ui/commonComponents/PreferenceItem.kt | 6 +++++- .../yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt | 3 +++ app/src/main/res/drawable/credentials_backup.xml | 4 ++++ app/src/main/res/drawable/import_credentials.xml | 4 ++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable/credentials_backup.xml create mode 100644 app/src/main/res/drawable/import_credentials.xml diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/commonComponents/PreferenceItem.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/commonComponents/PreferenceItem.kt index 87318642..62bc2145 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/commonComponents/PreferenceItem.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/commonComponents/PreferenceItem.kt @@ -15,6 +15,7 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.res.stringResource @@ -26,6 +27,7 @@ fun PreferenceItem( @StringRes summary: Int? = null, summaryStr: String? = null, icon: ImageVector? = null, + painter: Painter? = null, isCategory: Boolean = false, removeIconSpace: Boolean = false, onClickItem: (() -> Unit)? = null @@ -42,7 +44,9 @@ fun PreferenceItem( ) { if (!removeIconSpace) { Box(modifier = Modifier.width(56.dp), Alignment.CenterStart) { - if (icon != null) { + if (painter != null) { + Icon(painter = painter, contentDescription = "") + } else if (icon != null) { Icon(painter = rememberVectorPainter(image = icon), contentDescription = "") } } diff --git a/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt b/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt index 1fac72c7..739ef348 100644 --- a/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt +++ b/app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt @@ -24,6 +24,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.yogeshpaliyal.common.utils.email @@ -59,12 +60,14 @@ fun MySettingCompose() { Column { PreferenceItem(title = R.string.security, isCategory = true) PreferenceItem( + painter = painterResource(id = R.drawable.credentials_backup), title = R.string.credentials_backups, summary = R.string.credentials_backups_desc ) { dispatchAction(NavigationAction(BackupScreenState())) } PreferenceItem( + painter = painterResource(id = R.drawable.import_credentials), title = R.string.restore_credentials, summary = R.string.restore_credentials_desc ) { diff --git a/app/src/main/res/drawable/credentials_backup.xml b/app/src/main/res/drawable/credentials_backup.xml new file mode 100644 index 00000000..61583cce --- /dev/null +++ b/app/src/main/res/drawable/credentials_backup.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/import_credentials.xml b/app/src/main/res/drawable/import_credentials.xml new file mode 100644 index 00000000..6593a094 --- /dev/null +++ b/app/src/main/res/drawable/import_credentials.xml @@ -0,0 +1,4 @@ + + +