kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-18 03:45:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/Frans-Lukas/2238-historybookmarks-to-fragment' of https://github.com/kiwix/kiwix-android into feature/Frans-Lukas/2241-settings-to-fragment

Browse Source
This commit is contained in:
HissPirat 2020-08-07 11:30:18 +02:00
commit c09bfe3a25
6 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@ -3,7 +3,6 @@ import plugin.KiwixConfigurationPlugin
plugins { plugins {
android android
id("com.github.triplet.play") version Versions.com_github_triplet_play_gradle_plugin id("com.github.triplet.play") version Versions.com_github_triplet_play_gradle_plugin
id("androidx.navigation.safeargs")
} }
plugins.apply(KiwixConfigurationPlugin::class) plugins.apply(KiwixConfigurationPlugin::class)
@ -84,8 +83,5 @@ dependencies {
implementation(Libs.squidb) implementation(Libs.squidb)
implementation(Libs.squidb_annotations) implementation(Libs.squidb_annotations)
implementation(Libs.ink_page_indicator) 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) add("kapt", Libs.squidb_processor)
} }

1
app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
View File

@ -114,7 +114,6 @@ class ZimManageViewModel @Inject constructor(
val fileSelectActions = PublishProcessor.create<FileSelectActions>() val fileSelectActions = PublishProcessor.create<FileSelectActions>()
val requestDownloadLibrary = BehaviorProcessor.createDefault(Unit) val requestDownloadLibrary = BehaviorProcessor.createDefault(Unit)
val requestFiltering = BehaviorProcessor.createDefault("") val requestFiltering = BehaviorProcessor.createDefault("")
val currentPage = PublishProcessor.create<Int>()
private val compositeDisposable = CompositeDisposable() private val compositeDisposable = CompositeDisposable()

5
buildSrc/src/main/kotlin/plugin/AllProjectConfigurer.kt
View File

@ -42,6 +42,7 @@ class AllProjectConfigurer {
target.plugins.apply("com.hiya.jacoco-android") target.plugins.apply("com.hiya.jacoco-android")
target.plugins.apply("org.jlleitschuh.gradle.ktlint") target.plugins.apply("org.jlleitschuh.gradle.ktlint")
target.plugins.apply("io.gitlab.arturbosch.detekt") target.plugins.apply("io.gitlab.arturbosch.detekt")
target.plugins.apply("androidx.navigation.safeargs")
} }
fun configureBaseExtension(target: Project, path: String) { fun configureBaseExtension(target: Project, path: String) {
@ -159,6 +160,10 @@ class AllProjectConfigurer {
implementation(Libs.material) implementation(Libs.material)
implementation(Libs.constraintlayout) implementation(Libs.constraintlayout)
implementation(Libs.multidex) implementation(Libs.multidex)
// navigation
implementation(Libs.navigation_kotlin_fragment)
implementation(Libs.navigation_kotlin_ui)
androidTestImplementation(Libs.navigation_kotlin_testing)
implementation(Libs.okhttp) implementation(Libs.okhttp)
implementation(Libs.logging_interceptor) implementation(Libs.logging_interceptor)
implementation(Libs.retrofit) implementation(Libs.retrofit)

5
core/build.gradle.kts
View File

@ -14,7 +14,6 @@ buildscript {
} }
plugins { plugins {
`android-library` `android-library`
id("androidx.navigation.safeargs")
} }
plugins.apply(KiwixConfigurationPlugin::class) plugins.apply(KiwixConfigurationPlugin::class)
apply(plugin = "io.objectbox") apply(plugin = "io.objectbox")
@ -62,8 +61,4 @@ dependencies {
implementation(Libs.objectbox_kotlin) implementation(Libs.objectbox_kotlin)
implementation(Libs.objectbox_rxjava) implementation(Libs.objectbox_rxjava)
implementation(Libs.webkit) implementation(Libs.webkit)
// navigation
implementation(Libs.navigation_kotlin_fragment)
implementation(Libs.navigation_kotlin_ui)
androidTestImplementation(Libs.navigation_kotlin_testing)
} }

10
core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/FinishTest.kt → core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/PopFragmentBackstackTest.kt
View File

@ -18,17 +18,17 @@
package org.kiwix.kiwixmobile.core.search.viewmodel.effects package org.kiwix.kiwixmobile.core.search.viewmodel.effects
import androidx.appcompat.app.AppCompatActivity
import io.mockk.mockk import io.mockk.mockk
import io.mockk.verify import io.mockk.verify
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.kiwix.kiwixmobile.core.main.CoreMainActivity
internal class FinishTest { internal class PopFragmentBackstackTest {
@Test @Test
fun `invoke with finishes the activity`() { fun `invoke with pops activity backstack`() {
val activity = mockk<AppCompatActivity>() val activity = mockk<CoreMainActivity>(relaxed = true)
PopFragmentBackstack.invokeWith(activity) PopFragmentBackstack.invokeWith(activity)
verify { activity.finish() } verify { activity.navController.popBackStack() }
} }
} }

5
custom/build.gradle.kts
View File

@ -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 { fun ProductFlavor.createDownloadTask(file: File): Task {
return tasks.create("download${name.capitalize()}Zim") { return tasks.create("download${name.capitalize()}Zim") {