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

#2319 requested fixes

Browse Source
This commit is contained in:
HissPirat 2020-09-14 15:53:20 +02:00
parent 07392daf78
commit ee5e686b3d
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/androidTest/java/org/kiwix/kiwixmobile/intro/IntroFragmentTest.kt
View File

@ -18,12 +18,10 @@
package org.kiwix.kiwixmobile.intro
import androidx.test.internal.runner.junit4.statement.UiThreadStatement.runOnUiThread
import com.schibsted.spain.barista.interaction.BaristaSleepInteractions
import org.junit.Test
import org.kiwix.kiwixmobile.BaseActivityTest
import org.kiwix.kiwixmobile.R
import org.kiwix.kiwixmobile.main.KiwixMainActivity
import org.kiwix.kiwixmobile.testutils.TestUtils
class IntroFragmentTest : BaseActivityTest<KiwixMainActivity>() {
@ -32,9 +30,6 @@ class IntroFragmentTest : BaseActivityTest<KiwixMainActivity>() {
@Test
fun viewIsSwipeableAndNavigatesToMain() {
runOnUiThread { activityRule.activity.navigate(R.id.introFragment) }
BaristaSleepInteractions.sleep(TestUtils.TEST_PAUSE_MS.toLong())
intro {
swipeLeft()
} clickGetStarted { }
intro(IntroRobot::swipeLeft) clickGetStarted { }
}
}

22
core/src/main/java/org/kiwix/kiwixmobile/core/extensions/ActivityExtensions.kt
View File

@ -39,7 +39,7 @@ import org.kiwix.kiwixmobile.core.main.CoreMainActivity
object ActivityExtensions {
private val Activity.thisAsCoreMainActivity: CoreMainActivity get() = this as CoreMainActivity
private val Activity.coreMainActivity: CoreMainActivity get() = this as CoreMainActivity
fun AppCompatActivity.startActionMode(
menuId: Int,
@ -85,29 +85,29 @@ object ActivityExtensions {
.get(T::class.java)
fun Activity.navigate(action: NavDirections) {
thisAsCoreMainActivity.navigate(action)
coreMainActivity.navigate(action)
}
val Activity.cachedComponent: CoreActivityComponent
get() = thisAsCoreMainActivity.cachedComponent
get() = coreMainActivity.cachedComponent
fun Activity.setupDrawerToggle(toolbar: Toolbar) =
thisAsCoreMainActivity.setupDrawerToggle(toolbar)
coreMainActivity.setupDrawerToggle(toolbar)
fun Activity.navigate(fragmentId: Int) {
thisAsCoreMainActivity.navigate(fragmentId)
coreMainActivity.navigate(fragmentId)
}
fun Activity.navigate(fragmentId: Int, bundle: Bundle) {
thisAsCoreMainActivity.navigate(fragmentId, bundle)
coreMainActivity.navigate(fragmentId, bundle)
}
fun Activity.popNavigationBackstack() {
thisAsCoreMainActivity.navController.popBackStack()
coreMainActivity.navController.popBackStack()
}
private fun <T> Activity.getObservableNavigationResult(key: String = "result") =
thisAsCoreMainActivity.navController.currentBackStackEntry?.savedStateHandle
coreMainActivity.navController.currentBackStackEntry?.savedStateHandle
?.getLiveData<T>(key)
fun <T> Activity.observeNavigationResult(
@ -117,15 +117,15 @@ object ActivityExtensions {
) {
getObservableNavigationResult<T>(key)?.observe(owner) {
observer.onChanged(it)
thisAsCoreMainActivity.consumeObservable<T>(key)
coreMainActivity.consumeObservable<T>(key)
}
}
fun <T> Activity.consumeObservable(key: String = "result") =
thisAsCoreMainActivity.navController.currentBackStackEntry?.savedStateHandle?.remove<T>(key)
coreMainActivity.navController.currentBackStackEntry?.savedStateHandle?.remove<T>(key)
fun <T> Activity.setNavigationResult(result: T, key: String = "result") {
thisAsCoreMainActivity.navController.previousBackStackEntry?.savedStateHandle?.set(
coreMainActivity.navController.previousBackStackEntry?.savedStateHandle?.set(
key,
result
)

5
core/src/main/java/org/kiwix/kiwixmobile/core/main/CoreReaderFragment.java
View File

@ -1240,8 +1240,9 @@ public abstract class CoreReaderFragment extends BaseFragment
private void goToSearchWithText(Intent intent) {
saveTabStates();
String searchString = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? intent.getStringExtra(
Intent.EXTRA_PROCESS_TEXT) : "";
String searchString = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
? intent.getStringExtra(Intent.EXTRA_PROCESS_TEXT)
: "";
openSearch(searchString, false, false);
}

2
core/src/test/java/org/kiwix/kiwixmobile/core/search/viewmodel/SearchViewModelTest.kt
View File

@ -266,7 +266,7 @@ internal class SearchViewModelTest {
}
@Test
fun `CreatedWithIntent offers SearchArgumentProcessing`() {
fun `CreatedWithArguments offers SearchArgumentProcessing`() {
val bundle = mockk<Bundle>()
actionResultsInEffects(
CreatedWithArguments(bundle),