Skip to content

Commit

Permalink
Merge branch 'main' into add-entry-to-composition
Browse files Browse the repository at this point in the history
  • Loading branch information
sharon2719 authored Dec 20, 2024
2 parents c033e5f + 3c3dea1 commit 39ef9c2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions android/buildSrc/src/main/kotlin/BuildConfigs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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 = { _, _ -> },
Expand Down

0 comments on commit 39ef9c2

Please sign in to comment.