Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Add row weights to the fix top bar icons being hidden when text is too big #3669

Merged
merged 4 commits into from
Dec 20, 2024
Merged

🐛 Add row weights to the fix top bar icons being hidden when text is too big #3669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6728efe
🐛 Add Row weights to the top bar
dubdabasoduba Dec 20, 2024
c5c01c9
Merge branch 'main' into feature/fix_top_bar
dubdabasoduba Dec 20, 2024
c780027
⬆️ Update the app version
dubdabasoduba Dec 20, 2024
7aaf66e
Merge branch 'feature/fix_top_bar' of github.com:opensrp/fhircore int…
dubdabasoduba Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/buildSrc/src/main/kotlin/BuildConfigs.kt
View file
Open in desktop
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
6 changes: 3 additions & 3 deletions ...est/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween,
) {
Row(verticalAlignment = Alignment.CenterVertically) {
Row(verticalAlignment = Alignment.CenterVertically, modifier = Modifier.weight(4f)) {

Check warning on line 149 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt#L149 

Added line #L149 was not covered by tests
Icon(
when (toolBarHomeNavigation) {
ToolBarHomeNavigation.OPEN_DRAWER -> Icons.Filled.Menu
Expand All @@ -169,7 +169,7 @@

Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(start = 8.dp),
modifier = Modifier.padding(start = 8.dp).weight(1f),

Check warning on line 172 in android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt

View check run for this annotation

Codecov / codecov/patch

android/quest/src/main/java/org/smartregister/fhircore/quest/ui/main/components/TopScreenSection.kt#L172 

Added line #L172 was not covered by tests
) {
SetupToolbarIcons(
menuIcons = topScreenSection?.menuIcons,
Expand Down Expand Up @@ -412,7 +412,7 @@
@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
Loading