File tree Expand file tree Collapse file tree 3 files changed +20
-4
lines changed
core/src/main/java/com/example/util/simpletimetracker/core/utils
features/feature_change_record/src/main
java/com/example/util/simpletimetracker/feature_change_record/adapter Expand file tree Collapse file tree 3 files changed +20
-4
lines changed Original file line number Diff line number Diff line change 11package com.example.util.simpletimetracker.core.utils
22
3+ import android.view.View
34import androidx.cardview.widget.CardView
45import androidx.recyclerview.widget.RecyclerView
56import com.example.util.simpletimetracker.core.R
@@ -14,13 +15,18 @@ import com.example.util.simpletimetracker.feature_views.extension.getThemedAttr
1415/* *
1516 * Sets card background depending if it was clicked before (eg. opening a chooser by clicking on card).
1617 */
17- fun CardView .setChooserColor (opened : Boolean ) {
18+ fun View .setChooserColor (opened : Boolean ) {
1819 val colorAttr = if (opened) {
1920 R .attr.appInputFieldBorderColor
2021 } else {
2122 R .attr.appBackgroundColor
2223 }
23- context.getThemedAttr(colorAttr).let (::setCardBackgroundColor)
24+ val color = context.getThemedAttr(colorAttr)
25+ if (this is CardView ) {
26+ setCardBackgroundColor(color)
27+ } else {
28+ setBackgroundColor(color)
29+ }
2430}
2531
2632fun updateRunningRecordPreview (
Original file line number Diff line number Diff line change @@ -27,9 +27,9 @@ fun createChangeRecordTimeDoublePreviewAdapterDelegate(
2727 fieldChangeRecordChangeCurrentPreviewTimeEnded.isVisible = item.isTimeEndedAvailable
2828 btnChangeRecordChangeCurrentPreviewTimeStartedAdjust.isVisible = item.isTimeEndedAvailable
2929 btnChangeRecordChangeCurrentPreviewTimeEndedAdjust.isVisible = item.isTimeEndedAvailable
30- btnChangeRecordChangeCurrentPreviewTimeStartedAdjust
30+ viewChangeRecordChangeCurrentPreviewTimeStartedAdjust
3131 .setChooserColor(item.state == TimeAdjustmentState .TIME_STARTED )
32- btnChangeRecordChangeCurrentPreviewTimeEndedAdjust
32+ viewChangeRecordChangeCurrentPreviewTimeEndedAdjust
3333 .setChooserColor(item.state == TimeAdjustmentState .TIME_ENDED )
3434
3535 fieldChangeRecordChangeCurrentPreviewTimeStarted.setOnClickWith(item, onTimeStartedClick)
Original file line number Diff line number Diff line change 7878 app : layout_constraintEnd_toEndOf =" @id/spaceChangeRecordChangeCurrentPreviewTimeStartedEnd"
7979 app : layout_constraintTop_toTopOf =" @id/spaceChangeRecordChangeCurrentPreviewTimeStartedTop" >
8080
81+ <View
82+ android : id =" @+id/viewChangeRecordChangeCurrentPreviewTimeStartedAdjust"
83+ style =" @style/ButtonTimeAdjust"
84+ tools : background =" ?appInputFieldBorderColor" />
85+
8186 <androidx .appcompat.widget.AppCompatTextView style =" @style/ButtonTimeAdjust" />
8287
8388 </androidx .cardview.widget.CardView>
104109 app : layout_constraintEnd_toEndOf =" @id/spaceChangeRecordChangeCurrentPreviewTimeEndedEnd"
105110 app : layout_constraintTop_toTopOf =" @id/spaceChangeRecordChangeCurrentPreviewTimeEndedTop" >
106111
112+ <View
113+ android : id =" @+id/viewChangeRecordChangeCurrentPreviewTimeEndedAdjust"
114+ style =" @style/ButtonTimeAdjust"
115+ tools : background =" ?appBackgroundColor" />
116+
107117 <androidx .appcompat.widget.AppCompatTextView style =" @style/ButtonTimeAdjust" />
108118
109119 </androidx .cardview.widget.CardView>
You can’t perform that action at this time.
0 commit comments