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

Release/0.4.0.1 to develop #337

Merged
merged 11 commits into from
Dec 9, 2024
Merged

Release/0.4.0.1 to develop #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
51ba73a
Merge pull request #317 from dhis2/create-start-release-job
xavimolloy Oct 23, 2024
1b2dc0e
Merge pull request #326 from dhis2/release/0.4.0-SNAPSHOT
xavimolloy Nov 19, 2024
2ac840e
build: update design system version to new hotfix version
xavimolloy Nov 20, 2024
eb280a7
hotfix: async fetching of dropdown items
Balcan Nov 19, 2024
e3cbfe6
fix tests
Balcan Nov 22, 2024
e211e9e
fix snapshot test
Balcan Nov 22, 2024
768cdba
fix ktlint
Balcan Nov 22, 2024
c459d76
add missing docs
Balcan Nov 22, 2024
007f4b0
Merge pull request #332 from dhis2/large_option_set
xavimolloy Nov 22, 2024
44dafb4
add access to dismiss callback in dropdown inputs (#335)
Balcan Nov 28, 2024
a8d1cee
Merge branch 'develop' into release/0.4.0.1
andresmr Dec 3, 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
25 changes: 20 additions & 5 deletions common/src/commonMain/kotlin/org/hisp/dhis/common/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ fun Main(
modifier = Modifier
.background(SurfaceColor.Container),
) {
val screenDropdownItemList = mutableListOf<DropdownItem>()
Groups.entries.forEach {
screenDropdownItemList.add(DropdownItem(it.label))
var screenDropdownItemList by remember {
mutableStateOf(emptyList<DropdownItem>())
}

if (isComponentSelected) {
Expand All @@ -91,14 +90,30 @@ fun Main(
top = Spacing.Spacing16,
),
title = "Group",
dropdownItems = screenDropdownItemList.toList(),
onItemSelected = { currentScreen.value = getCurrentScreen(it.label) },
fetchItem = { index -> screenDropdownItemList[index] },
itemCount = screenDropdownItemList.size,
onSearchOption = { query ->
screenDropdownItemList = if (query.isNotEmpty()) {
screenDropdownItemList.filter { it.label.contains(query) }
} else {
Groups.entries.map {
DropdownItem(it.label)
}
}
},
useDropDown = false,
onItemSelected = { _, item -> currentScreen.value = getCurrentScreen(item.label) },
onResetButtonClicked = { currentScreen.value = Groups.NO_GROUP_SELECTED },
state = InputShellState.UNFOCUSED,
expanded = true,
selectedItem = DropdownItem(currentScreen.value.label),
inputStyle = InputStyle.DataInputStyle()
.apply { backGroundColor = SurfaceColor.SurfaceBright },
loadOptions = {
screenDropdownItemList = Groups.entries.map {
DropdownItem(it.label)
}
},
)

when (currentScreen.value) {
Expand Down
13 changes: 10 additions & 3 deletions ...n/src/commonMain/kotlin/org/hisp/dhis/common/screens/components/GroupComponentDropDown.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,18 @@ fun GroupComponentDropDown(
InputDropDown(
modifier = modifier.padding(horizontal = Spacing.Spacing16),
title = "Component",
dropdownItems = dropdownItems,
onItemSelected = onItemSelected,
itemCount = dropdownItems.size,
onSearchOption = {},
fetchItem = { index -> dropdownItems[index] },
onItemSelected = { _, item -> onItemSelected(item) },
onResetButtonClicked = onResetButtonClicked,
selectedItem = selectedItem,
state = InputShellState.UNFOCUSED,
inputStyle = InputStyle.DataInputStyle().apply { backGroundColor = SurfaceColor.SurfaceBright },
useDropDown = false,
inputStyle = InputStyle.DataInputStyle()
.apply { backGroundColor = SurfaceColor.SurfaceBright },
loadOptions = {
/*no-op*/
},
)
}
14 changes: 9 additions & 5 deletions ...n/src/commonMain/kotlin/org/hisp/dhis/common/screens/parameter/ParameterSelectorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,16 @@ fun ParameterSelectorScreen() {
title = "DropDown parameter",
state = InputShellState.UNFOCUSED,
inputStyle = InputStyle.ParameterInputStyle(),
dropdownItems = listOf(
DropdownItem("Item 1"),
DropdownItem("Item 2"),
),
onItemSelected = {},
itemCount = 2,
onSearchOption = {},
fetchItem = { index ->
DropdownItem("Item $index")
},
onItemSelected = { _, _ -> },
onResetButtonClicked = {},
loadOptions = {
/*no-op*/
},
)
},
onExpand = {},
Expand Down
100 changes: 74 additions & 26 deletions ...rc/commonMain/kotlin/org/hisp/dhis/common/screens/toggleableInputs/InputDropDownScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,64 +30,88 @@ fun InputDropDownScreen() {
)
var selectedItem by remember { mutableStateOf<DropdownItem?>(null) }

ColumnComponentContainer("Basic Input Dropdown with < 7 inputs") {
ColumnComponentContainer("Basic Input Dropdown") {
InputDropDown(
title = "Label",
state = InputShellState.UNFOCUSED,
dropdownItems = options.take(6),
itemCount = options.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
onResetButtonClicked = {
selectedItem = null
},
onItemSelected = {
selectedItem = it
onItemSelected = { _, item ->
selectedItem = item
},
selectedItem = selectedItem,
loadOptions = {
/*no-op*/
},
)

InputDropDown(
title = "Label - With supporting text",
state = InputShellState.UNFOCUSED,
dropdownItems = options.take(6),
itemCount = options.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
onResetButtonClicked = {
selectedItem = null
},
onItemSelected = {
selectedItem = it
onItemSelected = { _, item ->
selectedItem = item
},
selectedItem = selectedItem,
supportingTextData = listOf(
SupportingTextData(text = "Options"),
),
loadOptions = {
/*no-op*/
},
)

InputDropDown(
title = "Label - Parameter Style",
inputStyle = InputStyle.ParameterInputStyle(),
state = InputShellState.UNFOCUSED,
dropdownItems = options.take(6),
itemCount = options.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
onResetButtonClicked = {
selectedItem = null
},
onItemSelected = {
selectedItem = it
onItemSelected = { _, item ->
selectedItem = item
},
selectedItem = selectedItem,
loadOptions = {
/*no-op*/
},
)
}

ColumnComponentContainer("Basic Input Dropdown with >= 7 inputs") {
ColumnComponentContainer("Basic Input Dropdown for large set") {
var selectedItem4 by remember { mutableStateOf<DropdownItem?>(null) }
var filteredItems by remember { mutableStateOf(options) }
InputDropDown(
title = "Label",
state = InputShellState.UNFOCUSED,
dropdownItems = options,
itemCount = filteredItems.size,
onSearchOption = { query ->
filteredItems = options.filter { it.label.contains(query) }
},
fetchItem = { index -> filteredItems[index] },
useDropDown = false,
onResetButtonClicked = {
selectedItem4 = null
},
onItemSelected = {
selectedItem4 = it
onItemSelected = { _, item ->
selectedItem4 = item
},
selectedItem = selectedItem4,
loadOptions = {
/*no-op*/
},
)
}

Expand All @@ -96,14 +120,20 @@ fun InputDropDownScreen() {
InputDropDown(
title = "Label",
state = InputShellState.UNFOCUSED,
dropdownItems = options,
itemCount = options.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
useDropDown = false,
onResetButtonClicked = {
selectedItem1 = null
},
onItemSelected = {
selectedItem1 = it
onItemSelected = { _, item ->
selectedItem1 = item
},
selectedItem = selectedItem1,
loadOptions = {
/*no-op*/
},
)
}

Expand All @@ -112,14 +142,20 @@ fun InputDropDownScreen() {
InputDropDown(
title = "Label",
state = InputShellState.ERROR,
dropdownItems = options,
itemCount = options.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
useDropDown = false,
onResetButtonClicked = {
selectedItem2 = null
},
onItemSelected = {
selectedItem2 = it
onItemSelected = { _, item ->
selectedItem2 = item
},
selectedItem = selectedItem2,
loadOptions = {
/*no-op*/
},
)
}

Expand All @@ -128,14 +164,20 @@ fun InputDropDownScreen() {
InputDropDown(
title = "Label",
state = InputShellState.DISABLED,
dropdownItems = options,
itemCount = options.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
useDropDown = false,
onResetButtonClicked = {
selectedItem3 = null
},
onItemSelected = {
selectedItem3 = it
onItemSelected = { _, item ->
selectedItem3 = item
},
selectedItem = selectedItem3,
loadOptions = {
/*no-op*/
},
)
}

Expand All @@ -148,14 +190,20 @@ fun InputDropDownScreen() {
InputDropDown(
title = "Label",
state = InputShellState.UNFOCUSED,
dropdownItems = dropdownItems,
itemCount = dropdownItems.size,
onSearchOption = {},
fetchItem = { index -> options[index] },
useDropDown = false,
onResetButtonClicked = {
selectedItem = null
},
onItemSelected = {
selectedItem = it
onItemSelected = { _, item ->
selectedItem = item
},
selectedItem = selectedItem,
loadOptions = {
/*no-op*/
},
)
}
}
Expand Down
Loading
Loading