Migrate to new parcelize Implementation for Kotlin 1.8, also extend chatKit MessageInput to provide access to UI elements of that component

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

app/build.gradle

@@ -29,7 +29,7 @@ import com.nextcloud.talk.gradle.DownloadWebRtcTask
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-parcelize'
 apply plugin: 'com.github.spotbugs'
 apply plugin: 'io.gitlab.arturbosch.detekt'
 apply plugin: "org.jlleitschuh.gradle.ktlint"

app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt

@@ -57,7 +57,6 @@ import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.call_item.*
 import okhttp3.Cache
 import org.parceler.Parcels
 import java.io.IOException
@@ -234,7 +233,7 @@ class CallNotificationActivity : CallBaseActivity() {
     private fun setUpAfterConversationIsKnown() {
         binding!!.conversationNameTextView.text = currentConversation!!.displayName
         if (currentConversation!!.type === Conversation.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
-            avatarImageView.loadAvatar(userBeingCalled!!, currentConversation!!.name!!)
+            binding!!.avatarImageView.loadAvatar(userBeingCalled!!, currentConversation!!.name!!)
         } else {
             binding!!.avatarImageView.setImageResource(R.drawable.ic_circular_group)
         }

app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt

@@ -20,7 +20,7 @@
 package com.nextcloud.talk.activities
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 enum class CallStatus : Parcelable {

app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt

@@ -37,7 +37,7 @@ import com.nextcloud.talk.components.filebrowser.models.properties.OCFavorite
 import com.nextcloud.talk.components.filebrowser.models.properties.OCId
 import com.nextcloud.talk.components.filebrowser.models.properties.OCSize
 import com.nextcloud.talk.utils.Mimetype.FOLDER
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.io.File
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

@@ -198,7 +198,6 @@ import io.reactivex.Observer
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import io.reactivex.schedulers.Schedulers
-import kotlinx.android.synthetic.main.view_message_input.view.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode

app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorage.kt

@@ -21,7 +21,7 @@
 package com.nextcloud.talk.data.storage.model
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class ArbitraryStorage(

app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorageEntity.kt

@@ -24,7 +24,7 @@ import android.os.Parcelable
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @Entity(tableName = "ArbitraryStorage")

app/src/main/java/com/nextcloud/talk/data/user/model/User.kt

@@ -24,7 +24,7 @@ import com.nextcloud.talk.models.ExternalSignalingServer
 import com.nextcloud.talk.models.json.capabilities.Capabilities
 import com.nextcloud.talk.models.json.push.PushConfigurationState
 import com.nextcloud.talk.utils.ApiUtils
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.lang.Boolean.FALSE
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt

@@ -29,7 +29,7 @@ import androidx.room.PrimaryKey
 import com.nextcloud.talk.models.ExternalSignalingServer
 import com.nextcloud.talk.models.json.capabilities.Capabilities
 import com.nextcloud.talk.models.json.push.PushConfigurationState
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.lang.Boolean.FALSE
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/LoginData.kt

@@ -22,7 +22,7 @@
 package com.nextcloud.talk.models
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class LoginData(

app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.kt

@@ -22,7 +22,7 @@
 package com.nextcloud.talk.models
 
 import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class RetrofitBucket(

app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt

@@ -26,7 +26,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.converters.UriTypeConverter
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/SignatureVerification.kt

@@ -23,7 +23,7 @@ package com.nextcloud.talk.models
 
 import android.os.Parcelable
 import com.nextcloud.talk.data.user.model.User
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 data class SignatureVerification(

app/src/main/java/com/nextcloud/talk/models/json/AnyParceler.kt

@@ -20,7 +20,7 @@
 package com.nextcloud.talk.models.json
 
 import android.os.Parcel
-import kotlinx.android.parcel.Parceler
+import kotlinx.parcelize.Parceler
 
 class AnyParceler : Parceler<Any?> {
     override fun create(parcel: Parcel): Any? {

app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt

@@ -27,7 +27,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.autocomplete
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.autocomplete
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt

@@ -27,7 +27,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.capabilities
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt

@@ -40,7 +40,7 @@ import com.nextcloud.talk.utils.ApiUtils
 import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
 import com.stfalcon.chatkit.commons.models.IUser
 import com.stfalcon.chatkit.commons.models.MessageContentType
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.security.MessageDigest
 import java.util.Arrays
 import java.util.Date

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.chat
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.chat
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import java.util.HashMap
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.chat
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt

@@ -25,8 +25,8 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.AnyParceler
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
-import kotlinx.android.parcel.TypeParceler
+import kotlinx.parcelize.TypeParceler
 import java.util.HashMap
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.chat
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt

@@ -37,7 +37,7 @@ import com.nextcloud.talk.models.json.converters.EnumReadOnlyConversationConvert
 import com.nextcloud.talk.models.json.converters.EnumRoomTypeConverter
 import com.nextcloud.talk.models.json.participants.Participant.ParticipantType
 import com.nextcloud.talk.utils.database.user.CapabilitiesUtilNew
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.conversations
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.conversations
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt

@@ -23,7 +23,7 @@ package com.nextcloud.talk.models.json.conversations.password
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @JsonObject
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt

@@ -24,7 +24,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt

@@ -23,7 +23,7 @@ package com.nextcloud.talk.models.json.conversations.password
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.generic
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject(serializeNullObjects = true)

app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.generic
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.generic
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.generic
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.hovercard
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.hovercard
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt

@@ -26,7 +26,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.mention
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt

@@ -27,7 +27,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.mention
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.converters.LoganSquareJodaTimeConverter
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import org.joda.time.DateTime
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.notifications
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.notifications
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt

@@ -27,7 +27,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt

@@ -23,7 +23,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.opengraph
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.opengraph
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.opengraph
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.opengraph
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.opengraph
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt

@@ -26,7 +26,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.conversations.Conversation
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.conversations.RoomsOCS
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt

@@ -26,7 +26,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.converters.EnumActorTypeConverter
 import com.nextcloud.talk.models.json.converters.EnumParticipantTypeConverter
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.ArrayList
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.participants
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt

@@ -23,7 +23,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonIgnore
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.push
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.push
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.push
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.push
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt

@@ -23,7 +23,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.converters.EnumReactionActorTypeConverter
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import java.util.HashMap
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt

@@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.reactions
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt

@@ -26,7 +26,7 @@ import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
 import java.util.HashMap
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.search
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.sharees
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.sharees
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.sharees
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.sharees
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.sharees
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt

@@ -25,8 +25,8 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.AnyParceler
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
-import kotlinx.android.parcel.TypeParceler
+import kotlinx.parcelize.TypeParceler
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt

@@ -25,8 +25,8 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.AnyParceler
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
-import kotlinx.android.parcel.TypeParceler
+import kotlinx.parcelize.TypeParceler
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling.settings
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling.settings
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
 @Parcelize

app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt

@@ -25,7 +25,7 @@ import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
 import com.nextcloud.talk.models.json.generic.GenericMeta
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt

@@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.signaling.settings
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject

app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt

@@ -3,7 +3,7 @@ package com.nextcloud.talk.models.json.status
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
-import kotlinx.android.parcel.Parcelize
+import kotlinx.parcelize.Parcelize
 
 @Parcelize
 @JsonObject