From 75502edb217537efa6fbdfa7bcafcbc5f3289ed4 Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Mon, 13 Jan 2025 16:20:14 -0800
Subject: [PATCH 01/11] Convert XML styles to Compose

---
 .../org/wikipedia/compose/ComposeStyles.kt    | 76 +++++++++++++++++++
 .../compose/styles/WikipediaStyle.kt          | 55 ++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
 create mode 100644 app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt

diff --git a/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt b/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
new file mode 100644
index 00000000000..a06c3deae95
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
@@ -0,0 +1,76 @@
+package org.wikipedia.compose
+
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+object ComposeStyles {
+
+    val H1 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp,
+        lineHeight = 32.sp
+    )
+
+    val H1_AppBar = H1.copy(lineHeight = 24.sp)
+
+    val H1_Article = H1.copy(
+        fontFamily = FontFamily.Serif,
+        fontWeight = FontWeight.Normal
+    )
+
+    val H2 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+        lineHeight = 28.sp
+    )
+
+    val H3 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 16.sp,
+        lineHeight = 24.sp
+    )
+
+    val H3_Button = H3.copy(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Medium
+    )
+
+    val H3_Article = H3.copy(
+        fontFamily = FontFamily.Serif,
+        fontWeight = FontWeight.Normal
+    )
+
+
+    val P = H3.copy(fontWeight = FontWeight.Normal)
+
+    val P_Article = P.copy(lineHeight = 28.sp)
+
+    val H4 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 14.sp,
+        lineHeight = 24.sp
+    )
+
+    val List = H4.copy(
+        fontWeight = FontWeight.Normal
+    )
+
+    val Chip = H4.copy(
+        fontWeight = FontWeight.Medium
+    )
+
+    val H5 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 12.sp,
+        lineHeight = 18.sp
+    )
+
+    val Small = H5.copy(fontWeight = FontWeight.Medium)
+}
diff --git a/app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt b/app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt
new file mode 100644
index 00000000000..3ecadd184d1
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt
@@ -0,0 +1,55 @@
+package org.wikipedia.compose.styles
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Snackbar
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.wikipedia.compose.ComposeStyles
+import org.wikipedia.compose.theme.WikipediaTheme
+
+object WikipediaStyle {
+
+    @Composable
+    fun Snackbar(
+        message: String,
+        actionLabel: String? = null,
+        onActionClick: (() -> Unit)? = null,
+        modifier: Modifier = Modifier
+    ) {
+        Snackbar(
+            action = {
+                if (actionLabel != null && onActionClick != null) {
+                    TextButton(
+                        onClick = onActionClick,
+                        modifier = Modifier.padding(end = 8.dp)
+                    ) {
+                        Text(
+                            text = actionLabel,
+                            style = ComposeStyles.H3_Button.copy(
+                                color = WikipediaTheme.colors.progressiveColor
+                            )
+                        )
+                    }
+                }
+            },
+            modifier = modifier.padding(16.dp)
+        ) {
+            Text(
+                text = message,
+                style = ComposeStyles.H3_Button.copy(
+                    color = WikipediaTheme.colors.primaryColor,
+                    letterSpacing = 0.sp
+                ),
+                maxLines = 10,
+                overflow = TextOverflow.Ellipsis,
+                modifier = Modifier
+                    .padding(top = 0.dp, bottom = 0.dp, start = 0.dp, end = 8.dp)
+            )
+        }
+    }
+}

From 88a993023c114ca19c315c35fa8eb37713763c9a Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Mon, 13 Jan 2025 16:29:17 -0800
Subject: [PATCH 02/11] Lint

---
 app/src/main/java/org/wikipedia/compose/ComposeStyles.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt b/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
index a06c3deae95..663e64a66cd 100644
--- a/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
+++ b/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
@@ -45,7 +45,6 @@ object ComposeStyles {
         fontWeight = FontWeight.Normal
     )
 
-
     val P = H3.copy(fontWeight = FontWeight.Normal)
 
     val P_Article = P.copy(lineHeight = 28.sp)

From d3d83555f5f1e1fffbc0cda0be90f1a70732f1de Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Tue, 14 Jan 2025 16:16:25 -0800
Subject: [PATCH 03/11] Code review comments

---
 .../org/wikipedia/compose/ComposeStyles.kt    | 75 ----------------
 .../WikiSnackbar.kt}                          |  9 +-
 .../wikipedia/compose/theme/WikipediaTheme.kt |  7 +-
 .../compose/theme/WikipediaTypography.kt      | 90 +++++++++++++++++++
 4 files changed, 100 insertions(+), 81 deletions(-)
 delete mode 100644 app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
 rename app/src/main/java/org/wikipedia/compose/{styles/WikipediaStyle.kt => components/WikiSnackbar.kt} (87%)
 create mode 100644 app/src/main/java/org/wikipedia/compose/theme/WikipediaTypography.kt

