refactor

Author: Razeeman

core/src/main/java/com/example/util/simpletimetracker/core/delegates/iconSelection/mapper/IconSelectionMapper.kt

@@ -232,18 +232,17 @@ class IconSelectionMapper @Inject constructor(
         return if (iconType == IconType.TEXT) {
             IconSelectionSelectorStateViewData.None
         } else {
-            val theme = if (isDarkTheme) R.style.AppThemeDark else R.style.AppTheme
             IconSelectionSelectorStateViewData.Available(
                 state = iconImageState,
                 searchButtonColor = when (iconImageState) {
                     is IconImageState.Chooser -> R.attr.appInactiveColor
                     is IconImageState.Search -> R.attr.colorSecondary
-                }.let { resourceRepo.getThemedAttr(it, theme) },
+                }.let { resourceRepo.getThemedAttr(it, isDarkTheme) },
                 favouriteButtonColor = if (isSelectedIconFavourite) {
                     R.attr.colorSecondary
                 } else {
                     R.attr.appInactiveColor
-                }.let { resourceRepo.getThemedAttr(it, theme) },
+                }.let { resourceRepo.getThemedAttr(it, isDarkTheme) },
             )
         }
     }

core/src/main/java/com/example/util/simpletimetracker/core/interactor/ActivityFilterViewDataInteractor.kt

@@ -11,7 +11,6 @@ import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteracto
 import com.example.util.simpletimetracker.domain.recordShortcut.model.RecordShortcut
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
-import com.example.util.simpletimetracker.feature_base_adapter.activityFilter.ActivityFilterViewData
 import javax.inject.Inject
 
 class ActivityFilterViewDataInteractor @Inject constructor(

core/src/main/java/com/example/util/simpletimetracker/core/interactor/ActivitySuggestionViewDataInteractor.kt

@@ -7,7 +7,6 @@ import com.example.util.simpletimetracker.domain.extension.search
 import com.example.util.simpletimetracker.domain.record.model.RunningRecord
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
 import com.example.util.simpletimetracker.domain.recordType.model.RecordTypeGoal
-import com.example.util.simpletimetracker.feature_base_adapter.activityFilter.ActivityFilterViewData
 import com.example.util.simpletimetracker.feature_base_adapter.recordTypeSuggestion.RecordTypeSuggestionViewData
 import javax.inject.Inject
 

core/src/main/java/com/example/util/simpletimetracker/core/interactor/ColorViewDataInteractor.kt

@@ -13,6 +13,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.color.ColorFavour
 import com.example.util.simpletimetracker.feature_base_adapter.color.ColorPaletteViewData
 import com.example.util.simpletimetracker.feature_base_adapter.color.ColorViewData
 import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
+import com.example.util.simpletimetracker.feature_views.ColorUtils.darkenColorByFactor
 import javax.inject.Inject
 
 class ColorViewDataInteractor @Inject constructor(
@@ -53,7 +54,7 @@ class ColorViewDataInteractor @Inject constructor(
                     colorId = colorId.toLong(),
                     type = ColorViewData.Type.Base,
                     colorInt = colorInt.let {
-                        if (isDarkTheme) colorMapper.darkenColor(it) else it
+                        if (isDarkTheme) darkenColorByFactor(it) else it
                     },
                     selected = !customColorSelected && currentColor?.colorId == colorId,
                 )

core/src/main/java/com/example/util/simpletimetracker/core/interactor/RecordsShortcutsViewDataInteractor.kt

@@ -6,7 +6,6 @@ import com.example.util.simpletimetracker.domain.record.model.RunningRecord
 import com.example.util.simpletimetracker.domain.recordShortcut.interactor.RecordShortcutInteractor
 import com.example.util.simpletimetracker.domain.recordTag.model.RecordTag
 import com.example.util.simpletimetracker.domain.recordType.model.RecordType
-import com.example.util.simpletimetracker.feature_base_adapter.activityFilter.ActivityFilterViewData
 import com.example.util.simpletimetracker.feature_base_adapter.recordShortcut.RecordShortcutViewData
 import javax.inject.Inject
 

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

@@ -1,11 +1,11 @@
 package com.example.util.simpletimetracker.core.mapper
 
-import android.graphics.Color
 import androidx.annotation.ColorInt
 import com.example.util.simpletimetracker.core.R
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
 import com.example.util.simpletimetracker.domain.color.mapper.AppColorMapper
 import com.example.util.simpletimetracker.domain.color.model.AppColor
+import com.example.util.simpletimetracker.feature_views.ColorUtils.darkenColorByFactor
 import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
 import javax.inject.Inject
 
@@ -16,25 +16,16 @@ class ColorMapper @Inject constructor(
 
     @ColorInt fun mapToColorInt(color: AppColor, isDarkTheme: Boolean): Int {
         return appColorMapper.mapToColorInt(color).let {
-            if (isDarkTheme) darkenColor(it) else it
+            if (isDarkTheme) darkenColorByFactor(it) else it
         }
     }
 
-    // TODO use resourceRepo getThemedAttr, also others
     fun toUntrackedColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorUntrackedDark
-        } else {
-            R.color.colorUntracked
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appUntrackedColor, isDarkTheme)
     }
 
     fun toIconColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorIconDark
-        } else {
-            R.color.colorIcon
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appIconColor, isDarkTheme)
     }
 
     fun toIconColor(
@@ -57,11 +48,7 @@ class ColorMapper @Inject constructor(
     }
 
     fun toFilteredColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorFilteredDark
-        } else {
-            R.color.colorFiltered
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appFilteredColor, isDarkTheme)
     }
 
     fun toFilteredColor(
@@ -88,56 +75,23 @@ class ColorMapper @Inject constructor(
     }
 
     fun toFilteredIconColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorIconFilteredDark
-        } else {
-            R.color.colorIconFiltered
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appIconFilteredColor, isDarkTheme)
     }
 
     fun toActiveColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorActiveDark
