Merge pull request #103 from pravinyo/my_books_ui_layout

My books feature

Author: pravinyo

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

@@ -259,7 +259,6 @@ class MainActivity : BaseActivity() {
                 layoutParams = layout
             }
         }
-
     }
 
     private fun performAction(event: AudioPlayerEvent){
@@ -321,7 +320,6 @@ class MainActivity : BaseActivity() {
         stopAudioService()
         disposables.dispose()
         downloader.Destroy()
-        AppModule.unloadModule()
     }
 
     private fun stopAudioService(){

common/src/main/res/navigation/nav_graph.xml

@@ -38,8 +38,11 @@
 
     <fragment
         android:id="@+id/MyBooksFragment"
-        android:name="com.allsoftdroid.audiobook.feature_mybooks.MyBooksFragment"
+        android:name="com.allsoftdroid.audiobook.feature_mybooks.presentation.MyBooksFragment"
         android:label="MyBooksFragment">
+        <action
+            android:id="@+id/action_MyBooksFragment_to_AudioBookDetailsFragment"
+            app:destination="@id/AudioBookDetailsFragment"/>
     </fragment>
 
     <fragment

database/src/main/java/com/allsoftdroid/database/metadataCacheDB/MetadataDao.kt

@@ -23,6 +23,9 @@ interface MetadataDao{
     @Query("SELECT * FROM metadata_table where metadata_id=:bookId")
     fun getMetadata( bookId : String):LiveData<DatabaseMetadataEntity>
 
+    @Query("SELECT * FROM metadata_table where metadata_id=:bookId")
+    fun getMetadataNonLive( bookId : String):DatabaseMetadataEntity
+
     /**
      * Get album details for the specified audio book
      * @param metadata_id unique id given to audio book
@@ -50,6 +53,9 @@ interface MetadataDao{
     @Query("SELECT * FROM MediaTrack_Table where track_album_id=:metadata_id and format like '%' || :formatContains || '%'")
     fun getTrackDetails(metadata_id:String,formatContains:String):LiveData<List<DatabaseTrackEntity>>
 
+    @Query("SELECT * FROM MediaTrack_Table where track_album_id=:metadata_id and format like '%' || :formatContains || '%'")
+    fun getTrackDetailsNonLive(metadata_id:String,formatContains:String):List<DatabaseTrackEntity>
+
     /**
      * get list of  media VBR track files for the given album id . here album id is same as metadata id so we will
      * use complex sql queries to get VBR files

feature_book/src/main/java/com/allsoftdroid/feature_book/presentation/AudioBookListFragment.kt

@@ -274,9 +274,4 @@ class AudioBookListFragment : BaseUIFragment(){
             }
         }
     }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        FeatureBookModule.unLoadModules()
-    }
 }

feature_book_details/src/main/java/com/allsoftdroid/feature/book_details/di/BookDetailsModule.kt

@@ -115,15 +115,15 @@ object BookDetailsModule {
 
         factory {
             MetadataRepositoryImpl(
-                metadataDao = get(),
+                metadataDao = get(named(name = METADATA_DAO)),
                 bookId = getProperty(PROPERTY_BOOK_ID),
                 metadataDataSource = get(),
                 saveInDatabase = get(named(name = METADATA_DATABASE))) as IMetadataRepository
         }
 
         factory {
             TrackListRepositoryImpl(
-                metadataDao = get(),
+                metadataDao = get(named(name = METADATA_DAO)),
                 bookId = getProperty(PROPERTY_BOOK_ID)
             ) as ITrackListRepository
         }
@@ -158,7 +158,7 @@ object BookDetailsModule {
             AudioBookDatabase.getDatabase(get()).listenLaterDao()
         }
 
-        single {
+        single(named(name = METADATA_DAO)) {
             AudioBookDatabase.getDatabase(get()).metadataDao()
         }
 
@@ -167,7 +167,7 @@ object BookDetailsModule {
         }
 
         single(named(name = METADATA_DATABASE)) {
-            SaveMetadataInDatabase.setup(metadataDao = get()) as SaveInDatabase<MetadataDao,SaveMetadataInDatabase>
+            SaveMetadataInDatabase.setup(metadataDao = get(named(name = METADATA_DAO))) as SaveInDatabase<MetadataDao,SaveMetadataInDatabase>
         }
 
         single {
@@ -185,4 +185,5 @@ object BookDetailsModule {
 
     const val PROPERTY_BOOK_ID = "bookDetails_book_id"
     private const val METADATA_DATABASE = "SaveMetadataInDatabase"
+    private const val METADATA_DAO ="MetadataDao_BookDetailsModule"
 }

feature_book_details/src/test/java/com/allsoftdroid/feature/book_details/utils/FakeAudioDataSource.kt

@@ -2,6 +2,7 @@ package com.allsoftdroid.feature.book_details.utils
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import com.allsoftdroid.common.test.getOrAwaitValue
 import com.allsoftdroid.database.metadataCacheDB.MetadataDao
 import com.allsoftdroid.database.metadataCacheDB.entity.DatabaseAlbumEntity
 import com.allsoftdroid.database.metadataCacheDB.entity.DatabaseMetadataEntity
@@ -17,6 +18,10 @@ class FakeMetadataSource(private val _metadataLiveData: MutableLiveData<Database
         return _metadataLiveData
     }
 
+    override fun getMetadataNonLive(bookId: String): DatabaseMetadataEntity {
+        return _metadataLiveData.getOrAwaitValue()
+    }
+
     override fun getAlbumDetails(metadata_id: String): LiveData<DatabaseAlbumEntity> {
 
         return _albumEntity
@@ -34,6 +39,13 @@ class FakeMetadataSource(private val _metadataLiveData: MutableLiveData<Database
         return _tracks
     }
 
+    override fun getTrackDetailsNonLive(
+        metadata_id: String,
+        formatContains: String
+    ): List<DatabaseTrackEntity> {
+        return _tracks.getOrAwaitValue()
+    }
+
     override fun getTrackDetailsVBR(metadata_id: String): LiveData<List<DatabaseTrackEntity>> {
         return _tracks
     }

feature_downloader/src/main/res/drawable/ic_close_circle.xml

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#ffffff" android:pathData="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z" />
+    <path android:fillColor="#673AB7" android:pathData="M12,2C17.53,2 22,6.47 22,12C22,17.53 17.53,22 12,22C6.47,22 2,17.53 2,12C2,6.47 6.47,2 12,2M15.59,7L12,10.59L8.41,7L7,8.41L10.59,12L7,15.59L8.41,17L12,13.41L15.59,17L17,15.59L13.41,12L17,8.41L15.59,7Z" />
 </vector>

feature_downloader/src/main/res/drawable/ic_delete.xml

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#ffffff" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
+    <path android:fillColor="#673AB7" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
 </vector>

feature_downloader/src/main/res/drawable/ic_file_music.xml

@@ -4,5 +4,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#ffffff" android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M9,16A2,2 0 0,0 7,18A2,2 0 0,0 9,20A2,2 0 0,0 11,18V13H14V11H10V16.27C9.71,16.1 9.36,16 9,16Z" />
+    <path android:fillColor="#673AB7" android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M9,16A2,2 0 0,0 7,18A2,2 0 0,0 9,20A2,2 0 0,0 11,18V13H14V11H10V16.27C9.71,16.1 9.36,16 9,16Z" />
 </vector>

feature_downloader/src/main/res/layout/activity_download_management.xml

@@ -2,7 +2,6 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
-    android:background="?attr/colorPrimary"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".presentation.DownloadManagementActivity">