Compose About Activity conversion

app/src/main/AndroidManifest.xml

@@ -144,10 +144,6 @@
             android:name=".settings.NotificationSettingsActivity"
             android:label="@string/notification_preferences_title"
             android:theme="@style/AppTheme.ActionBar" />
-        <activity
-            android:name=".settings.AboutActivity"
-            android:label="@string/about_activity_title"
-            android:theme="@style/AppTheme.ActionBar" />
         <activity android:name=".settings.languages.WikipediaLanguagesActivity"
             android:label="@string/wikipedia_languages_title"/>
         <activity
@@ -190,17 +186,9 @@
             android:name=".gallery.GalleryActivity"
             android:configChanges="orientation|screenSize"
             android:theme="@style/AppTheme.FullScreen" />
+
         <activity
-            android:name=".settings.LicenseActivity"
-            android:theme="@style/AppTheme.ActionBar"
-            tools:ignore="GoogleAppIndexingUrlError"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:pathPrefix="/android_asset/licenses/" android:scheme="content" />
-            </intent-filter>
-        </activity>
+            android:name=".settings.LicenseActivity"/>
 
         <activity
             android:name=".feed.news.NewsActivity"
@@ -372,6 +360,9 @@
         <activity
             android:name=".donate.GooglePayActivity"/>
 
+        <activity
+            android:name=".settings.AboutActivity"/>
+
         <activity
             android:name=".games.onthisday.OnThisDayGameActivity"/>
 

app/src/main/java/org/wikipedia/compose/components/HtmlText.kt

@@ -0,0 +1,39 @@
+package org.wikipedia.compose.components
+
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.unit.em
+import androidx.compose.ui.unit.sp
+import org.wikipedia.compose.theme.WikipediaTheme
+
+@Composable
+fun HtmlText(
+    html: String,
+    linkStyle: TextLinkStyles = TextLinkStyles(
+        style = SpanStyle(
+            color = WikipediaTheme.colors.progressiveColor,
+            fontSize = 14.sp
+        )
+    ),
+    normalStyle: TextStyle = TextStyle(
+        color = WikipediaTheme.colors.secondaryColor,
+        fontSize = 14.sp
+    ),
+    modifier: Modifier = Modifier
+) {
+    Text(
+        modifier = modifier,
+        text = AnnotatedString.fromHtml(
+            htmlString = html,
+            linkStyles = linkStyle
+        ),
+        style = normalStyle,
+        lineHeight = 1.6.em
+    )
+}

app/src/main/java/org/wikipedia/compose/components/LicenseLinkText.kt

@@ -0,0 +1,63 @@
+package org.wikipedia.compose.components
+
+import android.content.Intent
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withLink
+import androidx.compose.ui.unit.em
+import org.wikipedia.compose.theme.WikipediaTheme
+import org.wikipedia.settings.LicenseActivity
+
+data class LinkTextData(
+    val text: String,
+    val url: String? = null,
+    val asset: String? = null,
+)
+
+@Composable
+fun LicenseLinkText(
+    links: List<LinkTextData>,
+    textStyle: TextStyle = WikipediaTheme.typography.small,
+    modifier: Modifier = Modifier
+) {
+    val context = LocalContext.current
+    val uriHandler = LocalUriHandler.current
+    val annotatedString = buildAnnotatedString {
+        links.forEach { linkTextData ->
+            withLink(
+                link = LinkAnnotation.Url(
+                    url = linkTextData.url ?: "",
+                    styles = TextLinkStyles(
+                        style = SpanStyle(color = WikipediaTheme.colors.progressiveColor)
+                    ),
+                    linkInteractionListener = {
+                        if (linkTextData.asset != null) {
+                            val intent = Intent(context, LicenseActivity::class.java)
+                            intent.putExtra(LicenseActivity.ASSET, linkTextData.asset)
+                            context.startActivity(intent)
+                        } else {
+                           uriHandler.openUri(linkTextData.url ?: "")
+                        }
+                    }
+                )
+            ) {
+                append(linkTextData.text)
+            }
+        }
+    }
+
+    Text(
+        text = annotatedString,
+        modifier = modifier,
+        style = textStyle,
+        lineHeight = 1.6.em
+    )
+}

app/src/main/java/org/wikipedia/compose/components/WikiSnackbar.kt

@@ -34,13 +34,15 @@ fun Snackbar(
                 }
             }
         },
-        modifier = modifier.padding(16.dp)
+        modifier = modifier
+            .padding(horizontal = 16.dp, vertical = 8.dp),
+        containerColor = WikipediaTheme.colors.borderColor
     ) {
         Text(
             text = message,
             style = WikipediaTheme.typography.h3.copy(
                 color = WikipediaTheme.colors.primaryColor,
-                letterSpacing = 0.sp
+                letterSpacing = 0.sp,
             ),
             maxLines = 10,
             overflow = TextOverflow.Ellipsis,

app/src/main/java/org/wikipedia/compose/components/WikiTopAppBar.kt

@@ -41,7 +41,8 @@ fun WikiTopAppBar(
             IconButton(onClick = onNavigationClick) {
                 Icon(
                     imageVector = navigationIcon,
-                    contentDescription = null
+                    tint = WikipediaTheme.colors.primaryColor,
+                    contentDescription = "Navigate up"
                 )
             }
         },

app/src/main/java/org/wikipedia/compose/theme/WikipediaTheme.kt

@@ -1,24 +1,25 @@
 package org.wikipedia.compose.theme
 
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-
-enum class WikipediaThemeType {
-    SYSTEM, LIGHT, DARK, BLACK, SEPIA
-}
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import org.wikipedia.WikipediaApp
+import org.wikipedia.theme.Theme
 
 @Composable
 fun BaseTheme(
-    wikipediaThemeType: WikipediaThemeType = WikipediaThemeType.SYSTEM,
+    currentTheme: Theme = WikipediaApp.instance.currentTheme,
     content: @Composable () -> Unit
 ) {
-    val wikipediaColorSystem = when (wikipediaThemeType) {
-        WikipediaThemeType.LIGHT -> LightColors
-        WikipediaThemeType.DARK -> DarkColors
-        WikipediaThemeType.BLACK -> BlackColors
-        WikipediaThemeType.SEPIA -> SepiaColors
-        WikipediaThemeType.SYSTEM -> if (isSystemInDarkTheme()) DarkColors else LightColors
+    val appTheme by remember { mutableStateOf(currentTheme) }
+
+    val wikipediaColorSystem = when (appTheme) {
+        Theme.LIGHT -> LightColors
+        Theme.DARK -> DarkColors
+        Theme.BLACK -> BlackColors
+        Theme.SEPIA -> SepiaColors
     }
 
     CompositionLocalProvider(

app/src/main/java/org/wikipedia/compose/theme/WikipediaTypography.kt

@@ -41,7 +41,7 @@ val Typography = WikipediaTypography(
     ),
     h3 = TextStyle(
         fontFamily = FontFamily.SansSerif,
-        fontWeight = FontWeight.Bold,
+        fontWeight = FontWeight.Medium,
         fontSize = 16.sp,
         lineHeight = 24.sp
     ),