SnipMeDev · tmaxxdd · Dec 23, 2022 · Dec 23, 2022 · Dec 23, 2022
diff --git a/app/src/main/java/pl/tkadziolka/snipmeandroid/bridge/detail/DetailModel.kt b/app/src/main/java/pl/tkadziolka/snipmeandroid/bridge/detail/DetailModel.kt
@@ -110,13 +110,10 @@ class DetailModel(
             deleteSnippet(it.uuid)
                 .subscribeOn(Schedulers.io())
                 .subscribeBy(
-                    onComplete = {
-                        mutableEvent.value = Deleted
-                    },
+                    onComplete = { mutableEvent.value = Deleted },
                     onError = { error ->
-                        Timber.e("Couldn't save snippet, error = $error")
+                        Timber.e("Couldn't delete snippet, error = $error")
                         parseError(error)
-                        mutableEvent.value = Deleted
                     }
                 ).also { disposables += it }
         }

diff --git a/app/src/main/java/pl/tkadziolka/snipmeandroid/bridge/main/MainModel.kt b/app/src/main/java/pl/tkadziolka/snipmeandroid/bridge/main/MainModel.kt
@@ -9,6 +9,7 @@ import pl.tkadziolka.snipmeandroid.bridge.session.SessionModel
 import pl.tkadziolka.snipmeandroid.domain.error.exception.*
 import pl.tkadziolka.snipmeandroid.domain.filter.*
 import pl.tkadziolka.snipmeandroid.domain.message.ErrorMessages
+import pl.tkadziolka.snipmeandroid.domain.snippet.ObserveSnippetUpdatesUseCase
 import pl.tkadziolka.snipmeandroid.domain.snippet.ObserveUpdatedSnippetPageUseCase
 import pl.tkadziolka.snipmeandroid.domain.snippet.ResetUpdatedSnippetPageUseCase
 import pl.tkadziolka.snipmeandroid.domain.snippets.*
