From a77454dc8eaa1299ff613975b9eaf8dafc0ffdc3 Mon Sep 17 00:00:00 2001 From: HissPirat Date: Fri, 7 Aug 2020 11:20:30 +0200 Subject: [PATCH 1/2] #2238 moved navigation implementation to AllProjectConfigurer --- app/build.gradle.kts | 4 ---- buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt | 5 +++++ core/build.gradle.kts | 5 ----- custom/build.gradle.kts | 5 ----- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dd5bfe935..363590732 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -3,7 +3,6 @@ import plugin.KiwixConfigurationPlugin plugins { android id("com.github.triplet.play") version Versions.com_github_triplet_play_gradle_plugin - id("androidx.navigation.safeargs") } plugins.apply(KiwixConfigurationPlugin::class) @@ -84,8 +83,5 @@ dependencies { implementation(Libs.squidb) implementation(Libs.squidb_annotations) implementation(Libs.ink_page_indicator) - implementation(Libs.navigation_kotlin_fragment) - implementation(Libs.navigation_kotlin_ui) - androidTestImplementation(Libs.navigation_kotlin_testing) add("kapt", Libs.squidb_processor) } diff --git a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt index e637ed03f..c1e23e2e8 100644 --- a/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt +++ b/buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt @@ -42,6 +42,7 @@ class AllProjectConfigurer { target.plugins.apply("com.hiya.jacoco-android") target.plugins.apply("org.jlleitschuh.gradle.ktlint") target.plugins.apply("io.gitlab.arturbosch.detekt") + target.plugins.apply("androidx.navigation.safeargs") } fun configureBaseExtension(target: Project, path: String) { @@ -159,6 +160,10 @@ class AllProjectConfigurer { implementation(Libs.material) implementation(Libs.constraintlayout) implementation(Libs.multidex) + // navigation + implementation(Libs.navigation_kotlin_fragment) + implementation(Libs.navigation_kotlin_ui) + androidTestImplementation(Libs.navigation_kotlin_testing) implementation(Libs.okhttp) implementation(Libs.logging_interceptor) implementation(Libs.retrofit) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 87e770539..11d59e9bb 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -14,7 +14,6 @@ buildscript { } plugins { `android-library` - id("androidx.navigation.safeargs") } plugins.apply(KiwixConfigurationPlugin::class) apply(plugin = "io.objectbox") @@ -62,8 +61,4 @@ dependencies { implementation(Libs.objectbox_kotlin) implementation(Libs.objectbox_rxjava) implementation(Libs.webkit) - // navigation - implementation(Libs.navigation_kotlin_fragment) - implementation(Libs.navigation_kotlin_ui) - androidTestImplementation(Libs.navigation_kotlin_testing) } diff --git a/custom/build.gradle.kts b/custom/build.gradle.kts index 5990cb014..d30e8f6ae 100644 --- a/custom/build.gradle.kts +++ b/custom/build.gradle.kts @@ -35,11 +35,6 @@ android { } } } -dependencies { - implementation(Libs.navigation_kotlin_fragment) - implementation(Libs.navigation_kotlin_ui) - androidTestImplementation(Libs.navigation_kotlin_testing) -} fun ProductFlavor.createDownloadTask(file: File): Task { return tasks.create("download${name.capitalize()}Zim") { From c303fc5445bca6828021d1a3f29a54ddd193d69b Mon Sep 17 00:00:00 2001 From: HissPirat Date: Fri, 7 Aug 2020 11:25:23 +0200 Subject: [PATCH 2/2] #2238 fixed pop backstack test --- .../kiwixmobile/zim_manager/ZimManageViewModel.kt | 1 - .../{FinishTest.kt => PopFragmentBackstackTest.kt} | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) rename core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/{FinishTest.kt => PopFragmentBackstackTest.kt} (78%) diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt index ecbbc043b..16da47ec2 100644 --- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt +++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt @@ -114,7 +114,6 @@ class ZimManageViewModel @Inject constructor( val fileSelectActions = PublishProcessor.create() val requestDownloadLibrary = BehaviorProcessor.createDefault(Unit) val requestFiltering = BehaviorProcessor.createDefault("") - val currentPage = PublishProcessor.create() private val compositeDisposable = CompositeDisposable() diff --git a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/FinishTest.kt b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/PopFragmentBackstackTest.kt similarity index 78% rename from core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/FinishTest.kt rename to core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/PopFragmentBackstackTest.kt index d9e233e41..3211098e1 100644 --- a/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/FinishTest.kt +++ b/core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/PopFragmentBackstackTest.kt @@ -18,17 +18,17 @@ package org.kiwix.kiwixmobile.core.search.viewmodel.effects -import androidx.appcompat.app.AppCompatActivity import io.mockk.mockk import io.mockk.verify import org.junit.jupiter.api.Test +import org.kiwix.kiwixmobile.core.main.CoreMainActivity -internal class FinishTest { +internal class PopFragmentBackstackTest { @Test - fun `invoke with finishes the activity`() { - val activity = mockk() + fun `invoke with pops activity backstack`() { + val activity = mockk(relaxed = true) PopFragmentBackstack.invokeWith(activity) - verify { activity.finish() } + verify { activity.navController.popBackStack() } } }