Fix multi download screen

app/build.gradle

@@ -86,6 +86,7 @@ dependencies {
     debugImplementation(LibraryDependency.LEAKY_CANARY)
     implementation(LibraryDependency.SUPPORT_V13)
     implementation(LibraryDependency.OSS_LICENSES)
+    implementation(LibraryDependency.TOOL_TIP)
 
     //crash analytics report
     implementation(LibraryDependency.FIREBASE_ANALYTICS)

app/src/main/AndroidManifest.xml

@@ -34,7 +34,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".feature_downloader.presentation.DownloadManagementActivity" />
+        <activity
+            android:launchMode= "singleTop"
+            android:name=".feature_downloader.presentation.DownloadManagementActivity" />
 
         <activity
             android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"

app/src/main/java/com/allsoftdroid/audiobook/presentation/MainActivity.kt

@@ -18,7 +18,7 @@ import com.allsoftdroid.audiobook.feature_downloader.presentation.DownloadManage
 import com.allsoftdroid.audiobook.feature_mini_player.presentation.MiniPlayerFragment
 import com.allsoftdroid.audiobook.presentation.viewModel.MainActivityViewModel
 import com.allsoftdroid.audiobook.utility.MovableFrameLayout
-import com.allsoftdroid.common.base.utils.StoragePermissionHandler
+import com.allsoftdroid.audiobook.utility.OnSwipeTouchListener
 import com.allsoftdroid.common.base.activity.BaseActivity
 import com.allsoftdroid.common.base.extension.Event
 import com.allsoftdroid.common.base.network.ConnectionLiveData
@@ -27,12 +27,14 @@ import com.allsoftdroid.common.base.store.downloader.DownloadEvent
 import com.allsoftdroid.common.base.store.downloader.DownloadEventStore
 import com.allsoftdroid.common.base.store.downloader.DownloadNothing
 import com.allsoftdroid.common.base.store.userAction.*
+import com.allsoftdroid.common.base.utils.StoragePermissionHandler
 import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.schedulers.Schedulers
+import it.sephiroth.android.library.xtooltip.Tooltip
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
@@ -55,6 +57,7 @@ class MainActivity : BaseActivity() {
     private val downloader: IDownloaderCore by inject{parametersOf(this)}
     private val userActionEventStore:UserActionEventStore by inject()
     private val disposables = CompositeDisposable()
+    private var isShownTooltip = false
 
 
     private val snackBar by lazy {
@@ -233,7 +236,19 @@ class MainActivity : BaseActivity() {
                     .commit()
             }
 
-            findViewById<MovableFrameLayout>(R.id.miniPlayerContainer).visibility = View.VISIBLE
+            findViewById<MovableFrameLayout>(R.id.miniPlayerContainer).apply {
+                visibility = View.VISIBLE
+                setOnTouchListener(object : OnSwipeTouchListener(context) {
+
+                    override fun onSwipeTop() {
+                        super.onSwipeTop()
+                        Timber.d("Event sent for opening main player event")
+                        userActionEventStore.publish(Event(OpenMainPlayerUI(this::class.java.simpleName)))
+                    }
+                })
+            }.post {
+                if(!isShownTooltip) showToolTipForMiniPlayer()
+            }
 
             findViewById<View>(R.id.navHostFragment).apply {
 
@@ -243,6 +258,8 @@ class MainActivity : BaseActivity() {
                 layoutParams = layout
             }
 
+
+
         }else{
             val fragment = supportFragmentManager.findFragmentByTag(MINI_PLAYER_TAG)
 
@@ -301,6 +318,10 @@ class MainActivity : BaseActivity() {
                 }
             }
 
+            is Finished -> {
+                mainActivityViewModel.playerStatus(showPlayer = false)
+            }
+
             else -> {
                 Timber.d("Unknown event received")
                 Timber.d("Unknown Event has message of type TrackDetails: ${event is TrackDetails}")
@@ -364,4 +385,28 @@ class MainActivity : BaseActivity() {
         }
 
     }
+
+    private fun showToolTipForMiniPlayer(){
+        val containerView:View = findViewById<MovableFrameLayout>(R.id.miniPlayerContainer)
+
+        val metrics = resources.displayMetrics
+        val gravity = Tooltip.Gravity.TOP
+
+        var tooltip:Tooltip? = Tooltip.Builder(containerView.context)
+            .anchor(containerView,100,70,false)
+            .text(getString(R.string.tooltip_open_player_message))
+            .maxWidth(metrics.widthPixels / 2)
+            .arrow(false)
+            .floatingAnimation(Tooltip.Animation.DEFAULT)
+            .showDuration(3000)
+            .overlay(true)
+            .create()
+
+        tooltip
+            ?.doOnHidden {
+                tooltip = null
+                isShownTooltip = true
+            }
+            ?.show(containerView.rootView, gravity, true)
+    }
 }

app/src/main/java/com/allsoftdroid/audiobook/utility/OnSwipeTouchListener.kt

@@ -0,0 +1,75 @@
+package com.allsoftdroid.audiobook.utility
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.view.GestureDetector
+import android.view.MotionEvent
+import android.view.View
+import kotlin.math.abs
+
+open class OnSwipeTouchListener(ctx: Context) : View.OnTouchListener {
+
+    private val gestureDetector: GestureDetector
+
+    companion object {
+
+        private const val SWIPE_THRESHOLD = 100
+        private const val SWIPE_VELOCITY_THRESHOLD = 100
+    }
+
+    init {
+        gestureDetector = GestureDetector(ctx, GestureListener())
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        return gestureDetector.onTouchEvent(event)
+    }
+
+    private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
+
+
+        override fun onDown(e: MotionEvent): Boolean {
+            return true
+        }
+
+        override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float, velocityY: Float): Boolean {
+            var result = false
+            try {
+                val diffY = e2.y - e1.y
+                val diffX = e2.x - e1.x
+                if (abs(diffX) > abs(diffY)) {
+                    if (abs(diffX) > SWIPE_THRESHOLD && abs(velocityX) > SWIPE_VELOCITY_THRESHOLD) {
+                        if (diffX > 0) {
+                            onSwipeRight()
+                        } else {
+                            onSwipeLeft()
+                        }
+                        result = true
+                    }
+                } else if (abs(diffY) > SWIPE_THRESHOLD && abs(velocityY) > SWIPE_VELOCITY_THRESHOLD) {
+                    if (diffY > 0) {
+                        onSwipeBottom()
+                    } else {
+                        onSwipeTop()
+                    }
+                    result = true
+                }
+            } catch (exception: Exception) {
+                exception.printStackTrace()
+            }
+
+            return result
+        }
+
+
+    }
+
+    open fun onSwipeRight() {}
+
+    open fun onSwipeLeft() {}
+
+    open fun onSwipeTop() {}
+
+    open fun onSwipeBottom() {}
+}

