Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 23e5e41f authored by Luca Stefani's avatar Luca Stefani Committed by Sebastiano Barezzi
Browse files

Twelve: Convert Serializable users to Parcel 

Except enum classes, since Kotlin will take care of that for us

Change-Id: Ie6d6e3885e3ec7887a2fa63e0263002f2b3d4c0b
parent ed57e271

app/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ android_app { 
    ],



    kotlin_plugins: [

        "kotlin-parcelize-compiler-plugin",

        "kotlin-serialize-compiler-plugin",

    ],
@@ -71,6 +72,7 @@ android_app { 
        "Twelve_io.coil-kt.coil3_coil-core-android",

        "Twelve_io.coil-kt.coil3_coil-network-core-android",

        "Twelve_io.coil-kt.coil3_coil-network-okhttp",

        "kotlin-parcelize-runtime",

        "kotlin-stdlib",

        "kotlinx_coroutines_guava",

        "kotlinx_serialization_json",

app/build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ plugins { 
    alias(libs.plugins.kapt)

    alias(libs.plugins.kotlin.android)

    alias(libs.plugins.kotlin.serialization)

    alias(libs.plugins.kotlin.parcelize)

    alias(libs.plugins.lineageos.generatebp)

}

app/src/main/java/org/lineageos/twelve/models/ProviderIdentifier.kt

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 


package org.lineageos.twelve.models



import kotlinx.serialization.Serializable

import android.os.Parcelable

import kotlinx.parcelize.Parcelize



/**

 * [Provider] identifier. Two instances are the same if they have the same [typeId] and [type].
@@ -13,12 +14,11 @@ import kotlinx.serialization.Serializable 
 * @param type The provider type

 * @param typeId The ID of the provider relative to the [ProviderType]

 */

@Suppress("PROVIDED_RUNTIME_TOO_LOW")

@Serializable

@Parcelize

open class ProviderIdentifier(

    val type: ProviderType,

    val typeId: Long,

) : Comparable<ProviderIdentifier> {

) : Comparable<ProviderIdentifier>, Parcelable {

    override fun compareTo(other: ProviderIdentifier) = compareValuesBy(

        this, other,

        ProviderIdentifier::type,

build.gradle.kts

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ 
plugins {

    alias(libs.plugins.android.application) apply false

    alias(libs.plugins.kotlin.android) apply false

    alias(libs.plugins.kotlin.parcelize) apply false

    alias(libs.plugins.lineageos.generatebp) apply false

}

gradle/libs.versions.toml

+1 −0
Original line number Diff line number Diff line
@@ -60,5 +60,6 @@ okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhtt 
android-application = { id = "com.android.application", version.ref = "agp" }

kapt = { id = "org.jetbrains.kotlin.kapt" }

kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }

kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

lineageos-generatebp = { id = "org.lineageos.generatebp", version.ref = "generateBp" }