diff --git a/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt b/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
deleted file mode 100644
index 663e64a66cd..00000000000
--- a/app/src/main/java/org/wikipedia/compose/ComposeStyles.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.wikipedia.compose
-
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
-
-object ComposeStyles {
-
-    val H1 = TextStyle(
-        fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Bold,
-        fontSize = 24.sp,
-        lineHeight = 32.sp
-    )
-
-    val H1_AppBar = H1.copy(lineHeight = 24.sp)
-
-    val H1_Article = H1.copy(
-        fontFamily = FontFamily.Serif,
-        fontWeight = FontWeight.Normal
-    )
-
-    val H2 = TextStyle(
-        fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Bold,
-        fontSize = 20.sp,
-        lineHeight = 28.sp
-    )
-
-    val H3 = TextStyle(
-        fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Bold,
-        fontSize = 16.sp,
-        lineHeight = 24.sp
-    )
-
-    val H3_Button = H3.copy(
-        fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Medium
-    )
-
-    val H3_Article = H3.copy(
-        fontFamily = FontFamily.Serif,
-        fontWeight = FontWeight.Normal
-    )
-
-    val P = H3.copy(fontWeight = FontWeight.Normal)
-
-    val P_Article = P.copy(lineHeight = 28.sp)
-
-    val H4 = TextStyle(
-        fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Bold,
-        fontSize = 14.sp,
-        lineHeight = 24.sp
-    )
-
-    val List = H4.copy(
-        fontWeight = FontWeight.Normal
-    )
-
-    val Chip = H4.copy(
-        fontWeight = FontWeight.Medium
-    )
-
-    val H5 = TextStyle(
-        fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Bold,
-        fontSize = 12.sp,
-        lineHeight = 18.sp
-    )
-
-    val Small = H5.copy(fontWeight = FontWeight.Medium)
-}
diff --git a/app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt b/app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt
similarity index 87%
rename from app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt
rename to app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt
index 3ecadd184d1..15e6b2aa8a3 100644
--- a/app/src/main/java/org/wikipedia/compose/styles/WikipediaStyle.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt
@@ -1,4 +1,4 @@
-package org.wikipedia.compose.styles
+package org.wikipedia.compose.components
 
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Snackbar
@@ -9,10 +9,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import org.wikipedia.compose.ComposeStyles
 import org.wikipedia.compose.theme.WikipediaTheme
 
-object WikipediaStyle {
+class WikiSnackbar {
 
     @Composable
     fun Snackbar(
@@ -30,7 +29,7 @@ object WikipediaStyle {
                     ) {
                         Text(
                             text = actionLabel,
-                            style = ComposeStyles.H3_Button.copy(
+                            style = WikipediaTheme.typography.h3.copy(
                                 color = WikipediaTheme.colors.progressiveColor
                             )
                         )
@@ -41,7 +40,7 @@ object WikipediaStyle {
         ) {
             Text(
                 text = message,
-                style = ComposeStyles.H3_Button.copy(
+                style = WikipediaTheme.typography.h3.copy(
                     color = WikipediaTheme.colors.primaryColor,
                     letterSpacing = 0.sp
                 ),
diff --git a/app/src/main/java/org/wikipedia/compose/theme/WikipediaTheme.kt b/app/src/main/java/org/wikipedia/compose/theme/WikipediaTheme.kt
index d1aa7fb0078..5f700e87bd2 100644
--- a/app/src/main/java/org/wikipedia/compose/theme/WikipediaTheme.kt
+++ b/app/src/main/java/org/wikipedia/compose/theme/WikipediaTheme.kt
@@ -22,7 +22,8 @@ fun BaseTheme(
     }
 
     CompositionLocalProvider(
-        LocalWikipediaColor provides wikipediaColorSystem
+        LocalWikipediaColor provides wikipediaColorSystem,
+        LocalWikipediaTypography provides Typography
     ) {
         content()
     }
@@ -32,4 +33,8 @@ object WikipediaTheme {
     val colors: WikipediaColor
         @Composable
         get() = LocalWikipediaColor.current
+
+    val typography: WikipediaTypography
+        @Composable
+        get() = LocalWikipediaTypography.current
 }
diff --git a/app/src/main/java/org/wikipedia/compose/theme/WikipediaTypography.kt b/app/src/main/java/org/wikipedia/compose/theme/WikipediaTypography.kt
new file mode 100644
index 00000000000..9eb32d4a6a5
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/compose/theme/WikipediaTypography.kt
@@ -0,0 +1,90 @@
+package org.wikipedia.compose.theme
+
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+@Immutable
+data class WikipediaTypography(
+    val h1: TextStyle = TextStyle(),
+    val h2: TextStyle = TextStyle(),
+    val h3: TextStyle = TextStyle(),
+    val h4: TextStyle = TextStyle(),
+    val h5: TextStyle = TextStyle(),
+    val p: TextStyle = TextStyle(),
+    val button: TextStyle = TextStyle(),
+    val article: TextStyle = TextStyle(),
+    val list: TextStyle = TextStyle(),
+    val chip: TextStyle = TextStyle(),
+    val small: TextStyle = TextStyle()
+)
+
+val LocalWikipediaTypography = staticCompositionLocalOf {
+    WikipediaTypography()
+}
+
+val Typography = WikipediaTypography(
+    h1 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp,
+        lineHeight = 32.sp
+    ),
+    h2 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 20.sp,
+        lineHeight = 28.sp
+    ),
+    h3 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 16.sp,
+        lineHeight = 24.sp
+    ),
+    h4 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 14.sp,
+        lineHeight = 24.sp
+    ),
+    h5 = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Bold,
+        fontSize = 12.sp,
+        lineHeight = 18.sp
+    ),
+    button = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Medium,
+        fontSize = 16.sp,
+        lineHeight = 24.sp
+    ),
+    article = TextStyle(
+        fontFamily = FontFamily.Serif,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp
+    ),
+    list = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Normal,
+        fontSize = 14.sp,
+        lineHeight = 24.sp
+    ),
+    chip = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Medium,
+        fontSize = 14.sp,
+        lineHeight = 24.sp
+    ),
+    small = TextStyle(
+        fontFamily = FontFamily.SansSerif,
+        fontWeight = FontWeight.Medium,
+        fontSize = 12.sp,
+        lineHeight = 18.sp
+    )
+)

