diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt index 113a3be11..d842ec0f6 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreActivityComponent.kt @@ -25,6 +25,7 @@ import org.kiwix.kiwixmobile.core.bookmark.BookmarksActivity import org.kiwix.kiwixmobile.core.di.ActivityScope import org.kiwix.kiwixmobile.core.di.modules.ActivityModule import org.kiwix.kiwixmobile.core.history.HistoryActivity +import org.kiwix.kiwixmobile.core.main.AddNoteDialog import org.kiwix.kiwixmobile.core.search.SearchActivity import org.kiwix.kiwixmobile.core.search.viewmodel.effects.ShowDeleteSearchDialog import org.kiwix.kiwixmobile.core.settings.CorePrefsFragment @@ -37,6 +38,7 @@ interface CoreActivityComponent { fun inject(corePrefsFragment: CorePrefsFragment) fun inject(historyActivity: HistoryActivity) fun inject(bookmarksActivity: BookmarksActivity) + fun inject(addNoteDialog: AddNoteDialog) @Subcomponent.Builder interface Builder { diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt index 85f35a179..a804fc8b3 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt @@ -39,7 +39,6 @@ import org.kiwix.kiwixmobile.core.data.local.dao.BookmarksDao import org.kiwix.kiwixmobile.core.data.remote.KiwixService import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule import org.kiwix.kiwixmobile.core.di.modules.CoreViewModelModule -import org.kiwix.kiwixmobile.core.di.modules.DialogModule import org.kiwix.kiwixmobile.core.di.modules.JNIModule import org.kiwix.kiwixmobile.core.di.modules.NetworkModule import org.kiwix.kiwixmobile.core.di.modules.SearchModule @@ -47,7 +46,6 @@ import org.kiwix.kiwixmobile.core.downloader.Downloader import org.kiwix.kiwixmobile.core.error.ErrorActivity import org.kiwix.kiwixmobile.core.help.HelpActivity import org.kiwix.kiwixmobile.core.history.HistoryModule -import org.kiwix.kiwixmobile.core.main.AddNoteDialog import org.kiwix.kiwixmobile.core.main.KiwixWebView import org.kiwix.kiwixmobile.core.reader.ZimContentProvider import org.kiwix.kiwixmobile.core.reader.ZimFileReader @@ -68,8 +66,7 @@ import javax.inject.Singleton JNIModule::class, DataModule::class, CoreViewModelModule::class, - SearchModule::class, - DialogModule::class + SearchModule::class ] ) interface CoreComponent { @@ -107,7 +104,6 @@ interface CoreComponent { fun inject(zimContentProvider: ZimContentProvider) fun inject(kiwixWebView: KiwixWebView) fun inject(storageSelectDialog: StorageSelectDialog) - fun inject(addNoteDialog: AddNoteDialog) fun inject(errorActivity: ErrorActivity) fun inject(searchActivity: SearchActivity) diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DialogModule.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DialogModule.kt deleted file mode 100644 index c60954060..000000000 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/modules/DialogModule.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Kiwix Android - * Copyright (c) 2019 Kiwix - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package org.kiwix.kiwixmobile.core.di.modules - -import dagger.Binds -import dagger.Module -import org.kiwix.kiwixmobile.core.di.ActivityScope -import org.kiwix.kiwixmobile.core.main.MainContract -import org.kiwix.kiwixmobile.core.main.MainPresenter -import org.kiwix.kiwixmobile.core.utils.AlertDialogShower -import org.kiwix.kiwixmobile.core.utils.DialogShower - -@Module -abstract class DialogModule { - - @Binds - @ActivityScope - abstract fun bindDialogShower(alertDialogShower: AlertDialogShower): DialogShower - - @Binds - internal abstract fun bindMainPresenter(mainPresenter: MainPresenter): MainContract.Presenter -} diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.java b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.java index 920b8bb41..388d9df70 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.java +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/main/AddNoteDialog.java @@ -56,6 +56,7 @@ import kotlin.Unit; import org.kiwix.kiwixmobile.core.CoreApp; import org.kiwix.kiwixmobile.core.R; import org.kiwix.kiwixmobile.core.R2; +import org.kiwix.kiwixmobile.core.di.components.CoreComponent; import org.kiwix.kiwixmobile.core.reader.ZimReaderContainer; import org.kiwix.kiwixmobile.core.utils.AlertDialogShower; import org.kiwix.kiwixmobile.core.utils.KiwixDialog; @@ -102,7 +103,7 @@ public class AddNoteDialog extends DialogFragment { @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - CoreApp.getCoreComponent().inject(this); + injection(CoreApp.getCoreComponent()); // Returns name of the form ".../Kiwix/granbluefantasy_en_all_all_nopic_2018-10.zim" zimFileName = zimReaderContainer.getZimCanonicalPath(); @@ -245,6 +246,10 @@ public class AddNoteDialog extends DialogFragment { } } + protected void injection(@NonNull CoreComponent coreComponent) { + coreComponent.activityComponentBuilder().activity(getActivity()).build().inject(this); + } + private void disableMenuItems() { if (toolbar.getMenu() != null) { MenuItem saveItem = toolbar.getMenu().findItem(R.id.save_note);