From 0c80e05f5c03f105996bbe5b2845a98629ad12dd Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 5 May 2023 20:10:55 +0200 Subject: [PATCH 1/3] Fix logo not found. --- app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt index eb9085c..99dff8e 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt @@ -43,7 +43,7 @@ fun AboutView() { .height(80.dp) .padding(end = 10.dp) .align(Top), - painter = painterResource(R.drawable.app_logo), + painter = painterResource(R.mipmap.ic_launcher), contentDescription = null, contentScale = ContentScale.Fit ) From fb4c83d60a481162d70fa8cf71e63cc56d22e5ac Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sun, 7 May 2023 20:50:42 +0200 Subject: [PATCH 2/3] Fix display of app logo on About page. --- .../tichucounter/ui/about/AboutView.kt | 14 ++++-- app/src/main/res/drawable/tichu_logo.xml | 48 +++++++++++++++++++ app/src/main/res/values/colors.xml | 5 -- 3 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/drawable/tichu_logo.xml delete mode 100644 app/src/main/res/values/colors.xml diff --git a/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt b/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt index 99dff8e..4c5ea65 100644 --- a/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt +++ b/app/src/main/java/me/zobrist/tichucounter/ui/about/AboutView.kt @@ -2,6 +2,7 @@ package me.zobrist.tichucounter.ui.about import android.content.res.Configuration import androidx.compose.foundation.Image +import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.Mail @@ -10,6 +11,7 @@ import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment.Companion.Top import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource @@ -40,12 +42,16 @@ fun AboutView() { Row() { Image( modifier = Modifier - .height(80.dp) .padding(end = 10.dp) - .align(Top), - painter = painterResource(R.mipmap.ic_launcher), + .align(Top) + .size(75.dp) + .background( + color = Color.Red, + shape = ShapeDefaults.Medium + ), + painter = painterResource(R.drawable.tichu_logo), contentDescription = null, - contentScale = ContentScale.Fit + contentScale = ContentScale.None ) Column { diff --git a/app/src/main/res/drawable/tichu_logo.xml b/app/src/main/res/drawable/tichu_logo.xml new file mode 100644 index 0000000..200a2f2 --- /dev/null +++ b/app/src/main/res/drawable/tichu_logo.xml @@ -0,0 +1,48 @@ + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml deleted file mode 100644 index ad9de19..0000000 --- a/app/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #d50000 - - \ No newline at end of file From 7e722feb275cdb7d47e87413ee7b11efc7b4ec51 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Sun, 7 May 2023 22:41:51 +0200 Subject: [PATCH 3/3] Update 'app/src/main/AndroidManifest.xml' --- app/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df25535..35a488c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:localeConfig="@xml/locales_config" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme">