Skip to content

Commit

Permalink
Rewrite WifiPermissionsActivity to M3 (#791)
Browse files Browse the repository at this point in the history 
* Extract composables

* Extract view model and create preview

* Switch to M3 and linting

* Optimize imports

* Minor changes

---------

Co-authored-by: Ricki Hirner <hirner@bitfire.at>
  • Loading branch information
@sunkup @rfc2822
sunkup and rfc2822 authored May 15, 2024
1 parent 86252f9 commit 814d19e
Show file tree
Hide file tree
Showing 4 changed files with 288 additions and 239 deletions.
251 changes: 14 additions & 237 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/account/WifiPermissionsActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,64 +4,17 @@

package at.bitfire.davdroid.ui.account

import android.Manifest
import android.accounts.Account
import android.app.Application
import android.content.Intent
import android.content.IntentFilter
import android.location.LocationManager
import android.os.Build
import android.os.Bundle
import android.provider.Settings
import androidx.activity.compose.setContent
import androidx.activity.viewModels
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.Divider
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.OutlinedButton
import androidx.compose.material.Scaffold
import androidx.compose.material.Switch
import androidx.compose.material.Text
import androidx.compose.material.TopAppBar
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.Help
import androidx.compose.material.icons.filled.CloudOff
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.core.app.TaskStackBuilder
import androidx.core.content.getSystemService
import androidx.core.location.LocationManagerCompat
import androidx.lifecycle.ViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewModelScope
import at.bitfire.davdroid.Constants
import at.bitfire.davdroid.Constants.withStatParams
import at.bitfire.davdroid.R
import at.bitfire.davdroid.ui.M2Theme
import at.bitfire.davdroid.ui.composable.PermissionSwitchRow
import at.bitfire.davdroid.util.PermissionUtils
import at.bitfire.davdroid.util.broadcastReceiverFlow
import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import javax.inject.Inject

@AndroidEntryPoint
class WifiPermissionsActivity: AppCompatActivity() {
Expand All @@ -71,207 +24,31 @@ class WifiPermissionsActivity: AppCompatActivity() {
}

private val account by lazy { intent.getParcelableExtra<Account>(EXTRA_ACCOUNT) ?: throw IllegalArgumentException("EXTRA_ACCOUNT must be set") }
private val model by viewModels<Model>()


override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

setContent {
M2Theme {
Scaffold(
topBar = {
TopAppBar(
navigationIcon = {
IconButton(onClick = { onSupportNavigateUp() }) {
Icon(Icons.AutoMirrored.Default.ArrowBack, stringResource(R.string.navigate_up))
}
},
title = { Text(stringResource(R.string.wifi_permissions_label)) },
actions = {
val uriHandler = LocalUriHandler.current
IconButton(onClick = {
uriHandler.openUri(Constants.HOMEPAGE_URL.buildUpon()
.appendPath(Constants.HOMEPAGE_PATH_FAQ)
.appendPath(Constants.HOMEPAGE_PATH_FAQ_LOCATION_PERMISSION)
.withStatParams("WifiPermissionsActivity")
.build().toString())
}) {
Icon(Icons.AutoMirrored.Default.Help, stringResource(R.string.help))
}
}
)
}
) { padding ->
Box(modifier = Modifier.padding(padding)) {
Content(
backgroundPermissionOptionLabel =
if (Build.VERSION.SDK_INT >= 30)
packageManager.backgroundPermissionOptionLabel.toString()
else
stringResource(R.string.wifi_permissions_background_location_permission_label),
locationServiceEnabled = model.locationEnabled.collectAsStateWithLifecycle().value
)
}
}
}
}
}

override fun supportShouldUpRecreateTask(targetIntent: Intent) = true

override fun onPrepareSupportNavigateUpTaskStack(builder: TaskStackBuilder) {
builder.editIntentAt(builder.intentCount - 1)?.putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, account)
}


@Composable
fun Content(
backgroundPermissionOptionLabel: String,
locationServiceEnabled: Boolean
) {
Column(
Modifier
.padding(8.dp)
.verticalScroll(rememberScrollState())) {
Text(
stringResource(R.string.wifi_permissions_intro),
style = MaterialTheme.typography.body1
)

// Android 8.1+: location permission
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
LocationPermission(
modifier = Modifier.padding(top = 16.dp)
)

// Android 10+: background location permission
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
BackgroundLocationPermission(
backgroundPermissionOptionLabel = backgroundPermissionOptionLabel,
modifier = Modifier.padding(top = 16.dp)
)

// Android 9+: location service
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
LocationService(
locationServiceEnabled = locationServiceEnabled,
modifier = Modifier.padding(top = 16.dp)
)

// If permissions have actively been denied
Text(
stringResource(R.string.permissions_app_settings_hint),
style = MaterialTheme.typography.body2,
modifier = Modifier.padding(top = 16.dp)
)
val context = LocalContext.current
OutlinedButton(
onClick = { PermissionUtils.showAppSettings(context) }
) {
Text(stringResource(R.string.permissions_app_settings).uppercase())
}

Divider(Modifier.padding(vertical = 16.dp))

// Disclaimer
Row {
Text(
stringResource(R.string.wifi_permissions_background_location_disclaimer, stringResource(R.string.app_name)),
style = MaterialTheme.typography.body2,
modifier = Modifier.weight(1f)
)
Icon(Icons.Default.CloudOff, null, modifier = Modifier.padding(8.dp))
}
}
}

@Composable
fun LocationPermission(
modifier: Modifier = Modifier
) {
val permission = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
Manifest.permission.ACCESS_FINE_LOCATION // since Android 10, fine location is required
else
Manifest.permission.ACCESS_COARSE_LOCATION // Android 8+: coarse location is enough

PermissionSwitchRow(
text = stringResource(R.string.wifi_permissions_location_permission),
permissions = listOf(permission),
summaryWhenGranted = stringResource(R.string.wifi_permissions_location_permission_on),
summaryWhenNotGranted = stringResource(R.string.wifi_permissions_location_permission_off),
modifier = modifier
)
}

@RequiresApi(Build.VERSION_CODES.Q)
@Composable
fun BackgroundLocationPermission(
backgroundPermissionOptionLabel: String,
modifier: Modifier = Modifier
) {
PermissionSwitchRow(
text = stringResource(R.string.wifi_permissions_background_location_permission),
permissions = listOf(Manifest.permission.ACCESS_BACKGROUND_LOCATION),
summaryWhenGranted = stringResource(R.string.wifi_permissions_background_location_permission_on, backgroundPermissionOptionLabel),
summaryWhenNotGranted = stringResource(R.string.wifi_permissions_background_location_permission_off, backgroundPermissionOptionLabel),
modifier = modifier
)
}

@Composable
fun LocationService(
locationServiceEnabled: Boolean,
modifier: Modifier = Modifier
) {
Row(modifier.fillMaxWidth()) {
Column(Modifier.weight(1f)) {
Text(
stringResource(R.string.wifi_permissions_location_enabled),
style = MaterialTheme.typography.body1
)
Text(
stringResource(
if (locationServiceEnabled)
R.string.wifi_permissions_location_enabled_on
else
R.string.wifi_permissions_location_enabled_off
),
style = MaterialTheme.typography.body2
)
}
Switch(
checked = locationServiceEnabled,
onCheckedChange = {
val intent = Intent(android.provider.Settings.ACTION_LOCATION_SOURCE_SETTINGS)
WifiPermissionsScreen(
backgroundPermissionOptionLabel =
if (Build.VERSION.SDK_INT >= 30)
packageManager.backgroundPermissionOptionLabel.toString()
else
stringResource(R.string.wifi_permissions_background_location_permission_label),
onEnableLocationService = {
val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)
if (intent.resolveActivity(packageManager) != null)
startActivity(intent)
}
},
onNavUp = ::onSupportNavigateUp
)
}
}

@Composable
@Preview
fun Content_Preview() {
Content(
backgroundPermissionOptionLabel = stringResource(R.string.wifi_permissions_background_location_permission_label),
locationServiceEnabled = true
)
}


@HiltViewModel
class Model @Inject constructor(
context: Application
): ViewModel() {

private val locationManager = context.getSystemService<LocationManager>()!!

val locationEnabled = broadcastReceiverFlow(context, IntentFilter(LocationManager.MODE_CHANGED_ACTION), immediate = true)
.map { LocationManagerCompat.isLocationEnabled(locationManager) }
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), false)
override fun supportShouldUpRecreateTask(targetIntent: Intent) = true

override fun onPrepareSupportNavigateUpTaskStack(builder: TaskStackBuilder) {
builder.editIntentAt(builder.intentCount - 1)?.putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, account)
}

}
24 changes: 24 additions & 0 deletions app/src/main/kotlin/at/bitfire/davdroid/ui/account/WifiPermissionsModel.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package at.bitfire.davdroid.ui.account

import android.app.Application
import android.content.IntentFilter
import android.location.LocationManager
import androidx.core.content.getSystemService
import androidx.core.location.LocationManagerCompat
import androidx.lifecycle.ViewModel
import at.bitfire.davdroid.util.broadcastReceiverFlow
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.map
import javax.inject.Inject

@HiltViewModel
class WifiPermissionsModel @Inject constructor(
context: Application
): ViewModel() {

private val locationManager = context.getSystemService<LocationManager>()!!

val locationEnabled = broadcastReceiverFlow(context, IntentFilter(LocationManager.MODE_CHANGED_ACTION), immediate = true)
.map { LocationManagerCompat.isLocationEnabled(locationManager) }

}
Loading

0 comments on commit 814d19e

Please sign in to comment.