Improved scope filter

Author: tmaxxdd

app/src/main/java/dev/snipme/snipmeapp/channel/main/MainModel.kt

@@ -89,8 +89,8 @@ class MainModel(
         filterState = SnippetFilters(
             languages = listOf(SNIPPET_FILTER_ALL),
             selectedLanguages = listOf(SNIPPET_FILTER_ALL),
-            scopes = listOf("All", "Visible", "Hidden"),
-            selectedScope = "Visible"
+            scopes = SnippetScope.entries.map { it.visibleName },
+            selectedScope = SnippetScope.ALL.visibleName
         )
 
         setupDemoSnippets()
@@ -152,7 +152,7 @@ class MainModel(
         pages: Int = 1,
         scope: SnippetScope = SnippetScope.ALL
     ) {
-        getSnippets(scope, pages)
+        getSnippets(scope)
             .subscribeOn(Schedulers.io())
             .subscribeBy(
                 onSuccess = {

app/src/main/java/dev/snipme/snipmeapp/di/UseCaseModule.kt

@@ -44,7 +44,7 @@ internal val useCaseModule = module {
     // User
     factory { GetSingleUserUseCase(get(), get(), get(), get()) }
     // Snippet
-    factory { GetSnippetsUseCase(get(), get(), get()) }
+    factory { GetSnippetsUseCase(get()) }
     factory { GetSingleSnippetUseCase(get(), get(), get()) }
     factory { HasMoreSnippetPagesUseCase(get(), get(), get()) }
     factory { CreateSnippetUseCase(get(), get(), get()) }

app/src/main/java/dev/snipme/snipmeapp/domain/snippets/GetSnippetsUseCase.kt

@@ -1,20 +1,13 @@
 package dev.snipme.snipmeapp.domain.snippets
 
-import dev.snipme.snipmeapp.domain.auth.AuthorizationUseCase
 import dev.snipme.snipmeapp.domain.repository.snippet.SnippetRepository
-import dev.snipme.snipmeapp.domain.user.GetSingleUserUseCase
 import io.reactivex.Single
 
 class GetSnippetsUseCase(
-    private val auth: AuthorizationUseCase,
     private val repository: SnippetRepository,
-    private val getSingleUser: GetSingleUserUseCase
 ) {
-    operator fun invoke(scope: SnippetScope, page: Int): Single<List<Snippet>> =
-        auth()
-            .andThen(getSingleUser())
-            .flatMap { user ->
-                repository.snippets()
-                    .map { list -> list.sortedByDescending { it.modifiedAt.time } }
-            }
+    operator fun invoke(scope: SnippetScope): Single<List<Snippet>> =
+        repository.snippets()
+            .map { it.filter { snippet -> snippet.visibility.name.lowercase() == scope.visibleName.lowercase() } }
+            .map { list -> list.sortedByDescending { it.modifiedAt.time } }
 }

app/src/main/java/dev/snipme/snipmeapp/domain/snippets/SnippetScope.kt

@@ -1,7 +1,7 @@
 package dev.snipme.snipmeapp.domain.snippets
 
-enum class SnippetScope {
-    ALL, PUBLIC, OWNED, SHARED_FOR;
+enum class SnippetScope(val visibleName: String) {
+    ALL("All"), VISIBLE("Visible"), HIDDEN("Hidden");
 }
 
 fun SnippetScope.value() = this.name.toLowerCase()