Skip to content

settings: migrate to kotlinx serialization #2884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Luna712 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

settings: migrate to kotlinx serialization #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac8f17
settings: migrate to kotlinx serialization
Luna712 Jun 5, 2026
89de7d3
Keep all JsonProperty for now
Luna712 Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions app/src/main/java/com/lagradost/cloudstream3/ui/settings/SettingsGeneral.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ import com.lagradost.cloudstream3.utils.USER_PROVIDER_API
import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement
import com.lagradost.cloudstream3.utils.downloader.DownloadFileManagement.getBasePath
import com.lagradost.cloudstream3.utils.downloader.DownloadQueueManager
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import java.util.Locale

// Change local language settings in the app.
Expand Down Expand Up @@ -134,7 +136,7 @@ fun Pair<String, String>.nameNextToFlagEmoji(): String {
// fallback to [A][A] -> [?] question mak flag
val flag = SubtitleHelper.getFlagFromIso(this.second) ?: "\ud83c\udde6\ud83c\udde6"

return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
return "$flag\u00a0${this.first}" // \u00a0 non-breaking space
}

class SettingsGeneral : BasePreferenceFragmentCompat() {
Expand All @@ -145,15 +147,12 @@ class SettingsGeneral : BasePreferenceFragmentCompat() {
setToolBarScrollFlags()
}

@Serializable
data class CustomSite(
@JsonProperty("parentJavaClass") // javaClass.simpleName
val parentJavaClass: String,
@JsonProperty("name")
val name: String,
@JsonProperty("url")
val url: String,
@JsonProperty("lang")
val lang: String,
@JsonProperty("parentJavaClass") @SerialName("parentJavaClass") val parentJavaClass: String, // javaClass.simpleName
@JsonProperty("name") @SerialName("name") val name: String,
@JsonProperty("url") @SerialName("url") val url: String,
@JsonProperty("lang") @SerialName("lang") val lang: String,
)

companion object {
Expand Down
15 changes: 9 additions & 6 deletions app/src/main/java/com/lagradost/cloudstream3/ui/settings/extensions/ExtensionsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ import com.lagradost.cloudstream3.plugins.RepositoryManager.PREBUILT_REPOSITORIE
import com.lagradost.cloudstream3.utils.UiText
import com.lagradost.cloudstream3.utils.txt
import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable

@Serializable
data class RepositoryData(
@JsonProperty("iconUrl") val iconUrl: String?,
@JsonProperty("name") val name: String,
@JsonProperty("url") val url: String
){
constructor(name: String,url: String):this(null,name,url)
@JsonProperty("iconUrl") @SerialName("iconUrl") val iconUrl: String?,
@JsonProperty("name") @SerialName("name") val name: String,
@JsonProperty("url") @SerialName("url") val url: String,
) {
constructor(name: String, url: String): this(null, name, url)
}

const val REPOSITORIES_KEY = "REPOSITORIES_KEY"
Expand Down Expand Up @@ -90,4 +93,4 @@ class ExtensionsViewModel : ViewModel() {
val urls = repos()
_repositories.postValue(urls)
}
}
}