From 31d98eb0a46f8ad8ab582330e3e186a017114715 Mon Sep 17 00:00:00 2001
From: Milan Cerovsky <milan@z.cash>
Date: Wed, 4 Sep 2024 17:21:55 +0200
Subject: [PATCH] #1420 Code cleanup

Closes #1420
---
 .../preference/AndroidPreferenceProvider.kt   |  7 ++--
 .../zcash/ui/design/component/Button.kt       | 32 -------------------
 .../zcash/ui/design/component/RadioButton.kt  | 10 +++---
 3 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/preference-impl-android-lib/src/main/java/co/electriccoin/zcash/preference/AndroidPreferenceProvider.kt b/preference-impl-android-lib/src/main/java/co/electriccoin/zcash/preference/AndroidPreferenceProvider.kt
index 1c86773e..f54aa23e 100644
--- a/preference-impl-android-lib/src/main/java/co/electriccoin/zcash/preference/AndroidPreferenceProvider.kt
+++ b/preference-impl-android-lib/src/main/java/co/electriccoin/zcash/preference/AndroidPreferenceProvider.kt
@@ -93,7 +93,7 @@ class AndroidPreferenceProvider private constructor(
             .map { getString(key) }
 
     companion object {
-        fun newStandard(
+        suspend fun newStandard(
             context: Context,
             filename: String
         ): PreferenceProvider {
@@ -103,7 +103,10 @@ class AndroidPreferenceProvider private constructor(
              */
             val singleThreadedDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
 
-            val sharedPreferences = context.getSharedPreferences(filename, Context.MODE_PRIVATE)
+            val sharedPreferences =
+                withContext(singleThreadedDispatcher) {
+                    context.getSharedPreferences(filename, Context.MODE_PRIVATE)
+                }
 
             return AndroidPreferenceProvider(sharedPreferences, singleThreadedDispatcher)
         }
diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt
index 18a8d6e6..330de8dc 100644
--- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt
+++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/Button.kt
@@ -47,7 +47,6 @@ import co.electriccoin.zcash.ui.design.theme.internal.ButtonColors
 import co.electriccoin.zcash.ui.design.theme.internal.DarkTertiaryButtonColors
 import co.electriccoin.zcash.ui.design.theme.internal.LightTertiaryButtonColors
 import co.electriccoin.zcash.ui.design.util.StringResource
-import co.electriccoin.zcash.ui.design.util.getValue
 
 @Preview
 @Composable
@@ -270,37 +269,6 @@ fun PrimaryButton(
     }
 }
 
-@Composable
-@Suppress("LongParameterList", "LongMethod")
-fun PrimaryButton(
-    state: ButtonState,
-    modifier: Modifier = Modifier,
-    minWidth: Dp = ZcashTheme.dimens.buttonWidth,
-    minHeight: Dp = ZcashTheme.dimens.buttonHeight,
-    buttonColors: ButtonColors = ZcashTheme.colors.primaryButtonColors,
-    textStyle: TextStyle = ZcashTheme.extendedTypography.buttonText,
-    outerPaddingValues: PaddingValues =
-        PaddingValues(
-            horizontal = ZcashTheme.dimens.spacingNone,
-            vertical = ZcashTheme.dimens.spacingSmall
-        ),
-    contentPaddingValues: PaddingValues = PaddingValues(all = 17.dp)
-) {
-    PrimaryButton(
-        onClick = state.onClick,
-        text = state.text.getValue(),
-        enabled = state.isEnabled,
-        showProgressBar = state.isLoading,
-        modifier = modifier,
-        minWidth = minWidth,
-        minHeight = minHeight,
-        buttonColors = buttonColors,
-        textStyle = textStyle,
-        outerPaddingValues = outerPaddingValues,
-        contentPaddingValues = contentPaddingValues,
-    )
-}
-
 @Composable
 @Suppress("LongParameterList", "LongMethod")
 fun SecondaryButton(
diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/RadioButton.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/RadioButton.kt
index 22429d44..8f54d38a 100644
--- a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/RadioButton.kt
+++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/RadioButton.kt
@@ -158,8 +158,10 @@ data class RadioButtonState(
     val onClick: () -> Unit,
 )
 
+@Suppress("UnusedPrivateMember")
+@PreviewScreens
 @Composable
-private fun RadioButtonPreview() =
+private fun RadioButtonPreview() = ZcashTheme {
     BlankBgColumn {
         var isChecked by remember { mutableStateOf(false) }
 
@@ -184,8 +186,4 @@ private fun RadioButtonPreview() =
             ),
         )
     }
-
-@Suppress("UnusedPrivateMember")
-@PreviewScreens
-@Composable
-private fun RadioButtonPreviewLight() = ZcashTheme { RadioButtonPreview() }
+}