(Calendar] Improve design when timeline is disabled #18

Author: maxkeppeler

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

@@ -21,6 +21,7 @@ import java.time.LocalDate
  * Defines all calculated information for a specific date.
  * @param date The current date that the view represents.
  * @param disabled Whenever the date is disabled.
+ * @param disabledTimeline Whenever the date is falling into a disabled time line.
  * @param selected Whenever the date is selected in a single or multiple date selection.
  * @param selectedBetween Whenever the date is within a range selection.
  * @param selectedStart Whenever the date is the start of a range selection.
@@ -30,6 +31,7 @@ import java.time.LocalDate
 internal data class CalendarDateData(
     val date: LocalDate? = null,
     val disabled: Boolean = false,
+    val disabledTimeline: Boolean = false,
     val selected: Boolean = false,
     val selectedBetween: Boolean = false,
     val selectedStart: Boolean = false,

calendar/src/main/java/com/maxkeppeler/sheets/calendar/utils/Constants.kt

@@ -40,4 +40,7 @@ internal object Constants {
 
     internal const val YEAR_GRID_COLUMNS = 1
     internal const val MONTH_GRID_COLUMNS = 4
+
+    internal const val DATE_ITEM_DISABLED_TIMELINE_OPACITY = 0.3f
+    internal const val DATE_ITEM_OPACITY = 1f
 }

calendar/src/main/java/com/maxkeppeler/sheets/calendar/utils/Utils.kt

@@ -255,7 +255,7 @@ internal fun calcCalendarDateData(
         }
     }
 
-    val otherMonth = config.disabledTimeline?.let { timeline ->
+    val disabledTimeline = config.disabledTimeline?.let { timeline ->
         when (timeline) {
             CalendarTimeline.PAST -> date.isBefore(today)
             CalendarTimeline.FUTURE -> date.isAfter(today)
@@ -266,11 +266,11 @@ internal fun calcCalendarDateData(
     return CalendarDateData(
         date = date,
         disabled = disabled,
+        disabledTimeline = disabledTimeline,
         selected = selected,
         selectedBetween = selectedBetween,
         selectedStart = selectedStartInit,
         selectedEnd = selectedEnd,
-        otherMonth = otherMonth
     )
 }
 

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

@@ -25,12 +25,14 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.maxkeppeler.sheets.calendar.models.CalendarDateData
 import com.maxkeppeler.sheets.calendar.models.CalendarSelection
+import com.maxkeppeler.sheets.calendar.utils.Constants
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import com.maxkeppeler.sheets.core.R as RC
@@ -104,20 +106,27 @@ internal fun CalendarDateItemComponent(
     }
 
     val cellModifier = when {
-        data.otherMonth -> otherMonthModifier
+        data.otherMonth || data.disabledTimeline -> otherMonthModifier
         data.disabled -> disabledModifier
         data.selected -> selectedModifier
         else -> normalModifier
     }
 
+    val textAlpha = when {
+        data.disabledTimeline -> Constants.DATE_ITEM_DISABLED_TIMELINE_OPACITY
+        else -> Constants.DATE_ITEM_OPACITY
+    }
+
     Column(modifier = parentModifier) {
         Row(
             modifier = cellModifier,
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Center
         ) {
             Text(
-                modifier = Modifier.weight(1f),
+                modifier = Modifier
+                    .weight(1f)
+                    .alpha(textAlpha),
                 text = data.date?.format(DateTimeFormatter.ofPattern("d"))
                     ?.takeUnless { data.otherMonth } ?: "",
                 style = textStyle,