@@ -4,12 +4,10 @@ import android.Manifest
44import androidx.annotation.DrawableRes
55import androidx.compose.foundation.clickable
66import androidx.compose.foundation.layout.*
7- import androidx.compose.foundation.rememberScrollState
87import androidx.compose.foundation.text.InlineTextContent
98import androidx.compose.foundation.text.KeyboardActions
109import androidx.compose.foundation.text.KeyboardOptions
1110import androidx.compose.foundation.text.appendInlineContent
12- import androidx.compose.foundation.verticalScroll
1311import androidx.compose.material.*
1412import androidx.compose.material.icons.Icons
1513import androidx.compose.material.icons.outlined.*
@@ -35,7 +33,6 @@ import androidx.compose.ui.text.input.ImeAction
3533import androidx.compose.ui.text.input.KeyboardType
3634import androidx.compose.ui.tooling.preview.Preview
3735import androidx.compose.ui.unit.dp
38- import androidx.compose.ui.window.Dialog
3936import com.google.accompanist.permissions.ExperimentalPermissionsApi
4037import com.google.accompanist.permissions.PermissionStatus
4138import com.google.accompanist.permissions.rememberMultiplePermissionsState
@@ -47,6 +44,7 @@ import com.mapcode.R
4744import com.mapcode.theme.Green600
4845import com.mapcode.theme.MapcodeTheme
4946import com.mapcode.theme.Yellow300
47+ import com.mapcode.util.ScrollableDialog
5048import kotlinx.coroutines.CoroutineScope
5149import kotlinx.coroutines.launch
5250
@@ -124,43 +122,6 @@ fun MapBox(
124122 }
125123}
126124
127- @Composable
128- fun ScrollableDialog (onDismiss : () -> Unit , title : String , buttonText : String , content : @Composable () -> Unit ) {
129- Dialog (onDismissRequest = onDismiss) {
130- Surface (color = MaterialTheme .colors.surface, shape = MaterialTheme .shapes.medium) {
131- Column (verticalArrangement = Arrangement .SpaceBetween ) {
132- Text (
133- modifier = Modifier
134- .align(Alignment .Start )
135- .height(64 .dp)
136- .wrapContentSize()
137- .padding(start = 24 .dp, end = 24 .dp),
138- text = title,
139- style = MaterialTheme .typography.h6
140- )
141- Divider (Modifier .height(1 .dp))
142- Box (
143- Modifier
144- .weight(1f , fill = false )
145- .verticalScroll(rememberScrollState())
146- .padding(start = 24 .dp, end = 24 .dp, top = 8 .dp, bottom = 8 .dp)
147- ) {
148- content()
149- }
150- Divider (Modifier .height(1 .dp))
151- TextButton (
152- modifier = Modifier
153- .align(Alignment .End )
154- .padding(8 .dp),
155- onClick = onDismiss
156- ) {
157- Text (buttonText)
158- }
159- }
160- }
161- }
162- }
163-
164125@Composable
165126fun AboutDialog (onDismiss : () -> Unit = {}) {
166127 val uriHandler = LocalUriHandler .current
0 commit comments