Merge pull request #140 from pravinyo/fix_time_bug

Fix time bug
pravinyo · Jun 2, 2020 · 543019e · 543019e
2 parents b7beb68 + d69c9cd
commit 543019e
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 103 deletions.
diff --git a/common/src/main/java/com/allsoftdroid/common/base/utils/BindingUtils.kt b/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) {

diff --git a/database/src/main/java/com/allsoftdroid/database/bookListDB/DatabaseEntities.kt b/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("","","","","")
 }
diff --git a/database/src/main/java/com/allsoftdroid/database/common/AudioBookDatabase.kt b/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(){
 

diff --git a/...ok/src/main/java/com/allsoftdroid/feature_book/data/databaseExtension/DatabaseEntities.kt b/...ok/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?:""
     )
 }
diff --git a/feature_book/src/main/java/com/allsoftdroid/feature_book/data/model/AudioBookDataModel.kt b/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
     )
 }
diff --git a/feature_book/src/main/java/com/allsoftdroid/feature_book/data/network/Utils.kt b/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"

diff --git a/...ure_book/src/main/java/com/allsoftdroid/feature_book/domain/model/AudioBookDomainModel.kt b/...ure_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
 )
diff --git a/feature_book/src/main/java/com/allsoftdroid/feature_book/utils/BindingUtils.kt b/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
         )

diff --git a/...e_book/src/test/java/com/allsoftdroid/feature_book/data/dataSource/FakeAudioDataSource.kt b/...e_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) {

diff --git a/...ok/src/test/java/com/allsoftdroid/feature_book/data/repository/FakeAudioBookRepository.kt b/...ok/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
 

diff --git a/...re_settings/src/main/java/com/allsoftdroid/audiobook/feature_settings/SettingsFragment.kt b/...re_settings/src/main/java/com/allsoftdroid/audiobook/feature_settings/SettingsFragment.kt
@@ -4,7 +4,6 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import com.allsoftdroid.audiobook.feature_settings.model.Feedback
@@ -21,13 +20,6 @@ class SettingsFragment : PreferenceFragmentCompat(), KoinComponent {
 
     private val userActionEventStore:UserActionEventStore by inject()
 
-    private val DOWNLOADS_FOLDER_CODE = 9999
-    private val standardDirectory = listOf<String>(
-        Environment.DIRECTORY_DOWNLOADS,
-        Environment.DIRECTORY_DOCUMENTS,
-        Environment.DIRECTORY_MUSIC,
-        Environment.DIRECTORY_MOVIES)
-
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings_preferences,rootKey)
 
@@ -131,85 +123,6 @@ class SettingsFragment : PreferenceFragmentCompat(), KoinComponent {
 
             val folder = "/$path/${ArchiveUtils.AppFolderName}/"
             downloadPref?.summary = folder
-
-//            val downloadHelpPref = findPreference<Preference>(SettingsPreferenceUtils.DOWNLOADS_HELP_KEY)
-//            downloadHelpPref?.setOnPreferenceClickListener {
-//                showAllowedFolderDialog()
-//                return@setOnPreferenceClickListener true
-//            }
-
         }
     }
-
-//    private fun showAllowedFolderDialog() {
-//        val builder = AlertDialog.Builder(this.requireActivity())
-//
-//        builder.setTitle("Folders allowed")
-//        builder.setMessage(TextUtils.join("\n",standardDirectory))
-//
-//        builder.setNegativeButton("Dismiss"){
-//                dialog,_ ->
-//            dialog.dismiss()
-//        }
-//
-//        val dialog = builder.create()
-//
-//        dialog.show()
-//    }
-//
-
-//    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-//        super.onActivityResult(requestCode, resultCode, data)
-//
-//        when(requestCode){
-//            DOWNLOADS_FOLDER_CODE -> {
-//
-//                data?.let {intent ->
-//                    val treeUri = intent.data
-//                    Timber.d("URL is $treeUri")
-//
-//                    activity?.let {activity ->
-//                        treeUri?.let {folderUri ->
-//
-//                            val root = Environment.getExternalStorageDirectory().path
-//                            Timber.d("Root is $root")
-//
-//                            val folderPath = folderUri
-//                                .toString()
-//                                .replace("%3A",":")
-//                                .replace("%2F","/")
-//                                .split(":")
-//                                .last()
-//                            Timber.d("Folder Path returned: $folderPath")
-//
-//                            val folder = folderPath.substring(root.length+1)
-//                            Timber.d("sub folder is : $folder")
-//
-//                            val directory = folder.split("/")[0]
-//
-//                            if(inStandardDirectory(directory)){
-//                                ArchiveUtils.setDownloadsRootFolder(activity.application,folderUri.toString())
-//                                this.findNavController()
-//                                    .navigate(R.id.SettingsFragment,null,NavOptions.Builder()
-//                                        .setPopUpTo(R.id.SettingsFragment,true)
-//                                        .build())
-//                            }else{
-//                                Toast.makeText(activity,"Please Press i for allowed directory",Toast.LENGTH_SHORT).show()
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//
-//            else ->{}
-//        }
-//    }
-
-//    private fun inStandardDirectory(directory: String): Boolean {
-//
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-//            if(directory == Environment.DIRECTORY_AUDIOBOOKS)  return true
-//        }
-//        return standardDirectory.contains(directory)
-//    }
 }