Add new features/refactor

- Refactor Bottom app bar (less code)
- Topics Screen
- Data layer for topics screen

Author: stslex

app/src/main/java/st/slex/csplashscreen/data/core/Mappers.kt

@@ -5,6 +5,8 @@ import st.slex.csplashscreen.data.model.remote.collection.RemoteLinksCollectionM
 import st.slex.csplashscreen.data.model.remote.download.RemoteDownloadModel
 import st.slex.csplashscreen.data.model.remote.image.*
 import st.slex.csplashscreen.data.model.remote.statistic.*
+import st.slex.csplashscreen.data.model.remote.topics.RemotePreviewPhotosModel
+import st.slex.csplashscreen.data.model.remote.topics.RemoteTopicsModel
 import st.slex.csplashscreen.data.model.remote.user.RemoteBadgeModel
 import st.slex.csplashscreen.data.model.remote.user.RemoteProfileImageModel
 import st.slex.csplashscreen.data.model.remote.user.RemoteUserLinksModel
@@ -13,6 +15,8 @@ import st.slex.csplashscreen.data.model.ui.*
 import st.slex.csplashscreen.data.model.ui.collection.CollectionModel
 import st.slex.csplashscreen.data.model.ui.collection.LinksCollectionModel
 import st.slex.csplashscreen.data.model.ui.image.*
+import st.slex.csplashscreen.data.model.ui.topics.PreviewPhotosModel
+import st.slex.csplashscreen.data.model.ui.topics.TopicsModel
 import st.slex.csplashscreen.data.model.ui.user.BadgeModel
 import st.slex.csplashscreen.data.model.ui.user.ProfileImageModel
 import st.slex.csplashscreen.data.model.ui.user.UserLinksModel
@@ -179,3 +183,31 @@ internal fun RemoteHistorical.toHistorical(): Historical =
 internal fun RemoteValue.toValue(): Value = Value(date = date, value = value)
 
 internal fun RemoteDownloadModel.toDownloadModel(): DownloadModel = DownloadModel(url = url)
+
+internal fun RemoteTopicsModel.toTopicsModel(): TopicsModel =
+    TopicsModel(
+        id = id.toString(),
+        slug = slug.toString(),
+        title = title.toString(),
+        description = description.toString(),
+        published_at = published_at.toString(),
+        updated_at = updated_at.toString(),
+        starts_at = starts_at.toString(),
+        ends_at = ends_at.toString(),
+        only_submissions_after = only_submissions_after.toString(),
+        featured = featured.toString(),
+        total_photos = total_photos.toString(),
+        links = links.toLinksCollectionModel(),
+        status = status.toString(),
+        owners = owners?.map { it.toUserModel() },
+        cover_photo = cover_photo?.toImageModel(),
+        preview_photos = preview_photos?.map { it.toPreviewPhotosModel() }
+    )
+
+internal fun RemotePreviewPhotosModel.toPreviewPhotosModel() =
+    PreviewPhotosModel(
+        id = id.toString(),
+        created_at = created_at.toString(),
+        updated_at = updated_at.toString(),
+        urls = urls?.toUrlsModel()
+    )

app/src/main/java/st/slex/csplashscreen/data/model/remote/collection/RemoteLinksCollectionModel.kt

@@ -3,10 +3,7 @@ package st.slex.csplashscreen.data.model.remote.collection
 import com.google.gson.annotations.SerializedName
 
 data class RemoteLinksCollectionModel(
-    @SerializedName("self")
-    val self: String,
-    @SerializedName("html")
-    val html: String,
-    @SerializedName("photos")
-    val photos: String
+    @SerializedName("self") val self: String,
+    @SerializedName("html") val html: String,
+    @SerializedName("photos") val photos: String
 )

app/src/main/java/st/slex/csplashscreen/data/model/remote/image/RemoteExifModel.kt

@@ -3,16 +3,10 @@ package st.slex.csplashscreen.data.model.remote.image
 import com.google.gson.annotations.SerializedName
 
 data class RemoteExifModel(
-    @SerializedName("make")
-    val make: String?,
-    @SerializedName("model")
-    val model: String?,
-    @SerializedName("exposure_time")
-    val exposure_time: String?,
-    @SerializedName("aperture")
-    val aperture: String?,
-    @SerializedName("focal_length")
-    val focal_length: String?,
-    @SerializedName("iso")
-    val iso: Int?
+    @SerializedName("make") val make: String?,
+    @SerializedName("model") val model: String?,
+    @SerializedName("exposure_time") val exposure_time: String?,
+    @SerializedName("aperture") val aperture: String?,
+    @SerializedName("focal_length") val focal_length: String?,
+    @SerializedName("iso") val iso: Int?
 )

