From 5dd1b9a2f956103b894e98441c9b1d81c9e3c094 Mon Sep 17 00:00:00 2001
From: Nik Clayton <nik@ngo.org.uk>
Date: Mon, 10 Jun 2024 16:28:55 +0200
Subject: [PATCH] refactor: Move CardViewMode to core.preferences (#729)

---
 app/src/main/java/app/pachli/adapter/StatusBaseViewHolder.kt    | 2 +-
 .../main/java/app/pachli/adapter/StatusDetailedViewHolder.kt    | 2 +-
 app/src/main/java/app/pachli/util/StatusDisplayOptions.kt       | 2 ++
 .../main/java/app/pachli/util/StatusDisplayOptionsRepository.kt | 1 +
 .../main/kotlin/app/pachli/core/preferences}/CardViewMode.kt    | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)
 rename {app/src/main/java/app/pachli/util => core/preferences/src/main/kotlin/app/pachli/core/preferences}/CardViewMode.kt (65%)

diff --git a/app/src/main/java/app/pachli/adapter/StatusBaseViewHolder.kt b/app/src/main/java/app/pachli/adapter/StatusBaseViewHolder.kt
index 61a45c2e9..aaeae5b6f 100644
--- a/app/src/main/java/app/pachli/adapter/StatusBaseViewHolder.kt
+++ b/app/src/main/java/app/pachli/adapter/StatusBaseViewHolder.kt
@@ -35,8 +35,8 @@ import app.pachli.core.network.model.Attachment
 import app.pachli.core.network.model.Emoji
 import app.pachli.core.network.model.PreviewCardKind
 import app.pachli.core.network.model.Status
+import app.pachli.core.preferences.CardViewMode
 import app.pachli.interfaces.StatusActionListener
-import app.pachli.util.CardViewMode
 import app.pachli.util.CompositeWithOpaqueBackground
 import app.pachli.util.StatusDisplayOptions
 import app.pachli.util.aspectRatios
diff --git a/app/src/main/java/app/pachli/adapter/StatusDetailedViewHolder.kt b/app/src/main/java/app/pachli/adapter/StatusDetailedViewHolder.kt
index 41841b0fd..2d6f60df5 100644
--- a/app/src/main/java/app/pachli/adapter/StatusDetailedViewHolder.kt
+++ b/app/src/main/java/app/pachli/adapter/StatusDetailedViewHolder.kt
@@ -10,10 +10,10 @@ import android.view.View
 import app.pachli.R
 import app.pachli.core.common.extensions.hide
 import app.pachli.core.common.extensions.show
+import app.pachli.core.preferences.CardViewMode
 import app.pachli.core.ui.NoUnderlineURLSpan
 import app.pachli.databinding.ItemStatusDetailedBinding
 import app.pachli.interfaces.StatusActionListener
-import app.pachli.util.CardViewMode
 import app.pachli.util.StatusDisplayOptions
 import app.pachli.util.createClickableText
 import app.pachli.util.description
diff --git a/app/src/main/java/app/pachli/util/StatusDisplayOptions.kt b/app/src/main/java/app/pachli/util/StatusDisplayOptions.kt
index 8a6b99df9..f18b0879a 100644
--- a/app/src/main/java/app/pachli/util/StatusDisplayOptions.kt
+++ b/app/src/main/java/app/pachli/util/StatusDisplayOptions.kt
@@ -17,6 +17,8 @@
 
 package app.pachli.util
 
+import app.pachli.core.preferences.CardViewMode
+
 data class StatusDisplayOptions(
     @get:JvmName("animateAvatars")
     val animateAvatars: Boolean = false,
diff --git a/app/src/main/java/app/pachli/util/StatusDisplayOptionsRepository.kt b/app/src/main/java/app/pachli/util/StatusDisplayOptionsRepository.kt
index 055d44d3d..39f852348 100644
--- a/app/src/main/java/app/pachli/util/StatusDisplayOptionsRepository.kt
+++ b/app/src/main/java/app/pachli/util/StatusDisplayOptionsRepository.kt
@@ -24,6 +24,7 @@ import app.pachli.core.common.di.ApplicationScope
 import app.pachli.core.data.repository.ServerRepository
 import app.pachli.core.database.model.AccountEntity
 import app.pachli.core.network.ServerOperation.ORG_JOINMASTODON_STATUSES_TRANSLATE
+import app.pachli.core.preferences.CardViewMode
 import app.pachli.core.preferences.PrefKeys
 import app.pachli.core.preferences.SharedPreferencesRepository
 import app.pachli.settings.AccountPreferenceDataStore
diff --git a/app/src/main/java/app/pachli/util/CardViewMode.kt b/core/preferences/src/main/kotlin/app/pachli/core/preferences/CardViewMode.kt
similarity index 65%
rename from app/src/main/java/app/pachli/util/CardViewMode.kt
rename to core/preferences/src/main/kotlin/app/pachli/core/preferences/CardViewMode.kt
index 031ea0554..9c37c905e 100644
--- a/app/src/main/java/app/pachli/util/CardViewMode.kt
+++ b/core/preferences/src/main/kotlin/app/pachli/core/preferences/CardViewMode.kt
@@ -1,4 +1,4 @@
-package app.pachli.util
+package app.pachli.core.preferences
 
 enum class CardViewMode {
     NONE,