Crop language SVG images in Translations screen

alialbaali · May 24, 2023 · a36f934 · a36f934
1 parent 0bc3c50
commit a36f934
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 18 deletions.
diff --git a/app/src/main/java/com/noto/app/settings/SettingsItem.kt b/app/src/main/java/com/noto/app/settings/SettingsItem.kt
@@ -1,12 +1,14 @@
 package com.noto.app.settings
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -32,13 +34,14 @@ fun SettingsItem(
     titleColor: Color = MaterialTheme.colorScheme.onSurface,
     painter: Painter? = null,
     painterColor: Color = Color.Unspecified,
+    contentScale: ContentScale = ContentScale.Fit,
     description: String? = null,
     descriptionMaxLines: Int = Int.MAX_VALUE,
     equalWeights: Boolean = true,
 ) {
     Surface(modifier = Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.small) {
         Row(modifier.padding(NotoTheme.dimensions.medium), horizontalArrangement = Arrangement.spacedBy(NotoTheme.dimensions.medium)) {
-            SettingsItemContent(title, titleColor, type, painter, painterColor, description, descriptionMaxLines, equalWeights)
+            SettingsItemContent(title, titleColor, type, painter, painterColor, contentScale, description, descriptionMaxLines, equalWeights)
         }
     }
 }
@@ -53,13 +56,14 @@ fun SettingsItem(
     titleColor: Color = MaterialTheme.colorScheme.onSurface,
     painter: Painter? = null,
     painterColor: Color = Color.Unspecified,
+    contentScale: ContentScale = ContentScale.Fit,
     description: String? = null,
     descriptionMaxLines: Int = Int.MAX_VALUE,
     equalWeights: Boolean = true,
 ) {
     Surface(onClick, modifier = Modifier.fillMaxWidth(), shape = MaterialTheme.shapes.small) {
         Row(modifier.padding(NotoTheme.dimensions.medium), horizontalArrangement = Arrangement.spacedBy(NotoTheme.dimensions.medium)) {
-            SettingsItemContent(title, titleColor, type, painter, painterColor, description, descriptionMaxLines, equalWeights)
+            SettingsItemContent(title, titleColor, type, painter, painterColor, contentScale, description, descriptionMaxLines, equalWeights)
         }
     }
 }
@@ -71,19 +75,31 @@ private fun RowScope.SettingsItemContent(
     type: SettingsItemType,
     painter: Painter?,
     painterColor: Color,
+    contentScale: ContentScale,
     description: String?,
     descriptionMaxLines: Int,
     equalWeights: Boolean,
 ) {
     if (painter != null) {
-        Icon(
-            painter = painter,
-            contentDescription = title,
-            modifier = Modifier
-                .size(IconSize)
-                .clip(MaterialTheme.shapes.extraSmall),
-            tint = painterColor,
-        )
+        if (contentScale == ContentScale.Fit) {
+            Icon(
+                painter = painter,
+                contentDescription = title,
+                modifier = Modifier
+                    .size(IconSize)
+                    .clip(MaterialTheme.shapes.extraSmall),
+                tint = painterColor,
+            )
+        } else {
+            Image(
+                painter = painter,
+                contentDescription = title,
+                modifier = Modifier
+                    .size(IconSize)
+                    .clip(MaterialTheme.shapes.extraSmall),
+                contentScale = contentScale,
+            )
+        }
     }
 
     Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(NotoTheme.dimensions.small)) {
@@ -109,6 +125,7 @@ private fun RowScope.SettingsItemContent(
                         modifier = if (equalWeights) Modifier.weight(1F) else Modifier
                     )
                 }
+
                 is SettingsItemType.Switch -> {
                     Spacer(Modifier.width(NotoTheme.dimensions.medium))
                     Switch(

diff --git a/app/src/main/java/com/noto/app/settings/about/TranslationsSettingsFragment.kt b/app/src/main/java/com/noto/app/settings/about/TranslationsSettingsFragment.kt
@@ -9,6 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.addCallback
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -61,6 +62,7 @@ class TranslationsSettingsFragment : Fragment() {
                 type = SettingsItemType.Text(context.stringResource(translation.language.toResource())),
                 painter = painterResource(id = translation.iconId),
                 equalWeights = false,
+                contentScale = ContentScale.Crop,
             )
 
             translation.translators.forEach { translator ->

diff --git a/app/src/main/res/drawable/ic_china.xml b/app/src/main/res/drawable/ic_china.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportWidth="640"
     android:viewportHeight="480">
     <path

diff --git a/app/src/main/res/drawable/ic_czech.xml b/app/src/main/res/drawable/ic_czech.xml
@@ -2,7 +2,7 @@
     android:viewportHeight="480"
     android:viewportWidth="640"
     android:height="24dp"
-    android:width="24dp">
+    android:width="32dp">
     <path
         android:fillColor="#fff"
         android:pathData="M0,0h640v240H0z" />

diff --git a/app/src/main/res/drawable/ic_france.xml b/app/src/main/res/drawable/ic_france.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportHeight="480"
     android:viewportWidth="640">
     <path

diff --git a/app/src/main/res/drawable/ic_germany.xml b/app/src/main/res/drawable/ic_germany.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportHeight="480"
     android:viewportWidth="640">
     <path

diff --git a/app/src/main/res/drawable/ic_lithuania.xml b/app/src/main/res/drawable/ic_lithuania.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportWidth="640"
     android:viewportHeight="480">
     <path

diff --git a/app/src/main/res/drawable/ic_saudi_arabia.xml b/app/src/main/res/drawable/ic_saudi_arabia.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportWidth="640"
     android:viewportHeight="480">
     <group>

diff --git a/app/src/main/res/drawable/ic_spain.xml b/app/src/main/res/drawable/ic_spain.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportHeight="480"
     android:viewportWidth="640">
     <path

diff --git a/app/src/main/res/drawable/ic_turkey.xml b/app/src/main/res/drawable/ic_turkey.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
-    android:width="24dp"
+    android:width="32dp"
     android:viewportHeight="480"
     android:viewportWidth="640">
     <path