diff --git a/app/build.gradle b/app/build.gradle index c89ce22d..d928d693 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -102,68 +102,50 @@ static def getDate() { dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') 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.viewpager2:viewpager2:1.1.0-alpha01" implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.core:core-ktx:1.3.1' implementation 'androidx.fragment:fragment-ktx:1.2.5' implementation 'androidx.palette:palette-ktx:1.0.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8' - implementation 'androidx.recyclerview:recyclerview:1.1.0' + def nav_version = "2.3.0" + implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" + implementation "androidx.navigation:navigation-ui-ktx:$nav_version" - implementation 'com.google.android.material:material:1.3.0-alpha01' - - def retrofit_version = '2.9.0' - implementation "com.squareup.retrofit2:retrofit:$retrofit_version" - implementation "com.squareup.retrofit2:converter-gson:$retrofit_version" - - def material_dialog_version = "0.9.6.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:recyclical:1.1.1' - - implementation 'com.github.bumptech.glide:glide:3.8.0' - implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.6.0' - - implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') { - transitive = true - } - - def kotlin_coroutines_version = "1.3.8" - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" - - 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.anjlab.android.iab.v3:library:1.1.0' - implementation 'com.r0adkll:slidableactivity:2.1.0' - implementation 'com.heinrichreimersoftware:material-intro:1.6' - implementation 'me.zhanghai.android.fastscroll:library:1.1.0' + def room_version = "2.2.5" + 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" 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.play:core:1.8.0' - implementation 'me.jorgecastillo:androidcolorx:0.2.0' - implementation 'com.github.dhaval2404:imagepicker:1.7.1' + implementation 'com.google.android.play:core-ktx:1.8.1' + implementation 'com.google.android.material:material:1.3.0-alpha01' + + 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' + + def material_dialog_version = "0.9.6.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' + + def kotlin_coroutines_version = "1.3.8" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0" + 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" @@ -173,16 +155,23 @@ dependencies { implementation "org.koin:koin-androidx-fragment:$koin_version" implementation "org.koin:koin-androidx-ext:$koin_version" - def nav_version = "2.3.0" - implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" - implementation "androidx.navigation:navigation-ui-ktx:$nav_version" + implementation 'com.github.bumptech.glide:glide:3.8.0' + implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0' - def room_version = "2.2.5" - implementation "androidx.room:room-runtime:$room_version" - kapt "androidx.room:room-compiler:$room_version" - implementation "androidx.room:room-ktx:$room_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.anjlab.android.iab.v3:library:1.1.0' + implementation 'com.r0adkll:slidableactivity:2.1.0' + implementation 'com.heinrichreimersoftware:material-intro:1.6' + implementation 'com.github.dhaval2404:imagepicker:1.7.1' + + implementation 'me.zhanghai.android.fastscroll:library:1.1.0' + implementation 'me.jorgecastillo:androidcolorx:0.2.0' debugImplementation 'com.amitshekhar.android:debug-db:1.0.6' } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt index c49389bd..2b1b9198 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt @@ -20,7 +20,6 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.SwipeableItemConstant import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultAction import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionDefault import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionRemoveItem -import com.h6ah4i.android.widget.advrecyclerview.swipeable.annotation.SwipeableItemResults import me.zhanghai.android.fastscroll.PopupTextProvider class PlayingQueueAdapter( @@ -153,8 +152,8 @@ class PlayingQueueAdapter( mDragStateFlags = flags } - override fun getSwipeableContainerView(): View? { - return dummyContainer + override fun getSwipeableContainerView(): View { + return dummyContainer!! } } @@ -165,10 +164,7 @@ class PlayingQueueAdapter( private const val UP_NEXT = 2 } - override fun onSwipeItem( - holder: ViewHolder?, - position: Int, @SwipeableItemResults result: Int - ): SwipeResultAction { + override fun onSwipeItem(holder: ViewHolder, position: Int, result: Int): SwipeResultAction? { return if (result == SwipeableItemConstants.RESULT_CANCELED) { SwipeResultActionDefault() } else { @@ -176,7 +172,7 @@ class PlayingQueueAdapter( } } - override fun onGetSwipeReactionType(holder: ViewHolder?, position: Int, x: Int, y: Int): Int { + override fun onGetSwipeReactionType(holder: ViewHolder, position: Int, x: Int, y: Int): Int { return if (onCheckCanStartDrag(holder!!, position, x, y)) { SwipeableItemConstants.REACTION_CAN_NOT_SWIPE_BOTH_H } else { @@ -184,10 +180,10 @@ class PlayingQueueAdapter( } } - override fun onSwipeItemStarted(p0: ViewHolder?, p1: Int) { + override fun onSwipeItemStarted(holder: ViewHolder, p1: Int) { } - override fun onSetSwipeBackground(holder: ViewHolder?, position: Int, result: Int) { + override fun onSetSwipeBackground(holder: ViewHolder, position: Int, result: Int) { } internal class SwipedResultActionRemoveItem(