From 9faa6595d727c6980a73daf2501b0f470198b353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20P=C3=B6hn?= <michael@poehn.at>
Date: Sat, 25 Nov 2023 13:48:37 +0100
Subject: [PATCH] =?UTF-8?q?=E2=9C=82=EF=B8=8F=20caption=20text=20sytling?=
 =?UTF-8?q?=20into=20composable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/fdroid/fdroid/compose/ComposeUtils.kt | 13 +++++++++----
 .../fdroid/views/IpfsGatewaySettingsActivity.kt    | 14 +++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt b/app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
index b1e48b32c..c8fc725f6 100644
--- a/app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
+++ b/app/src/main/java/org/fdroid/fdroid/compose/ComposeUtils.kt
@@ -143,9 +143,14 @@ object ComposeUtils {
     }
 
     /**
-     * reuse-able Modifier for making all captions in settings (and other places?) look the same
+     * Composable that mimics MDC TextView with `@style/CaptionText`
      */
-    fun Modifier.captionModifier() = this.then(
-        Modifier.padding(0.dp, 16.dp, 0.dp, 4.dp)
-    )
+    @Composable
+    fun CaptionText(text: String) {
+        Text(
+            text = text,
+            style = MaterialTheme.typography.caption,
+            modifier = Modifier.padding(0.dp, 16.dp, 0.dp, 4.dp)
+        )
+    }
 }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt b/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
index c7ebd70a1..2e256474d 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
+++ b/app/src/main/java/org/fdroid/fdroid/views/IpfsGatewaySettingsActivity.kt
@@ -44,9 +44,9 @@ import androidx.lifecycle.Lifecycle
 import org.fdroid.fdroid.IPreferencesIpfs
 import org.fdroid.fdroid.Preferences
 import org.fdroid.fdroid.R
+import org.fdroid.fdroid.compose.ComposeUtils
 import org.fdroid.fdroid.compose.ComposeUtils.FDroidContent
 import org.fdroid.fdroid.compose.ComposeUtils.LifecycleEventListener
-import org.fdroid.fdroid.compose.ComposeUtils.captionModifier
 
 class IpfsGatewaySettingsActivity : ComponentActivity() {
 
@@ -139,11 +139,7 @@ fun DefaultGatewaysSettings(
     var disabledDefaultGateways by remember { mutableStateOf(prefs.ipfsGwDisabledDefaults) }
 
     Column {
-        Text(
-            text = stringResource(id = R.string.ipfsgw_caption_official_gateways),
-            style = MaterialTheme.typography.caption,
-            modifier = Modifier.captionModifier()
-        )
+        ComposeUtils.CaptionText(text = stringResource(id = R.string.ipfsgw_caption_official_gateways))
         for (gatewayUrl in Preferences.DEFAULT_IPFS_GATEWAYS) {
             Row(
                 modifier = Modifier
@@ -195,11 +191,7 @@ fun UserGatewaysSettings(
 
     Column {
         if (userGateways.isNotEmpty()) {
-            Text(
-                text = stringResource(id = R.string.ipfsgw_caption_custom_gateways),
-                style = MaterialTheme.typography.caption,
-                modifier = Modifier.captionModifier()
-            )
+            ComposeUtils.CaptionText(text = stringResource(id = R.string.ipfsgw_caption_custom_gateways))
         }
         for (gatewayUrl in userGateways) {
             Row(