From 17dc2faec65a15ecff527b68ea5a1fd3e781dbc1 Mon Sep 17 00:00:00 2001 From: Stefano Sansone Date: Wed, 28 Feb 2024 23:42:06 +0000 Subject: [PATCH 1/2] fix reader container status bar color --- .../feature/reader/WebReaderLoadingContainer.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/reader/WebReaderLoadingContainer.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/reader/WebReaderLoadingContainer.kt index e58b5f0cb..3a80aeaf6 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/reader/WebReaderLoadingContainer.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/feature/reader/WebReaderLoadingContainer.kt @@ -6,6 +6,7 @@ import android.view.View import androidx.activity.ComponentActivity import androidx.activity.compose.LocalOnBackPressedDispatcherOwner import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels import androidx.compose.foundation.background import androidx.compose.foundation.isSystemInDarkTheme @@ -78,12 +79,14 @@ class WebReaderLoadingContainerActivity : ComponentActivity() { viewModel.loadItem(slug = slug, requestID = requestID) + enableEdgeToEdge() + setContent { OmnivoreTheme { Box( modifier = Modifier - .fillMaxSize() - .background(color = Color.Black) + .fillMaxSize() + .background(color = if (isSystemInDarkTheme()) Color.Black else Color.White) ) { if (viewModel.hasFetchError.value == true) { Text(stringResource(R.string.web_reader_loading_container_error_msg)) @@ -499,11 +502,11 @@ fun ReaderTopAppBar( fun BottomSheetUI(content: @Composable () -> Unit) { Box( modifier = Modifier - .wrapContentHeight() - .fillMaxWidth() - .clip(RoundedCornerShape(topEnd = 20.dp, topStart = 20.dp)) - .background(Color.White) - .statusBarsPadding() + .wrapContentHeight() + .fillMaxWidth() + .clip(RoundedCornerShape(topEnd = 20.dp, topStart = 20.dp)) + .background(Color.White) + .statusBarsPadding() ) { Scaffold { paddingValues -> Box(modifier = Modifier.fillMaxSize()) { From 20d1ca3151b1724c51b20d79ce4b8c3a5f5a59fa Mon Sep 17 00:00:00 2001 From: Stefano Sansone Date: Wed, 28 Feb 2024 23:42:16 +0000 Subject: [PATCH 2/2] bump version --- android/Omnivore/app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/Omnivore/app/build.gradle.kts b/android/Omnivore/app/build.gradle.kts index b3b0602fd..b77565308 100644 --- a/android/Omnivore/app/build.gradle.kts +++ b/android/Omnivore/app/build.gradle.kts @@ -28,7 +28,7 @@ android { minSdk = 26 targetSdk = 34 versionCode = 194001 - versionName = "0.194.1" + versionName = "0.195.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables {