(All) Customize icon style used for use-cases #6

Removes the material-icons-extended dependency at the same time for the library.

Author: maxkeppeler

buildSrc/src/main/java/LibraryModulePlugin.kt

@@ -46,7 +46,6 @@ class LibraryModulePlugin : Plugin<Project> {
                 Dependencies.Compose.ANIMATION_GRAPHICS,
                 Dependencies.Compose.RUNTIME,
                 Dependencies.Compose.MATERIAL_3,
-                Dependencies.Compose.ICONS_EXTENDED,
             )
 
 

calendar/src/main/java/com/maxkeppeler/sheets/calendar/models/CalendarConfig.kt

@@ -15,7 +15,9 @@
  */
 package com.maxkeppeler.sheets.calendar.models
 
+import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
+import com.maxkeppeker.sheets.core.utils.BaseConstants.DEFAULT_ICON_STYLE
 import com.maxkeppeler.sheets.calendar.utils.Constants
 import java.time.LocalDate
 
@@ -28,6 +30,7 @@ import java.time.LocalDate
  * @param maxYear The maximum year that is selectable.
  * @param disabledDates A list of dates that will be marked as disabled and can not be selected.
  * @param disabledTimeline The timeline you want to disable and which dates can not be selected.
+ * @param icons The style of icons that are used for dialog/ view-specific icons.
  */
 class CalendarConfig(
     val style: CalendarStyle = CalendarStyle.MONTH,
@@ -36,5 +39,6 @@ class CalendarConfig(
     val minYear: Int = Constants.DEFAULT_MIN_YEAR,
     val maxYear: Int = Constants.DEFAULT_MAX_YEAR,
     val disabledDates: List<LocalDate>? = null,
-    val disabledTimeline: CalendarTimeline? = null
+    val disabledTimeline: CalendarTimeline? = null,
+    override val icons: LibIcons = DEFAULT_ICON_STYLE,
 ) : BaseConfigs()

calendar/src/main/java/com/maxkeppeler/sheets/calendar/views/CalendarTopComponent.kt

@@ -18,16 +18,12 @@
 package com.maxkeppeler.sheets.calendar.views
 
 import androidx.compose.animation.*
-import androidx.compose.animation.core.tween
 import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi
 import androidx.compose.animation.graphics.res.animatedVectorResource
 import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter
 import androidx.compose.animation.graphics.vector.AnimatedImageVector
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ChevronLeft
-import androidx.compose.material.icons.rounded.ChevronRight
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -113,7 +109,7 @@ internal fun CalendarTopComponent(
                 ) {
                     Icon(
                         modifier = Modifier.size(dimensionResource(RC.dimen.scd_size_150)),
-                        imageVector = Icons.Rounded.ChevronLeft,
+                        imageVector = config.icons.ChevronLeft,
                         contentDescription = stringResource(
                             when (config.style) {
                                 CalendarStyle.MONTH -> R.string.scd_calendar_dialog_prev_month
@@ -199,7 +195,7 @@ internal fun CalendarTopComponent(
                 ) {
                     Icon(
                         modifier = Modifier.size(dimensionResource(RC.dimen.scd_size_150)),
-                        imageVector = Icons.Rounded.ChevronRight,
+                        imageVector = config.icons.ChevronRight,
                         contentDescription = stringResource(
                             when (config.style) {
                                 CalendarStyle.MONTH -> R.string.scd_calendar_dialog_next_month

clock/src/main/java/com/maxkeppeler/sheets/clock/ClockView.kt

@@ -62,6 +62,7 @@ fun ClockView(
                 onAm = clockState::onChange12HourFormatValue,
             )
             KeyboardComponent(
+                config = config,
                 keys = clockState.keys,
                 disabledKeys = clockState.disabledKeys,
                 onEnterValue = clockState::onEnterValue,

clock/src/main/java/com/maxkeppeler/sheets/clock/models/ClockConfig.kt

@@ -15,15 +15,19 @@
  */
 package com.maxkeppeler.sheets.clock.models
 
+import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
+import com.maxkeppeker.sheets.core.utils.BaseConstants.DEFAULT_ICON_STYLE
 import java.time.LocalTime
 
 /**
  * The general configuration for the clock dialog.
  * @param defaultTime The default time.
  * @param is24HourFormat If the 24HourFormat is enabled.
+ * @param icons The style of icons that are used for dialog/ view-specific icons.
  */
 data class ClockConfig(
     val defaultTime: LocalTime? = null,
     val is24HourFormat: Boolean? = null,
+    override val icons: LibIcons = DEFAULT_ICON_STYLE,
 ) : BaseConfigs()

clock/src/main/java/com/maxkeppeler/sheets/clock/views/KeyItemComponent.kt

@@ -27,9 +27,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ChevronLeft
-import androidx.compose.material.icons.outlined.ChevronRight
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -46,11 +43,13 @@ import androidx.compose.ui.text.font.FontWeight
 import com.maxkeppeker.sheets.core.utils.TestTags
 import com.maxkeppeker.sheets.core.utils.testTags
 import com.maxkeppeler.sheets.clock.R
+import com.maxkeppeler.sheets.clock.models.ClockConfig
 import com.maxkeppeler.sheets.clock.utils.Constants
 import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The item component of the keyboard.
+ * @param config The general configuration for the dialog view.
  * @param key The key that the component represents.
  * @param disabled Whenever the current key is disabled.
  * @param onEnterValue The listener that is invoked when a value was clicked.
@@ -59,6 +58,7 @@ import com.maxkeppeler.sheets.core.R as RC
  */
 @Composable
 internal fun KeyItemComponent(
+    config: ClockConfig,
     key: String,
     disabled: Boolean = false,
     onEnterValue: (Int) -> Unit,
@@ -110,7 +110,7 @@ internal fun KeyItemComponent(
             Icon(
                 modifier = Modifier
                     .size(dimensionResource(RC.dimen.scd_size_175)),
-                imageVector = if (isActionNext) Icons.Outlined.ChevronRight else Icons.Outlined.ChevronLeft,
+                imageVector = if (isActionNext) config.icons.ChevronRight else config.icons.ChevronLeft,
                 contentDescription = stringResource(if (isActionNext) R.string.scd_clock_dialog_next_value else R.string.scd_clock_dialog_previous_value),
                 tint = MaterialTheme.colorScheme.secondary
             )

clock/src/main/java/com/maxkeppeler/sheets/clock/views/KeyboardComponent.kt

@@ -18,18 +18,19 @@ package com.maxkeppeler.sheets.clock.views
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.GridCells
 import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
+import com.maxkeppeler.sheets.clock.models.ClockConfig
 import com.maxkeppeler.sheets.clock.utils.Constants
 import com.maxkeppeler.sheets.core.R as RC
 
 /**
  * The keyboard component that is used to input the clock time.
+ * @param config The general configuration for the dialog view.
  * @param keys A list of keys that will be displayed.
  * @param disabledKeys A list of the keys that are displayed.
  * @param onEnterValue The listener that is invoked when a value was clicked.
@@ -38,6 +39,7 @@ import com.maxkeppeler.sheets.core.R as RC
  */
 @Composable
 internal fun KeyboardComponent(
+    config: ClockConfig,
     keys: List<String>,
     disabledKeys: List<String>,
     onEnterValue: (Int) -> Unit,
@@ -55,6 +57,7 @@ internal fun KeyboardComponent(
         items(keys) { key ->
             val disabled = disabledKeys.contains(key)
             KeyItemComponent(
+                config = config,
                 key = key,
                 disabled = disabled,
                 onNextAction = onNextAction,

color/src/main/java/com/maxkeppeler/sheets/color/ColorView.kt

@@ -83,6 +83,7 @@ fun ColorView(
             when (colorState.displayMode) {
                 ColorSelectionMode.TEMPLATE ->
                     ColorTemplateComponent(
+                        config = config,
                         colors = colorState.colors,
                         selectedColor = colorState.color,
                         inputDisabled = colorState.inputDisabled,

color/src/main/java/com/maxkeppeler/sheets/color/models/ColorConfig.kt

@@ -15,18 +15,22 @@
  */
 package com.maxkeppeler.sheets.color.models
 
+import com.maxkeppeker.sheets.core.icons.LibIcons
 import com.maxkeppeker.sheets.core.models.base.BaseConfigs
+import com.maxkeppeker.sheets.core.utils.BaseConstants.DEFAULT_ICON_STYLE
 
 /**
  * The general configuration for the clock dialog.
  * @param displayMode Available color selection modes. If null, both are used.
  * @param defaultDisplayMode Default view when opening ColorDialog.
  * @param templateColors Colors for the [ColorSelectionMode.TEMPLATE]-view.
  * @param allowCustomColorAlphaValues Allow alpha values in the custom color picker.
+ * @param icons The style of icons that are used for dialog/ view-specific icons.
  */
 data class ColorConfig(
     val displayMode: ColorSelectionMode? = null,
     val defaultDisplayMode: ColorSelectionMode? = null,
     val templateColors: MultipleColors = MultipleColors.ColorsInt(),
     val allowCustomColorAlphaValues: Boolean = true,
+    override val icons: LibIcons = DEFAULT_ICON_STYLE,
 ) : BaseConfigs()

color/src/main/java/com/maxkeppeler/sheets/color/views/ColorCustomComponent.kt

@@ -33,6 +33,7 @@ internal fun ColorCustomComponent(
 ) {
     Column {
         ColorCustomInfoComponent(
+            config = config,
             color = color,
             onColorChange = onColorChange,
         )