diff --git a/.idea/compiler.xml b/.idea/compiler.xml index ac216bc8..61a9130c 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/markdown-navigator-enh.xml b/.idea/markdown-navigator-enh.xml new file mode 100644 index 00000000..a8fcc84d --- /dev/null +++ b/.idea/markdown-navigator-enh.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 00000000..57b84e5a --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 8b498314..69b55f66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/lib/src/main/java/com/kirkbushman/araw/RedditApi.kt b/lib/src/main/java/com/kirkbushman/araw/RedditApi.kt index 4345271f..715e9f82 100644 --- a/lib/src/main/java/com/kirkbushman/araw/RedditApi.kt +++ b/lib/src/main/java/com/kirkbushman/araw/RedditApi.kt @@ -240,6 +240,7 @@ interface RedditApi { fun submission( @Query("id") submissionId: String, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -297,6 +298,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -310,6 +312,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -322,6 +325,7 @@ interface RedditApi { @Query("limit") limit: Long? = null, @Query("depth") depth: Int? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call> @@ -337,6 +341,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -383,6 +388,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -522,6 +528,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -536,6 +543,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -608,6 +616,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call>> @@ -623,6 +632,7 @@ interface RedditApi { @Query("before") before: String? = null, @Query("restrict_sr") restrictToSubreddit: Boolean? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -639,6 +649,7 @@ interface RedditApi { @Query("before") before: String? = null, @Query("restrict_sr") restrictToSubreddit: Boolean? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -654,6 +665,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -669,6 +681,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call @@ -684,6 +697,7 @@ interface RedditApi { @Query("after") after: String? = null, @Query("before") before: String? = null, @Query("raw_json") rawJson: Int? = null, + @Query("sr_detail") srDetail: Int = 1, @HeaderMap header: HashMap ): Call diff --git a/lib/src/main/java/com/kirkbushman/araw/models/SrDetail.kt b/lib/src/main/java/com/kirkbushman/araw/models/SrDetail.kt new file mode 100644 index 00000000..106556e7 --- /dev/null +++ b/lib/src/main/java/com/kirkbushman/araw/models/SrDetail.kt @@ -0,0 +1,84 @@ +package com.kirkbushman.araw.models + +import android.os.Parcelable +import com.kirkbushman.araw.models.base.Thing +import com.kirkbushman.araw.models.commons.ImageDetail +import com.squareup.moshi.Json +import com.squareup.moshi.JsonClass +import kotlinx.parcelize.Parcelize +import java.util.* + +@JsonClass(generateAdapter = true) +@Parcelize +data class SrDetail( + + @Json(name = "name") + override val fullname: String, + + //sr_detail doesn't have an ID field, split the fullname + override val id: String = fullname.split("_").last(), + + @Json(name = "default_set") + val defaultSet: Boolean, + + @Json(name = "banner_img") + val bannerImg: String?, + + @Json(name = "community_icon") + val communityIcon: String?, + + @Json(name = "description") + val description: String?, + + @Json(name = "user_is_muted") + val userIsMuted: Boolean?, + + @Json(name = "display_name") + val displayName: String, + + @Json(name = "header_img") + val headerImg: String?, + + @Json(name = "title") + val title: String?, + + @Json(name = "user_is_moderator") + val userIsModerator: Boolean?, + + @Json(name = "over_18") + val over18: Boolean, + + @Json(name = "icon_size") + val iconSize: List?, + + @Json(name = "primary_color") + val primaryColor: String?, + + @Json(name = "icon_img") + val iconImg: String?, + + @Json(name = "icon_color") + val iconColor: String?, + + @Json(name = "subscribers") + val subscribers: Long, + + @Json(name = "display_name_prefixed") + val displayNamePrefixed: String, + + @Json(name = "key_color") + val keyColor: String?, + + @Json(name = "created_utc") + val createdUTC: Long, + + @Json(name = "banner_size") + val bannerSize: List?, + + @Json(name = "public_description") + val publicDescription: String?, + + @Json(name = "user_is_subscriber") + val userIsSubscriber: Boolean? + +) : Thing, Parcelable diff --git a/lib/src/main/java/com/kirkbushman/araw/models/Submission.kt b/lib/src/main/java/com/kirkbushman/araw/models/Submission.kt index f729cdf6..acf561ea 100644 --- a/lib/src/main/java/com/kirkbushman/araw/models/Submission.kt +++ b/lib/src/main/java/com/kirkbushman/araw/models/Submission.kt @@ -142,6 +142,9 @@ data class Submission( @Json(name = "gildings") override val gildings: Gildings, + @Json(name = "sr_detail") + val sr_detail: SrDetail?, + @Json(name = "archived") val isArchived: Boolean,