Skip to content

Commit 391354a

Browse files
authored
Merge pull request #715 from SimonMarquis/SimonMarquis-patch-2
Replace manual URI handling with Compose's `LocalUriHandler`
2 parents 553f55f + 0ebd0ab commit 391354a

File tree

1 file changed

+3
-9
lines changed
  • feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings

1 file changed

+3
-9
lines changed

feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.google.samples.apps.nowinandroid.feature.settings
1818

19-
import android.content.Intent
20-
import android.net.Uri
2119
import androidx.compose.foundation.clickable
2220
import androidx.compose.foundation.layout.Column
2321
import androidx.compose.foundation.layout.Row
@@ -42,13 +40,12 @@ import androidx.compose.ui.Alignment
4240
import androidx.compose.ui.ExperimentalComposeUiApi
4341
import androidx.compose.ui.Modifier
4442
import androidx.compose.ui.platform.LocalConfiguration
45-
import androidx.compose.ui.platform.LocalContext
43+
import androidx.compose.ui.platform.LocalUriHandler
4644
import androidx.compose.ui.res.stringResource
4745
import androidx.compose.ui.semantics.Role
4846
import androidx.compose.ui.tooling.preview.Preview
4947
import androidx.compose.ui.unit.dp
5048
import androidx.compose.ui.window.DialogProperties
51-
import androidx.core.content.ContextCompat
5249
import androidx.hilt.navigation.compose.hiltViewModel
5350
import androidx.lifecycle.compose.collectAsStateWithLifecycle
5451
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
@@ -277,18 +274,15 @@ private fun LinksPanel() {
277274

278275
@Composable
279276
private fun TextLink(text: String, url: String) {
280-
val launchResourceIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
281-
val context = LocalContext.current
277+
val uriHandler = LocalUriHandler.current
282278

283279
Text(
284280
text = text,
285281
style = MaterialTheme.typography.labelLarge,
286282
color = MaterialTheme.colorScheme.primary,
287283
modifier = Modifier
288284
.padding(vertical = 8.dp)
289-
.clickable {
290-
ContextCompat.startActivity(context, launchResourceIntent, null)
291-
},
285+
.clickable { uriHandler.openUri(url) },
292286
)
293287
}
294288

0 commit comments

Comments
 (0)