Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Tidy and simplify using PR suggestions

Browse source
This commit is contained in:
Chris Smith 2023-07-05 10:52:44 +01:00
parent 87853b467f
commit 0635fa9ee5
6 changed files with 95 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

46
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/AndroidLocationActions.kt
View file

@ -19,45 +19,28 @@ package io.element.android.features.location.impl.show
import android.content.Context
import android.content.Intent
import android.net.Uri
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.ui.platform.LocalContext
import androidx.annotation.VisibleForTesting
import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.features.location.api.Location
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.di.AppScope
import kotlinx.coroutines.withContext
import io.element.android.libraries.di.ApplicationContext
import timber.log.Timber
import javax.inject.Inject
@ContributesBinding(AppScope::class)
class AndroidLocationActions @Inject constructor(
private val coroutineDispatchers: CoroutineDispatchers
@ApplicationContext private val appContext: Context
) : LocationActions {
private var activityContext: Context? = null
@Composable
override fun Configure() {
val context = LocalContext.current
return DisposableEffect(Unit) {
activityContext = context
onDispose {
activityContext = null
}
}
}
override suspend fun share(location: Location, label: String?) {
override fun share(location: Location, label: String?) {
runCatching {
// Ref: https://developer.android.com/guide/components/intents-common#ViewMap
val suffix = if (label != null) "(${Uri.encode(label)})" else ""
val uri = Uri.parse("geo:0,0?q=${location.lat},${location.lon}$suffix")
val uri = Uri.parse(buildUrl(location, label))
val showMapsIntent = Intent(Intent.ACTION_VIEW).setData(uri)
val chooserIntent = Intent.createChooser(showMapsIntent, null)
withContext(coroutineDispatchers.main) {
activityContext!!.startActivity(chooserIntent)
}
chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
appContext.startActivity(chooserIntent)
}.onSuccess {
Timber.v("Open location succeed")
}.onFailure {
@ -65,3 +48,18 @@ class AndroidLocationActions @Inject constructor(
}
}
}
@VisibleForTesting
internal fun buildUrl(
location: Location,
label: String?,
urlEncoder: (String) -> String = Uri::encode
): String {
// Ref: https://developer.android.com/guide/components/intents-common#ViewMap
val base = "geo:0,0?q=%.6f,%.6f".format(location.lat, location.lon)
return if (label == null) {
base
} else {
"%s (%s)".format(base, urlEncoder(label))
}
}

8
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/LocationActions.kt
View file

@ -16,14 +16,8 @@
package io.element.android.features.location.impl.show
import androidx.compose.runtime.Composable
import io.element.android.features.location.api.Location
interface LocationActions {
@Composable
fun Configure()
suspend fun share(location: Location, label: String?)
fun share(location: Location, label: String?)
}

11
features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationPresenter.kt
View file

@ -23,8 +23,6 @@ import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
import io.element.android.features.location.api.Location
import io.element.android.libraries.architecture.Presenter
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
class ShowLocationPresenter @AssistedInject constructor(
private val actions: LocationActions,
@ -39,20 +37,13 @@ class ShowLocationPresenter @AssistedInject constructor(
@Composable
override fun present(): ShowLocationState {
val coroutineScope = rememberCoroutineScope()
actions.Configure()
return ShowLocationState(
location = location,
description = description
) {
when (it) {
ShowLocationEvents.Share -> coroutineScope.share(location, description)
ShowLocationEvents.Share -> actions.share(location, description)
}
}
}
private fun CoroutineScope.share(location: Location, label: String?) = launch {
actions.share(location, label)
}
}