diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/CloseButton.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/CloseButton.kt deleted file mode 100644 index aabee8b6b..000000000 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/CloseButton.kt +++ /dev/null @@ -1,47 +0,0 @@ -package app.omnivore.omnivore - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.Button -import androidx.compose.material.ButtonDefaults -import androidx.compose.material.Icon -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.unit.dp -import app.omnivore.omnivore.R - -typealias OnClickedClose = () -> Unit - -@Composable -fun CloseButton( - modifier: Modifier = Modifier, - onClickedClose: OnClickedClose -) { - Box( - modifier.then( - Modifier.padding(end = 13.dp, top = 13.dp) - ) - ) { - Button( - onClick = { onClickedClose() }, - modifier = Modifier.size(26.dp), - shape = CircleShape, - elevation = ButtonDefaults.elevation(defaultElevation = 0.dp, pressedElevation = 0.dp), - contentPadding = PaddingValues(0.dp), - colors = ButtonDefaults.outlinedButtonColors(backgroundColor = colorResource(id = R.color.cloud)) - ) { - Icon( - modifier = Modifier.align(Alignment.CenterVertically), - painter = painterResource(id = R.drawable.ic_x_2), - contentDescription = "CLOSE_BUTTON_DESCRIPTION", - tint = colorResource(id = R.color.gray_B7B7B7) - ) - } - } -} diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt index c1dce23f0..ab1495bd1 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveContent.kt @@ -1,19 +1,22 @@ package app.omnivore.omnivore -import android.view.Surface import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.material.MaterialTheme import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment -import androidx.compose.ui.Alignment.Companion.CenterHorizontally import androidx.compose.ui.Modifier import androidx.compose.material.* +import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.unit.dp +import kotlinx.coroutines.launch @Composable -fun SaveContent(extractedText: String?, modifier: Modifier, button: (@Composable () -> Unit)? = null) { +@OptIn(ExperimentalMaterialApi::class) +fun SaveContent(extractedText: String?, modalBottomSheetState: ModalBottomSheetState, modifier: Modifier) { + val coroutineScope = rememberCoroutineScope() + Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) { Column( verticalArrangement = Arrangement.Center, @@ -25,17 +28,17 @@ fun SaveContent(extractedText: String?, modifier: Modifier, button: (@Composable val authToken = "authToken" Text(text = extractedText ?: "no text extracted") - Spacer(modifier = Modifier.height(16.dp)) - Text(text = authToken ?: "no auth token") + Spacer(modifier = Modifier.height(16.dp)) + Text(text = authToken ?: "no auth token") + Button(onClick = { + coroutineScope.launch { + modalBottomSheetState.hide() + } + }) { + Text(text = "Dismiss") + } } - } - Column { - button?.let { - Box(modifier = Modifier.align(CenterHorizontally)) { - button() - } - } } } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt index ba2b1422e..71443102d 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/SaveSheetActivity.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import androidx.core.view.WindowCompat import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch @@ -120,16 +119,6 @@ abstract class SaveSheetActivity: AppCompatActivity() { .width(80.dp) .clip(RoundedCornerShape(50.dp)) ) - - CloseButton( - modifier = Modifier - .align(TopEnd) - .padding(10.dp) - ) { - coroutineScope.launch { - modalBottomSheetState.hide() - } - } } } @@ -175,7 +164,7 @@ abstract class SaveSheetActivity: AppCompatActivity() { onExit: () -> Unit? ) { Box(modifier = Modifier.height(300.dp).background(Color.White)) { - SaveContent(extractedText, modifier = Modifier.fillMaxSize()) + SaveContent(extractedText, modalBottomSheetState, modifier = Modifier.fillMaxSize()) } }