app/src/main/res/values/strings.xml

@@ -2,4 +2,5 @@
     <string name="app_name">AudioBook</string>
     <string name="title_feature_book">Feature Book</string>
     <string name="title_feature_downloader">Download Feature</string>
+    <string name="tooltip_open_player_message">Swipe up to open player</string>
 </resources>

common/src/main/java/com/allsoftdroid/common/base/store/audioPlayer/AudioPlayerEvent.kt

@@ -13,6 +13,7 @@ data class Pause(val result: AudioPlayerEventState) : AudioPlayerEvent()
 data class EmptyEvent(val default: AudioPlayerEventState):AudioPlayerEvent()
 object Rewind : AudioPlayerEvent()
 object Forward : AudioPlayerEvent()
+object Finished : AudioPlayerEvent()
 
 //Details or information event for the player and UI
 data class PlaySelectedTrack(val trackList : List<AudioPlayListItem>,val bookId:String,val bookName:String, val position:Int) : AudioPlayerEvent()

common/src/main/java/com/allsoftdroid/common/base/utils/BindingUtils.kt

@@ -17,7 +17,7 @@ object BindingUtils {
     }
 
     private fun getCurrentDate():String{
-        val format = SimpleDateFormat("yyyy.MM.dd")
+        val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
         return format.format(date)
     }
 
@@ -57,8 +57,10 @@ object BindingUtils {
                 "${result.year - 70}y"
             } else if (result.month > 0) {
                 "${1 + result.month}m"
-            } else {
-                "${result.date}d"
+            } else if (result.date>1){
+                "${result.date-1}d"
+            }else {
+                "${result.hours}hr"
             }
 
         } catch (e: Exception) {

database/src/main/java/com/allsoftdroid/database/bookListDB/DatabaseEntities.kt

@@ -21,7 +21,10 @@ data class DatabaseAudioBook(
     var creator : String?,
 
     @ColumnInfo(name = "published_date")
-    var date: String?
+    var date: String?,
+
+    @ColumnInfo(name = "added_date")
+    var addeddate: String?
 ){
-    constructor() : this("","","","")
+    constructor() : this("","","","","")
 }

database/src/main/java/com/allsoftdroid/database/common/AudioBookDatabase.kt

@@ -27,7 +27,7 @@ import com.allsoftdroid.database.networkCacheDB.NetworkCacheDao
         DatabaseNetworkResponseEntity::class,
         DatabaseListenLaterEntity::class
     ],
