From 3c3dea1decbaca441f33d5f48146a8eaccd3f799 Mon Sep 17 00:00:00 2001 From: Benjamin Mwalimu Date: Fri, 20 Dec 2024 16:56:26 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Add=20row=20weights=20to=20the?= =?UTF-8?q?=20fix=20top=20bar=20icons=20being=20hidden=20when=20text=20is?= =?UTF-8?q?=20too=20big=20(#3669)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🐛 Add Row weights to the top bar * ⬆️ Update the app version --- android/buildSrc/src/main/kotlin/BuildConfigs.kt | 4 ++-- .../fhircore/quest/ui/main/components/TopScreenSection.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/buildSrc/src/main/kotlin/BuildConfigs.kt b/android/buildSrc/src/main/kotlin/BuildConfigs.kt index b4ac17129a..7b8368968e 100644 --- a/android/buildSrc/src/main/kotlin/BuildConfigs.kt +++ b/android/buildSrc/src/main/kotlin/BuildConfigs.kt @@ -2,8 +2,8 @@ object BuildConfigs { const val minSdk = 26 const val compileSdk = 34 const val targetSdk = 34 - const val versionCode = 11 - const val versionName = "2.0.1" + const val versionCode = 12 + const val versionName = "2.0.2" const val applicationId = "org.smartregister.opensrp" const val jvmToolchain = 17 const val kotlinCompilerExtensionVersion = "1.5.8" diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt index 29c14d7acc..cf12ec2645 100644 --- a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt +++ b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt @@ -146,7 +146,7 @@ fun TopScreenSection( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, ) { - Row(verticalAlignment = Alignment.CenterVertically) { + Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(4f)) { Icon( when (toolBarHomeNavigation) { ToolBarHomeNavigation.OPEN_DRAWER -> Icons.Filled.Menu @@ -169,7 +169,7 @@ fun TopScreenSection( Row( verticalAlignment = Alignment.CenterVertically, - modifier = Modifier.padding(start = 8.dp), + modifier = Modifier.padding(start = 8.dp).weight(1f), ) { SetupToolbarIcons( menuIcons = topScreenSection?.menuIcons, @@ -412,7 +412,7 @@ private fun RenderMenuIcon( @Composable fun TopScreenSectionWithFilterItemOverNinetyNinePreview() { TopScreenSection( - title = "All Clients", + title = "All Clients All Clients All Clients All Clients All Clients", searchQuery = SearchQuery("Eddy"), filteredRecordsCount = 120, onSearchTextChanged = { _, _ -> },