Merge pull request #2339 from quran/use_reading_component

quran · Aug 5, 2023 · d483d26 · d483d26
2 parents 6e1e380 + 937181a
commit d483d26
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/app/src/main/java/com/quran/labs/androidquran/di/component/fragment/QuranPageComponent.kt b/app/src/main/java/com/quran/labs/androidquran/di/component/fragment/QuranPageComponent.kt
@@ -2,17 +2,17 @@ package com.quran.labs.androidquran.di.component.fragment
 
 import com.quran.data.di.QuranPageScope
 import com.quran.data.di.QuranReadingPageScope
-import com.quran.data.page.provider.di.QuranPageExtrasComponent
 import com.quran.labs.androidquran.di.module.fragment.QuranPageModule
 import com.quran.labs.androidquran.ui.fragment.QuranPageFragment
 import com.quran.labs.androidquran.ui.fragment.TabletFragment
 import com.quran.labs.androidquran.ui.fragment.TranslationFragment
+import com.quran.mobile.di.QuranReadingPageComponent
 import com.squareup.anvil.annotations.MergeSubcomponent
 import dagger.Subcomponent
 
 @QuranPageScope
 @MergeSubcomponent(QuranReadingPageScope::class, modules = [QuranPageModule::class])
-interface QuranPageComponent: QuranPageExtrasComponent {
+interface QuranPageComponent: QuranReadingPageComponent {
   fun inject(quranPageFragment: QuranPageFragment)
   fun inject(tabletFragment: TabletFragment)
   fun inject(translationFragment: TranslationFragment)

diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java b/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java
@@ -57,8 +57,6 @@
 import com.quran.data.model.selection.AyahSelectionKt;
 import com.quran.data.model.selection.SelectionIndicator;
 import com.quran.data.model.selection.SelectionIndicatorKt;
-import com.quran.data.page.provider.di.QuranPageExtrasComponent;
-import com.quran.data.page.provider.di.QuranPageExtrasComponentProvider;
 import com.quran.labs.androidquran.BuildConfig;
 import com.quran.labs.androidquran.HelpActivity;
 import com.quran.labs.androidquran.QuranApplication;
@@ -119,6 +117,8 @@
 import com.quran.mobile.di.AyahActionFragmentProvider;
 import com.quran.mobile.di.QuranReadingActivityComponent;
 import com.quran.mobile.di.QuranReadingActivityComponentProvider;
+import com.quran.mobile.di.QuranReadingPageComponent;
+import com.quran.mobile.di.QuranReadingPageComponentProvider;
 import com.quran.mobile.feature.qarilist.QariListWrapper;
 import com.quran.mobile.feature.qarilist.di.QariListWrapperInjector;
 import com.quran.page.common.factory.PageViewFactoryProvider;
@@ -161,7 +161,7 @@ public class PagerActivity extends AppCompatActivity implements
     AyahSelectedListener,
     JumpDestination,
     QuranReadingActivityComponentProvider,
-    QuranPageExtrasComponentProvider,
+    QuranReadingPageComponentProvider,
     AyahToolBarInjector,
     QariListWrapperInjector,
     ActivityCompat.OnRequestPermissionsResultCallback {
@@ -826,7 +826,7 @@ public QuranReadingActivityComponent provideQuranReadingActivityComponent() {
 
   @NonNull
   @Override
-  public QuranPageExtrasComponent provideQuranPageExtrasComponent(@NonNull int... pages) {
+  public QuranReadingPageComponent provideQuranReadingPageComponent(@NonNull int... pages) {
     return getPagerActivityComponent()
         .quranPageComponentBuilder()
         .withQuranPageModule(new QuranPageModule(pages))

diff --git a/common/di/src/main/java/com/quran/mobile/di/QuranReadingPageComponent.kt b/common/di/src/main/java/com/quran/mobile/di/QuranReadingPageComponent.kt
@@ -0,0 +1,3 @@
+package com.quran.mobile.di
+
+interface QuranReadingPageComponent
diff --git a/common/di/src/main/java/com/quran/mobile/di/QuranReadingPageComponentProvider.kt b/common/di/src/main/java/com/quran/mobile/di/QuranReadingPageComponentProvider.kt
@@ -0,0 +1,5 @@
+package com.quran.mobile.di
+
+interface QuranReadingPageComponentProvider {
+  fun provideQuranReadingPageComponent(vararg pages: Int): QuranReadingPageComponent
+}
diff --git a/pages/madani/src/main/java/com/quran/data/page/provider/di/QuranPageExtrasComponent.kt b/pages/madani/src/main/java/com/quran/data/page/provider/di/QuranPageExtrasComponent.kt
diff --git a/.../madani/src/main/java/com/quran/data/page/provider/di/QuranPageExtrasComponentProvider.kt b/.../madani/src/main/java/com/quran/data/page/provider/di/QuranPageExtrasComponentProvider.kt