kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-14 09:57:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

1581 revert two unnecessary deletions. Update TestComponent with modules

Browse Source
This commit is contained in:
Justin Biggs 2020-01-25 08:47:24 -06:00
parent 7e39f98b66
commit 6ce34bd92b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/androidTest/java/org/kiwix/kiwixmobile/core/di/components/TestComponent.kt
View File

@ -22,12 +22,14 @@ import dagger.BindsInstance
import dagger.Component import dagger.Component
import org.kiwix.kiwixmobile.NetworkTest import org.kiwix.kiwixmobile.NetworkTest
import org.kiwix.kiwixmobile.ZimTest import org.kiwix.kiwixmobile.ZimTest
import org.kiwix.kiwixmobile.core.bookmark.BookmarksModule
import org.kiwix.kiwixmobile.core.data.DataModule import org.kiwix.kiwixmobile.core.data.DataModule
import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule
import org.kiwix.kiwixmobile.core.di.modules.CoreViewModelModule import org.kiwix.kiwixmobile.core.di.modules.CoreViewModelModule
import org.kiwix.kiwixmobile.core.di.modules.JNIModule import org.kiwix.kiwixmobile.core.di.modules.JNIModule
import org.kiwix.kiwixmobile.core.di.modules.SearchModule import org.kiwix.kiwixmobile.core.di.modules.SearchModule
import org.kiwix.kiwixmobile.core.di.modules.TestNetworkModule import org.kiwix.kiwixmobile.core.di.modules.TestNetworkModule
import org.kiwix.kiwixmobile.core.history.HistoryModule
import javax.inject.Singleton import javax.inject.Singleton
/** /**
@ -37,6 +39,8 @@ import javax.inject.Singleton
@Singleton @Singleton
@Component( @Component(
modules = [ modules = [
BookmarksModule::class,
HistoryModule::class,
ApplicationModule::class, ApplicationModule::class,
TestNetworkModule::class, TestNetworkModule::class,
JNIModule::class, JNIModule::class,

2
core/src/main/java/org/kiwix/kiwixmobile/core/search/viewmodel/effects/ShowDeleteSearchDialog.kt
View File

@ -21,6 +21,7 @@ package org.kiwix.kiwixmobile.core.search.viewmodel.effects
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import io.reactivex.processors.PublishProcessor import io.reactivex.processors.PublishProcessor
import org.kiwix.kiwixmobile.core.base.SideEffect import org.kiwix.kiwixmobile.core.base.SideEffect
import org.kiwix.kiwixmobile.core.search.SearchActivity
import org.kiwix.kiwixmobile.core.search.adapter.SearchListItem import org.kiwix.kiwixmobile.core.search.adapter.SearchListItem
import org.kiwix.kiwixmobile.core.search.viewmodel.Action import org.kiwix.kiwixmobile.core.search.viewmodel.Action
import org.kiwix.kiwixmobile.core.utils.DialogShower import org.kiwix.kiwixmobile.core.utils.DialogShower
@ -35,6 +36,7 @@ data class ShowDeleteSearchDialog(
@Inject lateinit var dialogShower: DialogShower @Inject lateinit var dialogShower: DialogShower
override fun invokeWith(activity: AppCompatActivity) { override fun invokeWith(activity: AppCompatActivity) {
(activity as SearchActivity).activityComponent.inject(this)
dialogShower.show(DeleteSearch, { actions.offer(Action.ConfirmedDelete(searchListItem)) }) dialogShower.show(DeleteSearch, { actions.offer(Action.ConfirmedDelete(searchListItem)) })
} }
} }

4
core/src/main/java/org/kiwix/kiwixmobile/core/settings/CoreSettingsActivity.java
View File

@ -72,8 +72,4 @@ public abstract class CoreSettingsActivity extends BaseActivity {
toolbar.setNavigationOnClickListener(v -> onBackPressed()); toolbar.setNavigationOnClickListener(v -> onBackPressed());
} }
@Override protected void injection(CoreComponent coreComponent) {
coreComponent.inject(this);
}
} }