Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move QariItem to common/audio #1316

Merged
merged 1 commit into from
Apr 14, 2020
Merged

Move QariItem to common/audio #1316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ if (new File(rootDir, 'extras/extras.gradle').exists()) {
}

dependencies {
implementation project(path: ':common:audio')
implementation project(path: ':common:data')
implementation project(path: ':common:networking')
implementation project(path: ':common:pages')
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/dao/audio/AudioRequest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.quran.labs.androidquran.dao.audio

import android.os.Parcelable
import com.quran.labs.androidquran.common.QariItem
import com.quran.labs.androidquran.common.audio.QariItem
import com.quran.labs.androidquran.data.SuraAyah
import kotlinx.android.parcel.Parcelize

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/presenter/audio/AudioPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.quran.labs.androidquran.presenter.audio
import android.content.Context
import android.content.Intent
import com.quran.labs.androidquran.R
import com.quran.labs.androidquran.common.QariItem
import com.quran.labs.androidquran.common.audio.QariItem
import com.quran.labs.androidquran.dao.audio.AudioPathInfo
import com.quran.labs.androidquran.dao.audio.AudioRequest
import com.quran.labs.androidquran.data.QuranInfo
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/ui/AudioManagerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
import androidx.recyclerview.widget.RecyclerView.ViewHolder
import com.quran.labs.androidquran.QuranApplication
import com.quran.labs.androidquran.R
import com.quran.labs.androidquran.common.QariItem
import com.quran.labs.androidquran.common.audio.QariItem
import com.quran.labs.androidquran.data.QuranInfo
import com.quran.labs.androidquran.util.AudioManagerUtils
import com.quran.labs.androidquran.util.AudioUtils
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import com.quran.labs.androidquran.R;
import com.quran.labs.androidquran.SearchActivity;
import com.quran.labs.androidquran.common.LocalTranslation;
import com.quran.labs.androidquran.common.QariItem;
import com.quran.labs.androidquran.common.audio.QariItem;
import com.quran.labs.androidquran.component.activity.PagerActivityComponent;
import com.quran.labs.androidquran.dao.audio.AudioRequest;
import com.quran.labs.androidquran.data.Constants;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/ui/SheikhAudioManagerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import androidx.recyclerview.widget.RecyclerView.Adapter
import androidx.recyclerview.widget.RecyclerView.ViewHolder
import com.quran.labs.androidquran.QuranApplication
import com.quran.labs.androidquran.R
import com.quran.labs.androidquran.common.QariItem
import com.quran.labs.androidquran.common.audio.QariItem
import com.quran.labs.androidquran.data.QuranInfo
import com.quran.labs.androidquran.data.SuraAyah
import com.quran.labs.androidquran.service.QuranDownloadService
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/util/AudioManagerUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import androidx.annotation.NonNull;
import android.util.Pair;

import com.quran.labs.androidquran.common.QariItem;
import com.quran.labs.androidquran.common.audio.QariItem;
import com.quran.labs.androidquran.data.QuranInfo;

import java.io.File;
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/quran/labs/androidquran/util/AudioUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.content.Context
import android.content.Intent
import androidx.annotation.VisibleForTesting
import com.quran.labs.androidquran.R
import com.quran.labs.androidquran.common.QariItem
import com.quran.labs.androidquran.common.audio.QariItem
import com.quran.labs.androidquran.data.QuranInfo
import com.quran.labs.androidquran.data.SuraAyah
import com.quran.labs.androidquran.service.AudioService
Expand Down Expand Up @@ -49,7 +49,9 @@ constructor(private val quranInfo: QuranInfo, private val quranFileUtils: QuranF
val items = mutableListOf<QariItem>()
for (i in shuyookh.indices) {
if (hasGaplessEquivalent[i] == 0 || haveAnyFiles(context, paths[i])) {
items += QariItem(i, shuyookh[i], urls[i], paths[i], databases[i])
items += QariItem(
i, shuyookh[i], urls[i], paths[i], databases[i]
)
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/util/QariDownloadInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.util.Pair;
import android.util.SparseBooleanArray;

import com.quran.labs.androidquran.common.QariItem;
import com.quran.labs.androidquran.common.audio.QariItem;

import java.util.Collections;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/quran/labs/androidquran/widgets/AudioStatusBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import android.widget.TextView;

import com.quran.labs.androidquran.R;
import com.quran.labs.androidquran.common.QariItem;
import com.quran.labs.androidquran.common.audio.QariItem;
import com.quran.labs.androidquran.data.Constants;
import com.quran.labs.androidquran.util.QuranSettings;
import com.quran.labs.androidquran.util.QuranUtils;
Expand Down
5 changes: 5 additions & 0 deletions common/audio/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion deps.android.build.compileSdkVersion
defaultConfig {
minSdkVersion deps.android.build.minSdkVersion
targetSdkVersion deps.android.build.targetSdkVersion
}

androidExtensions {
experimental = true
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion ...uran/labs/androidquran/common/QariItem.kt → ...abs/androidquran/common/audio/QariItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.quran.labs.androidquran.common
package com.quran.labs.androidquran.common.audio

import android.os.Parcelable
import kotlinx.android.parcel.IgnoredOnParcel
Expand Down