From 801a17d759d002f94707204b13f91c6fa76d2dfc Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Tue, 7 Mar 2023 20:53:57 +0100 Subject: [PATCH 1/3] Increase version to 2.1 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 55e0f8f..f1eb6f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ def keystoreProperties = new Properties() def versionProperties = new Properties() def versionMajor = 2 -def versionMinor = 0 +def versionMinor = 1 // Load your keystore.properties file into the keystoreProperties object. keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) -- 2.49.1 From 343d1d8e754f20c125570fc018e268f382df7ba8 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Tue, 7 Mar 2023 22:41:49 +0100 Subject: [PATCH 2/3] [#20] Add missing translation key. closes #20 --- app/src/main/res/values-de/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index be60463..5a3a559 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -22,5 +22,6 @@ Aktives Spiel Vergangene Spiele Counter + About \ No newline at end of file -- 2.49.1 From 895264de2aa8563d72c8dee1335d390af97cd89e Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 10 Mar 2023 15:08:38 +0100 Subject: [PATCH 3/3] [#34] Add contact button and play store button to about page. closes [#34] --- .../tichucounter/ui/about/AboutView.kt | 81 ++++++++++++++----- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values/strings.xml | 2 + 3 files changed, 62 insertions(+), 22 deletions(-) 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 9202b49..eb9085c 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,17 +2,16 @@ package me.zobrist.tichucounter.ui.about import android.content.res.Configuration import androidx.compose.foundation.Image -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Surface -import androidx.compose.material3.Text +import androidx.compose.foundation.layout.* +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Mail +import androidx.compose.material.icons.outlined.Shop +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.layout.ContentScale +import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview @@ -24,24 +23,62 @@ import me.zobrist.tichucounter.ui.AppTheme @Composable fun AboutView() { - Row(Modifier.padding(20.dp)) { - Image( - modifier = Modifier - .height(80.dp) - .padding(end = 10.dp) - .align(Top), - painter = painterResource(R.drawable.app_logo), - contentDescription = null, - contentScale = ContentScale.Fit - ) - Column { - Text( - text = stringResource(id = R.string.app_name), - style = MaterialTheme.typography.headlineMedium + val uriHandler = LocalUriHandler.current + + Column( + modifier = Modifier + .padding( + top = 20.dp, + start = 20.dp, + end = 20.dp, + bottom = 40.dp + ), + + ) { + + Row() { + Image( + modifier = Modifier + .height(80.dp) + .padding(end = 10.dp) + .align(Top), + painter = painterResource(R.drawable.app_logo), + contentDescription = null, + contentScale = ContentScale.Fit ) - Text(text = "V" + BuildConfig.VERSION_NAME) + + Column { + Text( + text = stringResource(id = R.string.app_name), + style = MaterialTheme.typography.headlineMedium + ) + Text(text = "V" + BuildConfig.VERSION_NAME) + } } + + + Button( + modifier = Modifier + .fillMaxWidth() + .padding(top = 30.dp), + onClick = { uriHandler.openUri("market://details?id=me.zobrist.tichucounter") } + ) { + Icon(imageVector = Icons.Outlined.Shop, contentDescription = null) + Text(stringResource(id = R.string.play_store)) + } + + Button( + modifier = Modifier + .fillMaxWidth() + .padding(top = 30.dp), + onClick = { uriHandler.openUri("mailto:app@zobrist.me") } + ) { + Icon(imageVector = Icons.Outlined.Mail, contentDescription = null) + Text(stringResource(id = R.string.contact_us)) + } + + } } diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5a3a559..ae3d8f6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -23,5 +23,6 @@ Vergangene Spiele Counter About + Schreib uns \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e0d8623..30a2071 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,4 +26,6 @@ Old Games Counter About + Contact us + Play Store \ No newline at end of file -- 2.49.1