Fix for using unique key in features and credits (#586)

Adventech · Mar 20, 2023 · 0fc3b90 · 0fc3b90
1 parent 9f420ba
commit 0fc3b90
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/common/misc/src/main/java/ss/misc/DeviceHelper.kt b/common/misc/src/main/java/ss/misc/DeviceHelper.kt
@@ -30,8 +30,13 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 interface DeviceHelper {
+
+    /** Returns the device's country code. **/
     fun country(): String
+
+    /** Returns the device's current timestamp in millis. **/
     fun nowEpochMilli(): Long
+
 }
 
 @Singleton

diff --git a/...ons/src/main/java/com/cryart/sabbathschool/lessons/ui/lessons/components/LessonsFooter.kt b/...ons/src/main/java/com/cryart/sabbathschool/lessons/ui/lessons/components/LessonsFooter.kt
@@ -82,7 +82,7 @@ internal fun LazyListScope.footer(
         )
     }
 
-    items(spec.features, key = { it.name }) { feature ->
+    items(spec.features, key = { it.hashCode() }) { feature ->
         FooterItem(
             title = feature.title,
             description = feature.description,
@@ -92,7 +92,7 @@ internal fun LazyListScope.footer(
         )
     }
 
-    items(spec.credits, key = { it.name }) { credit ->
+    items(spec.credits, key = { it.hashCode() }) { credit ->
         FooterItem(
             title = credit.name,
             description = credit.value,

diff --git a/...java/com/cryart/sabbathschool/lessons/ui/lessons/components/features/QuarterlyFeatures.kt b/...java/com/cryart/sabbathschool/lessons/ui/lessons/components/features/QuarterlyFeatures.kt
@@ -52,8 +52,8 @@ internal data class QuarterlyFeaturesSpec(
 
 @Composable
 internal fun QuarterlyFeaturesRow(
-    modifier: Modifier = Modifier,
-    spec: QuarterlyFeaturesSpec
+    spec: QuarterlyFeaturesSpec,
+    modifier: Modifier = Modifier
 ) {
     Row(
         modifier = modifier

diff --git a/...s/src/main/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/CreditSpec.kt b/...s/src/main/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/CreditSpec.kt
@@ -26,7 +26,7 @@ import app.ss.models.Credit
 import javax.annotation.concurrent.Immutable
 
 @Immutable
-data class CreditSpec(
+internal data class CreditSpec(
     val name: String,
     val value: String
 )

diff --git a/.../src/main/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/FeatureSpec.kt b/.../src/main/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/FeatureSpec.kt
@@ -26,7 +26,7 @@ import app.ss.models.Feature
 import javax.annotation.concurrent.Immutable
 
 @Immutable
-data class FeatureSpec(
+internal data class FeatureSpec(
     val name: String,
     val title: String,
     val description: String,

diff --git a/...in/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/PublishingInfoSpec.kt b/...in/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/PublishingInfoSpec.kt
@@ -26,7 +26,7 @@ import androidx.compose.runtime.Immutable
 import app.ss.models.PublishingInfo
 
 @Immutable
-data class PublishingInfoSpec(
+internal data class PublishingInfoSpec(
     val message: String,
     val url: String,
     val primaryColorHex: String

diff --git a/...ain/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/QuarterlyInfoSpec.kt b/...ain/java/com/cryart/sabbathschool/lessons/ui/lessons/components/spec/QuarterlyInfoSpec.kt
@@ -34,7 +34,7 @@ import org.joda.time.Interval
 import ss.misc.DateHelper
 
 @Immutable
-data class QuarterlyInfoSpec(
+internal data class QuarterlyInfoSpec(
     val title: String,
     val description: String,
     val date: String,