feat: support tags filter for random unsplash wallpapers (closes #182)

you-apps · Mar 11, 2024 · b439f96 · b439f96
1 parent f3ce109
commit b439f96
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/bnyro/wallpaper/api/us/Unsplash.kt b/app/src/main/java/com/bnyro/wallpaper/api/us/Unsplash.kt
@@ -20,5 +20,7 @@ interface Unsplash {
     ): UsSearch
 
     @GET("/napi/photos/random")
-    suspend fun getRandom(): UsImage
+    suspend fun getRandom(
+        @Query("query") query: String
+    ): UsImage
 }
diff --git a/app/src/main/java/com/bnyro/wallpaper/api/us/UsApi.kt b/app/src/main/java/com/bnyro/wallpaper/api/us/UsApi.kt
@@ -16,11 +16,13 @@ class UsApi() : Api() {
 
     override suspend fun getWallpapers(page: Int): List<Wallpaper> {
         val tags = getTags()
+        val sortOrder = getQuery("order_by")
 
         val wallpapers = if (tags.isEmpty()) {
-            api.getWallpapers(page, getQuery("order_by"))
+            api.getWallpapers(page, sortOrder)
         } else {
-            api.searchWallpapers(page, tags.joinToString(" "), getQuery("order_by")).results
+            val tagString = tags.joinToString(" ")
+            api.searchWallpapers(page, tagString, sortOrder).results
         }
 
         return wallpapers.filter { it.premium != true }.map {
@@ -36,7 +38,9 @@ class UsApi() : Api() {
     }
 
     override suspend fun getRandomWallpaperUrl(): String? {
-        return api.getRandom().let {
+        val tagString = getTags().joinToString(" ")
+
+        return api.getRandom(tagString).let {
             it.links.download ?: it.urls?.raw ?: it.urls?.full
         }
     }