app/src/main/java/st/slex/csplashscreen/data/model/remote/image/RemoteImageModel.kt

@@ -6,48 +6,26 @@ import st.slex.csplashscreen.data.model.remote.statistic.RemotePhotoStatistics
 import st.slex.csplashscreen.data.model.remote.user.RemoteUserModel
 
 class RemoteImageModel(
-    @SerializedName("id")
-    val id: String,
-    @SerializedName("created_at")
-    val created_at: String?,
-    @SerializedName("updated_at")
-    val updated_at: String?,
-    @SerializedName("width")
-    val width: Int?,
-    @SerializedName("height")
-    val height: Int?,
-    @SerializedName("color")
-    val color: String? = "#E0E0E0",
-    @SerializedName("blur_hash")
-    val blur_hash: String?,
-    @SerializedName("views")
-    val views: Int?,
-    @SerializedName("downloads")
-    val downloads: Int?,
-    @SerializedName("likes")
-    val likes: Int?,
-    @SerializedName("liked_by_user")
-    var liked_by_user: Boolean?,
-    @SerializedName("description")
-    val description: String?,
-    @SerializedName("alt_description")
-    val alt_description: String?,
-    @SerializedName("exif")
-    val exif: RemoteExifModel?,
-    @SerializedName("location")
-    val location: RemoteLocationModel?,
-    @SerializedName("tags")
-    val tags: List<RemoteTagModel>?,
-    @SerializedName("current_user_collections")
-    val current_user_collections: List<RemoteCollectionModel>?,
-    @SerializedName("sponsorship")
-    val sponsorship: RemoteSponsorship?,
-    @SerializedName("urls")
-    val urls: RemoteUrlsModel,
-    @SerializedName("links")
-    val links: RemoteLinksImageModel?,
-    @SerializedName("user")
-    val user: RemoteUserModel?,
-    @SerializedName("statistics")
-    val statistics: RemotePhotoStatistics?
+    @SerializedName("id") val id: String,
+    @SerializedName("created_at") val created_at: String?,
+    @SerializedName("updated_at") val updated_at: String?,
+    @SerializedName("width") val width: Int?,
+    @SerializedName("height") val height: Int?,
+    @SerializedName("color") val color: String? = "#E0E0E0",
+    @SerializedName("blur_hash") val blur_hash: String?,
+    @SerializedName("views") val views: Int?,
+    @SerializedName("downloads") val downloads: Int?,
+    @SerializedName("likes") val likes: Int?,
+    @SerializedName("liked_by_user") var liked_by_user: Boolean?,
+    @SerializedName("description") val description: String?,
+    @SerializedName("alt_description") val alt_description: String?,
+    @SerializedName("exif") val exif: RemoteExifModel?,
+    @SerializedName("location") val location: RemoteLocationModel?,
+    @SerializedName("tags") val tags: List<RemoteTagModel>?,
+    @SerializedName("current_user_collections") val current_user_collections: List<RemoteCollectionModel>?,
+    @SerializedName("sponsorship") val sponsorship: RemoteSponsorship?,
+    @SerializedName("urls") val urls: RemoteUrlsModel,
+    @SerializedName("links") val links: RemoteLinksImageModel?,
+    @SerializedName("user") val user: RemoteUserModel?,
+    @SerializedName("statistics") val statistics: RemotePhotoStatistics?
 )

app/src/main/java/st/slex/csplashscreen/data/model/remote/image/RemoteLinksImageModel.kt

@@ -3,12 +3,8 @@ package st.slex.csplashscreen.data.model.remote.image
 import com.google.gson.annotations.SerializedName
 
 data class RemoteLinksImageModel(
-    @SerializedName("self")
-    val self: String,
-    @SerializedName("html")
-    val html: String,
-    @SerializedName("download")
-    val download: String,
-    @SerializedName("download_location")
-    val download_location: String
+    @SerializedName("self") val self: String,
+    @SerializedName("html") val html: String,
+    @SerializedName("download") val download: String,
+    @SerializedName("download_location") val download_location: String
 )

app/src/main/java/st/slex/csplashscreen/data/model/remote/image/RemoteUrlsModel.kt

