From e9263aeffad2bbacabc4e460b7fe7a0fbf288996 Mon Sep 17 00:00:00 2001 From: niranjannlc <77341018@nou.edu.np> Date: Mon, 26 Feb 2024 14:03:04 +0545 Subject: [PATCH] added parcelize anotation in remaining class --- .../model/domain/BankAccountDetails.kt | 40 ++------------ .../model/domain/NotificationPayload.kt | 38 ++----------- .../mobilewallet/model/domain/SearchResult.kt | 2 +- .../mobilewallet/model/domain/Transaction.kt | 54 ++----------------- .../model/domain/twofactor/AccessToken.kt | 37 +++---------- .../model/domain/twofactor/DeliveryMethod.kt | 37 ++----------- .../mobilewallet/model/domain/user/User.kt | 30 ++--------- .../entity/standinginstruction/SDIResponse.kt | 27 ++-------- 8 files changed, 34 insertions(+), 231 deletions(-) diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt index 221fe934..05e6b118 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/BankAccountDetails.kt @@ -2,7 +2,9 @@ package com.mifos.mobilewallet.model.domain import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize +@Parcelize data class BankAccountDetails( var bankName: String?=null, var accountholderName: String?=null, @@ -11,38 +13,6 @@ data class BankAccountDetails( var type: String?=null, var isUpiEnabled: Boolean=false, var upiPin: String?=null -) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readString(), - parcel.readByte() != 0.toByte(), - parcel.readString() - ) - - override fun describeContents(): Int { - return 0 - } - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeString(bankName) - parcel.writeString(accountholderName) - parcel.writeString(branch) - parcel.writeString(ifsc) - parcel.writeString(type) - parcel.writeByte(if (isUpiEnabled) 1 else 0) - parcel.writeString(upiPin) - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): BankAccountDetails { - return BankAccountDetails(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } -} +) : Parcelable { + constructor() : this("", "", "", "", "", false, "") +} \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt index 47a0ed28..67d30dce 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/NotificationPayload.kt @@ -2,43 +2,13 @@ package com.mifos.mobilewallet.model.domain import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize +@Parcelize data class NotificationPayload( var title: String? = null, var body: String? = null, var timestamp: String? = null ) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readString(), - parcel.readString(), - parcel.readString() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeString(title) - parcel.writeString(body) - parcel.writeString(timestamp) - } - - override fun describeContents(): Int { - return 0 - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): NotificationPayload { - return NotificationPayload(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } - - override fun toString(): String { - return "NotificationPayload{" + - "title='" + title + '\'' + - ", body='" + body + '\'' + - ", timestamp='" + timestamp + '\'' + - '}' - } -} + constructor() : this("", "", "") +} \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt index 43afe16a..b3f8b68d 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/SearchResult.kt @@ -12,4 +12,4 @@ data class SearchResult( var resultType: String ) : Parcelable { constructor() : this(0, "", "") -} +} \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt index 3fa86040..01a696e5 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/Transaction.kt @@ -5,7 +5,9 @@ import android.os.Parcelable import com.mifos.mobilewallet.model.domain.Currency import com.mifos.mobilewallet.model.domain.TransactionType import com.mifos.mobilewallet.model.entity.accounts.savings.TransferDetail +import kotlinx.parcelize.Parcelize +@Parcelize data class Transaction( var transactionId: String? = null, var clientId: Long = 0, @@ -17,53 +19,5 @@ data class Transaction( var transferId: Long = 0, var transferDetail: TransferDetail = TransferDetail(), var receiptId: String? = null -) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readString(), - parcel.readLong(), - parcel.readLong(), - parcel.readDouble(), - parcel.readString(), - parcel.readParcelable(Currency::class.java.classLoader)!!, - TransactionType.values()[parcel.readInt()], - parcel.readLong(), - parcel.readParcelable(TransferDetail::class.java.classLoader)!!, - parcel.readString() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeString(transactionId) - parcel.writeLong(clientId) - parcel.writeLong(accountId) - parcel.writeDouble(amount) - parcel.writeString(date) - parcel.writeParcelable(currency, flags) - parcel.writeInt(transactionType.ordinal) - parcel.writeLong(transferId) - parcel.writeParcelable(transferDetail, flags) - parcel.writeString(receiptId) - } - - override fun describeContents(): Int { - return 0 - } - - override fun toString(): String { - return "Transaction{" + - "transactionId='" + transactionId + '\'' + - ", transferId=" + transferId + - ", transferDetail=" + transferDetail + - ", receiptId=" + receiptId + - '}' - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): Transaction { - return Transaction(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } -} +) : Parcelable { + constructor() : this("", 0, 0, 0.0, "", Currency(), TransactionType.OTHER, 0, TransferDetail(), "")} \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt index 2b638383..8f4ddbb7 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/AccessToken.kt @@ -2,35 +2,14 @@ package com.mifos.mobilewallet.model.domain.twofactor import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize -class AccessToken() : Parcelable { - var token: String? = null - var validFrom: Long? = null +@Parcelize +data class AccessToken( + var token: String? = null, + var validFrom: Long? = null, var validTo: Long? = null - - constructor(parcel: Parcel) : this() { - token = parcel.readString() - validFrom = parcel.readValue(Long::class.java.classLoader) as? Long - validTo = parcel.readValue(Long::class.java.classLoader) as? Long - } - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeString(token) - parcel.writeValue(validFrom) - parcel.writeValue(validTo) - } - - override fun describeContents(): Int { - return 0 - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): AccessToken { - return AccessToken(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } +) : Parcelable{ + constructor(): this("", 0L, 0L) } + diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt index 7e3f6b71..93470fae 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/twofactor/DeliveryMethod.kt @@ -2,39 +2,12 @@ package com.mifos.mobilewallet.model.domain.twofactor import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize +@Parcelize data class DeliveryMethod( var name: String?, var target: String? -) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readString(), - parcel.readString() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeString(name) - parcel.writeString(target) - } - - override fun describeContents(): Int { - return 0 - } - - override fun toString(): String { - return "DeliveryMethod{" + - "name='$name', " + - "target='$target'" + - '}' - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): DeliveryMethod { - return DeliveryMethod(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } -} +) : Parcelable{ + constructor() : this("", "") +} \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt index c11cdab9..1c65d62f 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/domain/user/User.kt @@ -2,35 +2,13 @@ package com.mifos.mobilewallet.model.domain.user import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize +@Parcelize data class User( var userId: Long=0L, var userName: String?=null, var authenticationKey: String?=null ) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readLong(), - parcel.readString(), - parcel.readString() - ) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeLong(userId) - parcel.writeString(userName) - parcel.writeString(authenticationKey) - } - - override fun describeContents(): Int { - return 0 - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): User { - return User(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } -} + constructor() : this(0L, "", "") +} \ No newline at end of file diff --git a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt b/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt index 67a5705c..e75ceeea 100644 --- a/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt +++ b/core/model/src/main/java/com/mifos/mobilewallet/model/entity/standinginstruction/SDIResponse.kt @@ -2,32 +2,11 @@ package com.mifos.mobilewallet.model.entity.standinginstruction import android.os.Parcel import android.os.Parcelable +import kotlinx.parcelize.Parcelize /** * Created by Shivansh */ -data class SDIResponse(val clientId : Int, val resourceId : String?) : Parcelable { - constructor(parcel: Parcel) : this( - parcel.readInt(), - parcel.readString()) - - override fun writeToParcel(parcel: Parcel, flags: Int) { - parcel.writeInt(clientId) - parcel.writeString(resourceId) - } - - override fun describeContents(): Int { - return 0 - } - - companion object CREATOR : Parcelable.Creator { - override fun createFromParcel(parcel: Parcel): SDIResponse { - return SDIResponse(parcel) - } - - override fun newArray(size: Int): Array { - return arrayOfNulls(size) - } - } -} \ No newline at end of file +@Parcelize +data class SDIResponse(val clientId : Int, val resourceId : String?) : Parcelable \ No newline at end of file