Skip to content

Commit 7cf564a

Browse files
committed
fix untracked record transition then they have same data
1 parent f9d7455 commit 7cf564a

File tree

2 files changed

+5
-6
lines changed
  • core/src/main/java/com/example/util/simpletimetracker/core/mapper
  • features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/record

2 files changed

+5
-6
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class RecordViewDataMapper @Inject constructor(
5858
return RecordViewData.Untracked(
5959
name = R.string.untracked_time_name
6060
.let(resourceRepo::getString),
61-
tagName = "",
6261
timeStarted = timeStarted
6362
.let { timeMapper.formatTime(it, useMilitaryTime) },
6463
timeStartedTimestamp = timeStarted,
@@ -69,7 +68,6 @@ class RecordViewDataMapper @Inject constructor(
6968
.let { timeMapper.formatInterval(it, useProportionalMinutes) },
7069
iconId = RecordTypeIcon.Image(R.drawable.unknown),
7170
color = colorMapper.toUntrackedColor(isDarkTheme),
72-
comment = ""
7371
)
7472
}
7573
}

features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/record/RecordViewData.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,20 @@ sealed class RecordViewData : ViewHolderType {
4040
override val timeStartedTimestamp: Long,
4141
override val timeEndedTimestamp: Long,
4242
override val name: String,
43-
override val tagName: String,
4443
override val timeStarted: String,
4544
override val timeFinished: String,
4645
override val duration: String,
4746
override val iconId: RecordTypeIcon,
4847
@ColorInt override val color: Int,
49-
override val comment: String
5048
) : RecordViewData() {
5149

50+
override val tagName: String = ""
51+
override val comment: String = ""
52+
5253
override fun getUniqueId(): Long {
5354
var result = 31L
54-
result = 31L * result + timeStarted.hashCode()
55-
result = 31L * result + timeFinished.hashCode()
55+
result = 31L * result + timeStartedTimestamp.hashCode()
56+
result = 31L * result + timeEndedTimestamp.hashCode()
5657
return result
5758
}
5859

0 commit comments

Comments
 (0)