From 79ae7d05877bc49690f64b114b97c8099cf3ecdf Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Tue, 14 Jan 2025 17:13:00 -0800
Subject: [PATCH 04/11] Adding button styles

---
 .../compose/components/WikiButtons.kt         | 168 ++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt

diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
new file mode 100644
index 00000000000..6f09300435b
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
@@ -0,0 +1,168 @@
+package org.wikipedia.compose.components
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.wikipedia.compose.theme.WikipediaTheme
+
+class WikiButtons {
+
+    @Composable
+    fun Button(
+        text: String,
+        backgroundColor: Color = WikipediaTheme.colors.progressiveColor,
+        contentColor: Color = WikipediaTheme.colors.paperColor,
+        icon: @Composable (() -> Unit)? = null,
+        onClick: () -> Unit,
+        modifier: Modifier = Modifier
+    ) {
+        Button(
+            onClick = onClick,
+            modifier = modifier,
+            colors = ButtonDefaults.buttonColors(
+                containerColor = backgroundColor,
+                contentColor = contentColor,
+            ),
+            contentPadding = ButtonDefaults.ContentPadding
+        ) {
+            icon?.invoke()
+            Text(
+                text = text,
+                fontSize = 16.sp,
+                modifier = Modifier.padding(start = 8.dp, end = 8.dp)
+            )
+        }
+    }
+
+    @Composable
+    fun TextButton(
+        text: String,
+        contentColor: Color = WikipediaTheme.colors.progressiveColor,
+        icon: @Composable (() -> Unit)? = null,
+        onClick: () -> Unit,
+        modifier: Modifier = Modifier,
+    ) {
+        Button(
+            onClick = onClick,
+            modifier = modifier,
+            colors = ButtonDefaults.buttonColors(
+                containerColor = Color.Transparent,
+                contentColor = contentColor
+            ),
+            elevation = ButtonDefaults.elevatedButtonElevation(0.dp)
+        ) {
+            icon?.invoke()
+            Text(
+                text = text,
+                fontSize = 16.sp
+            )
+        }
+    }
+
+    @Composable
+    fun OutlineButton(
+        text: String,
+        backgroundColor: Color = WikipediaTheme.colors.paperColor,
+        contentColor: Color = WikipediaTheme.colors.progressiveColor,
+        borderColor: Color = WikipediaTheme.colors.borderColor,
+        cornerRadius: Int = 8,
+        strokeWidth: Int = 1,
+        icon: @Composable (() -> Unit)? = null,
+        onClick: () -> Unit,
+        modifier: Modifier = Modifier
+    ) {
+        Button(
+            onClick = onClick,
+            modifier = modifier.border(
+                width = strokeWidth.dp,
+                color = borderColor,
+                shape = RoundedCornerShape(cornerRadius.dp)
+            ),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = backgroundColor,
+                contentColor = contentColor
+            )
+        ) {
+            icon?.invoke()
+            Text(
+                text = text,
+                fontSize = 16.sp
+            )
+        }
+    }
+
+    @Composable
+    fun SmallOutlineButton(
+        text: String,
+        backgroundColor: Color = WikipediaTheme.colors.paperColor,
+        contentColor: Color = WikipediaTheme.colors.progressiveColor,
+        borderColor: Color = WikipediaTheme.colors.borderColor,
+        cornerRadius: Int = 16,
+        icon: @Composable (() -> Unit)? = null,
+        onClick: () -> Unit,
+        modifier: Modifier = Modifier
+    ) {
+        Button(
+            onClick = onClick,
+            modifier = modifier.border(
+                width = 1.dp,
+                color = borderColor,
+                shape = RoundedCornerShape(cornerRadius.dp)
+            ),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = backgroundColor,
+                contentColor = contentColor
+            ),
+            contentPadding = PaddingValues(horizontal = 16.dp)
+        ) {
+            icon?.invoke()
+            Text(
+                text = text,
+                fontSize = 16.sp
+            )
+        }
+    }
+
+    @Composable
+    fun ThemeColorCircularButton(
+        text: String = "Aa",
+        backgroundColor: Color,
+        contentColor: Color,
+        borderColor: Color,
+        onClick: () -> Unit,
+        modifier: Modifier = Modifier
+    ) {
+        Button(
+            onClick = onClick,
+            modifier = modifier.size(40.dp).border(
+                width = 1.dp,
+                color = borderColor,
+                shape = CircleShape
+            ),
+            colors = ButtonDefaults.buttonColors(
+                containerColor = backgroundColor,
+                contentColor = contentColor
+            ),
+            contentPadding = PaddingValues(0.dp)
+        ) {
+            Text(
+                text = text,
+                style = WikipediaTheme.typography.h3.copy(
+                    color = WikipediaTheme.colors.primaryColor,
+                    letterSpacing = 0.sp
+                )
+            )
+        }
+    }
+}