-        } else {
-            R.color.colorActive
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appActiveColor, isDarkTheme)
     }
 
     fun toInactiveColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorInactiveDark
-        } else {
-            R.color.colorInactive
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appInactiveColor, isDarkTheme)
     }
 
     fun toPositiveColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorPositiveDark
-        } else {
-            R.color.colorPositive
-        }.let(resourceRepo::getColor)
+        return resourceRepo.getThemedAttr(R.attr.appPositiveColor, isDarkTheme)
     }
 
     fun toNegativeColor(isDarkTheme: Boolean): Int {
-        return if (isDarkTheme) {
-            R.color.colorNegativeDark
-        } else {
-            R.color.colorNegative
-        }.let(resourceRepo::getColor)
-    }
-
-    // TODO move to ColorUtils
-    /**
-     * Darkens color.
-     */
-    @ColorInt
-    fun darkenColor(@ColorInt color: Int): Int {
-        return FloatArray(3).apply {
-            Color.colorToHSV(color, this)
-            // change value
-            this[2] *= 0.8f
-        }.let(Color::HSVToColor)
+        return resourceRepo.getThemedAttr(R.attr.appNegativeColor, isDarkTheme)
     }
 
     companion object {

core/src/main/java/com/example/util/simpletimetracker/core/repo/ResourceRepo.kt

@@ -51,23 +51,15 @@ class ResourceRepo @Inject constructor(
         return context.resources.getDimension(dimenResId).pxToDp()
     }
 
-    fun getThemedAttr(attrId: Int, themeId: Int): Int {
+    fun getThemedAttr(attrId: Int, isDarkTheme: Boolean): Int {
+        val themeId = if (isDarkTheme) R.style.AppThemeDark else R.style.AppTheme
         return TypedValue().apply {
             ContextThemeWrapper(context, themeId)
                 .theme
                 .resolveAttribute(attrId, this, true)
         }.data
     }
 
-    fun getThemedAttr(attrId: Int, isDarkTheme: Boolean): Int {
-        val theme = if (isDarkTheme) {
-            R.style.AppThemeDark
-        } else {
-            R.style.AppTheme
-        }
-        return getThemedAttr(attrId = attrId, themeId = theme)
-    }
-
     fun getDrawable(@DrawableRes drawableResId: Int): Drawable? {
         return ResourcesCompat.getDrawable(context.resources, drawableResId, context.theme)
     }

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/delegates/ChangeRecordActionsAdjustDelegate.kt

@@ -1,6 +1,7 @@
 package com.example.util.simpletimetracker.feature_change_record.viewModel.delegates
 
 import com.example.util.simpletimetracker.core.base.ViewModelDelegate
+import com.example.util.simpletimetracker.core.mapper.RecordQuickActionMapper
 import com.example.util.simpletimetracker.domain.extension.addOrRemove
 import com.example.util.simpletimetracker.core.mapper.TimeMapper
 import com.example.util.simpletimetracker.core.repo.ResourceRepo
@@ -41,6 +42,7 @@ class ChangeRecordActionsAdjustDelegate @Inject constructor(
     private val recordInteractor: RecordInteractor,
     private val timeMapper: TimeMapper,
     private val prefsInteractor: PrefsInteractor,
+    private val recordQuickActionMapper: RecordQuickActionMapper,
 ) : ViewModelDelegate(),
     ChangeRecordActionsSubDelegate {
 
@@ -91,13 +93,14 @@ class ChangeRecordActionsAdjustDelegate @Inject constructor(
         val useMilitaryTime = prefsInteractor.getUseMilitaryTimeFormat()
         val showSeconds = prefsInteractor.getShowSeconds()
         val isDarkTheme = prefsInteractor.getDarkMode()
+        val action = RecordQuickAction.ADJUST
 
         val result = mutableListOf<ViewHolderType>()
         val hintText = if (params.adjustParams.isTimeEndedAvailable) {
-            R.string.change_record_change_adjacent_records
+            recordQuickActionMapper.mapHint(action).orEmpty()
         } else {
-            R.string.change_record_change_prev_record
-        }.let(resourceRepo::getString)
+            resourceRepo.getString(R.string.change_record_change_prev_record)
+        }
         result += HintViewData(hintText)
         val state = loadViewData(
             recordId = params.adjustParams.originalRecordId,
@@ -144,7 +147,7 @@ class ChangeRecordActionsAdjustDelegate @Inject constructor(
         }
         result += state.changesPreview
         result += changeRecordViewDataMapper.mapRecordActionButton(
-            action = RecordQuickAction.ADJUST,
+            action = action,
             isEnabled = params.baseParams.isButtonEnabled,
             isDarkTheme = isDarkTheme,
         )

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/delegates/ChangeRecordActionsContinueDelegate.kt

@@ -1,6 +1,6 @@
 package com.example.util.simpletimetracker.feature_change_record.viewModel.delegates
 
-import com.example.util.simpletimetracker.core.repo.ResourceRepo
+import com.example.util.simpletimetracker.core.mapper.RecordQuickActionMapper
 import com.example.util.simpletimetracker.domain.extension.plusAssign
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.recordAction.interactor.RecordActionContinueMediator
@@ -16,10 +16,10 @@ import javax.inject.Inject
 
 class ChangeRecordActionsContinueDelegate @Inject constructor(
     private val router: Router,
-    private val resourceRepo: ResourceRepo,
     private val prefsInteractor: PrefsInteractor,
     private val recordActionContinueMediator: RecordActionContinueMediator,
     private val changeRecordViewDataMapper: ChangeRecordViewDataMapper,
+    private val recordQuickActionMapper: RecordQuickActionMapper,
 ) : ChangeRecordActionsSubDelegate {
 
     private var bridge: ChangeRecordDelegateBridge? = null
@@ -68,13 +68,14 @@ class ChangeRecordActionsContinueDelegate @Inject constructor(
         if (!params.continueParams.isAvailable) return emptyList()
         if (prefsInteractor.getRetroactiveTrackingMode()) return emptyList()
         val isDarkTheme = prefsInteractor.getDarkMode()
+        val action = RecordQuickAction.CONTINUE
 
         val result = mutableListOf<ViewHolderType>()
         result += HintViewData(
-            text = resourceRepo.getString(R.string.change_record_continue_hint),
+            text = recordQuickActionMapper.mapHint(action).orEmpty(),
         )
         result += changeRecordViewDataMapper.mapRecordActionButton(
-            action = RecordQuickAction.CONTINUE,
+            action = action,
             isEnabled = params.baseParams.isButtonEnabled,
             isDarkTheme = isDarkTheme,
         )

features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/delegates/ChangeRecordActionsDuplicateDelegate.kt

@@ -1,23 +1,22 @@
 package com.example.util.simpletimetracker.feature_change_record.viewModel.delegates
 
-import com.example.util.simpletimetracker.core.repo.ResourceRepo
+import com.example.util.simpletimetracker.core.mapper.RecordQuickActionMapper
 import com.example.util.simpletimetracker.domain.extension.plusAssign
 import com.example.util.simpletimetracker.domain.prefs.interactor.PrefsInteractor
 import com.example.util.simpletimetracker.domain.recordAction.interactor.RecordActionDuplicateMediator
 import com.example.util.simpletimetracker.domain.recordAction.model.RecordQuickAction
 import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
 import com.example.util.simpletimetracker.feature_base_adapter.hint.HintViewData
-import com.example.util.simpletimetracker.feature_change_record.R
 import com.example.util.simpletimetracker.feature_change_record.mapper.ChangeRecordViewDataMapper
 import com.example.util.simpletimetracker.feature_change_record.viewModel.base.ChangeRecordDelegateBridge
 import com.example.util.simpletimetracker.feature_change_record.viewModel.base.ChangeRecordActionsSubDelegate
 import javax.inject.Inject
 
 class ChangeRecordActionsDuplicateDelegate @Inject constructor(
-    private val resourceRepo: ResourceRepo,
     private val prefsInteractor: PrefsInteractor,
     private val recordActionDuplicateMediator: RecordActionDuplicateMediator,
     private val changeRecordViewDataMapper: ChangeRecordViewDataMapper,
+    private val recordQuickActionMapper: RecordQuickActionMapper,
 ) : ChangeRecordActionsSubDelegate {
 
     private var bridge: ChangeRecordDelegateBridge? = null
@@ -52,13 +51,14 @@ class ChangeRecordActionsDuplicateDelegate @Inject constructor(
         val params = bridge?.getParams() ?: return emptyList()
         if (!params.duplicateParams.isAvailable) return emptyList()
         val isDarkTheme = prefsInteractor.getDarkMode()
+        val action = RecordQuickAction.DUPLICATE
 
         val result = mutableListOf<ViewHolderType>()
         result += HintViewData(
-            text = resourceRepo.getString(R.string.change_record_duplicate_hint),
+            text = recordQuickActionMapper.mapHint(action).orEmpty(),
         )
         result += changeRecordViewDataMapper.mapRecordActionButton(
-            action = RecordQuickAction.DUPLICATE,
+            action = action,
             isEnabled = params.baseParams.isButtonEnabled,
             isDarkTheme = isDarkTheme,
         )