@@ -3,14 +3,9 @@ package st.slex.csplashscreen.data.model.remote.image
 import com.google.gson.annotations.SerializedName
 
 data class RemoteUrlsModel(
-    @SerializedName("raw")
-    val raw: String,
-    @SerializedName("full")
-    val full: String,
-    @SerializedName("regular")
-    val regular: String,
-    @SerializedName("small")
-    val small: String,
-    @SerializedName("thumb")
-    val thumb: String
+    @SerializedName("raw") val raw: String,
+    @SerializedName("full") val full: String,
+    @SerializedName("regular") val regular: String,
+    @SerializedName("small") val small: String,
+    @SerializedName("thumb") val thumb: String
 )

app/src/main/java/st/slex/csplashscreen/data/model/remote/topics/RemotePreviewPhotosModel.kt

@@ -0,0 +1,11 @@
+package st.slex.csplashscreen.data.model.remote.topics
+
+import com.google.gson.annotations.SerializedName
+import st.slex.csplashscreen.data.model.remote.image.RemoteUrlsModel
+
+data class RemotePreviewPhotosModel(
+    @SerializedName("id") val id: String? = "",
+    @SerializedName("created_at") val created_at: String? = "",
+    @SerializedName("updated_at") val updated_at: String? = "",
+    @SerializedName("urls") val urls: RemoteUrlsModel?
+)

app/src/main/java/st/slex/csplashscreen/data/model/remote/topics/RemoteTopicsModel.kt

@@ -0,0 +1,25 @@
+package st.slex.csplashscreen.data.model.remote.topics
+
+import com.google.gson.annotations.SerializedName
+import st.slex.csplashscreen.data.model.remote.collection.RemoteLinksCollectionModel
+import st.slex.csplashscreen.data.model.remote.image.RemoteImageModel
+import st.slex.csplashscreen.data.model.remote.user.RemoteUserModel
+
+data class RemoteTopicsModel(
+    @SerializedName("id") val id: String? = "",
+    @SerializedName("slug") val slug: String? = "",
+    @SerializedName("title") val title: String? = "",
+    @SerializedName("description") val description: String? = "",
+    @SerializedName("published_at") val published_at: String? = "",
+    @SerializedName("updated_at") val updated_at: String? = "",
+    @SerializedName("starts_at") val starts_at: String? = "",
+    @SerializedName("ends_at") val ends_at: String? = "",
+    @SerializedName("only_submissions_after") val only_submissions_after: String? = "",
+    @SerializedName("featured") val featured: String? = "",
+    @SerializedName("total_photos") val total_photos: String? = "",
+    @SerializedName("links") val links: RemoteLinksCollectionModel,
+    @SerializedName("status") val status: String? = "",
+    @SerializedName("owners") val owners: List<RemoteUserModel>?,
+    @SerializedName("cover_photo") val cover_photo: RemoteImageModel?,
+    @SerializedName("preview_photos") val preview_photos: List<RemotePreviewPhotosModel>?
+)

app/src/main/java/st/slex/csplashscreen/data/model/ui/topics/PreviewPhotosModel.kt

@@ -0,0 +1,10 @@
+package st.slex.csplashscreen.data.model.ui.topics
+
+import st.slex.csplashscreen.data.model.ui.image.UrlsModel
+
+data class PreviewPhotosModel(
+    val id: String,
+    val created_at: String,
+    val updated_at: String,
+    val urls: UrlsModel?
+)

app/src/main/java/st/slex/csplashscreen/data/model/ui/topics/TopicsModel.kt

@@ -0,0 +1,24 @@
+package st.slex.csplashscreen.data.model.ui.topics
+
+import st.slex.csplashscreen.data.model.ui.collection.LinksCollectionModel
+import st.slex.csplashscreen.data.model.ui.image.ImageModel
+import st.slex.csplashscreen.data.model.ui.user.UserModel
+
+data class TopicsModel(
+    val id: String,
+    val slug: String,
+    val title: String,
+    val description: String,
+    val published_at: String,
+    val updated_at: String,
+    val starts_at: String,
+    val ends_at: String,
+    val only_submissions_after: String,
+    val featured: String,
+    val total_photos: String,
+    val links: LinksCollectionModel,
+    val status: String,
+    val owners: List<UserModel>?,
+    val cover_photo: ImageModel?,
+    val preview_photos: List<PreviewPhotosModel>?
+)