clear up some deprecations

This commit is contained in:
Chloe committed 2024-11-15 15:50:14 -07:00
1 parent 1d91357cad
commit 8617d900ee
4 files changed
+22 -17

No files matched your search

@@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.ClickableText
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.filled.Share
@@ -39,13 +38,16 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalClipboardManager import androidx.compose.ui.platform.LocalClipboardManager
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.LinkAnnotation
import androidx.compose.ui.text.SpanStyle
import androidx.compose.ui.text.TextLinkStyles
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.style.TextDecoration
import androidx.compose.ui.text.withLink
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.geode.launcher.preferences.ApplicationLogsActivity import com.geode.launcher.preferences.ApplicationLogsActivity
import com.geode.launcher.BuildConfig import com.geode.launcher.BuildConfig
@@ -261,7 +263,6 @@ fun ErrorInfoActions(extraDetails: String?, modifier: Modifier = Modifier) {
@Composable @Composable
fun DownloadRecommendation(needsUniversal: Boolean, modifier: Modifier = Modifier) { fun DownloadRecommendation(needsUniversal: Boolean, modifier: Modifier = Modifier) {
val uriHandler = LocalUriHandler.current
val context = LocalContext.current val context = LocalContext.current
val version = BuildConfig.VERSION_NAME val version = BuildConfig.VERSION_NAME
@@ -304,16 +305,20 @@ fun DownloadRecommendation(needsUniversal: Boolean, modifier: Modifier = Modifie
Text("\u2022\u00A0\u00A0$recommendationText") Text("\u2022\u00A0\u00A0$recommendationText")
ClickableText( Text(
text = AnnotatedString(downloadText), buildAnnotatedString {
onClick = { withLink(LinkAnnotation.Url(
uriHandler.openUri(downloadUrl) downloadUrl,
}, TextLinkStyles(
style = SpanStyle(
style = TextStyle.Default.copy( color = MaterialTheme.colorScheme.primary,
color = MaterialTheme.colorScheme.primary, textDecoration = TextDecoration.Underline
textDecoration = TextDecoration.Underline ),
), )
)) {
append(downloadText)
}
}
) )
} }
} }
@@ -92,7 +92,7 @@ fun installLauncherUpdate(context: Context) {
try { try {
val intent = generateInstallIntent(uri) val intent = generateInstallIntent(uri)
context.startActivity(intent) context.startActivity(intent)
} catch (e: ActivityNotFoundException) { } catch (_: ActivityNotFoundException) {
Toast.makeText(context, context.getString(R.string.no_activity_found), Toast.LENGTH_SHORT).show() Toast.makeText(context, context.getString(R.string.no_activity_found), Toast.LENGTH_SHORT).show()
} }
} else { } else {
@@ -177,7 +177,7 @@ fun StringDialog(
singleLine = true, singleLine = true,
keyboardOptions = KeyboardOptions( keyboardOptions = KeyboardOptions(
keyboardType = KeyboardType.Ascii, keyboardType = KeyboardType.Ascii,
autoCorrect = false autoCorrectEnabled = false
), ),
trailingIcon = { trailingIcon = {
if (enteredValue.isNotEmpty()) { if (enteredValue.isNotEmpty()) {
@@ -1,7 +1,7 @@
package com.geode.launcher.utils package com.geode.launcher.utils
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.lifecycle.compose.LocalLifecycleOwner
import androidx.lifecycle.Lifecycle import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleEventObserver
import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.LifecycleOwner