From 600b59630b289dc16cf621150d0cfc66d25abb82 Mon Sep 17 00:00:00 2001 From: Ahmed El-Helw Date: Sat, 13 Jan 2024 23:04:26 +0400 Subject: [PATCH] Move some audio models out of app and clean up --- .../androidquran/presenter/audio/AudioPresenter.kt | 6 +++--- .../presenter/audio/service/AudioQueue.kt | 2 +- .../labs/androidquran/service/AudioService.kt | 2 +- .../androidquran/service/util/DownloadStarter.kt | 2 +- .../quran/labs/androidquran/ui/PagerActivity.java | 14 +++----------- .../ui/fragment/AyahPlaybackFragment.kt | 2 +- .../extension/QariDownloadInfoExtensionTest.kt | 4 ++-- .../common/audio/cache/QariDownloadInfoManager.kt | 4 ++-- .../audio/cache/QariDownloadInfoStorageCache.kt | 2 +- .../common/audio/cache/command/AudioInfoCommand.kt | 2 +- .../audio/cache/command/GappedAudioInfoCommand.kt | 2 +- .../extension/PartiallyDownloadedSuraExtension.kt | 2 +- .../audio/extension/QariDownloadInfoExtension.kt | 2 +- .../model/{ => download}/AudioDownloadMetadata.kt | 2 +- .../{ => download}/PartiallyDownloadedSura.kt | 2 +- .../audio/model/{ => download}/QariDownloadInfo.kt | 2 +- .../common/audio/model/playback}/AudioPathInfo.kt | 2 +- .../common/audio/model/playback}/AudioRequest.kt | 5 +++-- .../cache/command/GappedAudioInfoCommandTest.kt | 2 +- .../quran/reading/common/ReadingEventPresenter.kt | 2 +- .../presenter/SheikhAudioPresenter.kt | 4 ++-- .../qarilist/presenter/QariListPresenter.kt | 2 +- 22 files changed, 31 insertions(+), 38 deletions(-) rename common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/{ => download}/AudioDownloadMetadata.kt (68%) rename common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/{ => download}/PartiallyDownloadedSura.kt (63%) rename common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/{ => download}/QariDownloadInfo.kt (89%) rename {app/src/main/java/com/quran/labs/androidquran/dao/audio => common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback}/AudioPathInfo.kt (79%) rename {app/src/main/java/com/quran/labs/androidquran/dao/audio => common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback}/AudioRequest.kt (84%) diff --git a/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt b/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt index 4eff9736af..d9e391c8c8 100644 --- a/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt +++ b/app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt @@ -5,12 +5,12 @@ import android.content.Intent import com.quran.data.model.SuraAyah import com.quran.labs.androidquran.R import com.quran.labs.androidquran.common.audio.model.QariItem -import com.quran.labs.androidquran.dao.audio.AudioPathInfo -import com.quran.labs.androidquran.dao.audio.AudioRequest +import com.quran.labs.androidquran.common.audio.model.playback.AudioPathInfo +import com.quran.labs.androidquran.common.audio.model.playback.AudioRequest import com.quran.labs.androidquran.data.QuranDisplayData import com.quran.labs.androidquran.presenter.Presenter import com.quran.labs.androidquran.service.QuranDownloadService -import com.quran.labs.androidquran.common.audio.model.AudioDownloadMetadata +import com.quran.labs.androidquran.common.audio.model.download.AudioDownloadMetadata import com.quran.labs.androidquran.service.util.ServiceIntentHelper import com.quran.labs.androidquran.ui.PagerActivity import com.quran.labs.androidquran.util.AudioUtils diff --git a/app/src/main/java/com/quran/labs/androidquran/presenter/audio/service/AudioQueue.kt b/app/src/main/java/com/quran/labs/androidquran/presenter/audio/service/AudioQueue.kt index 24a252e2c0..4584911e52 100644 --- a/app/src/main/java/com/quran/labs/androidquran/presenter/audio/service/AudioQueue.kt +++ b/app/src/main/java/com/quran/labs/androidquran/presenter/audio/service/AudioQueue.kt @@ -2,7 +2,7 @@ package com.quran.labs.androidquran.presenter.audio.service import com.quran.data.core.QuranInfo import com.quran.labs.androidquran.dao.audio.AudioPlaybackInfo -import com.quran.labs.androidquran.dao.audio.AudioRequest +import com.quran.labs.androidquran.common.audio.model.playback.AudioRequest import com.quran.data.model.SuraAyah import com.quran.labs.androidquran.extension.requiresBasmallah import java.util.Locale diff --git a/app/src/main/java/com/quran/labs/androidquran/service/AudioService.kt b/app/src/main/java/com/quran/labs/androidquran/service/AudioService.kt index fbebe83763..ef1495bc2a 100644 --- a/app/src/main/java/com/quran/labs/androidquran/service/AudioService.kt +++ b/app/src/main/java/com/quran/labs/androidquran/service/AudioService.kt @@ -63,7 +63,7 @@ import com.quran.data.model.SuraAyah import com.quran.labs.androidquran.QuranApplication import com.quran.labs.androidquran.R import com.quran.labs.androidquran.dao.audio.AudioPlaybackInfo -import com.quran.labs.androidquran.dao.audio.AudioRequest +import com.quran.labs.androidquran.common.audio.model.playback.AudioRequest import com.quran.labs.androidquran.data.Constants import com.quran.labs.androidquran.data.QuranDisplayData import com.quran.labs.androidquran.data.QuranFileConstants diff --git a/app/src/main/java/com/quran/labs/androidquran/service/util/DownloadStarter.kt b/app/src/main/java/com/quran/labs/androidquran/service/util/DownloadStarter.kt index bcf8cb749f..fafd70e63f 100644 --- a/app/src/main/java/com/quran/labs/androidquran/service/util/DownloadStarter.kt +++ b/app/src/main/java/com/quran/labs/androidquran/service/util/DownloadStarter.kt @@ -7,7 +7,7 @@ import com.quran.data.core.QuranInfo import com.quran.data.di.AppScope import com.quran.data.model.SuraAyah import com.quran.data.model.audio.Qari -import com.quran.labs.androidquran.common.audio.model.AudioDownloadMetadata +import com.quran.labs.androidquran.common.audio.model.download.AudioDownloadMetadata import com.quran.labs.androidquran.service.QuranDownloadService import com.quran.labs.androidquran.util.AudioUtils import com.quran.mobile.common.download.Downloader 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 index e9ffcf2cda..f665f8c62e 100644 --- a/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java +++ b/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java @@ -69,7 +69,7 @@ import com.quran.labs.androidquran.bridge.ReadingEventPresenterBridge; import com.quran.labs.androidquran.common.QuranAyahInfo; import com.quran.labs.androidquran.common.audio.model.QariItem; -import com.quran.labs.androidquran.dao.audio.AudioRequest; +import com.quran.labs.androidquran.common.audio.model.playback.AudioRequest; import com.quran.labs.androidquran.data.Constants; import com.quran.labs.androidquran.data.QuranDataProvider; import com.quran.labs.androidquran.data.QuranDisplayData; @@ -1159,7 +1159,7 @@ private void switchToTranslation() { endAyahMode(); } - if (translations.size() == 0) { + if (translations.isEmpty()) { startTranslationManager(); } else { int page = getCurrentPage(); @@ -1204,14 +1204,6 @@ public List getTranslations() { return translations; } - public String[] getTranslationNames() { - return translationNames; - } - - public Set getActiveTranslationsFilesNames() { - return activeTranslationsFilesNames; - } - @Override public void onAddTagSelected() { FragmentManager fm = getSupportFragmentManager(); @@ -1852,7 +1844,7 @@ private void shareAyah(SuraAyah start, SuraAyah end, final boolean isCopy) { compositeDisposable.add( arabicDatabaseUtils .getVerses(start, end) - .filter(quranAyahs -> quranAyahs.size() > 0) + .filter(quranAyahs -> !quranAyahs.isEmpty()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(quranAyahs -> { if (isCopy) { diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/fragment/AyahPlaybackFragment.kt b/app/src/main/java/com/quran/labs/androidquran/ui/fragment/AyahPlaybackFragment.kt index 815b2d7ccc..994eccb637 100644 --- a/app/src/main/java/com/quran/labs/androidquran/ui/fragment/AyahPlaybackFragment.kt +++ b/app/src/main/java/com/quran/labs/androidquran/ui/fragment/AyahPlaybackFragment.kt @@ -14,7 +14,7 @@ import android.widget.CheckBox import com.quran.data.core.QuranInfo import com.quran.data.model.SuraAyah import com.quran.labs.androidquran.R -import com.quran.labs.androidquran.dao.audio.AudioRequest +import com.quran.labs.androidquran.common.audio.model.playback.AudioRequest import com.quran.labs.androidquran.ui.PagerActivity import com.quran.labs.androidquran.ui.helpers.SlidingPagerAdapter import com.quran.labs.androidquran.ui.util.TypefaceManager diff --git a/app/src/test/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtensionTest.kt b/app/src/test/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtensionTest.kt index 00d9dc05c7..1dcffb5a1e 100644 --- a/app/src/test/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtensionTest.kt +++ b/app/src/test/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtensionTest.kt @@ -2,8 +2,8 @@ package com.quran.labs.androidquran.common.audio.extension import com.quran.data.model.SuraAyah import com.quran.data.model.audio.Qari -import com.quran.labs.androidquran.common.audio.model.PartiallyDownloadedSura -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.PartiallyDownloadedSura +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue import org.junit.Test diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoManager.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoManager.kt index 9522169fa3..00b4a0adf6 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoManager.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoManager.kt @@ -2,8 +2,8 @@ package com.quran.labs.androidquran.common.audio.cache import com.quran.data.core.QuranFileManager import com.quran.labs.androidquran.common.audio.cache.command.AudioInfoCommand -import com.quran.labs.androidquran.common.audio.model.AudioDownloadMetadata -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.AudioDownloadMetadata +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo import com.quran.mobile.common.download.DownloadInfo import com.quran.mobile.common.download.DownloadInfoStreams import kotlinx.coroutines.CoroutineScope diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoStorageCache.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoStorageCache.kt index 5c9b5e6d5a..8ce0bc7e61 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoStorageCache.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/QariDownloadInfoStorageCache.kt @@ -1,6 +1,6 @@ package com.quran.labs.androidquran.common.audio.cache -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/AudioInfoCommand.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/AudioInfoCommand.kt index 517de2080a..0c25acb392 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/AudioInfoCommand.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/AudioInfoCommand.kt @@ -1,7 +1,7 @@ package com.quran.labs.androidquran.common.audio.cache.command import com.quran.data.model.audio.Qari -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo import com.quran.labs.androidquran.common.audio.util.QariUtil import javax.inject.Inject import okio.FileSystem diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommand.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommand.kt index 1cad0ca264..831f40043f 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommand.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommand.kt @@ -1,7 +1,7 @@ package com.quran.labs.androidquran.common.audio.cache.command import com.quran.data.core.QuranInfo -import com.quran.labs.androidquran.common.audio.model.PartiallyDownloadedSura +import com.quran.labs.androidquran.common.audio.model.download.PartiallyDownloadedSura import com.quran.labs.androidquran.common.audio.util.AudioFileUtil import okio.FileSystem import okio.Path diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/PartiallyDownloadedSuraExtension.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/PartiallyDownloadedSuraExtension.kt index 1f64150521..fe2d6c3dcf 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/PartiallyDownloadedSuraExtension.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/PartiallyDownloadedSuraExtension.kt @@ -1,6 +1,6 @@ package com.quran.labs.androidquran.common.audio.extension -import com.quran.labs.androidquran.common.audio.model.PartiallyDownloadedSura +import com.quran.labs.androidquran.common.audio.model.download.PartiallyDownloadedSura fun PartiallyDownloadedSura.didDownloadAyat(currentSura: Int, start: Int, end: Int): Boolean { val ayat = IntRange(start, end) diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtension.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtension.kt index a804e31ed1..e849ba6e36 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtension.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/extension/QariDownloadInfoExtension.kt @@ -1,7 +1,7 @@ package com.quran.labs.androidquran.common.audio.extension import com.quran.data.model.SuraAyah -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo /** * Determine whether the range of verses is downloaded diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/AudioDownloadMetadata.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/AudioDownloadMetadata.kt similarity index 68% rename from common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/AudioDownloadMetadata.kt rename to common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/AudioDownloadMetadata.kt index ce0017b99f..12beef35d1 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/AudioDownloadMetadata.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/AudioDownloadMetadata.kt @@ -1,4 +1,4 @@ -package com.quran.labs.androidquran.common.audio.model +package com.quran.labs.androidquran.common.audio.model.download import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/PartiallyDownloadedSura.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/PartiallyDownloadedSura.kt similarity index 63% rename from common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/PartiallyDownloadedSura.kt rename to common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/PartiallyDownloadedSura.kt index b71a12fa82..ba587ce0cb 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/PartiallyDownloadedSura.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/PartiallyDownloadedSura.kt @@ -1,3 +1,3 @@ -package com.quran.labs.androidquran.common.audio.model +package com.quran.labs.androidquran.common.audio.model.download data class PartiallyDownloadedSura(val sura: Int, val expectedAyahCount: Int, val downloadedAyat: List) diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/QariDownloadInfo.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/QariDownloadInfo.kt similarity index 89% rename from common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/QariDownloadInfo.kt rename to common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/QariDownloadInfo.kt index 8ed0e27acc..99a0dba8f2 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/QariDownloadInfo.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/download/QariDownloadInfo.kt @@ -1,4 +1,4 @@ -package com.quran.labs.androidquran.common.audio.model +package com.quran.labs.androidquran.common.audio.model.download import com.quran.data.model.audio.Qari diff --git a/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioPathInfo.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback/AudioPathInfo.kt similarity index 79% rename from app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioPathInfo.kt rename to common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback/AudioPathInfo.kt index 7a1cd0e563..c36841a63f 100644 --- a/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioPathInfo.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback/AudioPathInfo.kt @@ -1,4 +1,4 @@ -package com.quran.labs.androidquran.dao.audio +package com.quran.labs.androidquran.common.audio.model.playback import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback/AudioRequest.kt similarity index 84% rename from app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt rename to common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback/AudioRequest.kt index fc52f9c542..e444a03cc6 100644 --- a/app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/model/playback/AudioRequest.kt @@ -1,4 +1,4 @@ -package com.quran.labs.androidquran.dao.audio +package com.quran.labs.androidquran.common.audio.model.playback import android.os.Parcelable import com.quran.data.model.SuraAyah @@ -14,7 +14,8 @@ data class AudioRequest(val start: SuraAyah, val enforceBounds: Boolean, val playbackSpeed: Float = 1f, val shouldStream: Boolean, - val audioPathInfo: AudioPathInfo) : Parcelable { + val audioPathInfo: AudioPathInfo +) : Parcelable { fun isGapless() = qari.isGapless fun needsIsti3athaAudio() = !isGapless() || audioPathInfo.gaplessDatabase?.contains("minshawi_murattal") ?: false diff --git a/common/audio/src/test/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommandTest.kt b/common/audio/src/test/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommandTest.kt index 7d213fee43..b8e720d1a4 100644 --- a/common/audio/src/test/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommandTest.kt +++ b/common/audio/src/test/java/com/quran/labs/androidquran/common/audio/cache/command/GappedAudioInfoCommandTest.kt @@ -3,7 +3,7 @@ package com.quran.labs.androidquran.common.audio.cache.command import com.google.common.truth.Truth import com.quran.data.core.QuranInfo import com.quran.data.pageinfo.common.MadaniDataSource -import com.quran.labs.androidquran.common.audio.model.PartiallyDownloadedSura +import com.quran.labs.androidquran.common.audio.model.download.PartiallyDownloadedSura import okio.Path.Companion.toPath import okio.fakefilesystem.FakeFileSystem import org.junit.Test diff --git a/common/reading/src/main/java/com/quran/reading/common/ReadingEventPresenter.kt b/common/reading/src/main/java/com/quran/reading/common/ReadingEventPresenter.kt index ee7f0a5cf1..017d673a05 100644 --- a/common/reading/src/main/java/com/quran/reading/common/ReadingEventPresenter.kt +++ b/common/reading/src/main/java/com/quran/reading/common/ReadingEventPresenter.kt @@ -25,7 +25,7 @@ class ReadingEventPresenter @Inject constructor(private val quranInfo: QuranInfo ) private val quranClickInternalFlow = MutableSharedFlow( replay = 0, extraBufferCapacity = 1, onBufferOverflow = DROP_OLDEST) - private val detailsPanelInternalFlow = MutableStateFlow(false) + private val detailsPanelInternalFlow = MutableStateFlow(false) private val ayahSelectionInternalFlow = MutableStateFlow(AyahSelection.None) val clicksFlow: Flow = clicksInternalFlow.asSharedFlow() diff --git a/feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/presenter/SheikhAudioPresenter.kt b/feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/presenter/SheikhAudioPresenter.kt index 0002b77e51..b2a286a45c 100644 --- a/feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/presenter/SheikhAudioPresenter.kt +++ b/feature/downloadmanager/src/main/kotlin/com/quran/mobile/feature/downloadmanager/presenter/SheikhAudioPresenter.kt @@ -4,8 +4,8 @@ import com.quran.data.core.QuranFileManager import com.quran.data.di.ActivityScope import com.quran.labs.androidquran.common.audio.cache.AudioCacheInvalidator import com.quran.labs.androidquran.common.audio.cache.QariDownloadInfoManager -import com.quran.labs.androidquran.common.audio.model.AudioDownloadMetadata -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.AudioDownloadMetadata +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo import com.quran.mobile.common.download.DownloadConstants import com.quran.mobile.common.download.DownloadInfo import com.quran.mobile.common.download.DownloadInfoStreams diff --git a/feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/presenter/QariListPresenter.kt b/feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/presenter/QariListPresenter.kt index 2357a67261..136bd71802 100644 --- a/feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/presenter/QariListPresenter.kt +++ b/feature/qarilist/src/main/kotlin/com/quran/mobile/feature/qarilist/presenter/QariListPresenter.kt @@ -5,7 +5,7 @@ import com.quran.data.model.SuraAyah import com.quran.data.model.audio.Qari import com.quran.labs.androidquran.common.audio.cache.QariDownloadInfoManager import com.quran.labs.androidquran.common.audio.extension.isRangeDownloaded -import com.quran.labs.androidquran.common.audio.model.QariDownloadInfo +import com.quran.labs.androidquran.common.audio.model.download.QariDownloadInfo import com.quran.labs.androidquran.common.audio.model.QariItem import com.quran.mobile.feature.qarilist.R import com.quran.mobile.feature.qarilist.model.QariUiModel