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

fix: [ANDROAPP-6457] limit max height of expanded cards in maps #3910

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
+21 −4
Open

fix: [ANDROAPP-6457] limit max height of expanded cards in maps #3910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b321ad2
fix: [ANDROAPP-6457] limit max height of expanded cards in maps
Balcan Nov 29, 2024
d730f11
fix:[ANDROAPP-6457] hide tei attributes if value is empty
xavimolloy Dec 12, 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
1 change: 1 addition & 0 deletions app/src/main/java/org/dhis2/usescases/teiDashboard/ui/mapper/TeiDashboardCardMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,5 @@ class TeiDashboardCardMapper(
this.filter { it.first.valueType() != ValueType.IMAGE }
.filter { it.first.valueType() != ValueType.COORDINATE }
.filter { it.first.valueType() != ValueType.FILE_RESOURCE }
.filter { it.second.value()?.isNotEmpty() == true }
xavimolloy marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/dhis2/usescases/tracker/TrackedEntityInstanceInfoProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class TrackedEntityInstanceInfoProvider(
ValueType.IMAGE,
ValueType.FILE_RESOURCE,
ValueType.COORDINATE,
).contains(attribute.valueType)
).contains(attribute.valueType) && attribute.value != null
}.map { attribute ->
AdditionalInfoItem(
key = attribute.displayFormName,
Expand Down
22 changes: 19 additions & 3 deletions dhis2_android_maps/src/main/java/org/dhis2/maps/views/MapScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,23 @@ import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyItemScope
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material.Icon
import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.onGloballyPositioned
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import org.dhis2.maps.R
import org.dhis2.maps.location.LocationState
Expand All @@ -34,7 +41,15 @@ fun MapScreen(
onItem: @Composable LazyItemScope.(item: MapItemModel) -> Unit,

) {
Box(modifier = Modifier.fillMaxSize()) {
var pagerMaxHeight by remember { mutableStateOf(Dp.Unspecified) }

Box(
modifier = Modifier
.fillMaxSize()
.onGloballyPositioned {
pagerMaxHeight = (it.size.height * 0.7).dp
},
) {
map()
Column(
modifier = Modifier
Expand All @@ -46,7 +61,8 @@ fun MapScreen(
MapItemHorizontalPager(
modifier = Modifier
.align(Alignment.BottomCenter)
.testTag("MAP_CAROUSEL"),
.testTag("MAP_CAROUSEL")
.heightIn(max = pagerMaxHeight),
state = listState,
items = items,
onItem = onItem,
Expand Down
Loading