From 8ea46e146b060d990232b04e4b307896ade6ea65 Mon Sep 17 00:00:00 2001 From: aminecmi Date: Tue, 8 Nov 2022 21:54:12 +0100 Subject: [PATCH] Cleaning. --- androidApp/build.gradle.kts | 6 ----- androidApp/proguard-rules.pro | 7 ------ .../android/model/ParecelableItem.kt | 23 +++++++++---------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 462495a..4e1c52d 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -142,12 +142,6 @@ dependencies { implementation("com.mikepenz:aboutlibraries-core:10.5.1") implementation("com.mikepenz:aboutlibraries:10.5.1") - // Retrofit + http logging + okhttp - implementation("com.squareup.retrofit2:retrofit:2.9.0") - implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.3") - implementation("com.squareup.retrofit2:converter-gson:2.9.0") - implementation("com.burgstaller:okhttp-digest:2.5") - // Material-ish things implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0") implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1") diff --git a/androidApp/proguard-rules.pro b/androidApp/proguard-rules.pro index 3f9c98f..0162f3e 100644 --- a/androidApp/proguard-rules.pro +++ b/androidApp/proguard-rules.pro @@ -30,15 +30,8 @@ ; } --dontwarn okio.** --dontwarn retrofit2.Platform$Java8 --keep class retrofit.** { *; } --keepclasseswithmembers class * { - @retrofit.http.* ; -} -keepattributes *Annotation*,Signature -keepattributes Exceptions --dontwarn okio.** -dontwarn javax.annotation.Nullable -dontwarn javax.annotation.ParametersAreNonnullByDefault diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt index 2904286..b42a196 100644 --- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt +++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt @@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.model import android.os.Parcel import android.os.Parcelable import bou.amine.apps.readerforselfossv2.model.SelfossModel -import com.google.gson.annotations.SerializedName fun SelfossModel.Item.toParcelable() : ParecelableItem = ParecelableItem( @@ -34,17 +33,17 @@ fun ParecelableItem.toModel() : SelfossModel.Item = this.tags.split(",") ) data class ParecelableItem( - @SerializedName("id") val id: Int, - @SerializedName("datetime") val datetime: String, - @SerializedName("title") val title: String, - @SerializedName("content") val content: String, - @SerializedName("unread") var unread: Boolean, - @SerializedName("starred") var starred: Boolean, - @SerializedName("thumbnail") val thumbnail: String?, - @SerializedName("icon") val icon: String?, - @SerializedName("link") val link: String, - @SerializedName("sourcetitle") val sourcetitle: String, - @SerializedName("tags") val tags: String + val id: Int, + val datetime: String, + val title: String, + val content: String, + var unread: Boolean, + var starred: Boolean, + val thumbnail: String?, + val icon: String?, + val link: String, + val sourcetitle: String, + val tags: String ) : Parcelable { companion object {