diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7a92d34..a641912 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,8 +16,8 @@ android { applicationId = "com.aredruss.warmaster" minSdk = 24 targetSdk = 34 - versionCode = 5 - versionName = "0.5" + versionCode = 7 + versionName = "0.7" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/aredruss/warmaster/ui/about/AboutWarmaster.kt b/app/src/main/java/com/aredruss/warmaster/ui/about/AboutWarmaster.kt index 962970f..cd4f14d 100644 --- a/app/src/main/java/com/aredruss/warmaster/ui/about/AboutWarmaster.kt +++ b/app/src/main/java/com/aredruss/warmaster/ui/about/AboutWarmaster.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -47,7 +48,8 @@ import org.koin.androidx.compose.getViewModel fun AboutWarmaster(navigator: DestinationsNavigator) { val viewModel = getViewModel() - val url = "https://github.com/Aredruss/Warmaster" + val url = "https://play.google.com/store/apps/details?id=com.aredruss.warmaster&hl=en_US" + val githubUrl = "https://github.com/Aredruss/Warmaster" val discordUrl = "https://discord.com/invite/8fcDRVZQ8x" val clipboardManager: ClipboardManager = LocalClipboardManager.current @@ -124,11 +126,12 @@ fun AboutWarmaster(navigator: DestinationsNavigator) { ) .background(color = MaterialTheme.colorScheme.secondary) .padding(all = 10.dp), - text = url, + text = url.dropLast(40).plus("…"), style = MaterialTheme.typography.labelLarge, color = MaterialTheme.colorScheme.onSecondary, - textAlign = TextAlign.Center - ) + textAlign = TextAlign.Center, + + ) } Spacer(modifier = Modifier.height(height = 20.dp)) Text( @@ -141,22 +144,37 @@ fun AboutWarmaster(navigator: DestinationsNavigator) { ) Row( - modifier = Modifier - .clip(shape = MaterialTheme.shapes.small) - .background(color = discordBlue) - .clickable { - uriHandler.openUri(discordUrl) - } - .padding(all = 15.dp), + modifier = Modifier, verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center ) { Icon( - modifier = Modifier.size(size = 30.dp), + modifier = Modifier + .size(size = 60.dp) + .clip(shape = MaterialTheme.shapes.small) + .background(color = discordBlue) + .clickable { + uriHandler.openUri(discordUrl) + } + .padding(all = 10.dp), painter = painterResource(id = R.drawable.ic_discord), contentDescription = "", tint = Color.White ) + Spacer(modifier = Modifier.width(width = 15.dp)) + Icon( + modifier = Modifier + .size(size = 60.dp) + .clip(shape = MaterialTheme.shapes.small) + .background(color = Color.White) + .clickable { + uriHandler.openUri(githubUrl) + } + .padding(all = 10.dp), + painter = painterResource(id = R.drawable.ic_github), + contentDescription = "", + tint = Color.Black + ) } } }, diff --git a/app/src/main/java/com/aredruss/warmaster/ui/theme/Theme.kt b/app/src/main/java/com/aredruss/warmaster/ui/theme/Theme.kt index f21fb37..94082a4 100644 --- a/app/src/main/java/com/aredruss/warmaster/ui/theme/Theme.kt +++ b/app/src/main/java/com/aredruss/warmaster/ui/theme/Theme.kt @@ -17,38 +17,6 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalView import androidx.core.view.WindowCompat -private val LightColors = lightColorScheme( - primary = md_theme_light_primary, - onPrimary = md_theme_light_onPrimary, - primaryContainer = md_theme_light_primaryContainer, - onPrimaryContainer = md_theme_light_onPrimaryContainer, - secondary = md_theme_light_secondary, - onSecondary = md_theme_light_onSecondary, - secondaryContainer = md_theme_light_secondaryContainer, - onSecondaryContainer = md_theme_light_onSecondaryContainer, - tertiary = md_theme_light_tertiary, - onTertiary = md_theme_light_onTertiary, - tertiaryContainer = md_theme_light_tertiaryContainer, - onTertiaryContainer = md_theme_light_onTertiaryContainer, - error = md_theme_light_error, - errorContainer = md_theme_light_errorContainer, - onError = md_theme_light_onError, - onErrorContainer = md_theme_light_onErrorContainer, - background = md_theme_light_background, - onBackground = md_theme_light_onBackground, - surface = md_theme_light_surface, - onSurface = md_theme_light_onSurface, - surfaceVariant = md_theme_light_surfaceVariant, - onSurfaceVariant = md_theme_light_onSurfaceVariant, - outline = md_theme_light_outline, - inverseOnSurface = md_theme_light_inverseOnSurface, - inverseSurface = md_theme_light_inverseSurface, - inversePrimary = md_theme_light_inversePrimary, - surfaceTint = md_theme_light_surfaceTint, - outlineVariant = md_theme_light_outlineVariant, - scrim = md_theme_light_scrim, -) - private val DarkColors = darkColorScheme( primary = md_theme_dark_primary, onPrimary = md_theme_dark_onPrimary, @@ -87,10 +55,6 @@ fun WarmasterTheme( dynamicColor: Boolean = true, content: @Composable () -> Unit ) { - val colorScheme = when { - darkTheme -> DarkColors - else -> LightColors - } val view = LocalView.current if (!view.isInEditMode) { SideEffect { diff --git a/app/src/main/res/drawable/ic_github.xml b/app/src/main/res/drawable/ic_github.xml new file mode 100644 index 0000000..6cf0024 --- /dev/null +++ b/app/src/main/res/drawable/ic_github.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b097a0..faaffa0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -35,7 +35,7 @@ Quick reference Army builder or just copy the link below - And join the official discord! + Join the official discord and checkout this project on GitHub! Detachments Enhancements Strategems