From a993d795f63cdbccb9a6bc6dec231aa233c97030 Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Wed, 15 Jan 2025 11:23:20 -0800
Subject: [PATCH 05/11] Code review comments

---
 .../compose/components/WikiButtons.kt         | 245 ++++++++----------
 .../compose/components/WikiSnackbar.kt        |  71 +++--
 2 files changed, 144 insertions(+), 172 deletions(-)

diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
index 6f09300435b..bed3d6da63d 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
@@ -2,7 +2,6 @@ package org.wikipedia.compose.components
 
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -16,153 +15,129 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.wikipedia.compose.theme.WikipediaTheme
 
-class WikiButtons {
-
-    @Composable
-    fun Button(
-        text: String,
-        backgroundColor: Color = WikipediaTheme.colors.progressiveColor,
-        contentColor: Color = WikipediaTheme.colors.paperColor,
-        icon: @Composable (() -> Unit)? = null,
-        onClick: () -> Unit,
-        modifier: Modifier = Modifier
+@Composable
+fun Button(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = WikipediaTheme.colors.progressiveColor,
+    contentColor: Color = WikipediaTheme.colors.paperColor,
+    content: @Composable (() -> Unit)
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier,
+        colors = ButtonDefaults.buttonColors(
+            containerColor = backgroundColor,
+            contentColor = contentColor,
+        ),
+        contentPadding = ButtonDefaults.ContentPadding
     ) {
-        Button(
-            onClick = onClick,
-            modifier = modifier,
-            colors = ButtonDefaults.buttonColors(
-                containerColor = backgroundColor,
-                contentColor = contentColor,
-            ),
-            contentPadding = ButtonDefaults.ContentPadding
-        ) {
-            icon?.invoke()
-            Text(
-                text = text,
-                fontSize = 16.sp,
-                modifier = Modifier.padding(start = 8.dp, end = 8.dp)
-            )
-        }
+        content()
     }
+}
 
-    @Composable
-    fun TextButton(
-        text: String,
-        contentColor: Color = WikipediaTheme.colors.progressiveColor,
-        icon: @Composable (() -> Unit)? = null,
-        onClick: () -> Unit,
-        modifier: Modifier = Modifier,
+@Composable
+fun TextButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    contentColor: Color = WikipediaTheme.colors.progressiveColor,
+    content: @Composable (() -> Unit)
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier,
+        colors = ButtonDefaults.buttonColors(
+            containerColor = Color.Transparent,
+            contentColor = contentColor
+        ),
+        elevation = ButtonDefaults.elevatedButtonElevation(0.dp)
     ) {
-        Button(
-            onClick = onClick,
-            modifier = modifier,
-            colors = ButtonDefaults.buttonColors(
-                containerColor = Color.Transparent,
-                contentColor = contentColor
-            ),
-            elevation = ButtonDefaults.elevatedButtonElevation(0.dp)
-        ) {
-            icon?.invoke()
-            Text(
-                text = text,
-                fontSize = 16.sp
-            )
-        }
+        content()
     }
+}
 
-    @Composable
-    fun OutlineButton(
-        text: String,
-        backgroundColor: Color = WikipediaTheme.colors.paperColor,
-        contentColor: Color = WikipediaTheme.colors.progressiveColor,
-        borderColor: Color = WikipediaTheme.colors.borderColor,
-        cornerRadius: Int = 8,
-        strokeWidth: Int = 1,
-        icon: @Composable (() -> Unit)? = null,
-        onClick: () -> Unit,
-        modifier: Modifier = Modifier
+@Composable
+fun OutlineButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = WikipediaTheme.colors.paperColor,
+    contentColor: Color = WikipediaTheme.colors.progressiveColor,
+    borderColor: Color = WikipediaTheme.colors.borderColor,
+    cornerRadius: Int = 8,
+    strokeWidth: Int = 1,
+    content: @Composable (() -> Unit)
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.border(
+            width = strokeWidth.dp,
+            color = borderColor,
+            shape = RoundedCornerShape(cornerRadius.dp)
+        ),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = backgroundColor,
+            contentColor = contentColor
+        )
     ) {
-        Button(
-            onClick = onClick,
-            modifier = modifier.border(
-                width = strokeWidth.dp,
-                color = borderColor,
-                shape = RoundedCornerShape(cornerRadius.dp)
-            ),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = backgroundColor,
-                contentColor = contentColor
-            )
-        ) {
-            icon?.invoke()
-            Text(
-                text = text,
-                fontSize = 16.sp
-            )
-        }
+        content()
     }
+}
 
