Merge remote-tracking branch 'retro/dev' into dev
# Conflicts: # .github/ISSUE_TEMPLATE/bug_report.md # README.md # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/code/name/monkey/retromusic/App.kt # app/src/main/java/code/name/monkey/retromusic/Constants.kt # app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt # app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java # app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt # app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt # app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt # app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java # app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt # app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt # app/src/main/java/code/name/monkey/retromusic/model/Artist.kt # app/src/main/java/code/name/monkey/retromusic/model/Song.kt # app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt # app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt # app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt # app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt # app/src/main/java/code/name/monkey/retromusic/service/MusicService.java # app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt # app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java # app/src/main/java/code/name/monkey/retromusic/util/PremiumShow.kt # app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt # app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java # app/src/main/res/layout-sw600dp/item_list_no_image.xml # app/src/main/res/layout/activity_donation.xml # app/src/main/res/layout/activity_pro_version.xml # app/src/main/res/layout/fragment_blur.xml # app/src/main/res/layout/fragment_classic_player.xml # app/src/main/res/layout/fragment_color_player.xml # app/src/main/res/layout/fragment_fit.xml # app/src/main/res/layout/fragment_flat_player.xml # app/src/main/res/layout/fragment_full.xml # app/src/main/res/layout/fragment_gradient_player.xml # app/src/main/res/layout/fragment_home_player.xml # app/src/main/res/layout/fragment_peak_player.xml # app/src/main/res/layout/fragment_plain_player.xml # app/src/main/res/layout/fragment_simple_player.xml # app/src/main/res/layout/fragment_tiny_player.xml # app/src/main/res/layout/item_storage.xml # app/src/main/res/layout/sliding_music_panel_layout.xml # app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml # app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml # app/src/main/res/values-fa-rIR/strings.xml
This commit is contained in:
JFronny
commit
4df292bddf
925 changed files with 37703 additions and 63683 deletions
127
app/build.gradle
127
app/build.gradle
|
|
@ -1,23 +1,22 @@
|
|||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'kotlin-android'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
apply plugin: 'kotlin-kapt'
|
||||
apply plugin: "androidx.navigation.safeargs.kotlin"
|
||||
apply plugin: 'kotlin-parcelize'
|
||||
|
||||
android {
|
||||
compileSdkVersion 29
|
||||
buildToolsVersion = '30.0.3'
|
||||
compileSdk 32
|
||||
buildTools = '30.0.3'
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 29
|
||||
minSdk 21
|
||||
targetSdk 32
|
||||
|
||||
renderscriptTargetApi 29 //must match target sdk and build tools
|
||||
vectorDrawables.useSupportLibrary = true
|
||||
|
||||
applicationId 'io.github.muntashirakon.Music'
|
||||
versionCode 10503
|
||||
versionName '4.0.010'
|
||||
versionCode 10579
|
||||
versionName '5.8.4'
|
||||
|
||||
multiDexEnabled true
|
||||
}
|
||||
|
|
@ -32,15 +31,17 @@ android {
|
|||
}
|
||||
}
|
||||
|
||||
packagingOptions {
|
||||
exclude 'META-INF/LICENSE'
|
||||
exclude 'META-INF/NOTICE'
|
||||
exclude 'META-INF/java.properties'
|
||||
buildFeatures{
|
||||
viewBinding true
|
||||
}
|
||||
lintOptions {
|
||||
disable 'MissingTranslation'
|
||||
disable 'InvalidPackage'
|
||||
packagingOptions {
|
||||
resources {
|
||||
excludes += ['META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/java.properties']
|
||||
}
|
||||
}
|
||||
lint {
|
||||
abortOnError false
|
||||
disable 'MissingTranslation', 'InvalidPackage'
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
|
|
@ -53,86 +54,82 @@ android {
|
|||
configurations.all {
|
||||
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
|
||||
}
|
||||
androidExtensions {
|
||||
experimental = true
|
||||
}
|
||||
kapt {
|
||||
generateStubs = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
implementation project(':appthemehelper')
|
||||
implementation 'androidx.multidex:multidex:2.0.1'
|
||||
implementation "androidx.gridlayout:gridlayout:1.0.0"
|
||||
implementation "androidx.cardview:cardview:1.0.0"
|
||||
implementation 'androidx.appcompat:appcompat:1.2.0'
|
||||
implementation 'androidx.annotation:annotation:1.1.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.1.0'
|
||||
implementation 'androidx.preference:preference-ktx:1.1.1'
|
||||
implementation 'androidx.core:core-ktx:1.3.2'
|
||||
implementation 'androidx.fragment:fragment-ktx:1.2.5'
|
||||
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
||||
implementation 'androidx.annotation:annotation:1.3.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
|
||||
implementation 'androidx.recyclerview:recyclerview:1.2.1'
|
||||
implementation "androidx.preference:preference-ktx:$preference_version"
|
||||
implementation 'androidx.core:core-ktx:1.7.0'
|
||||
implementation 'androidx.palette:palette-ktx:1.0.0'
|
||||
|
||||
def nav_version = "2.3.2"
|
||||
implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
|
||||
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
|
||||
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
|
||||
implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
|
||||
implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
|
||||
implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
|
||||
|
||||
def room_version = "2.2.6"
|
||||
def room_version = '2.4.2'
|
||||
implementation "androidx.room:room-runtime:$room_version"
|
||||
implementation "androidx.room:room-ktx:$room_version"
|
||||
kapt "androidx.room:room-compiler:$room_version"
|
||||
|
||||
def lifecycle_version = "2.2.0"
|
||||
def lifecycle_version = "2.5.0-rc01"
|
||||
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
|
||||
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
|
||||
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
|
||||
|
||||
implementation 'com.google.android.material:material:1.3.0-alpha04'
|
||||
implementation "androidx.core:core-splashscreen:1.0.0-beta02"
|
||||
|
||||
implementation "com.google.android.material:material:$mdc_version"
|
||||
|
||||
def retrofit_version = '2.9.0'
|
||||
implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
|
||||
implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.7'
|
||||
|
||||
def material_dialog_version = "0.9.6.0"
|
||||
def material_dialog_version = "3.3.0"
|
||||
implementation "com.afollestad.material-dialogs:core:$material_dialog_version"
|
||||
implementation "com.afollestad.material-dialogs:commons:$material_dialog_version"
|
||||
implementation 'com.afollestad:material-cab:0.1.12'
|
||||
implementation "com.afollestad.material-dialogs:input:$material_dialog_version"
|
||||
implementation "com.afollestad.material-dialogs:color:$material_dialog_version"
|
||||
|
||||
def kotlin_coroutines_version = "1.3.8"
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10"
|
||||
implementation 'com.afollestad:material-cab:2.0.1'
|
||||
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||
|
||||
def kotlin_coroutines_version = '1.6.1'
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
|
||||
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"
|
||||
|
||||
def koin_version = "2.1.5"
|
||||
implementation "org.koin:koin-core:$koin_version"
|
||||
implementation "org.koin:koin-core-ext:$koin_version"
|
||||
implementation "org.koin:koin-androidx-scope:$koin_version"
|
||||
implementation "org.koin:koin-androidx-viewmodel:$koin_version"
|
||||
implementation "org.koin:koin-androidx-fragment:$koin_version"
|
||||
implementation "org.koin:koin-androidx-ext:$koin_version"
|
||||
def koin_version = '3.2.0'
|
||||
implementation "io.insert-koin:koin-core:$koin_version"
|
||||
implementation "io.insert-koin:koin-android:$koin_version"
|
||||
|
||||
implementation 'com.github.bumptech.glide:glide:3.8.0'
|
||||
implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
|
||||
def glide_version = '4.13.2'
|
||||
implementation "com.github.bumptech.glide:glide:$glide_version"
|
||||
kapt "com.github.bumptech.glide:compiler:$glide_version"
|
||||
implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
|
||||
|
||||
implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
|
||||
|
||||
implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:3.4.0.201406110918-r'
|
||||
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
|
||||
implementation 'com.github.kabouzeid:recyclerview-fastscroll:1.9-kmod'
|
||||
implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
|
||||
implementation 'com.r0adkll:slidableactivity:2.1.0'
|
||||
implementation 'com.heinrichreimersoftware:material-intro:1.6'
|
||||
implementation 'com.github.dhaval2404:imagepicker:1.7.1'
|
||||
implementation 'org.jsoup:jsoup:1.11.1'
|
||||
implementation 'me.zhanghai.android.fastscroll:library:1.1.0'
|
||||
implementation 'me.jorgecastillo:androidcolorx:0.2.0'
|
||||
implementation 'org.jsoup:jsoup:1.11.1'
|
||||
debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
|
||||
}
|
||||
implementation 'com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0'
|
||||
|
||||
apply from: '../spotless.gradle'
|
||||
implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:3.0.0-RC3'
|
||||
implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
|
||||
|
||||
implementation "dev.chrisbanes.insetter:insetter:0.6.1"
|
||||
|
||||
implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5'
|
||||
implementation 'com.github.Adonai:jaudiotagger:2.3.15'
|
||||
implementation 'com.r0adkll:slidableactivity:2.1.0'
|
||||
implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
|
||||
implementation 'com.github.dhaval2404:imagepicker:2.1'
|
||||
implementation 'me.zhanghai.android.fastscroll:library:1.1.8'
|
||||
implementation 'cat.ereza:customactivityoncrash:2.3.0'
|
||||
implementation 'me.tankery.lib:circularSeekBar:1.3.2'
|
||||
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue