feat: ask permissions
This commit is contained in:
parent
5d81e98b02
commit
db766c2acc
@ -6,7 +6,11 @@
|
|||||||
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@ -17,6 +21,7 @@
|
|||||||
android:roundIcon="@mipmap/ic_launcher_round"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.GeoTracker"
|
android:theme="@style/Theme.GeoTracker"
|
||||||
|
android:usesCleartextTraffic="true"
|
||||||
tools:targetApi="31">
|
tools:targetApi="31">
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
|
@ -5,18 +5,24 @@
|
|||||||
|
|
||||||
package ru.risdeveau.geotracker
|
package ru.risdeveau.geotracker
|
||||||
|
|
||||||
|
import android.Manifest
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.pm.PackageManager
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.activity.ComponentActivity
|
import androidx.activity.ComponentActivity
|
||||||
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||||
import androidx.activity.compose.setContent
|
import androidx.activity.compose.setContent
|
||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
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.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.outlined.Done
|
||||||
import androidx.compose.material3.Button
|
import androidx.compose.material3.Button
|
||||||
import androidx.compose.material3.CircularProgressIndicator
|
import androidx.compose.material3.CircularProgressIndicator
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
import androidx.compose.material3.MaterialTheme
|
import androidx.compose.material3.MaterialTheme
|
||||||
import androidx.compose.material3.OutlinedTextField
|
import androidx.compose.material3.OutlinedTextField
|
||||||
import androidx.compose.material3.Scaffold
|
import androidx.compose.material3.Scaffold
|
||||||
@ -29,17 +35,15 @@ import androidx.compose.runtime.remember
|
|||||||
import androidx.compose.runtime.setValue
|
import androidx.compose.runtime.setValue
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.platform.LocalContext
|
||||||
import androidx.compose.ui.text.TextStyle
|
import androidx.compose.ui.text.TextStyle
|
||||||
import androidx.compose.ui.text.font.FontStyle
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.compose.ui.text.style.TextDecoration
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import org.intellij.lang.annotations.JdkConstants
|
|
||||||
import ru.risdeveau.geotracker.ui.theme.GeoTrackerTheme
|
import ru.risdeveau.geotracker.ui.theme.GeoTrackerTheme
|
||||||
import splitties.resources.appColor
|
import splitties.experimental.ExperimentalSplittiesApi
|
||||||
|
import splitties.init.appCtx
|
||||||
import splitties.resources.appStr
|
import splitties.resources.appStr
|
||||||
import kotlin.apply
|
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@ -55,10 +59,14 @@ class MainActivity : ComponentActivity() {
|
|||||||
var screen by remember { mutableStateOf<Screen>(Screen.Loading) }
|
var screen by remember { mutableStateOf<Screen>(Screen.Loading) }
|
||||||
|
|
||||||
when (screen) {
|
when (screen) {
|
||||||
Screen.Main -> TODO()
|
Screen.Main -> {
|
||||||
|
Text("Hello world")
|
||||||
|
}
|
||||||
|
|
||||||
Screen.Settings -> {
|
Screen.Settings -> {
|
||||||
Settings(Modifier.align(Alignment.Center))
|
Settings(Modifier.align(Alignment.Center)) {
|
||||||
|
screen = Screen.Main
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Screen.Loading -> {
|
Screen.Loading -> {
|
||||||
@ -90,8 +98,9 @@ sealed class Screen {
|
|||||||
object Loading : Screen()
|
object Loading : Screen()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalSplittiesApi::class)
|
||||||
@Composable
|
@Composable
|
||||||
fun Settings(modifier: Modifier = Modifier) {
|
fun Settings(modifier: Modifier = Modifier, onConfirm: () -> Unit) {
|
||||||
var username by remember { mutableStateOf("") }
|
var username by remember { mutableStateOf("") }
|
||||||
var url by remember { mutableStateOf("") }
|
var url by remember { mutableStateOf("") }
|
||||||
var urlIsValid by remember { mutableStateOf(false) }
|
var urlIsValid by remember { mutableStateOf(false) }
|
||||||
@ -116,13 +125,75 @@ fun Settings(modifier: Modifier = Modifier) {
|
|||||||
OutlinedTextField(
|
OutlinedTextField(
|
||||||
value = url,
|
value = url,
|
||||||
onValueChange = { url = it },
|
onValueChange = { url = it },
|
||||||
placeholder = { Text("https://geo.example.com", style = TextStyle(color = MaterialTheme.colorScheme.onSurfaceVariant)) },
|
placeholder = {
|
||||||
|
Text("https://geo.example.com",
|
||||||
|
style = TextStyle(color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||||
|
)
|
||||||
|
},
|
||||||
label = { Text(appStr(R.string.server_url)) },
|
label = { Text(appStr(R.string.server_url)) },
|
||||||
trailingIcon = { if (loading) CircularProgressIndicator() }
|
trailingIcon = {
|
||||||
|
if (loading) CircularProgressIndicator()
|
||||||
|
else if (urlIsValid) Icon(Icons.Outlined.Done, "Done")
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
Button({}, enabled = urlIsValid) {
|
LocationPermissionScreen()
|
||||||
|
|
||||||
|
Button({
|
||||||
|
SettingsPreferences.username = username.trim()
|
||||||
|
SettingsPreferences.url = url
|
||||||
|
onConfirm()
|
||||||
|
}, enabled = urlIsValid
|
||||||
|
&& !loading
|
||||||
|
&& username.trim().isNotEmpty()
|
||||||
|
&& hasLocationPermissions(appCtx)
|
||||||
|
) {
|
||||||
Text(appStr(R.string.apply))
|
Text(appStr(R.string.apply))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun LocationPermissionScreen() {
|
||||||
|
val context = LocalContext.current
|
||||||
|
val locationPermissions = arrayOf(
|
||||||
|
Manifest.permission.ACCESS_FINE_LOCATION
|
||||||
|
)
|
||||||
|
|
||||||
|
val hasLocationPermissions = remember {
|
||||||
|
mutableStateOf(
|
||||||
|
locationPermissions.all {
|
||||||
|
ContextCompat.checkSelfPermission(context, it) == PackageManager.PERMISSION_GRANTED
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
val permissionLauncher = rememberLauncherForActivityResult(
|
||||||
|
contract = ActivityResultContracts.RequestMultiplePermissions()
|
||||||
|
) { permissions ->
|
||||||
|
hasLocationPermissions.value = permissions.all { it.value }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasLocationPermissions.value) {
|
||||||
|
Button({}, enabled = false) {
|
||||||
|
Icon(Icons.Outlined.Done, "Done")
|
||||||
|
Text("Разрешения получены")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Button(onClick = {
|
||||||
|
permissionLauncher.launch(locationPermissions)
|
||||||
|
}) {
|
||||||
|
Text("Получить разрешения")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hasLocationPermissions(context: Context): Boolean {
|
||||||
|
return ContextCompat.checkSelfPermission(
|
||||||
|
context,
|
||||||
|
Manifest.permission.ACCESS_FINE_LOCATION
|
||||||
|
) == PackageManager.PERMISSION_GRANTED && ContextCompat.checkSelfPermission(
|
||||||
|
context,
|
||||||
|
Manifest.permission.ACCESS_COARSE_LOCATION
|
||||||
|
) == PackageManager.PERMISSION_GRANTED
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user