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

update design library #3492

Merged
merged 2 commits into from
Feb 8, 2024
+11 −7
Merged

update design library #3492

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
b7722f9
update and adapt design library version
andresmr Feb 8, 2024
c6ab8bc
fix tests
andresmr Feb 8, 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
3 changes: 2 additions & 1 deletion app/src/androidTest/java/org/dhis2/usescases/searchte/robot/SearchTeiRobot.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.not
import org.hisp.dhis.mobile.ui.designsystem.component.AdditionalInfoItem
import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel


fun searchTeiRobot(searchTeiRobot: SearchTeiRobot.() -> Unit) {
Expand Down Expand Up @@ -186,7 +187,7 @@ class SearchTeiRobot : BaseRobot() {

composeTestRule.setContent {
ListCard(
title = title,
title = ListCardTitleModel(text = title),
additionalInfoList = displayedAttributes,
onCardClick = { }
)
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/org/dhis2/usescases/datasets/datasetDetail/datasetList/DataSetListAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.dhis2.databinding.ItemDatasetBinding
import org.dhis2.usescases.datasets.datasetDetail.DataSetDetailModel
import org.dhis2.usescases.datasets.datasetDetail.datasetList.mapper.DatasetCardMapper
import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel

class DataSetListAdapter(
val viewModel: DataSetListViewModel,
Expand Down Expand Up @@ -49,7 +50,7 @@ class DataSetListAdapter(
)
ListCard(
listAvatar = card.avatar,
title = card.title,
title = ListCardTitleModel(text = card.title),
lastUpdated = card.lastUpdated,
additionalInfoList = card.additionalInfo,
actionButton = card.actionButton,
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/dhis2/usescases/programEventDetail/ProgramEventDetailLiveAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import org.dhis2.usescases.programEventDetail.eventList.ui.mapper.EventCardMappe
import org.dhis2.usescases.teiDashboard.dashboardfragments.teidata.teievents.EventViewHolder
import org.hisp.dhis.android.core.program.Program
import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel

class ProgramEventDetailLiveAdapter(
private val program: Program,
Expand Down Expand Up @@ -65,7 +66,7 @@ class ProgramEventDetailLiveAdapter(
)
ListCard(
listAvatar = card.avatar,
title = card.title,
title = ListCardTitleModel(text = card.title),
lastUpdated = card.lastUpdated,
additionalInfoList = card.additionalInfo,
actionButton = card.actionButton,
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/dhis2/usescases/searchTrackEntity/adapters/SearchTeiLiveAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.dhis2.databinding.ItemSearchErrorBinding
import org.dhis2.databinding.ItemSearchTrackedEntityBinding
import org.dhis2.usescases.searchTrackEntity.ui.mapper.TEICardMapper
import org.hisp.dhis.mobile.ui.designsystem.component.ListCard
import org.hisp.dhis.mobile.ui.designsystem.component.ListCardTitleModel

class SearchTeiLiveAdapter(
private val fromRelationship: Boolean,
Expand Down Expand Up @@ -101,7 +102,7 @@ class SearchTeiLiveAdapter(
)
ListCard(
listAvatar = card.avatar,
title = card.title,
title = ListCardTitleModel(text = card.title),
lastUpdated = card.lastUpdated,
additionalInfoList = card.additionalInfo,
actionButton = card.actionButton,
Expand Down
2 changes: 1 addition & 1 deletion form/src/main/java/org/dhis2/form/ui/provider/inputfield/CheckBoxProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal fun ProvideCheckBoxInput(
uid = option.uid(),
checked = fieldUiModel.displayName == option.displayName(),
enabled = true,
textInput = option.displayName(),
textInput = option.displayName() ?: "",
)
} ?: emptyList()

Expand Down
2 changes: 1 addition & 1 deletion form/src/main/java/org/dhis2/form/ui/provider/inputfield/RadioButtonProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ internal fun ProvideRadioButtonInput(
uid = option.uid(),
selected = fieldUiModel.displayName == option.displayName(),
enabled = true,
textInput = option.displayName(),
textInput = option.displayName() ?: "",
)
} ?: emptyList()

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ kotlin = '1.9.21'
hilt = '2.47'
hiltCompiler = '1.0.0'
jacoco = '0.8.10'
designSystem = "0.2-20240206.071329-16"
designSystem = "0.2-20240208.105715-18"
dhis2sdk = "1.10.0-20240129.132841-8"
ruleEngine = "2.1.9"
appcompat = "1.6.1"
Expand Down
Loading