Skip to content

Commit 2bd6fec

Browse files
RazeemanRazeeman
committed
change quick action colors
1 parent 9b44b0d commit 2bd6fec

File tree

6 files changed

+34
-43
lines changed

6 files changed

+34
-43
lines changed

‎core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordQuickActionMapper.kt‎

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

3-
import androidx.annotation.ColorInt
43
import androidx.annotation.DrawableRes
54
import com.example.util.simpletimetracker.core.R
65
import com.example.util.simpletimetracker.core.repo.ResourceRepo
@@ -50,19 +49,4 @@ class RecordQuickActionMapper @Inject constructor(
5049
CHANGE_ACTIVITY, CHANGE_TAG -> R.drawable.action_change_item
5150
}
5251
}
53-
54-
@ColorInt
55-
fun mapColor(data: RecordQuickAction): Int {
56-
return when (data) {
57-
CONTINUE -> R.color.red_300
58-
REPEAT -> R.color.purple_300
59-
DUPLICATE -> R.color.indigo_300
60-
MOVE -> R.color.indigo_300
61-
MERGE -> R.color.light_blue_300
62-
STOP -> R.color.teal_300
63-
CHANGE_ACTIVITY, CHANGE_TAG -> R.color.green_300
64-
SPLIT -> R.color.pink_300
65-
ADJUST -> R.color.amber_300
66-
}.let(resourceRepo::getColor)
67-
}
6852
}

‎features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/mapper/ChangeRecordViewDataMapper.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ class ChangeRecordViewDataMapper @Inject constructor(
133133
text = recordQuickActionMapper.mapText(action),
134134
icon = ButtonViewData.Icon.Present(
135135
icon = recordQuickActionMapper.mapIcon(action),
136-
iconColor = resourceRepo.getThemedAttr(R.attr.appCardBackgroundColor, isDarkTheme),
137-
iconBackgroundColor = recordQuickActionMapper.mapColor(action),
136+
iconColor = resourceRepo.getThemedAttr(R.attr.appLightTextColor, isDarkTheme),
137+
iconBackgroundColor = resourceRepo.getThemedAttr(R.attr.appInactiveColor, isDarkTheme),
138138
),
139139
backgroundColor = resourceRepo.getThemedAttr(R.attr.appActiveColor, isDarkTheme),
140140
isEnabled = isEnabled,

‎features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/adapter/RecordQuickActionsButtonAdapterDelegate.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ fun createRecordQuickActionsButtonAdapterDelegate(
2121

2222
tvRecordQuickActionsButton.text = item.text
2323
ivRecordQuickActionsButton.setImageResource(item.icon)
24-
cardRecordQuickActionsButton.setCardBackgroundColor(item.iconColor)
2524
itemRecordQuickActionsButton.setOnClickWith(item.block, onClick)
2625
}
2726
}
@@ -31,7 +30,6 @@ data class RecordQuickActionsButtonViewData(
3130
override val width: Width = Width.Small,
3231
val text: String,
3332
@DrawableRes val icon: Int,
34-
@ColorInt val iconColor: Int,
3533
) : ViewHolderType,
3634
RecordQuickActionsBlockHolder,
3735
RecordQuickActionsWidthHolder {

‎features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/interactor/RecordQuickActionsViewDataInteractor.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ class RecordQuickActionsViewDataInteractor @Inject constructor(
9292
block = it,
9393
text = recordQuickActionMapper.mapText(action),
9494
icon = recordQuickActionMapper.mapIcon(action),
95-
iconColor = recordQuickActionMapper.mapColor(action),
9695
)
9796
}
9897
}

‎features/feature_dialogs/src/main/res/layout/record_quick_actions_button_big_item.xml‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,40 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent">
1414

