Remove some unnecessary Serializable impl

Author: levinli303

CelestiaFoundation/src/main/java/space/celestia/celestiafoundation/resource/model/GuideItem.kt

@@ -1,7 +1,6 @@
 package space.celestia.celestiafoundation.resource.model
 
 import androidx.annotation.Keep
-import java.io.Serializable
 
 @Keep
-class GuideItem(val id: String, val title: String): Serializable
+class GuideItem(val id: String, val title: String)

CelestiaFoundation/src/main/java/space/celestia/celestiafoundation/resource/model/ResourceItem.kt

@@ -11,7 +11,6 @@ package space.celestia.celestiafoundation.resource.model
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import java.io.Serializable
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -20,11 +19,8 @@ class ResourceItem(
     val id: String,
     val name: String,
     val type: String?,
-    val description: String,
     val item: String,
     val checksum: String?,
-    val image: String?,
-    val authors: List<String>?,
     val objectName: String?,
     val mainScriptName: String?
-): Serializable, Parcelable
+): Parcelable

CelestiaUI/src/main/java/space/celestia/celestiaui/resource/AddonScreen.kt

@@ -9,6 +9,7 @@
 
 package space.celestia.celestiaui.resource
 
+import android.os.Parcelable
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -36,6 +37,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
 import space.celestia.celestia.AppCore
 import space.celestia.celestiafoundation.resource.model.ResourceItem
 import space.celestia.celestiafoundation.resource.model.ResourceManager
@@ -47,19 +49,15 @@ import space.celestia.celestiaui.info.model.perform
 import space.celestia.celestiaui.resource.viewmodel.AddonViewModel
 import space.celestia.celestiaui.utils.CelestiaString
 import java.io.File