-    version = 7 ,
+    version = 8 ,
     exportSchema = false)
 abstract class AudioBookDatabase : RoomDatabase(){
 

feature_book/src/main/java/com/allsoftdroid/feature_book/data/databaseExtension/DatabaseEntities.kt

@@ -13,7 +13,8 @@ fun List<DatabaseAudioBook>.asBookDomainModel():List<AudioBookDomainModel>{
             mId = it.identifier,
             title = it.title,
             creator = it.creator,
-            date = it.date
+            date = it.date,
+            addeddate = it.addeddate?:""
         )
     }
 }
@@ -23,6 +24,7 @@ fun DatabaseAudioBook.toBookDomainModel():AudioBookDomainModel{
         mId = identifier,
         title = title,
         creator = creator,
-        date = date
+        date = date,
+        addeddate = addeddate?:""
     )
 }

feature_book/src/main/java/com/allsoftdroid/feature_book/data/model/AudioBookDataModel.kt

@@ -7,7 +7,8 @@ internal data class AudioBookDataModel(
     val identifier: String,
     val title: String,
     val creator: Any?,
-    val date: String
+    val date: String,
+    val addeddate:String
 )
 
 internal fun AudioBookDataModel.toDomainModel(): AudioBookDomainModel {
@@ -16,7 +17,8 @@ internal fun AudioBookDataModel.toDomainModel(): AudioBookDomainModel {
         mId = this.identifier,
         title = this.title,
         creator = this.creator?.toString()?:"N/A",
-        date = this.date
+        date = this.date,
+        addeddate = this.addeddate
     )
 }
 
@@ -27,6 +29,7 @@ internal fun AudioBookDataModel.toDatabaseModel(): DatabaseAudioBook {
         identifier = this.identifier,
         title = this.title,
         creator = this.creator?.toString()?:"N/A",
-        date = this.date
+        date = this.date,
+        addeddate = this.addeddate
     )
 }

feature_book/src/main/java/com/allsoftdroid/feature_book/data/network/Utils.kt

@@ -3,7 +3,7 @@ package com.allsoftdroid.feature_book.data.network
 class Utils {
     object Books{
         private const val BASE_URL = "https://archive.org/"
-        private const val FILTER_MOST_RECENT = "+AND+mediatype%3A(audio)&fl[]=creator,date,identifier,title&sort[]=-date&output=json"
+        private const val FILTER_MOST_RECENT = "+AND+mediatype%3A(audio)&fl[]=creator,date,identifier,title,addeddate&sort[]=-date&output=json"
         private const val QUERY="librivox"
         private const val COLLECTIONS="librivoxaudio"
         private const val OUTPUT_FIELDS = "fl[]=creator,date,identifier,title&sort[]=-date&output=json"

feature_book/src/main/java/com/allsoftdroid/feature_book/domain/model/AudioBookDomainModel.kt

@@ -4,5 +4,6 @@ data class AudioBookDomainModel(
     val mId: String,
     val title: String,
     val creator: String?,
-    val date: String?
+    val date: String?,
+    val addeddate:String
 )

feature_book/src/main/java/com/allsoftdroid/feature_book/utils/BindingUtils.kt

@@ -81,7 +81,7 @@ fun TextView.setBookDescription(item: AudioBookDomainModel?){
     item?.let {
         text = getNormalizedText(
             "- by ${formattedCreators(it.creator)},  ${convertDateToTime(
-                it.date,
+                it.addeddate?:it.date,
                 this.context
             )}", 70
         )

feature_book/src/test/java/com/allsoftdroid/feature_book/data/dataSource/FakeAudioDataSource.kt

@@ -19,7 +19,7 @@ class FakeAudioDataSource(var bookList: MutableList<DatabaseAudioBook> = mutable
             if(it.identifier == identifier) return it
         }
 
-        return DatabaseAudioBook(identifier="",title = "",creator = "",date = "")
+        return DatabaseAudioBook(identifier="",title = "",creator = "",date = "",addeddate = "")
     }
 
     override fun insert(book: DatabaseAudioBook) {

feature_book/src/test/java/com/allsoftdroid/feature_book/data/repository/FakeAudioBookRepository.kt

@@ -28,7 +28,7 @@ class FakeAudioBookRepository(private val manualFailure:Boolean = false) : Audio
     override suspend fun fetchBookList(page: Int) {
         if(!manualFailure){
             val list = ArrayList<AudioBookDomainModel>()
-            list.add(AudioBookDomainModel("1","Title","creator","2019"))
+            list.add(AudioBookDomainModel("1","Title","creator","2019","2020-06-01T11:22:00"))
 
             audioBooks.value = list