nm17/narodmon-app
1
1
Fork 0
Code Issues 8 Pull requests 1 Projects 1 Releases Packages Activity

dc09-sensors #4

Merged
nm17 merged 6 commits from dc09-sensors into master 2023-06-05 21:37:07 +03:00
Conversation 0 Commits 6 Files changed 6 +2 -8
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 35bd573cb0 - Show all commits

9
app/src/main/java/ru/nm17/narodmon/ui/elements/AgreementDialog.kt
View file

@ -2,9 +2,6 @@
package ru.nm17.narodmon.ui.elements package ru.nm17.narodmon.ui.elements
import android.content.Context
import android.content.Intent
import android.net.Uri
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -22,9 +19,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.activity.ComponentActivity
import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.platform.LocalUriHandler
import androidx.core.content.ContextCompat.startActivity
import ru.nm17.narodmon.R import ru.nm17.narodmon.R
import kotlin.system.exitProcess import kotlin.system.exitProcess
@ -40,7 +35,7 @@ fun AgreementDialog(onClick: () -> Unit) {
Text(text = stringResource(id = R.string.agreement_dialog_text)) Text(text = stringResource(id = R.string.agreement_dialog_text))
Divider(Modifier.padding(vertical = 8.dp)) Divider(Modifier.padding(vertical = 8.dp))
ListItem( ListItem(
headlineText = { headlineContent = {
Text( Text(
text = stringResource(id = R.string.privacy_policy), text = stringResource(id = R.string.privacy_policy),
style = MaterialTheme.typography.titleSmall style = MaterialTheme.typography.titleSmall
@ -56,7 +51,7 @@ fun AgreementDialog(onClick: () -> Unit) {
) )
ListItem( ListItem(
headlineText = { headlineContent = {
Text( Text(
text = stringResource(id = R.string.user_agreement), text = stringResource(id = R.string.user_agreement),
style = MaterialTheme.typography.titleSmall style = MaterialTheme.typography.titleSmall

1
app/src/main/java/ru/nm17/narodmon/ui/elements/Scaffolds.kt
View file

@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import kotlinx.coroutines.launch import kotlinx.coroutines.launch