-import java.io.Serializable
 
 
-sealed class AddonState: Serializable {
-    data object None: AddonState(), Serializable {
-        private fun readResolve(): Any = None
-    }
-    data object Downloading: AddonState(), Serializable {
-        private fun readResolve(): Any = Downloading
-    }
-    data object Installed: AddonState(), Serializable {
-        private fun readResolve(): Any = Installed
-    }
+sealed class AddonState: Parcelable {
+    @Parcelize
+    data object None: AddonState()
+    @Parcelize
+    data object Downloading: AddonState()
+    @Parcelize
+    data object Installed: AddonState()
 }
 
 sealed class AddonAlert {

CelestiaUI/src/main/java/space/celestia/celestiaui/resource/CommonWebFragment.kt

@@ -7,6 +7,7 @@ import android.net.Uri
 import android.net.http.SslError
 import android.os.Build
 import android.os.Bundle
+import android.os.Parcelable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -41,6 +42,7 @@ import androidx.webkit.WebSettingsCompat
 import androidx.webkit.WebViewFeature
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
 import space.celestia.celestia.AppCore
 import space.celestia.celestiafoundation.resource.model.ResourceItem
 import space.celestia.celestiaui.R
@@ -53,17 +55,14 @@ import space.celestia.celestiaui.resource.CommonWebFragment.Companion.ARG_URI
 import space.celestia.celestiaui.resource.model.ResourceAPIService
 import space.celestia.celestiaui.utils.CelestiaString
 import java.io.File
-import java.io.Serializable
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
-sealed class WebError: Serializable {
-    data object NotAvailable: WebError(), Serializable {
-        private fun readResolve(): Any = NotAvailable
-    }
-    data object Loading: WebError(), Serializable {
-        private fun readResolve(): Any = Loading
-    }
+sealed class WebError: Parcelable {
+    @Parcelize
+    data object NotAvailable: WebError()
+    @Parcelize
+    data object Loading: WebError()
 }
 
 @Composable

CelestiaUI/src/main/java/space/celestia/celestiaui/settings/viewmodel/SettingsModel.kt

@@ -4,17 +4,15 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import space.celestia.celestiaui.utils.CelestiaString
 import space.celestia.celestiaui.utils.PreferenceManager
-import java.io.Serializable
 
 const val settingUnmarkAllID = "UnmarkAll"
 
-sealed class Footer: Serializable {
-    data class Text(val text: String): Footer(), Serializable
-    data class TextWithLink(val text: String, val linkText: String, val link: String, val localizable: Boolean): Footer(),
-        Serializable
+sealed class Footer {
+    data class Text(val text: String): Footer()
+    data class TextWithLink(val text: String, val linkText: String, val link: String, val localizable: Boolean): Footer()
 }
 
-enum class SettingsKey : PreferenceManager.Key, Serializable {
+enum class SettingsKey : PreferenceManager.Key {
     // Boolean values
     ShowStars,
     ShowPlanets,
@@ -302,7 +300,7 @@ class SettingsSliderItem(
     private val internalKey: SettingsKey,
     val minValue: Double = 0.0,
     val maxValue: Double = 1.0
-) : SettingsItem, Serializable {
+) : SettingsItem {
     val key: String = internalKey.valueString
 
     override val name: String
@@ -314,7 +312,7 @@ class SettingsPreferenceSwitchItem(
     private val displayName: String,
     val defaultOn: Boolean = false,
     val subtitle: String? = null
-) : SettingsItem, Serializable {
+) : SettingsItem {
     override val name: String
         get() = displayName
 }
@@ -326,12 +324,12 @@ class SettingsPreferenceSliderItem(
     val minValue: Double = 0.0,
     val maxValue: Double = 1.0,
     val defaultValue: Double = 0.0
-) : SettingsItem, Serializable {
+) : SettingsItem {
     override val name: String
         get() = displayName
 }
 
-class SettingsLanguageItem : SettingsItem, Serializable {
+class SettingsLanguageItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Language", "Display language setting")
 }
@@ -342,7 +340,7 @@ class SettingsSwitchItem(
     val volatile: Boolean,
     val representation: Representation = Representation.Checkmark,
     val subtitle: String? = null
-) : SettingsItem, Serializable {
+) : SettingsItem {
     enum class Representation {
         Checkmark, Switch;
     }
@@ -358,7 +356,7 @@ class SettingsPreferenceSelectionItem(
     private val displayName: String,
     val options: List<Pair<Int, String>>,
     val defaultSelection: Int
-) : SettingsItem, Serializable {
+) : SettingsItem {
     override val name: String
         get() = displayName
 }
@@ -370,7 +368,7 @@ class SettingsSelectionSingleItem(
     val defaultSelection: Int,
     val showTitle: Boolean = true,
     val subtitle: String? = null
-) : SettingsItem, Serializable {
+) : SettingsItem {
     override val name: String
         get() = displayName
 
@@ -381,48 +379,44 @@ class SettingsCurrentTimeItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Current Time", "")
 }
-class SettingsDataLocationItem : SettingsItem, Serializable {
+class SettingsDataLocationItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Data Location", "Title for celestia.cfg, data location setting")
 }
 
 @RequiresApi(Build.VERSION_CODES.Q)
-class SettingsFontItem : SettingsItem, Serializable {
+class SettingsFontItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Font", "")
 }
 
-class SettingsToolbarItem : SettingsItem, Serializable {
+class SettingsToolbarItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Toolbar", "Toolbar customization entry in Settings")
 }
 
 
-class SettingsRefreshRateItem : SettingsItem, Serializable {
+class SettingsRefreshRateItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Frame Rate", "Frame rate of simulation")
 }
 
-class SettingsRenderInfoItem : SettingsItem, Serializable {
+class SettingsRenderInfoItem : SettingsItem {
     override val name: String
         get() = CelestiaString("Render Info", "Information about renderer")
 }
 
-class SettingsAboutItem : SettingsItem, Serializable {
+class SettingsAboutItem : SettingsItem {
     override val name: String
         get() = CelestiaString("About", "About Celestia")
 }
 
-class SettingsUnknownTextItem(override val name: String, val id: String) : SettingsItem,
-    Serializable
+class SettingsUnknownTextItem(override val name: String, val id: String) : SettingsItem
 
-class SettingsActionItem(override val name: String, val action: Int): SettingsItem,
-    Serializable
+class SettingsActionItem(override val name: String, val action: Int): SettingsItem
 
-class SettingsCommonItem(override val name: String, val sections: List<Section>) : SettingsItem,
-    Serializable {
-    class Section(val rows: List<SettingsItem>, val header: String? = "", val footer: Footer? = null) :
-        Serializable
+class SettingsCommonItem(override val name: String, val sections: List<Section>) : SettingsItem {
+    class Section(val rows: List<SettingsItem>, val header: String? = "", val footer: Footer? = null)
 
     companion object {
         fun create(name: String, items: List<SettingsItem>): SettingsCommonItem {