diff --git a/app/build.gradle b/app/build.gradle index b6335b5a1..e31e1b051 100644 --- a/app/build.gradle +++ b/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" diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt index e35e53acf..ace335318 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallNotificationActivity.kt +++ b/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) } diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt b/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt index 6810544b9..d717ea02d 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallStatus.kt +++ b/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 { diff --git a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt b/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt index c20590ec2..789987df7 100644 --- a/app/src/main/java/com/nextcloud/talk/components/filebrowser/models/BrowserFile.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 78a76c554..8641cf3fb 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorage.kt b/app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorage.kt index 90353bc76..baf5e9678 100644 --- a/app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorage.kt +++ b/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( diff --git a/app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorageEntity.kt b/app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorageEntity.kt index a76d3e684..9b5258f31 100644 --- a/app/src/main/java/com/nextcloud/talk/data/storage/model/ArbitraryStorageEntity.kt +++ b/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") diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt index 551a4a2e2..888ed034a 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/model/User.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt b/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt index 555bdebcd..d76f6f625 100644 --- a/app/src/main/java/com/nextcloud/talk/data/user/model/UserEntity.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt b/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt index c1b476e76..d4caf8a6d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/ExternalSignalingServer.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/LoginData.kt b/app/src/main/java/com/nextcloud/talk/models/LoginData.kt index 42dd08555..9291fa8dd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/LoginData.kt +++ b/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( diff --git a/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.kt b/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.kt index 508e0d3ec..8b6460836 100644 --- a/app/src/main/java/com/nextcloud/talk/models/RetrofitBucket.kt +++ b/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( diff --git a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt b/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt index a9c1c0700..004a48501 100644 --- a/app/src/main/java/com/nextcloud/talk/models/RingtoneSettings.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.kt b/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.kt index 11e043c0a..f96f25b02 100644 --- a/app/src/main/java/com/nextcloud/talk/models/SignatureVerification.kt +++ b/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( diff --git a/app/src/main/java/com/nextcloud/talk/models/json/AnyParceler.kt b/app/src/main/java/com/nextcloud/talk/models/json/AnyParceler.kt index a419ad6bf..2d790c6be 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/AnyParceler.kt +++ b/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 { override fun create(parcel: Parcel): Any? { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt index 6c8912016..9473b31bc 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt index 32583dff9..4976a219d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt b/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt index f356ad5e5..6e66c9d7b 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/autocomplete/AutocompleteUser.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt index bc94d731a..c15d65546 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/Capabilities.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt index acf6ce609..ff15869db 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesList.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt index 46316ca54..fffe8a9af 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt index a3fb106d7..636846e70 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CapabilitiesOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt index d5bf24ff9..09a1ad7a5 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/CoreCapability.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt index ac8d207f4..e32fe0bd7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/NotificationsCapability.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt index 2ff775777..637ad7384 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ProvisioningCapability.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt index 658301ee7..8e3a8d950 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/SpreedCapability.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt index 83f4280c2..35d78dd24 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/ThemingCapability.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt b/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt index 2ca1edf2f..47f100bf3 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/capabilities/UserStatusCapability.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt index 98937fddf..537e2e82c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt index 5e36b98a7..5cb67f1a7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt index 49a6194f0..eb12998ae 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOCSSingleMessage.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt index 60820b444..9378f1c5f 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt index e182adf5c..f0aca47b9 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatOverallSingleMessage.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt index d84b37f7c..417426d27 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt index a5acce78a..2e0612ced 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt index 68d1da2a3..cdae47620 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOCS.kt +++ b/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.android.parcel.TypeParceler +import kotlinx.parcelize.Parcelize +import kotlinx.parcelize.TypeParceler import java.util.HashMap @Parcelize diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt index 7cfe04d82..93da5ed48 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatShareOverviewOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt index 4fa6a111f..642b4ffd4 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/Conversation.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt index 6ae6fbe67..6a7eb5aaa 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt index 689f07278..ef5574c84 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt index b99436bc8..8672b99bd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt index fb0883c8b..83c6de9b4 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/RoomsOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt index f89b7da13..b11fb201d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordData.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt index e15d9aee3..d2c68ae15 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt index 4ff7e9851..e91e259ab 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/conversations/password/PasswordOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt index d5d6824c4..4d145d6bf 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericMeta.kt +++ b/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) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt index faac6262e..b3cc3361a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt index e5bd828b3..2cfaeaa75 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/generic/GenericOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt b/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt index 4e13cfc9c..0e2e46402 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/generic/Status.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt index 05421b749..a90603849 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCard.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt index 89037b21f..9d4b60fdc 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardAction.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt index acba60336..19083c657 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/hovercard/HoverCardOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt index 93e179231..740c72fe9 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/mention/Mention.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt index fd82964c2..5851cdee3 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt index 3f9b949a4..a3d39d1c5 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/mention/MentionOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt index 6df6f3af1..86b6cf27c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/Notification.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt index df10a5e16..cb06eb837 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationAction.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt index bf23947f6..4745ffaa7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt index 1eca97d2e..e4eff410e 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationRichObject.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt index f4e5a451d..94f3280ac 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/notifications/NotificationsOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt index eb834c5f8..941d849a6 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt index d92d80ffa..31087440c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphObject.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt index 8cedd0d0a..fae9653b2 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt index f4ac43008..07be4c527 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/OpenGraphResponse.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt index 581c20dd8..052cfc327 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/Reference.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt b/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt index 129d1d4fb..43331cf78 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/opengraph/RichObject.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt index 852aac0c4..fef24a6e6 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt index 58dbf39a6..8fee65813 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/participants/AddParticipantOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt index d9500d8f5..937471738 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/participants/Participant.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt index d98d55e7f..0b0af271c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt index b26af9932..cc69f6320 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/participants/ParticipantsOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt index 264184a75..9ff9b3a32 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt index 62351a4ed..8f0634bc5 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/push/NotificationUser.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt index ff68fd87f..9b6e39956 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushConfigurationState.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt index eb5c3b2d5..dcfa7c1c7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistration.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt index ec17284c9..204c83e2b 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt index bedb13144..dc6fd9c7e 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/push/PushRegistrationOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt index 8ae56e5b6..c50015587 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionVoter.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt index cc0318f54..a52cea636 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt index 3a2e629e5..56fad102c 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/reactions/ReactionsOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt index 5c4f769d4..4e6709ff2 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt index 77fc8b783..6fdf7ccf7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/search/ContactsByNumberOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt index 9c98a64a9..11373f31e 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ExactSharees.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt index a7259ae23..e70fbc947 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Sharee.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt index e8847d440..b6b06489e 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt index b6d6c35cb..0aa6229e7 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/ShareesOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt index 63e8608d3..265ffadc3 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/SharesData.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt b/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt index c040dfb9f..1f2af0db6 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/sharees/Value.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt index b0ab14457..d4c0a0c66 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/DataChannelMessage.kt +++ b/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.android.parcel.TypeParceler +import kotlinx.parcelize.Parcelize +import kotlinx.parcelize.TypeParceler @Parcelize @JsonObject diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt index d63d58b08..e59a3d63e 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCIceCandidate.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt index 79b0b4b6e..6387649f3 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCMessagePayload.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt index 2af0b97da..f87f9a9b4 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/NCSignalingMessage.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt index e04e54e10..854716042 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/Signaling.kt +++ b/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.android.parcel.TypeParceler +import kotlinx.parcelize.Parcelize +import kotlinx.parcelize.TypeParceler @Parcelize @JsonObject diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt index bfbec9166..157eef621 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOCS.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt index 4d19942bc..e52b37c3a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/SignalingOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt index 90d57ff79..332f596fd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/IceServer.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt index 4b1a1cd6b..c4385adb9 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettings.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt index 2b3358155..1bc0c05cd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOcs.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt index 3fc736aaf..743530efd 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/signaling/settings/SignalingSettingsOverall.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt index 34e3ea19c..d1dd87184 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/ClearAt.kt +++ b/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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt index d31beb7c5..9f43683ab 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/Status.kt @@ -22,7 +22,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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt index 4d982fba3..8d9d13c34 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOCS.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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt index b3e68a321..a8d88e369 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusOverall.kt @@ -24,7 +24,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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt index 170d0cb9a..679c0c5a1 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatus.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import com.bluelinelabs.logansquare.annotation.JsonField import com.bluelinelabs.logansquare.annotation.JsonObject import com.nextcloud.talk.models.json.status.ClearAt -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize @JsonObject diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt index 526890a4f..e89ae28f6 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOCS.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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt index 030bd4926..8a8706198 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/predefined/PredefinedStatusOverall.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.status.predefined 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt index 0cfe1d256..8311eaaa2 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchEntry.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.unifiedsearch 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt index fd21d9fa5..c37a4d45a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOCS.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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt index 0fb7cce07..ce5992463 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchOverall.kt @@ -22,7 +22,7 @@ package com.nextcloud.talk.models.json.unifiedsearch 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt index a05857d4b..f261aea22 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/unifiedsearch/UnifiedSearchResponseData.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.unifiedsearch 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt index e405c151d..c82c60af1 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileData.kt @@ -26,7 +26,7 @@ import com.bluelinelabs.logansquare.annotation.JsonObject import com.nextcloud.talk.controllers.ProfileController import com.nextcloud.talk.models.json.converters.ScopeConverter import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize @JsonObject diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt index db512661a..354d2f749 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOCS.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.ArrayList @Parcelize diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt index 466704928..9c9875860 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileFieldsOverall.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.userprofile 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt index dc74e7400..9c7d6eebc 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOCS.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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt index 95a89fd02..657bd353e 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/userprofile/UserProfileOverall.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.userprofile 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt index 0542ed9f5..7e771dc73 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ActorWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt index 7afa0b6a6..70fb1a635 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthParametersWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt index a9fe8e2be..b71b0d7e8 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/AuthWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt index 9bef196e8..eac13ec30 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/BaseWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt index b450700e2..d57f8a40a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ByeWebSocketMessage.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.android.parcel.TypeParceler +import kotlinx.parcelize.Parcelize +import kotlinx.parcelize.TypeParceler import java.util.HashMap @Parcelize diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt index 4137b6d2c..83969ed88 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallOverallWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt index 1bd855c43..5156ac301 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.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.signaling.NCSignalingMessage -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize @JsonObject diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt index a3110d8ca..17eb4637a 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorOverallWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt index 3d2a33c5b..a158e9b89 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ErrorWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt index dc06c0329..f2ef0a122 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/EventOverallWebSocketMessage.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.android.parcel.TypeParceler +import kotlinx.parcelize.Parcelize +import kotlinx.parcelize.TypeParceler import java.util.HashMap @Parcelize diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt index 0da623ceb..b0a1e1767 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloOverallWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt index c213190c1..2036f4752 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseOverallWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt index 8e0e1a1a1..edd9b6128 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloResponseWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt index 6aa62f9d6..1e3b3f3b4 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/HelloWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt index 69a977371..68c335caf 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/JoinedRoomOverallWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt index ecf77c134..94b54a269 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomOverallWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt index 74bd8b2fc..bb8d282a0 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomPropertiesWebSocketMessage.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.ConversationType import com.nextcloud.talk.models.json.converters.EnumRoomTypeConverter -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize @JsonObject diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt index 5096d33f1..17742bad8 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/RoomWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt index 5d8ac619d..7fa4ca2b3 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/ServerHelloResponseFeaturesWebSocketMessage.kt @@ -24,7 +24,7 @@ package com.nextcloud.talk.models.json.websocket 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 diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt index 0d03e0172..072e8304b 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollDetailsResponse.kt @@ -22,7 +22,7 @@ package com.nextcloud.talk.polls.repositories.model 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 diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt index 1adf3832b..cb691979d 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOCS.kt @@ -22,7 +22,7 @@ package com.nextcloud.talk.polls.repositories.model 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 diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt index d5b8fb331..f0b3f48b8 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollOverall.kt @@ -22,7 +22,7 @@ package com.nextcloud.talk.polls.repositories.model 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 diff --git a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt index 9010ee2f5..a8c693899 100644 --- a/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt +++ b/app/src/main/java/com/nextcloud/talk/polls/repositories/model/PollResponse.kt @@ -22,7 +22,7 @@ package com.nextcloud.talk.polls.repositories.model 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 diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/model/RemoteFileBrowserItem.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/model/RemoteFileBrowserItem.kt index e4eb2c044..3dbfc89bb 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/model/RemoteFileBrowserItem.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/model/RemoteFileBrowserItem.kt @@ -23,7 +23,7 @@ package com.nextcloud.talk.remotefilebrowser.model import android.os.Parcelable -import kotlinx.android.parcel.Parcelize +import kotlinx.parcelize.Parcelize @Parcelize data class RemoteFileBrowserItem( diff --git a/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt b/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt new file mode 100644 index 000000000..e92f1b445 --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt @@ -0,0 +1,59 @@ +package com.nextcloud.talk.ui + +import android.content.Context +import android.util.AttributeSet +import android.widget.Chronometer +import android.widget.ImageButton +import android.widget.ImageView +import android.widget.TextView +import androidx.emoji2.widget.EmojiEditText +import com.nextcloud.talk.R +import com.stfalcon.chatkit.messages.MessageInput + +class MessageInput : MessageInput { + lateinit var audioRecordDuration: Chronometer + lateinit var recordAudioButton: ImageButton + lateinit var slideToCancelDescription: TextView + lateinit var microphoneEnabledInfo: ImageView + lateinit var microphoneEnabledInfoBackground: ImageView + lateinit var smileyButton: ImageButton + + constructor(context: Context?) : super(context) { + init() + } + + constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs) { + init() + } + + constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) { + init() + } + + private fun init() { + audioRecordDuration = findViewById(R.id.audioRecordDuration) + recordAudioButton = findViewById(R.id.recordAudioButton) + slideToCancelDescription = findViewById(R.id.slideToCancelDescription) + microphoneEnabledInfo = findViewById(R.id.microphoneEnabledInfo) + microphoneEnabledInfoBackground = findViewById(R.id.microphoneEnabledInfoBackground) + smileyButton = findViewById(R.id.smileyButton) + } + + var messageInput: EmojiEditText + get() = messageInput + set(messageInput) { + super.messageInput = messageInput + } + + var attachmentButton: ImageButton + get() = attachmentButton + set(attachmentButton) { + super.attachmentButton = attachmentButton + } + + var messageSendButton: ImageButton + get() = messageSendButton + set(messageSendButton) { + super.messageSendButton = messageSendButton + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/controller_chat.xml index 724e238b6..97c2b3646 100644 --- a/app/src/main/res/layout/controller_chat.xml +++ b/app/src/main/res/layout/controller_chat.xml @@ -121,7 +121,7 @@ android:layout_height="1dp" android:background="@color/controller_chat_separator" /> -