@@ -24,7 +25,7 @@ class MainModel(
     private val errorMessages: ErrorMessages,
     private val getUser: GetSingleUserUseCase,
     private val getSnippets: GetSnippetsUseCase,
-    private val observeUpdatedPage: ObserveUpdatedSnippetPageUseCase,
+    private val observeUpdates: ObserveSnippetUpdatesUseCase,
     private val hasMore: HasMoreSnippetPagesUseCase,
     private val getLanguageFilters: GetLanguageFiltersUseCase,
     private val filterSnippetsByLanguage: FilterSnippetsByLanguageUseCase,
@@ -42,7 +43,6 @@ class MainModel(
 
     private var cachedSnippets = emptyList<Snippet>()
     private var scopedSnippets = emptyList<Snippet>()
-    private var shouldRefresh = false
     private lateinit var filterState: SnippetFilters;
 
     override fun parseError(throwable: Throwable) {
@@ -62,12 +62,10 @@ class MainModel(
     }
 
     init {
-        observeUpdatedPage(getScope())
+        observeUpdates()
             .subscribeOn(Schedulers.io())
             .subscribeBy(
-                onNext = { updatedPage ->
-                    initState()
-                },
+                onNext = { initState() },
                 onError = { Timber.e("Couldn't refresh snippet updates, error = $it") }
             ).also { disposables += it }
     }
@@ -155,10 +153,6 @@ class MainModel(
                         filterState
                     )
                     loadNextPage()
-                    if (shouldRefresh) {
-                        mutableEvent.value = ListRefreshed
-                        shouldRefresh = false
-                    }
                 },
                 onError = {
                     Timber.e("Couldn't load snippets, error = $it")

diff --git a/app/src/main/java/pl/tkadziolka/snipmeandroid/di/ModelModule.kt b/app/src/main/java/pl/tkadziolka/snipmeandroid/di/ModelModule.kt
@@ -9,6 +9,6 @@ import pl.tkadziolka.snipmeandroid.bridge.session.SessionModel
 internal val modelModule = module {
     single { SessionModel(get()) }
     single { LoginModel(get(), get(), get()) }
-    single { MainModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
+    single { MainModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
     single { DetailModel(get(), get(), get(), get(), get(), get(), get(), get(), get()) }
 }
diff --git a/app/src/main/java/pl/tkadziolka/snipmeandroid/di/UseCaseModule.kt b/app/src/main/java/pl/tkadziolka/snipmeandroid/di/UseCaseModule.kt
@@ -41,6 +41,7 @@ internal val useCaseModule = module {
     factory { CreateSnippetUseCase(get(), get(), get()) }
     factory { UpdateSnippetUseCase(get(), get(), get()) }
     factory { ObserveUpdatedSnippetPageUseCase(get()) }
+    factory { ObserveSnippetUpdatesUseCase(get()) }
     factory { ResetUpdatedSnippetPageUseCase(get()) }
     factory { GetTargetUserReactionUseCase() }
     factory { SetUserReactionUseCase(get(), get(), get()) }

diff --git a/app/src/main/java/pl/tkadziolka/snipmeandroid/domain/snippet/DeleteSnippetUseCase.kt b/app/src/main/java/pl/tkadziolka/snipmeandroid/domain/snippet/DeleteSnippetUseCase.kt
@@ -1,12 +1,13 @@
 package pl.tkadziolka.snipmeandroid.domain.snippet
 
+import io.reactivex.Completable
 import pl.tkadziolka.snipmeandroid.domain.repository.snippet.SnippetRepository
 import pl.tkadziolka.snipmeandroid.domain.snippets.Snippet
 
 class DeleteSnippetUseCase(private val repository: SnippetRepository) {
 
-    operator fun invoke(uuid: String) =
+    operator fun invoke(uuid: String): Completable =
         repository
             .delete(uuid)
-            .andThen { repository.updateListener.onNext(Snippet.EMPTY) }
+            .doOnComplete { repository.updateListener.onNext(Snippet.EMPTY.copy(uuid)) }
 }
diff --git a/app/src/main/java/pl/tkadziolka/snipmeandroid/domain/snippet/ObserveSnippetUpdatesUseCase.kt b/app/src/main/java/pl/tkadziolka/snipmeandroid/domain/snippet/ObserveSnippetUpdatesUseCase.kt
@@ -0,0 +1,9 @@
+package pl.tkadziolka.snipmeandroid.domain.snippet
+
+import io.reactivex.Observable
+import pl.tkadziolka.snipmeandroid.domain.repository.snippet.SnippetRepository
+import pl.tkadziolka.snipmeandroid.domain.snippets.Snippet
+
+class ObserveSnippetUpdatesUseCase(private val repository: SnippetRepository) {
+    operator fun invoke(): Observable<Snippet> = repository.updateListener.share()
+}
diff --git a/flutter_module/lib/presentation/navigation/details/details_navigator.dart b/flutter_module/lib/presentation/navigation/details/details_navigator.dart
@@ -13,6 +13,5 @@ class DetailsNavigator extends ScreenNavigator {
   void goToDetails(BuildContext context, String snippetId) {
     _snippetId = snippetId;
     router.push(DetailsScreen.name.route);
-    print("Navigated to $_snippetId");
   }
 }
diff --git a/flutter_module/lib/presentation/screens/details_screen.dart b/flutter_module/lib/presentation/screens/details_screen.dart
@@ -62,20 +62,26 @@ class _DetailsPage extends HookWidget {
       (current, newState) => (current as DetailModelEventData).equals(newState),
     ).value;
 
-    if (event.event == DetailModelEvent.saved) {
-      final snippetId = event.value;
-      if (snippetId == null) {
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (event.event == DetailModelEvent.saved) {
+        final snippetId = event.value;
+        if (snippetId == null) {
+          _exit();
+          return;
+        }
+
         _exit();
-        return const SizedBox();
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          navigator.goToDetails(context, snippetId);
+        });
       }
+    });
 
-      _exit();
-      navigator.goToDetails(context, snippetId);
-    }
-
-    if (event.event == DetailModelEvent.deleted) {
-      _exit();
-    }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (event.event == DetailModelEvent.deleted) {
+        _exit();
+      }
+    });
 
     useEffect(() {
       model.load(navigator.snippetId ?? '');
@@ -111,8 +117,8 @@ class _DetailsPage extends HookWidget {
   }
 
   void _exit() {
-    navigator.back();
     model.resetEvent();
+    navigator.back();
   }
 }