From a820a1949f5bff1c0467d12719d93113418e4298 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 14 Nov 2023 12:23:40 +0800 Subject: [PATCH 1/2] Fix padding on library header on Android --- android/Omnivore/app/build.gradle | 4 ++-- .../omnivore/ui/library/LibraryNavigationBar.kt | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index 2f2e663aa..df72a15bd 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "app.omnivore.omnivore" minSdk 26 targetSdk 33 - versionCode 132 - versionName "0.0.132" + versionCode 140 + versionName "0.0.140" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryNavigationBar.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryNavigationBar.kt index e0ccd4b35..30af18ee7 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryNavigationBar.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/library/LibraryNavigationBar.kt @@ -35,12 +35,11 @@ fun LibraryNavigationBar( val actionsMenuItem: SavedItemWithLabelsAndHighlights? by savedItemViewModel.actionsMenuItemLiveData.observeAsState(null) TopAppBar( - title = { - Text(if (actionsMenuItem == null) - stringResource(R.string.library_nav_bar_title) else - stringResource(R.string.library_nav_bar_title_alt)) - }, - modifier = Modifier.statusBarsPadding(), + title = { + Text(if (actionsMenuItem == null) + stringResource(R.string.library_nav_bar_title) else + stringResource(R.string.library_nav_bar_title_alt)) + }, colors = TopAppBarDefaults.topAppBarColors( containerColor = if (actionsMenuItem == null) MaterialTheme.colorScheme.background else MaterialTheme.colorScheme.surfaceVariant ), From 41beee5ad35b4b1fea41fdc52274b89bc20485d8 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 14 Nov 2023 13:18:08 +0800 Subject: [PATCH 2/2] Update build --- android/Omnivore/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index df72a15bd..069a7c6b8 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -17,8 +17,8 @@ android { applicationId "app.omnivore.omnivore" minSdk 26 targetSdk 33 - versionCode 140 - versionName "0.0.140" + versionCode 142 + versionName "0.0.142" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables {