Skip to content

Commit fa3621f

Browse files
committed
increased size of date selector card and selected text
1 parent 3528409 commit fa3621f

6 files changed

Lines changed: 20 additions & 3 deletions

File tree

core/src/main/java/com/example/util/simpletimetracker/core/delegates/dateSelector/mapper/DateSelectorMapper.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class DateSelectorMapper @Inject constructor(
141141
isToday = isToday,
142142
isSelected = isSelected,
143143
isFuture = isFuture,
144+
increasedTextSize = isSelected,
144145
)
145146
}
146147

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/dateSelector/DateSelectorDayAdapterDelegate.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.example.util.simpletimetracker.feature_base_adapter.dateSelector
22

3+
import android.util.TypedValue
34
import android.view.View
45
import android.widget.TextView
56
import androidx.core.view.isVisible
@@ -33,6 +34,7 @@ fun createDateSelectorDayAdapterDelegate(
3334
dayMonth = item.dayMonth,
3435
topText = tvDateSelectorTopText,
3536
bottomText = tvDateSelectorBottomText,
37+
increasedTextSize = item.cardData.increasedTextSize,
3638
)
3739
root.setCardData(
3840
cardData = item.cardData,
@@ -69,10 +71,20 @@ internal fun setDayMoth(
6971
dayMonth: ViewData.DayMonth,
7072
topText: TextView,
7173
bottomText: TextView,
74+
increasedTextSize: Boolean,
7275
) {
7376
topText.text = dayMonth.topText
7477
topText.isVisible = dayMonth.topText.isNotEmpty()
7578
bottomText.text = dayMonth.bottomText
79+
80+
topText.setTextSize(
81+
TypedValue.COMPLEX_UNIT_SP,
82+
if (increasedTextSize) 14f else 12f,
83+
)
84+
bottomText.setTextSize(
85+
TypedValue.COMPLEX_UNIT_SP,
86+
if (increasedTextSize) 18f else 14f,
87+
)
7688
}
7789

7890
internal fun View.setCardData(
@@ -108,6 +120,7 @@ data class DateSelectorDayViewData(
108120
val isToday: Boolean,
109121
val isSelected: Boolean,
110122
val isFuture: Boolean,
123+
val increasedTextSize: Boolean,
111124
)
112125

113126
override fun isValidType(other: ViewHolderType): Boolean = other is ViewData

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/dateSelector/DateSelectorRangeAdapterDelegate.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ fun createDateSelectorRangeAdapterDelegate(
2727
dayMonth = item.dayMonth1,
2828
topText = tvDateSelectorTopText1,
2929
bottomText = tvDateSelectorBottomText1,
30+
increasedTextSize = item.cardData.increasedTextSize,
3031
)
3132
setDayMoth(
3233
dayMonth = item.dayMonth2,
3334
topText = tvDateSelectorTopText2,
3435
bottomText = tvDateSelectorBottomText2,
36+
increasedTextSize = item.cardData.increasedTextSize,
3537
)
3638
root.setCardData(
3739
cardData = item.cardData,

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/dateSelector/DateSelectorSingleAdapterDelegate.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fun createDateSelectorSingleAdapterDelegate(
3030
dayMonth = item.dayMonth,
3131
topText = tvDateSelectorTopText,
3232
bottomText = tvDateSelectorBottomText,
33+
increasedTextSize = item.cardData.increasedTextSize,
3334
)
3435
root.setCardData(
3536
cardData = item.cardData,

features/feature_base_adapter/src/main/res/layout/item_date_day_selector.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/containerDateSelectorDay"
6-
android:layout_width="56dp"
7-
android:layout_height="60dp">
6+
android:layout_width="64dp"
7+
android:layout_height="64dp">
88

99
<View
1010
android:id="@+id/viewDateSelectorClickable"

features/feature_base_adapter/src/main/res/layout/item_date_range_selector.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools"
55
android:id="@+id/containerDateSelectorRange"
66
android:layout_width="96dp"
7-
android:layout_height="60dp">
7+
android:layout_height="64dp">
88

99
<View
1010
android:id="@+id/viewDateSelectorClickable"

0 commit comments

Comments
 (0)