From 83100ae0ec0148de5674e31c22d07f8a8b71cc42 Mon Sep 17 00:00:00 2001 From: razeeman Date: Sun, 13 Nov 2022 22:42:32 +0300 Subject: [PATCH] rename icon emoji to icon text --- .../util/simpletimetracker/ChangeRecordTest.kt | 2 +- .../ChangeRunningRecordTest.kt | 10 +++++----- .../example/util/simpletimetracker/IconTest.kt | 2 +- .../util/simpletimetracker/utils/BaseUiTest.kt | 4 ++-- .../core/extension/ViewDataExensions.kt | 4 ++-- .../core/mapper/CategoryViewDataMapper.kt | 15 +++------------ .../core/mapper/ColorMapper.kt | 12 ++++++++++++ .../core/mapper/IconMapper.kt | 2 +- .../core/mapper/RecordTypeViewDataMapper.kt | 18 ++++-------------- .../simpletimetracker/core/utils/TestUtils.kt | 4 ++-- .../view/ChangeRecordTypeFragment.kt | 2 +- .../typesFilter/mapper/TypesFilterMapper.kt | 2 +- .../feature_views/CategoryView.kt | 6 +++--- .../feature_views/IconView.kt | 8 ++++---- .../feature_views/RecordTypeView.kt | 6 +++--- .../feature_views/RecordView.kt | 6 +++--- .../feature_views/RunningRecordView.kt | 6 +++--- .../feature_views/StatisticsView.kt | 6 +++--- .../feature_views/viewData/RecordTypeIcon.kt | 2 +- .../src/main/res/values/attrs.xml | 12 ++++++------ .../params/screen/RecordTypeIconParams.kt | 2 +- 21 files changed, 62 insertions(+), 69 deletions(-) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTest.kt index 350cfd49..ce0ee273 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRecordTest.kt @@ -50,7 +50,7 @@ class ChangeRecordTest : BaseUiTest() { // Add activities testUtils.addActivity(name = name, color = firstColor, icon = firstIcon) - testUtils.addActivity(name = newName, color = lastColor, emoji = lastEmoji) + testUtils.addActivity(name = newName, color = lastColor, text = lastEmoji) testUtils.addRecordTag(tag1, name) testUtils.addRecordTag(tag2, newName) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRunningRecordTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRunningRecordTest.kt index d103e5b9..d1e5a936 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRunningRecordTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/ChangeRunningRecordTest.kt @@ -49,7 +49,7 @@ class ChangeRunningRecordTest : BaseUiTest() { // Add activities testUtils.addActivity(name = name1, color = firstColor, icon = firstIcon, goalTime = firstGoalTime) - testUtils.addActivity(name = name2, color = lastColor, emoji = lastEmoji) + testUtils.addActivity(name = name2, color = lastColor, text = lastEmoji) testUtils.addRecordTag(tag2, name2) // Start timer @@ -152,7 +152,7 @@ class ChangeRunningRecordTest : BaseUiTest() { checkRunningRecordDisplayed( name = fullName2, color = lastColor, - emoji = lastEmoji, + text = lastEmoji, timeStarted = timeStartedPreview, goalTime = "", comment = comment @@ -284,7 +284,7 @@ class ChangeRunningRecordTest : BaseUiTest() { name: String, color: Int? = null, icon: Int? = null, - emoji: String? = null, + text: String? = null, timeStarted: String? = null, goalTime: String? = null, comment: String? = null, @@ -297,8 +297,8 @@ class ChangeRunningRecordTest : BaseUiTest() { if (icon != null) { checkViewIsDisplayed(allOf(isDescendantOfA(withId(R.id.viewRunningRecordItem)), withTag(icon))) } - if (emoji != null) { - checkViewIsDisplayed(allOf(isDescendantOfA(withId(R.id.viewRunningRecordItem)), withText(emoji))) + if (text != null) { + checkViewIsDisplayed(allOf(isDescendantOfA(withId(R.id.viewRunningRecordItem)), withText(text))) } if (timeStarted != null) { checkViewIsDisplayed(allOf(isDescendantOfA(withId(R.id.viewRunningRecordItem)), withText(timeStarted))) diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt index a5dfdaea..cdce8a8a 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/IconTest.kt @@ -37,7 +37,7 @@ class IconTest : BaseUiTest() { val lastName = "last" // Add activity - testUtils.addActivity(name = lastName, emoji = lastEmoji) + testUtils.addActivity(name = lastName, text = lastEmoji) // Open change record type screen tryAction { clickOnViewWithText(R.string.running_records_add_type) } diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt index f839fcff..f7a8c3c6 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/utils/BaseUiTest.kt @@ -2,8 +2,8 @@ package com.example.util.simpletimetracker.utils import android.content.Context import androidx.annotation.ColorInt -import androidx.emoji.bundled.BundledEmojiCompatConfig -import androidx.emoji.text.EmojiCompat +import androidx.emoji2.bundled.BundledEmojiCompatConfig +import androidx.emoji2.text.EmojiCompat import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.IdlingRegistry import androidx.test.ext.junit.rules.ActivityScenarioRule diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/extension/ViewDataExensions.kt b/core/src/main/java/com/example/util/simpletimetracker/core/extension/ViewDataExensions.kt index 1e363d18..8fd5816f 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/extension/ViewDataExensions.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/extension/ViewDataExensions.kt @@ -6,13 +6,13 @@ import com.example.util.simpletimetracker.navigation.params.screen.RecordTypeIco fun RecordTypeIconParams.toViewData(): RecordTypeIcon { return when (this) { is RecordTypeIconParams.Image -> RecordTypeIcon.Image(this.iconId) - is RecordTypeIconParams.Emoji -> RecordTypeIcon.Emoji(this.emojiText) + is RecordTypeIconParams.Text -> RecordTypeIcon.Text(this.text) } } fun RecordTypeIcon.toParams(): RecordTypeIconParams { return when (this) { is RecordTypeIcon.Image -> RecordTypeIconParams.Image(this.iconId) - is RecordTypeIcon.Emoji -> RecordTypeIconParams.Emoji(this.emojiText) + is RecordTypeIcon.Text -> RecordTypeIconParams.Text(this.text) } } \ No newline at end of file diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt index 2309227b..6725f9c1 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/CategoryViewDataMapper.kt @@ -10,7 +10,6 @@ import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType import com.example.util.simpletimetracker.feature_base_adapter.category.CategoryViewData import com.example.util.simpletimetracker.feature_base_adapter.empty.EmptyViewData import com.example.util.simpletimetracker.feature_base_adapter.info.InfoViewData -import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon import javax.inject.Inject class CategoryViewDataMapper @Inject constructor( @@ -47,7 +46,7 @@ class CategoryViewDataMapper @Inject constructor( id = tag.id, name = tag.name, iconColor = getTextColor(isDarkTheme, isFiltered), - iconAlpha = getIconAlpha(icon, isFiltered), + iconAlpha = colorMapper.toIconAlpha(icon, isFiltered), color = getColor(color, isDarkTheme, isFiltered), icon = if (showIcon) icon else null ) @@ -86,14 +85,6 @@ class CategoryViewDataMapper @Inject constructor( } } - fun getIconAlpha(icon: RecordTypeIcon?, isFiltered: Boolean): Float { - return if (icon is RecordTypeIcon.Emoji && isFiltered) { - FILTERED_ICON_EMOJI_ALPHA - } else { - DEFAULT_ICON_EMOJI_ALPHA - } - } - private fun getColor( color: AppColor, isDarkTheme: Boolean, @@ -107,7 +98,7 @@ class CategoryViewDataMapper @Inject constructor( } companion object { - private const val DEFAULT_ICON_EMOJI_ALPHA = 1.0f - private const val FILTERED_ICON_EMOJI_ALPHA = 0.3f + private const val DEFAULT_ICON_TEXT_ALPHA = 1.0f + private const val FILTERED_ICON_TEXT_ALPHA = 0.3f } } \ No newline at end of file diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt index a97349b0..16965422 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/ColorMapper.kt @@ -6,6 +6,7 @@ import com.example.util.simpletimetracker.core.R import com.example.util.simpletimetracker.core.repo.ResourceRepo import com.example.util.simpletimetracker.domain.mapper.AppColorMapper import com.example.util.simpletimetracker.domain.model.AppColor +import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon import javax.inject.Inject class ColorMapper @Inject constructor( @@ -35,6 +36,14 @@ class ColorMapper @Inject constructor( }.let(resourceRepo::getColor) } + fun toIconAlpha(icon: RecordTypeIcon?, isFiltered: Boolean): Float { + return if (icon is RecordTypeIcon.Text && isFiltered) { + FILTERED_ICON_TEXT_ALPHA + } else { + DEFAULT_ICON_TEXT_ALPHA + } + } + fun toFilteredColor(isDarkTheme: Boolean): Int { return if (isDarkTheme) { R.color.colorFilteredDark @@ -84,6 +93,9 @@ class ColorMapper @Inject constructor( return availableColors } + private const val DEFAULT_ICON_TEXT_ALPHA = 1.0f + private const val FILTERED_ICON_TEXT_ALPHA = 0.3f + // Don't change color positions as they are saved in DB by it. private val availableColors: List = listOf( R.color.palette_black, // last by color order. diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconMapper.kt index b06bb36c..761787aa 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/IconMapper.kt @@ -13,7 +13,7 @@ class IconMapper @Inject constructor( return if (icon.startsWith("ic_") || icon.isEmpty()) { icon.let(iconImageMapper::mapToDrawableResId).let(RecordTypeIcon::Image) } else { - RecordTypeIcon.Emoji(icon) + RecordTypeIcon.Text(icon) } } } \ No newline at end of file diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTypeViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTypeViewDataMapper.kt index 01b6893a..5fbae2f6 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTypeViewDataMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/RecordTypeViewDataMapper.kt @@ -2,13 +2,12 @@ package com.example.util.simpletimetracker.core.mapper import androidx.annotation.ColorInt import com.example.util.simpletimetracker.core.R -import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType -import com.example.util.simpletimetracker.feature_base_adapter.empty.EmptyViewData import com.example.util.simpletimetracker.core.repo.ResourceRepo import com.example.util.simpletimetracker.domain.model.AppColor -import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon -import com.example.util.simpletimetracker.feature_base_adapter.recordType.RecordTypeViewData import com.example.util.simpletimetracker.domain.model.RecordType +import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType +import com.example.util.simpletimetracker.feature_base_adapter.empty.EmptyViewData +import com.example.util.simpletimetracker.feature_base_adapter.recordType.RecordTypeViewData import javax.inject.Inject class RecordTypeViewDataMapper @Inject constructor( @@ -66,11 +65,7 @@ class RecordTypeViewDataMapper @Inject constructor( default.copy( color = colorMapper.toFilteredColor(isDarkTheme), iconColor = colorMapper.toFilteredIconColor(isDarkTheme), - iconAlpha = if (default.iconId is RecordTypeIcon.Emoji) { - FILTERED_ICON_EMOJI_ALPHA - } else { - DEFAULT_ICON_EMOJI_ALPHA - } + iconAlpha = colorMapper.toIconAlpha(default.iconId, true), ) } else { default @@ -80,9 +75,4 @@ class RecordTypeViewDataMapper @Inject constructor( @ColorInt private fun mapColor(color: AppColor, isDarkTheme: Boolean): Int { return colorMapper.mapToColorInt(color, isDarkTheme) } - - companion object { - private const val DEFAULT_ICON_EMOJI_ALPHA = 1.0f - private const val FILTERED_ICON_EMOJI_ALPHA = 0.3f - } } \ No newline at end of file diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt index dfd5dcba..78633fc4 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/utils/TestUtils.kt @@ -62,7 +62,7 @@ class TestUtils @Inject constructor( color: Int? = null, colorInt: Int? = null, icon: Int? = null, - emoji: String? = null, + text: String? = null, goalTime: Long? = null, archived: Boolean = false, categories: List = emptyList(), @@ -70,7 +70,7 @@ class TestUtils @Inject constructor( val icons = iconImageMapper.getAvailableImages().values .toList().flatMap { it.toList() }.toMap() val iconId = icons.filterValues { it == icon }.keys.firstOrNull() - ?: emoji + ?: text ?: icons.keys.first() val colors = ColorMapper.getAvailableColors() diff --git a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt index 5f34ebf1..b4d8c35c 100644 --- a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt +++ b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt @@ -251,7 +251,7 @@ class ChangeRecordTypeFragment : private fun updateUi(item: RecordTypeViewData) = with(binding) { etChangeRecordTypeName.setText(item.name) etChangeRecordTypeName.setSelection(item.name.length) - (item.iconId as? RecordTypeIcon.Emoji)?.emojiText?.let { + (item.iconId as? RecordTypeIcon.Text)?.text?.let { etChangeRecordTypeIconText.setText(it) } } diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/typesFilter/mapper/TypesFilterMapper.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/typesFilter/mapper/TypesFilterMapper.kt index e0520392..354e4cfb 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/typesFilter/mapper/TypesFilterMapper.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/typesFilter/mapper/TypesFilterMapper.kt @@ -27,7 +27,7 @@ class TypesFilterMapper @Inject constructor( typeId = type.id, name = R.string.change_record_untagged.let(resourceRepo::getString), iconColor = categoryViewDataMapper.getTextColor(isDarkTheme, isFiltered), - iconAlpha = categoryViewDataMapper.getIconAlpha(icon, isFiltered), + iconAlpha = colorMapper.toIconAlpha(icon, isFiltered), color = if (isFiltered) { colorMapper.toFilteredColor(isDarkTheme) } else { diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/CategoryView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/CategoryView.kt index 906eaeab..3a60915c 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/CategoryView.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/CategoryView.kt @@ -45,9 +45,9 @@ class CategoryView @JvmOverloads constructor( getResourceId(R.styleable.CategoryView_itemIcon, R.drawable.unknown) .let(RecordTypeIcon::Image) - if (hasValue(R.styleable.CategoryView_itemEmoji)) itemIcon = - getString(R.styleable.CategoryView_itemEmoji).orEmpty() - .let(RecordTypeIcon::Emoji) + if (hasValue(R.styleable.CategoryView_itemIconText)) itemIcon = + getString(R.styleable.CategoryView_itemIconText).orEmpty() + .let(RecordTypeIcon::Text) if (hasValue(R.styleable.CategoryView_itemIconColor)) { itemIconColor = getColor(R.styleable.CategoryView_itemIconColor, Color.WHITE) diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/IconView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/IconView.kt index ee9905ce..e156f5a0 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/IconView.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/IconView.kt @@ -31,8 +31,8 @@ class IconView @JvmOverloads constructor( if (hasValue(R.styleable.IconView_itemIcon)) itemIcon = getResourceId(R.styleable.IconView_itemIcon, R.drawable.unknown).let(RecordTypeIcon::Image) - if (hasValue(R.styleable.IconView_itemEmoji)) itemIcon = - getString(R.styleable.IconView_itemEmoji).orEmpty().let(RecordTypeIcon::Emoji) + if (hasValue(R.styleable.IconView_itemIconText)) itemIcon = + getString(R.styleable.IconView_itemIconText).orEmpty().let(RecordTypeIcon::Text) if (hasValue(R.styleable.IconView_itemIconColor)) itemIconColor = getColor(R.styleable.IconView_itemIconColor, Color.WHITE) @@ -48,7 +48,7 @@ class IconView @JvmOverloads constructor( set(value) { when (value) { is RecordTypeIcon.Image -> setImageIcon(value.iconId) - is RecordTypeIcon.Emoji -> setEmojiIcon(value.emojiText) + is RecordTypeIcon.Text -> setTextIcon(value.text) } field = value } @@ -75,7 +75,7 @@ class IconView @JvmOverloads constructor( tvIconViewEmoji.visible = false } - private fun setEmojiIcon(value: String) = with(binding) { + private fun setTextIcon(value: String) = with(binding) { tvIconViewEmoji.text = value tvIconViewEmoji.visible = true diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordTypeView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordTypeView.kt index 190b5cba..131c826a 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordTypeView.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordTypeView.kt @@ -52,9 +52,9 @@ class RecordTypeView @JvmOverloads constructor( itemIcon = RecordTypeIcon.Image(data) } - if (hasValue(R.styleable.RecordTypeView_itemEmoji)) { - val data = getString(R.styleable.RecordTypeView_itemEmoji).orEmpty() - itemIcon = RecordTypeIcon.Emoji(data) + if (hasValue(R.styleable.RecordTypeView_itemIconText)) { + val data = getString(R.styleable.RecordTypeView_itemIconText).orEmpty() + itemIcon = RecordTypeIcon.Text(data) } if (hasValue(R.styleable.RecordTypeView_itemIconColor)) { diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordView.kt index e737fa2b..dfa6a99b 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordView.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RecordView.kt @@ -118,9 +118,9 @@ class RecordView @JvmOverloads constructor( getResourceId(R.styleable.RecordView_itemIcon, R.drawable.unknown) .let(RecordTypeIcon::Image) - if (hasValue(R.styleable.RecordView_itemEmoji)) itemIcon = - getString(R.styleable.RecordView_itemEmoji).orEmpty() - .let(RecordTypeIcon::Emoji) + if (hasValue(R.styleable.RecordView_itemIconText)) itemIcon = + getString(R.styleable.RecordView_itemIconText).orEmpty() + .let(RecordTypeIcon::Text) if (hasValue(R.styleable.RecordView_itemTimeStarted)) itemTimeStarted = getString(R.styleable.RecordView_itemTimeStarted).orEmpty() diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RunningRecordView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RunningRecordView.kt index 0d26f1ad..84455bfa 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RunningRecordView.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/RunningRecordView.kt @@ -119,9 +119,9 @@ class RunningRecordView @JvmOverloads constructor( getResourceId(R.styleable.RunningRecordView_itemIcon, R.drawable.unknown) .let(RecordTypeIcon::Image) - if (hasValue(R.styleable.RunningRecordView_itemEmoji)) itemIcon = - getString(R.styleable.RunningRecordView_itemEmoji).orEmpty() - .let(RecordTypeIcon::Emoji) + if (hasValue(R.styleable.RunningRecordView_itemIconText)) itemIcon = + getString(R.styleable.RunningRecordView_itemIconText).orEmpty() + .let(RecordTypeIcon::Text) if (hasValue(R.styleable.RunningRecordView_itemTimeStarted)) itemTimeStarted = getString(R.styleable.RunningRecordView_itemTimeStarted).orEmpty() diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsView.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsView.kt index 9f4d84f7..b66e137e 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsView.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/StatisticsView.kt @@ -93,9 +93,9 @@ class StatisticsView @JvmOverloads constructor( getResourceId(R.styleable.StatisticsView_itemIcon, R.drawable.unknown) .let(RecordTypeIcon::Image) - if (hasValue(R.styleable.StatisticsView_itemEmoji)) itemIcon = - getString(R.styleable.StatisticsView_itemEmoji).orEmpty() - .let(RecordTypeIcon::Emoji) + if (hasValue(R.styleable.StatisticsView_itemIconText)) itemIcon = + getString(R.styleable.StatisticsView_itemIconText).orEmpty() + .let(RecordTypeIcon::Text) if (hasValue(R.styleable.StatisticsView_itemIconVisible)) itemIconVisible = getBoolean(R.styleable.StatisticsView_itemIconVisible, false) diff --git a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/viewData/RecordTypeIcon.kt b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/viewData/RecordTypeIcon.kt index cb06033f..3c62ec2d 100644 --- a/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/viewData/RecordTypeIcon.kt +++ b/features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/viewData/RecordTypeIcon.kt @@ -10,5 +10,5 @@ sealed class RecordTypeIcon : Parcelable { data class Image(@DrawableRes val iconId: Int) : RecordTypeIcon() @Parcelize - data class Emoji(val emojiText: String) : RecordTypeIcon() + data class Text(val text: String) : RecordTypeIcon() } diff --git a/features/feature_views/src/main/res/values/attrs.xml b/features/feature_views/src/main/res/values/attrs.xml index 1e29e121..4ca1aca8 100644 --- a/features/feature_views/src/main/res/values/attrs.xml +++ b/features/feature_views/src/main/res/values/attrs.xml @@ -29,14 +29,14 @@ - + - + @@ -47,7 +47,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -84,7 +84,7 @@ - + diff --git a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/RecordTypeIconParams.kt b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/RecordTypeIconParams.kt index a712f977..ee9bed92 100644 --- a/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/RecordTypeIconParams.kt +++ b/navigation/src/main/java/com/example/util/simpletimetracker/navigation/params/screen/RecordTypeIconParams.kt @@ -9,5 +9,5 @@ sealed class RecordTypeIconParams : Parcelable { data class Image(@DrawableRes val iconId: Int) : RecordTypeIconParams() @Parcelize - data class Emoji(val emojiText: String) : RecordTypeIconParams() + data class Text(val text: String) : RecordTypeIconParams() } \ No newline at end of file -- 2.51.2