Cleaning.
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing

This commit is contained in:
aminecmi 2022-11-08 21:54:12 +01:00
parent 5ecf3c3f87
commit 8ea46e146b
3 changed files with 11 additions and 25 deletions

View File

@ -142,12 +142,6 @@ dependencies {
implementation("com.mikepenz:aboutlibraries-core:10.5.1") implementation("com.mikepenz:aboutlibraries-core:10.5.1")
implementation("com.mikepenz:aboutlibraries: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 // Material-ish things
implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0") implementation("com.ashokvarma.android:bottom-navigation-bar:2.2.0")
implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1") implementation("com.amulyakhare:com.amulyakhare.textdrawable:1.0.1")

View File

@ -30,15 +30,8 @@
<fields>; <fields>;
} }
-dontwarn okio.**
-dontwarn retrofit2.Platform$Java8
-keep class retrofit.** { *; }
-keepclasseswithmembers class * {
@retrofit.http.* <methods>;
}
-keepattributes *Annotation*,Signature -keepattributes *Annotation*,Signature
-keepattributes Exceptions -keepattributes Exceptions
-dontwarn okio.**
-dontwarn javax.annotation.Nullable -dontwarn javax.annotation.Nullable
-dontwarn javax.annotation.ParametersAreNonnullByDefault -dontwarn javax.annotation.ParametersAreNonnullByDefault

View File

@ -3,7 +3,6 @@ package bou.amine.apps.readerforselfossv2.android.model
import android.os.Parcel import android.os.Parcel
import android.os.Parcelable import android.os.Parcelable
import bou.amine.apps.readerforselfossv2.model.SelfossModel import bou.amine.apps.readerforselfossv2.model.SelfossModel
import com.google.gson.annotations.SerializedName
fun SelfossModel.Item.toParcelable() : ParecelableItem = fun SelfossModel.Item.toParcelable() : ParecelableItem =
ParecelableItem( ParecelableItem(
@ -34,17 +33,17 @@ fun ParecelableItem.toModel() : SelfossModel.Item =
this.tags.split(",") this.tags.split(",")
) )
data class ParecelableItem( data class ParecelableItem(
@SerializedName("id") val id: Int, val id: Int,
@SerializedName("datetime") val datetime: String, val datetime: String,
@SerializedName("title") val title: String, val title: String,
@SerializedName("content") val content: String, val content: String,
@SerializedName("unread") var unread: Boolean, var unread: Boolean,
@SerializedName("starred") var starred: Boolean, var starred: Boolean,
@SerializedName("thumbnail") val thumbnail: String?, val thumbnail: String?,
@SerializedName("icon") val icon: String?, val icon: String?,
@SerializedName("link") val link: String, val link: String,
@SerializedName("sourcetitle") val sourcetitle: String, val sourcetitle: String,
@SerializedName("tags") val tags: String val tags: String
) : Parcelable { ) : Parcelable {
companion object { companion object {