15+
<androidx.cardview.widget.CardView
16+
android:id="@+id/cardRecordQuickActionsButtonBig"
17+
android:layout_width="32dp"
18+
android:layout_height="32dp"
19+
android:layout_marginStart="12dp"
20+
android:backgroundTint="?appActiveColor"
21+
android:foreground="?selectableItemBackground"
22+
app:cardCornerRadius="8dp"
23+
app:cardElevation="0dp"
24+
app:layout_constraintBottom_toBottomOf="parent"
25+
app:layout_constraintStart_toStartOf="parent"
26+
app:layout_constraintTop_toTopOf="parent">
27+
28+
<androidx.appcompat.widget.AppCompatImageView
29+
android:id="@+id/ivRecordQuickActionsButtonBig"
30+
android:layout_width="match_parent"
31+
android:layout_height="match_parent"
32+
android:padding="4dp"
33+
android:scaleType="centerCrop"
34+
android:tint="?appLightTextColor"
35+
tools:ignore="ContentDescription"
36+
tools:src="@drawable/statistics" />
37+
38+
</androidx.cardview.widget.CardView>
39+
1540
<androidx.appcompat.widget.AppCompatTextView
1641
android:id="@+id/tvRecordQuickActionsButtonBig"
1742
style="@style/EditScreenControlButtonText"
18-
android:layout_width="wrap_content"
43+
android:layout_width="0dp"
1944
android:layout_height="match_parent"
2045
android:textColor="?appLightTextColor"
21-
app:layout_constraintEnd_toStartOf="@id/ivRecordQuickActionsButtonBig"
22-
app:layout_constraintHorizontal_chainStyle="packed"
23-
app:layout_constraintStart_toStartOf="parent"
24-
tools:text="Button text" />
25-
26-
<androidx.appcompat.widget.AppCompatImageView
27-
android:id="@+id/ivRecordQuickActionsButtonBig"
28-
style="@style/EditScreenControlButtonImage"
29-
android:layout_width="wrap_content"
30-
android:layout_height="match_parent"
31-
android:layout_marginEnd="4dp"
32-
android:tint="?appLightTextColor"
3346
app:layout_constraintEnd_toEndOf="parent"
34-
app:layout_constraintStart_toEndOf="@id/tvRecordQuickActionsButtonBig"
35-
tools:ignore="ContentDescription"
36-
tools:src="@drawable/statistics" />
47+
app:layout_constraintStart_toEndOf="@id/cardRecordQuickActionsButtonBig"
48+
tools:text="Button text" />
3749

3850
</androidx.constraintlayout.widget.ConstraintLayout>
3951

‎features/feature_dialogs/src/main/res/layout/record_quick_actions_button_item.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,21 @@
1717
android:layout_width="32dp"
1818
android:layout_height="32dp"
1919
android:layout_marginStart="12dp"
20+
android:backgroundTint="?appInactiveColor"
2021
android:foreground="?selectableItemBackground"
2122
app:cardCornerRadius="8dp"
2223
app:cardElevation="0dp"
2324
app:layout_constraintBottom_toBottomOf="parent"
24-
app:layout_constraintHorizontal_chainStyle="packed"
2525
app:layout_constraintStart_toStartOf="parent"
26-
app:layout_constraintTop_toTopOf="parent"
27-
tools:backgroundTint="@color/purple_200">
26+
app:layout_constraintTop_toTopOf="parent">
2827

2928
<androidx.appcompat.widget.AppCompatImageView
3029
android:id="@+id/ivRecordQuickActionsButton"
3130
android:layout_width="match_parent"
3231
android:layout_height="match_parent"
3332
android:padding="4dp"
3433
android:scaleType="centerCrop"
35-
android:tint="?appCardBackgroundColor"
34+
android:tint="?appLightTextColor"
3635
tools:ignore="ContentDescription"
3736
tools:src="@drawable/action_continue" />
3837

@@ -43,10 +42,9 @@
4342
style="@style/EditScreenControlButtonText"
4443
android:layout_width="0dp"
4544
android:layout_height="match_parent"
46-
android:layout_marginStart="48dp"
4745
android:textColor="?appLightTextColor"
4846
app:layout_constraintEnd_toEndOf="parent"
49-
app:layout_constraintStart_toStartOf="parent"
47+
app:layout_constraintStart_toEndOf="@id/cardRecordQuickActionsButton"
5048
tools:text="Button text" />
5149

5250
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)