From 26cf8c729cd74e489f7f4a0164d2458812bf8fbd Mon Sep 17 00:00:00 2001
From: Hekmatullah <hekmatullah.aminullah2@gmail.com>
Date: Sun, 26 Jan 2025 16:57:14 +0000
Subject: [PATCH] fix: Prevent app crash when clicking Mifos Initiative License
 and Change icon colors (#2748)

---
 androidApp/src/main/AndroidManifest.xml       |  2 +
 .../mobile/feature/about/ui/AboutUsScreen.kt  | 43 ++++++++++---------
 .../drawable/feature_about_source_code.xml    |  2 +-
 .../res/drawable/feature_about_website.xml    |  2 +-
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml
index 20104c72a..b5b893ef1 100644
--- a/androidApp/src/main/AndroidManifest.xml
+++ b/androidApp/src/main/AndroidManifest.xml
@@ -64,10 +64,12 @@
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
             android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.DayNight"
             android:windowSoftInputMode="adjustResize" />
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
             android:configChanges="orientation|screenSize"
+            android:theme="@style/Theme.AppCompat.DayNight"
             android:windowSoftInputMode="adjustResize" />
 
         <provider
diff --git a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt
index f8c6aff83..519b94faa 100644
--- a/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt
+++ b/feature/about/src/main/java/org/mifos/mobile/feature/about/ui/AboutUsScreen.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
@@ -35,26 +36,28 @@ internal fun AboutUsScreen(
     modifier: Modifier = Modifier,
 ) {
     val context = LocalContext.current
-    LazyColumn(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(16.dp),
-    ) {
-        item {
-            Spacer(modifier = Modifier.height(48.dp))
-            AboutUsHeader()
-        }
-        items(getAboutUsItem(context)) { item ->
-            MifosItemCard(
-                modifier = Modifier.padding(bottom = 8.dp),
-                onClick = { navigateToItem(item) },
-            ) {
-                item.title?.let {
-                    AboutUsItemCard(
-                        title = it,
-                        subtitle = item.subtitle,
-                        iconUrl = item.iconUrl,
-                    )
+    Surface {
+        LazyColumn(
+            modifier = modifier
+                .fillMaxSize()
+                .padding(16.dp),
+        ) {
+            item {
+                Spacer(modifier = Modifier.height(48.dp))
+                AboutUsHeader()
+            }
+            items(getAboutUsItem(context)) { item ->
+                MifosItemCard(
+                    modifier = Modifier.padding(bottom = 8.dp),
+                    onClick = { navigateToItem(item) },
+                ) {
+                    item.title?.let {
+                        AboutUsItemCard(
+                            title = it,
+                            subtitle = item.subtitle,
+                            iconUrl = item.iconUrl,
+                        )
+                    }
                 }
             }
         }
diff --git a/feature/about/src/main/res/drawable/feature_about_source_code.xml b/feature/about/src/main/res/drawable/feature_about_source_code.xml
index 703f5be12..336a25c71 100644
--- a/feature/about/src/main/res/drawable/feature_about_source_code.xml
+++ b/feature/about/src/main/res/drawable/feature_about_source_code.xml
@@ -14,7 +14,7 @@
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
-        android:fillColor="#212121"
+        android:fillColor="#FFFFFF"
         android:pathData="M24.9316,8.0001 L19,40.0001h4.0684L29,8.0001ZM14,14.0001l-10,10 10,10 2.8008,-2.8008 -7.2012,-7.1992 7.2012,-7.1992zM34,14.0001 L31.1992,16.8009 38.4004,24.0001 31.1992,31.1993 34,34.0001 44,24.0001z"
         android:strokeWidth="2" />
 </vector>
\ No newline at end of file
diff --git a/feature/about/src/main/res/drawable/feature_about_website.xml b/feature/about/src/main/res/drawable/feature_about_website.xml
index e2d89be27..b08c7bb3a 100644
--- a/feature/about/src/main/res/drawable/feature_about_website.xml
+++ b/feature/about/src/main/res/drawable/feature_about_website.xml
@@ -14,6 +14,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#212121"
+        android:fillColor="#FFFFFF"
         android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z" />
 </vector>