Skip to content

Added leading Icon to the missing preferences #10

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

Open
Georgegipa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added leading Icon to the missing preferences #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 0 deletions ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/DropDownPref.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import java.lang.Exception
* @param dropdownBackgroundColor Color of the dropdown menu
* @param textColor Text colour of the [title] and [summary]
* @param enabled If false, this Pref cannot be clicked and the dropdown menu will not show.
* @param leadingIcon Icon which is positioned at the start of the Pref
* @param entries Map of keys to values for entries that should be shown in the DropDown.
*/
@Composable
Expand All @@ -47,6 +48,7 @@ fun DropDownPref(
dropdownBackgroundColor: Color? = null,
textColor: Color = MaterialTheme.colorScheme.onBackground,
enabled: Boolean = true,
leadingIcon: @Composable (() -> Unit)? = null,
entries: Map<String, String> = mapOf()
) {

Expand Down Expand Up @@ -83,6 +85,7 @@ fun DropDownPref(
useSelectedAsSummary && value == null -> "Not Set"
else -> summary
},
leadingIcon = leadingIcon,
textColor = textColor,
enabled = enabled,
onClick = {
Expand Down
3 changes: 3 additions & 0 deletions ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/EditTextPref.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import kotlinx.coroutines.launch
* @param dialogBackgroundColor Color of the dropdown menu
* @param textColor Text colour of the [title] and [summary]
* @param enabled If false, this Pref cannot be clicked.
* @param leadingIcon Icon which is positioned at the start of the Pref
*/
@OptIn(ExperimentalMaterial3Api::class)
@ExperimentalComposeUiApi
Expand All @@ -54,6 +55,7 @@ fun EditTextPref(
dialogBackgroundColor: Color = MaterialTheme.colorScheme.background,
textColor: Color = MaterialTheme.colorScheme.onBackground,
enabled: Boolean = true,
leadingIcon: @Composable (() -> Unit)? = null
) {

var showDialog by rememberSaveable { mutableStateOf(false) }
Expand Down Expand Up @@ -107,6 +109,7 @@ fun EditTextPref(
summary = summary,
textColor = textColor,
enabled = enabled,
leadingIcon = leadingIcon,
onClick = { if (enabled) showDialog = !showDialog },
)

Expand Down
3 changes: 3 additions & 0 deletions ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/ListPref.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import java.lang.Exception
* @param selectionColor Colour of the radiobutton of the selected item
* @param buttonColor Colour of the cancel button
* @param enabled If false, this Pref cannot be clicked and the Dialog cannot be shown.
* @param leadingIcon Icon which is positioned at the start of the Pref
* @param entries Map of keys to values for entries that should be shown in the Dialog.
*/
@OptIn(ExperimentalMaterial3Api::class)
Expand All @@ -55,6 +56,7 @@ fun ListPref(
selectionColor: Color = MaterialTheme.colorScheme.primary,
buttonColor: Color = MaterialTheme.colorScheme.primary,
enabled: Boolean = true,
leadingIcon: @Composable (() -> Unit)? = null,
entries: Map<String, String> = mapOf(), //TODO: Change to List?
) {

Expand Down Expand Up @@ -90,6 +92,7 @@ fun ListPref(
useSelectedAsSummary && selected == null -> "Not Set"
else -> summary
},
leadingIcon = leadingIcon,
modifier = modifier,
textColor = textColor,
enabled = true,
Expand Down
3 changes: 3 additions & 0 deletions ComposePrefs3/src/main/java/com/jamal/composeprefs3/ui/prefs/MultiSelectListPref.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import java.lang.Exception
* @param dialogBackgroundColor Background color of the Dialog
* @param textColor Text colour of the [title] and [summary]
* @param enabled If false, this Pref cannot be clicked and the Dialog cannot be shown.
* @param leadingIcon Icon which is positioned at the start of the Pref
* @param entries Map of keys to values for entries that should be shown in the Dialog.
*/
@OptIn(ExperimentalMaterial3Api::class)
Expand All @@ -50,6 +51,7 @@ fun MultiSelectListPref(
dialogBackgroundColor: Color = MaterialTheme.colorScheme.surface,
textColor: Color = MaterialTheme.colorScheme.onBackground,
enabled: Boolean = true,
leadingIcon: @Composable (() -> Unit)? = null,
entries: Map<String, String> = mapOf() //TODO: Change to List?
) {

Expand Down Expand Up @@ -89,6 +91,7 @@ fun MultiSelectListPref(
title = title,
modifier = modifier,
summary = summary,
leadingIcon = leadingIcon,
textColor = textColor,
enabled = true,
onClick = { if (enabled) showDialog = !showDialog },
Expand Down