clean up unsupported version warning

This commit is contained in:
Chloe committed 2024-11-11 05:49:22 -07:00
1 parent 86a79f8cda
commit d3a3ab57a1
3 files changed
+44 -10

No files matched your search

@@ -11,6 +11,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Settings
import androidx.compose.material.icons.filled.Warning
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
@@ -25,7 +26,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
@@ -162,7 +162,7 @@ fun MainScreen(
Image(
painter = painterResource(id = R.drawable.geode_logo),
contentDescription = context.getString(R.string.launcher_logo_alt),
modifier = Modifier.size(136.dp, 136.dp)
modifier = Modifier.size(100.dp, 100.dp)
)
Text(
context.getString(R.string.launcher_title),
@@ -194,13 +194,26 @@ fun MainScreen(
)
if (gdVersion < Constants.SUPPORTED_VERSION_CODE) {
ElevatedCard(modifier = Modifier.padding(8.dp)) {
Text(
stringResource(R.string.launcher_game_update_required),
textAlign = TextAlign.Center,
modifier = Modifier.padding(8.dp).sizeIn(maxWidth = 512.dp)
)
}
InlineDialog(
headline = {
Icon(
Icons.Default.Warning,
contentDescription = null,
modifier = Modifier.size(28.dp)
)
Text(
stringResource(R.string.launcher_unsupported_version_title),
style = MaterialTheme.typography.titleMedium,
)
},
body = {
Text(
stringResource(R.string.launcher_game_update_required),
)
},
modifier = Modifier.padding(8.dp)
)
}
}
}
@@ -7,14 +7,18 @@ import android.net.Uri
import android.widget.Toast
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.sizeIn
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.AbsoluteRoundedCornerShape
import androidx.compose.material3.ElevatedCard
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.platform.LocalContext
@@ -65,4 +69,21 @@ fun StatusIndicator(
text()
}
}
}
@Composable
fun InlineDialog(headline: @Composable () -> Unit, body: @Composable () -> Unit, modifier: Modifier = Modifier) {
ElevatedCard(modifier = modifier) {
Column(modifier = Modifier.padding(8.dp).sizeIn(maxWidth = 512.dp)) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.padding(4.dp)
) {
headline()
}
body()
}
}
}
+1 -1
View File
@@ -35,7 +35,7 @@
</string>
<string name="launcher_game_update_required_short">A Geometry Dash update is required.</string>
<string name="launcher_game_update_required">The currently installed version of Geometry Dash is out-of-date. Please update to continue receiving Geode updates.</string>
<string name="launcher_game_update_required">The currently installed version of Geometry Dash is no longer supported. Please update Geometry Dash to continue receiving Geode updates.</string>
<string name="launcher_update_available">A new launcher update is available!</string>
<string name="launcher_update_dismiss">Dismiss</string>