-    @Composable
-    fun SmallOutlineButton(
-        text: String,
-        backgroundColor: Color = WikipediaTheme.colors.paperColor,
-        contentColor: Color = WikipediaTheme.colors.progressiveColor,
-        borderColor: Color = WikipediaTheme.colors.borderColor,
-        cornerRadius: Int = 16,
-        icon: @Composable (() -> Unit)? = null,
-        onClick: () -> Unit,
-        modifier: Modifier = Modifier
+@Composable
+fun SmallOutlineButton(
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    backgroundColor: Color = WikipediaTheme.colors.paperColor,
+    contentColor: Color = WikipediaTheme.colors.progressiveColor,
+    borderColor: Color = WikipediaTheme.colors.borderColor,
+    cornerRadius: Int = 16,
+    content: @Composable (() -> Unit)
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.border(
+            width = 1.dp,
+            color = borderColor,
+            shape = RoundedCornerShape(cornerRadius.dp)
+        ),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = backgroundColor,
+            contentColor = contentColor
+        ),
+        contentPadding = PaddingValues(horizontal = 16.dp)
     ) {
-        Button(
-            onClick = onClick,
-            modifier = modifier.border(
-                width = 1.dp,
-                color = borderColor,
-                shape = RoundedCornerShape(cornerRadius.dp)
-            ),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = backgroundColor,
-                contentColor = contentColor
-            ),
-            contentPadding = PaddingValues(horizontal = 16.dp)
-        ) {
-            icon?.invoke()
-            Text(
-                text = text,
-                fontSize = 16.sp
-            )
-        }
+        content()
     }
+}
 
-    @Composable
-    fun ThemeColorCircularButton(
-        text: String = "Aa",
-        backgroundColor: Color,
-        contentColor: Color,
-        borderColor: Color,
-        onClick: () -> Unit,
-        modifier: Modifier = Modifier
+@Composable
+fun ThemeColorCircularButton(
+    onClick: () -> Unit,
+    text: String = "Aa",
+    modifier: Modifier = Modifier,
+    backgroundColor: Color,
+    contentColor: Color,
+    borderColor: Color
+) {
+    Button(
+        onClick = onClick,
+        modifier = modifier.size(40.dp).border(
+            width = 1.dp,
+            color = borderColor,
+            shape = CircleShape
+        ),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = backgroundColor,
+            contentColor = contentColor
+        ),
+        contentPadding = PaddingValues(0.dp)
     ) {
-        Button(
-            onClick = onClick,
-            modifier = modifier.size(40.dp).border(
-                width = 1.dp,
-                color = borderColor,
-                shape = CircleShape
-            ),
-            colors = ButtonDefaults.buttonColors(
-                containerColor = backgroundColor,
-                contentColor = contentColor
-            ),
-            contentPadding = PaddingValues(0.dp)
-        ) {
-            Text(
-                text = text,
-                style = WikipediaTheme.typography.h3.copy(
-                    color = WikipediaTheme.colors.primaryColor,
-                    letterSpacing = 0.sp
-                )
+        Text(
+            text = text,
+            style = WikipediaTheme.typography.h3.copy(
+                color = WikipediaTheme.colors.primaryColor,
+                letterSpacing = 0.sp
             )
-        }
+        )
     }
 }
diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt b/app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt
index 15e6b2aa8a3..a59f9ac613a 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt
@@ -11,44 +11,41 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.wikipedia.compose.theme.WikipediaTheme
 
-class WikiSnackbar {
-
-    @Composable
-    fun Snackbar(
-        message: String,
-        actionLabel: String? = null,
-        onActionClick: (() -> Unit)? = null,
-        modifier: Modifier = Modifier
-    ) {
-        Snackbar(
-            action = {
-                if (actionLabel != null && onActionClick != null) {
-                    TextButton(
-                        onClick = onActionClick,
-                        modifier = Modifier.padding(end = 8.dp)
-                    ) {
-                        Text(
-                            text = actionLabel,
-                            style = WikipediaTheme.typography.h3.copy(
-                                color = WikipediaTheme.colors.progressiveColor
-                            )
+@Composable
+fun Snackbar(
+    message: String,
+    modifier: Modifier = Modifier,
+    actionLabel: String? = null,
+    onActionClick: (() -> Unit)? = null,
+) {
+    Snackbar(
+        action = {
+            if (actionLabel != null && onActionClick != null) {
+                TextButton(
+                    onClick = onActionClick,
+                    modifier = Modifier.padding(end = 8.dp)
+                ) {
+                    Text(
+                        text = actionLabel,
+                        style = WikipediaTheme.typography.h3.copy(
+                            color = WikipediaTheme.colors.progressiveColor
                         )
-                    }
+                    )
                 }
-            },
-            modifier = modifier.padding(16.dp)
-        ) {
-            Text(
-                text = message,
-                style = WikipediaTheme.typography.h3.copy(
-                    color = WikipediaTheme.colors.primaryColor,
-                    letterSpacing = 0.sp
-                ),
-                maxLines = 10,
-                overflow = TextOverflow.Ellipsis,
-                modifier = Modifier
-                    .padding(top = 0.dp, bottom = 0.dp, start = 0.dp, end = 8.dp)
-            )
-        }
+            }
+        },
+        modifier = modifier.padding(16.dp)
+    ) {
+        Text(
+            text = message,
+            style = WikipediaTheme.typography.h3.copy(
+                color = WikipediaTheme.colors.primaryColor,
+                letterSpacing = 0.sp
+            ),
+            maxLines = 10,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier
+                .padding(top = 0.dp, bottom = 0.dp, start = 0.dp, end = 8.dp)
+        )
     }
 }

From 139f88f484a507c4dd25e03772556881a8617033 Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Wed, 15 Jan 2025 15:36:33 -0800
Subject: [PATCH 06/11] Add TopAppBar and remove unused style

---
 .../compose/components/WikiActionBar.kt       | 54 +++++++++++++++++++
 .../compose/components/WikiButtons.kt         |  2 +-
 app/src/main/res/values/styles.xml            | 13 -----
 3 files changed, 55 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt

diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt b/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
new file mode 100644
index 00000000000..6a218ded66e
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
@@ -0,0 +1,54 @@
+package org.wikipedia.compose.components
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.wikipedia.compose.theme.WikipediaTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun WikiTopAppBar(
+    title: String,
+    onNavigationClick: (() -> Unit),
+    modifier: Modifier = Modifier
+) {
+    val navigationIcon = Icons.AutoMirrored.Filled.ArrowBack
+    val backgroundColor = WikipediaTheme.colors.paperColor
+    val elevation = 0.dp // Elevation set to 0dp
+    val titleStyle = WikipediaTheme.typography.h1.copy(
+        lineHeight = 24.sp
+    )
+
+    TopAppBar(
+        title = {
+            Text(
+                text = title,
+                style = titleStyle,
+                color = WikipediaTheme.colors.primaryColor
+            )
+        },
+        navigationIcon = {
+            IconButton(onClick = onNavigationClick) {
+                Icon(
+                    imageVector = navigationIcon,
+                    contentDescription = null
+                )
+            }
+        },
+        colors = TopAppBarDefaults.topAppBarColors().copy(
+            containerColor = backgroundColor,
+            titleContentColor = WikipediaTheme.colors.primaryColor
+        ),
+        modifier = modifier.shadow(elevation = elevation)
+    )
+}
diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
index bed3d6da63d..d68b75e8aa2 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.unit.sp
 import org.wikipedia.compose.theme.WikipediaTheme
 
 @Composable
-fun Button(
+fun AppButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     backgroundColor: Color = WikipediaTheme.colors.progressiveColor,
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2010a4f6e9d..d5664969a49 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -551,19 +551,6 @@
         <item name="errorTextAppearance">@style/TextInputLayoutErrorTextAppearance</item>
     </style>
 
-    <style name="SpinnerTextInputLayoutStyle" parent="Widget.MaterialComponents.TextInputLayout.FilledBox.ExposedDropdownMenu">
-        <item name="android:textColor">?attr/primary_color</item>
-        <item name="android:textColorHint">?attr/placeholder_color</item>
-        <item name="boxBackgroundColor">?attr/background_color</item>
-        <item name="boxStrokeColor">?attr/input_stroke_color_state</item>
-        <item name="hintTextColor">?attr/progressive_color</item>
-        <item name="helperTextTextColor">?attr/placeholder_color</item>
-        <item name="counterTextColor">?attr/placeholder_color</item>
-        <item name="errorTextColor">?attr/destructive_color</item>
-        <item name="boxStrokeErrorColor">?attr/destructive_color</item>
-        <item name="errorTextAppearance">@style/TextInputLayoutErrorTextAppearance</item>
-    </style>
-
     <style name="PagePopupMenu" parent="@style/Widget.Material3.PopupMenu.Overflow">
         <item name="android:dropDownHorizontalOffset">@dimen/popup_menu_drop_down_horizontal_offset</item>
         <item name="android:dropDownVerticalOffset">@dimen/popup_menu_drop_down_vertical_offset</item>

From 77e35c69084ca384ae28efa2452656cc7c6c218a Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Wed, 15 Jan 2025 15:46:56 -0800
Subject: [PATCH 07/11] Add parameters for Toolbar

---
 .../java/org/wikipedia/compose/components/WikiActionBar.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt b/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
index 6a218ded66e..192ae458264 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
@@ -11,6 +11,7 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.wikipedia.compose.theme.WikipediaTheme
@@ -20,12 +21,14 @@ import org.wikipedia.compose.theme.WikipediaTheme
 fun WikiTopAppBar(
     title: String,
     onNavigationClick: (() -> Unit),
+    titleStyle: TextStyle = WikipediaTheme.typography.h1,
+    elevation: Int = 0,
     modifier: Modifier = Modifier
 ) {
     val navigationIcon = Icons.AutoMirrored.Filled.ArrowBack
     val backgroundColor = WikipediaTheme.colors.paperColor
-    val elevation = 0.dp // Elevation set to 0dp
-    val titleStyle = WikipediaTheme.typography.h1.copy(
+    val elevation = elevation.dp
+    val titleStyle = titleStyle.copy(
         lineHeight = 24.sp
     )
 

From 9b40b3de7e7162821818315478593727b4a16e77 Mon Sep 17 00:00:00 2001
From: cooltey <coolteygame@gmail.com>
Date: Thu, 16 Jan 2025 16:07:09 -0800
Subject: [PATCH 08/11] Address comments

---
 .../org/wikipedia/compose/components/WikiButtons.kt  | 12 +++++-------
 .../{WikiActionBar.kt => WikiTopAppBar.kt}           | 11 ++++-------
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename app/src/main/java/org/wikipedia/compose/components/{WikiActionBar.kt => WikiTopAppBar.kt} (86%)

diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
index d68b75e8aa2..6cd0f859e65 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
@@ -37,7 +37,7 @@ fun AppButton(
 }
 
 @Composable
-fun TextButton(
+fun AppTextButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     contentColor: Color = WikipediaTheme.colors.progressiveColor,
@@ -116,19 +116,17 @@ fun ThemeColorCircularButton(
     text: String = "Aa",
     modifier: Modifier = Modifier,
     backgroundColor: Color,
-    contentColor: Color,
     borderColor: Color
 ) {
     Button(
         onClick = onClick,
-        modifier = modifier.size(40.dp).border(
-            width = 1.dp,
+        modifier = modifier.border(
+            width = 2.dp,
             color = borderColor,
             shape = CircleShape
-        ),
+        ).size(40.dp),
         colors = ButtonDefaults.buttonColors(
-            containerColor = backgroundColor,
-            contentColor = contentColor
+            containerColor = backgroundColor
         ),
         contentPadding = PaddingValues(0.dp)
     ) {
diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt b/app/src/main/java/org/wikipedia/compose/components/WikiTopAppBar.kt
similarity index 86%
rename from app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
rename to app/src/main/java/org/wikipedia/compose/components/WikiTopAppBar.kt
index 192ae458264..4e47d3f8942 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiActionBar.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiTopAppBar.kt
@@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.wikipedia.compose.theme.WikipediaTheme
@@ -21,16 +22,12 @@ import org.wikipedia.compose.theme.WikipediaTheme
 fun WikiTopAppBar(
     title: String,
     onNavigationClick: (() -> Unit),
-    titleStyle: TextStyle = WikipediaTheme.typography.h1,
-    elevation: Int = 0,
+    titleStyle: TextStyle = WikipediaTheme.typography.h1.copy(lineHeight = 24.sp),
+    elevation: Dp = 0.dp,
     modifier: Modifier = Modifier
 ) {
     val navigationIcon = Icons.AutoMirrored.Filled.ArrowBack
     val backgroundColor = WikipediaTheme.colors.paperColor
-    val elevation = elevation.dp
-    val titleStyle = titleStyle.copy(
-        lineHeight = 24.sp
-    )
 
     TopAppBar(
         title = {
@@ -48,7 +45,7 @@ fun WikiTopAppBar(
                 )
             }
         },
-        colors = TopAppBarDefaults.topAppBarColors().copy(
+        colors = TopAppBarDefaults.topAppBarColors(
             containerColor = backgroundColor,
             titleContentColor = WikipediaTheme.colors.primaryColor
         ),

From 0bdfb9fc7f579d9976d4a52a9170c70d7a8b43b9 Mon Sep 17 00:00:00 2001
From: Cooltey Feng <cfeng@wikimedia.org>
Date: Fri, 17 Jan 2025 11:51:33 -0800
Subject: [PATCH 09/11] Add `pilicense=any` for prop=pageimages API calls
 (#5240)

Co-authored-by: Dmitry Brant <dbrant@wikimedia.org>
---
 app/src/main/java/org/wikipedia/dataclient/Service.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/wikipedia/dataclient/Service.kt b/app/src/main/java/org/wikipedia/dataclient/Service.kt
index 80c8ba4a148..4a85b81535a 100644
--- a/app/src/main/java/org/wikipedia/dataclient/Service.kt
+++ b/app/src/main/java/org/wikipedia/dataclient/Service.kt
@@ -92,7 +92,7 @@ interface Service {
 
     @GET(
         MW_API_PREFIX + "action=query&generator=search&gsrnamespace=0&gsrqiprofile=classic_noboostlinks" +
-                "&origin=*&piprop=thumbnail&prop=pageimages|description|info|pageprops" +
+                "&origin=*&piprop=thumbnail&pilicense=any&prop=pageimages|description|info|pageprops" +
                 "&inprop=varianttitles&smaxage=86400&maxage=86400&pithumbsize=" + PREFERRED_THUMB_SIZE
     )
     suspend fun searchMoreLike(
@@ -112,7 +112,7 @@ interface Service {
     @GET(MW_API_PREFIX + "action=query&prop=description&redirects=1")
     suspend fun getDescription(@Query("titles") titles: String): MwQueryResponse
 
-    @GET(MW_API_PREFIX + "action=query&prop=info|description|pageimages&inprop=varianttitles|displaytitle&redirects=1&pithumbsize=" + PREFERRED_THUMB_SIZE)
+    @GET(MW_API_PREFIX + "action=query&prop=info|description|pageimages&pilicense=any&inprop=varianttitles|displaytitle&redirects=1&pithumbsize=" + PREFERRED_THUMB_SIZE)
     suspend fun getInfoByPageIdsOrTitles(@Query("pageids") pageIds: String? = null, @Query("titles") titles: String? = null): MwQueryResponse
 
     @GET(MW_API_PREFIX + "action=query&meta=siteinfo&siprop=general|autocreatetempuser")
@@ -172,7 +172,7 @@ interface Service {
     @GET(MW_API_PREFIX + "action=query&prop=info&generator=categories&inprop=varianttitles|displaytitle&gclshow=!hidden&gcllimit=500")
     suspend fun getCategories(@Query("titles") titles: String): MwQueryResponse
 
-    @GET(MW_API_PREFIX + "action=query&prop=description|pageimages|info&generator=categorymembers&inprop=varianttitles|displaytitle&gcmprop=ids|title")
+    @GET(MW_API_PREFIX + "action=query&prop=description|pageimages|info&pilicense=any&generator=categorymembers&inprop=varianttitles|displaytitle&gcmprop=ids|title")
     suspend fun getCategoryMembers(
         @Query("gcmtitle") title: String,
         @Query("gcmtype") type: String,

From 68cf619872da009636c2707cc26c43c569ffce13 Mon Sep 17 00:00:00 2001
From: Dmitry Brant <me@dmitrybrant.com>
Date: Fri, 17 Jan 2025 14:51:40 -0500
Subject: [PATCH 10/11] Image recs on dewiki: restrict to CC-licensed images.

---
 .../provider/EditingSuggestionsProvider.kt               | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/wikipedia/suggestededits/provider/EditingSuggestionsProvider.kt b/app/src/main/java/org/wikipedia/suggestededits/provider/EditingSuggestionsProvider.kt
index 0b0777febbd..1612852749e 100644
--- a/app/src/main/java/org/wikipedia/suggestededits/provider/EditingSuggestionsProvider.kt
+++ b/app/src/main/java/org/wikipedia/suggestededits/provider/EditingSuggestionsProvider.kt
@@ -324,7 +324,14 @@ object EditingSuggestionsProvider {
                         // TODO: make use of continuation parameter?
                         response.query?.pages?.forEach { page ->
                             if (page.thumbUrl().isNullOrEmpty() && page.growthimagesuggestiondata?.get(0)?.images?.get(0) != null) {
-                                articlesWithImageRecommendationsCache.addFirst(page)
+                                if (articlesWithImageRecommendationsCacheLang == "de") {
+                                    // In the case of dewiki, make sure the image is CC-licensed:
+                                    if (page.growthimagesuggestiondata[0].images[0].metadata?.license.orEmpty().lowercase().contains("cc")) {
+                                        articlesWithImageRecommendationsCache.addFirst(page)
+                                    }
+                                } else {
+                                    articlesWithImageRecommendationsCache.addFirst(page)
+                                }
                             }
                         }
                     }

From 723bb1785e1bfb4f91748b3d6d62c63eb45c7138 Mon Sep 17 00:00:00 2001
From: williamrai <williamrai13@gmail.com>
Date: Fri, 17 Jan 2025 15:11:30 -0500
Subject: [PATCH 11/11] - adds state to the ThemeColorCircularButton

---
 .../compose/components/WikiButtons.kt         | 56 ++++++++++++++++---
 1 file changed, 47 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
index 6cd0f859e65..2a56195a198 100644
--- a/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
+++ b/app/src/main/java/org/wikipedia/compose/components/WikiButtons.kt
@@ -1,7 +1,10 @@
 package org.wikipedia.compose.components
 
 import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -9,10 +12,15 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 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.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import org.wikipedia.compose.ComposeColors
+import org.wikipedia.compose.theme.BaseTheme
 import org.wikipedia.compose.theme.WikipediaTheme
 
 @Composable
@@ -115,27 +123,57 @@ fun ThemeColorCircularButton(
     onClick: () -> Unit,
     text: String = "Aa",
     modifier: Modifier = Modifier,
-    backgroundColor: Color,
-    borderColor: Color
+    size: Dp = 40.dp,
+    defaultBackgroundColor: Color = WikipediaTheme.colors.paperColor,
+    selectedBackgroundColor: Color = WikipediaTheme.colors.backgroundColor,
+    borderColor: Color = WikipediaTheme.colors.progressiveColor,
+    textColor: Color = WikipediaTheme.colors.primaryColor,
+    rippleColor: Color = Color.Transparent,
+    isSelected: Boolean = false
 ) {
     Button(
         onClick = onClick,
-        modifier = modifier.border(
-            width = 2.dp,
-            color = borderColor,
-            shape = CircleShape
-        ).size(40.dp),
+        modifier = modifier
+            .border(
+                width = 2.dp,
+                color = if (isSelected) borderColor else Color.Transparent,
+                shape = CircleShape
+            )
+            .size(size),
         colors = ButtonDefaults.buttonColors(
-            containerColor = backgroundColor
+            containerColor = if (isSelected) defaultBackgroundColor else selectedBackgroundColor,
+            contentColor = rippleColor
         ),
         contentPadding = PaddingValues(0.dp)
     ) {
         Text(
             text = text,
             style = WikipediaTheme.typography.h3.copy(
-                color = WikipediaTheme.colors.primaryColor,
+                color = textColor,
                 letterSpacing = 0.sp
             )
         )
     }
 }
+
+@Preview(showSystemUi = true)
+@Composable
+private fun SepiaThemeColorButton() {
+    BaseTheme {
+        Column(
+            modifier = Modifier
+                .fillMaxSize(),
+            verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterVertically),
+            horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+            ThemeColorCircularButton(
+                isSelected = true,
+                defaultBackgroundColor = ComposeColors.Beige300,
+                selectedBackgroundColor = ComposeColors.Beige300,
+                rippleColor = ComposeColors.Beige300,
+                textColor = ComposeColors.Gray700,
+                onClick = {}
+            )
+        }
+    }
+}