add browser option to show media as a list

befora · Aug 27, 2018 · e5ce678 · e5ce678
1 parent 725fdc2
commit e5ce678
Show file tree

Hide file tree

Showing 24 changed files with 383 additions and 68 deletions.
diff --git a/app/src/main/java/com/sethchhim/kuboo_client/Constants.kt b/app/src/main/java/com/sethchhim/kuboo_client/Constants.kt
@@ -24,6 +24,7 @@ object Constants {
     internal const val ARG_TRANSITION_URL = "ARG_TRANSITION_URL"
 
     internal const val KEY_APP_THEME = "KEY_APP_THEME"
+    internal const val KEY_BROWSER_MEDIA_FORCE_LIST = "KEY_BROWSER_MEDIA_FORCE_LIST"
     internal const val KEY_BROWSER_IMMERSIVE = "KEY_BROWSER_IMMERSIVE"
     internal const val KEY_DOWNLOAD_SAVE_PATH = "KEY_DOWNLOAD_SAVE_PATH"
     internal const val KEY_DOWNLOAD_TRACKING_INTERVAL = "KEY_DOWNLOAD_TRACKING_INTERVAL"

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/Extensions.kt b/app/src/main/java/com/sethchhim/kuboo_client/Extensions.kt
@@ -407,7 +407,10 @@ object Extensions {
 
     internal fun Book.getBrowserContentType() =
             when (isBrowserMediaType()) {
-                true -> BrowserContentType.MEDIA
+                true -> when (Settings.BROWSER_MEDIA_FORCE_LIST) {
+                    true -> BrowserContentType.MEDIA_FORCE_LIST
+                    false -> BrowserContentType.MEDIA
+                }
                 false -> BrowserContentType.FOLDER
             }
 

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/Settings.kt b/app/src/main/java/com/sethchhim/kuboo_client/Settings.kt
@@ -42,6 +42,7 @@ object Settings {
     var MARK_FINISHED = false
     var PREVIEW = true
     var REVERSE_LAYOUT = false
+    var BROWSER_MEDIA_FORCE_LIST = true
 
     const val SHARED_ELEMENT_TRANSITION_DURATION = 350L //Screen rotation delay before animation.
     const val RECYCLER_VIEW_DELAY = 600L

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/data/model/Browser.kt b/app/src/main/java/com/sethchhim/kuboo_client/data/model/Browser.kt
@@ -10,6 +10,7 @@ class Browser(var type: Int, var book: Book) : MultiItemEntity {
     companion object {
         const val FOLDER = 1
         const val MEDIA = 2
+        const val MEDIA_FORCE_LIST = 3
     }
 
     override fun getItemType(): Int {

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/data/repository/BrowserRepository.kt b/app/src/main/java/com/sethchhim/kuboo_client/data/repository/BrowserRepository.kt
@@ -2,6 +2,7 @@ package com.sethchhim.kuboo_client.data.repository
 
 import android.os.Parcelable
 import com.sethchhim.kuboo_client.Extensions.isFileType
+import com.sethchhim.kuboo_client.Settings
 import com.sethchhim.kuboo_client.data.model.Browser
 import com.sethchhim.kuboo_remote.model.Book
 import timber.log.Timber
@@ -15,7 +16,10 @@ class BrowserRepository {
         contentList.clear()
         list.forEach {
             when (it.isFileType()) {
-                true -> contentList.add(Browser(Browser.MEDIA, it))
+                true -> when (Settings.BROWSER_MEDIA_FORCE_LIST) {
+                    true -> contentList.add(Browser(Browser.MEDIA_FORCE_LIST, it))
+                    false -> contentList.add(Browser(Browser.MEDIA, it))
+                }
                 false -> contentList.add(Browser(Browser.FOLDER, it))
             }
         }

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/MainActivity.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/MainActivity.kt
@@ -84,6 +84,7 @@ open class MainActivity : MainActivityImpl3_Service(), BottomNavigationView.OnNa
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_main, menu)
+        browserLayoutMenuItem = menu.findItem(R.id.main_action_browser_layout)
         downloadMenuItem = menu.findItem(R.id.main_action_download)
         httpsMenuItem = menu.findItem(R.id.main_action_https)
         markFinishedAddMenuItem = menu.findItem(R.id.main_action_mark_finished_add)
@@ -189,6 +190,7 @@ open class MainActivity : MainActivityImpl3_Service(), BottomNavigationView.OnNa
         when (item.itemId) {
             R.id.main_overflow_about -> showActivityAbout()
             R.id.main_overflow_log -> showActivityLog()
+            R.id.main_action_browser_layout -> toggleBrowserLayout()
             R.id.main_action_https -> showDialogHttps()
             R.id.main_action_download -> startSelectionDownload()
             R.id.main_action_mark_finished_add -> startSelectionAddFinished()

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/MainActivityImpl0_View.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/MainActivityImpl0_View.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Intent
 import android.support.design.widget.BottomNavigationView
 import android.support.v4.app.Fragment
+import android.support.v4.content.ContextCompat
 import android.support.v7.widget.SearchView
 import android.support.v7.widget.Toolbar
 import android.view.MenuItem
@@ -12,10 +13,12 @@ import android.widget.TextView
 import butterknife.BindView
 import com.sethchhim.kuboo_client.Extensions.show
 import com.sethchhim.kuboo_client.R
+import com.sethchhim.kuboo_client.Settings
 import com.sethchhim.kuboo_client.ui.about.AboutActivity
 import com.sethchhim.kuboo_client.ui.base.BaseActivity
 import com.sethchhim.kuboo_client.ui.log.LogActivity
 import com.sethchhim.kuboo_client.ui.main.browser.*
+import com.sethchhim.kuboo_client.ui.main.browser.custom.BrowserContentType
 import com.sethchhim.kuboo_client.ui.main.downloads.DownloadsFragment
 import com.sethchhim.kuboo_client.ui.main.home.HomeFragment
 import com.sethchhim.kuboo_client.ui.main.home.HomeFragmentImpl1_Content
@@ -50,6 +53,7 @@ open class MainActivityImpl0_View : BaseActivity() {
     @BindView(R.id.main_layout_base_toolBar) lateinit var toolbar: Toolbar
     @BindView(R.id.main_layout_base_frameLayout) lateinit var frameLayout: FrameLayout
 
+    internal lateinit var browserLayoutMenuItem: MenuItem
     internal lateinit var downloadMenuItem: MenuItem
     internal lateinit var httpsMenuItem: MenuItem
     internal lateinit var markFinishedAddMenuItem: MenuItem
@@ -76,12 +80,14 @@ open class MainActivityImpl0_View : BaseActivity() {
     }
 
     internal fun setStateDisconnected(response: Response?) {
+        hideMenuItemBrowserLayout()
         hideMenuItemSearch()
         hideMenuItemHttps()
         showFragmentFail(response)
     }
 
     internal fun setStateLoading() {
+        hideMenuItemBrowserLayout()
         hideMenuItemSearch()
         hideMenuItemHttps()
         showFragmentLoading()
@@ -182,6 +188,10 @@ open class MainActivityImpl0_View : BaseActivity() {
 
     protected fun getSelectedBrowserTitle() = "${getString(R.string.main_selected)} (${viewModel.getSelectedListSize()})"
 
+    internal fun hideMenuItemBrowserLayout() {
+        if (::browserLayoutMenuItem.isInitialized && browserLayoutMenuItem.isVisible) browserLayoutMenuItem.isVisible = false
+    }
+
     protected fun hideMenuItemHttps() {
         if (::httpsMenuItem.isInitialized && httpsMenuItem.isVisible) httpsMenuItem.isVisible = false
     }
@@ -192,6 +202,10 @@ open class MainActivityImpl0_View : BaseActivity() {
 
     private fun showFragmentFail(response: Response?) = supportFragmentManager.show(FailFragment.newInstance(response), R.id.main_layout_base_frameLayout)
 
+    private fun showMenuItemBrowserLayout() {
+        if (::browserLayoutMenuItem.isInitialized && !browserLayoutMenuItem.isVisible) browserLayoutMenuItem.isVisible = true
+    }
+
     private fun showMenuItemHttps() {
         if (::httpsMenuItem.isInitialized && !httpsMenuItem.isVisible) httpsMenuItem.isVisible = true
     }
@@ -200,9 +214,38 @@ open class MainActivityImpl0_View : BaseActivity() {
         if (::searchMenuItem.isInitialized && !searchMenuItem.isVisible) searchMenuItem.isVisible = true
     }
 
+    internal fun toggleMenuItemBrowserLayout(browserContentType: BrowserContentType) {
+        if (::browserLayoutMenuItem.isInitialized) {
+            when (browserContentType) {
+                BrowserContentType.MEDIA -> {
+                    browserLayoutMenuItem.icon = ContextCompat.getDrawable(this, R.drawable.ic_view_list_white_24dp)
+                    showMenuItemBrowserLayout()
+                }
+                BrowserContentType.MEDIA_FORCE_LIST -> {
+                    browserLayoutMenuItem.icon = ContextCompat.getDrawable(this, R.drawable.ic_view_module_white_24dp)
+                    showMenuItemBrowserLayout()
+                }
+                else -> hideMenuItemBrowserLayout()
+            }
+        }
+    }
+
     protected fun toggleMenuItemHttps() = when (viewModel.isConnectedEncrypted()) {
         true -> showMenuItemHttps()
         false -> hideMenuItemHttps()
     }
 
+    protected fun toggleBrowserLayout() {
+        Settings.BROWSER_MEDIA_FORCE_LIST = !Settings.BROWSER_MEDIA_FORCE_LIST
+        sharedPrefsHelper.saveBrowserMediaForceList()
+        (getCurrentFragment() as? BrowserBaseFragment)?.let {
+            it.contentRecyclerView.contentType = when (Settings.BROWSER_MEDIA_FORCE_LIST) {
+                true -> BrowserContentType.MEDIA_FORCE_LIST
+                false -> BrowserContentType.MEDIA
+            }
+            toggleMenuItemBrowserLayout(it.contentRecyclerView.contentType)
+            it.onSwipeRefresh()
+        }
+    }
+
 }
diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/MainActivityImpl2_Selection.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/MainActivityImpl2_Selection.kt
@@ -89,13 +89,16 @@ open class MainActivityImpl2_Selection : MainActivityImpl1_Content() {
 
     private fun resetAllColorState() = (getCurrentFragment() as? BrowserBaseFragment)?.contentAdapter?.resetAllColorState()
 
+    private fun getBrowserContentType() = (getCurrentFragment() as? BrowserBaseFragment)?.contentRecyclerView?.contentType
+
     private fun setSelectionMenuStateSelected() {
         title = getSelectedBrowserTitle()
         downloadMenuItem.visible()
         searchMenuItem.gone()
         markFinishedDeleteMenuItem.visible()
         markFinishedAddMenuItem.visible()
 
+        hideMenuItemBrowserLayout()
         hideMenuItemHttps()
     }
 
@@ -106,6 +109,7 @@ open class MainActivityImpl2_Selection : MainActivityImpl1_Content() {
         markFinishedDeleteMenuItem.gone()
         markFinishedAddMenuItem.gone()
 
+        getBrowserContentType()?.let { toggleMenuItemBrowserLayout(it) }
         toggleMenuItemHttps()
     }
 

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserBaseFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserBaseFragment.kt
@@ -42,6 +42,11 @@ open class BrowserBaseFragment : BrowserBaseFragmentImpl1_Content() {
         isFirstInstance = false
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        mainActivity.hideMenuItemBrowserLayout()
+    }
+
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
         setContentSpanCount(newConfig.orientation, contentRecyclerView.contentType)

diff --git a/.../main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserBaseFragmentImpl1_Content.kt b/.../main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserBaseFragmentImpl1_Content.kt
@@ -10,6 +10,7 @@ import com.sethchhim.kuboo_client.Settings
 import com.sethchhim.kuboo_client.ui.main.browser.adapter.BrowserContentAdapter
 import com.sethchhim.kuboo_client.ui.main.browser.adapter.BrowserPathAdapter
 import com.sethchhim.kuboo_client.ui.main.browser.custom.BrowserContentType.MEDIA
+import com.sethchhim.kuboo_client.ui.main.browser.custom.BrowserContentType.MEDIA_FORCE_LIST
 import com.sethchhim.kuboo_client.ui.main.browser.handler.PaginationHandler
 import com.sethchhim.kuboo_remote.model.Book
 import com.sethchhim.kuboo_remote.model.Pagination
@@ -70,7 +71,10 @@ open class BrowserBaseFragmentImpl1_Content : BrowserBaseFragmentImpl0_View() {
         }
 
         setStateConnected()
-        setContentSpanCount(resources.configuration.orientation, book.getBrowserContentType())
+
+        val browserContentType = book.getBrowserContentType()
+        setContentSpanCount(resources.configuration.orientation, browserContentType)
+        mainActivity.toggleMenuItemBrowserLayout(browserContentType)
         populatePaginationLinks(book, newResult)
         contentAdapter.update(newResult)
         if (loadState) loadRecyclerViewState(book)
@@ -106,8 +110,15 @@ open class BrowserBaseFragmentImpl1_Content : BrowserBaseFragmentImpl0_View() {
     private fun onPopulateMediaSuccess(book: Book?, result: List<Book>) {
         Timber.i("onPopulateMediaSuccess result: ${result.size}")
         setStateConnected()
-        setContentSpanCount(resources.configuration.orientation, MEDIA)
-        book?.let { populatePaginationLinks(it, result) }
+        setContentSpanCount(resources.configuration.orientation, when (Settings.BROWSER_MEDIA_FORCE_LIST) {
+            true -> MEDIA_FORCE_LIST
+            false -> MEDIA
+        })
+
+        book?.let {
+            populatePaginationLinks(it, result)
+            mainActivity.toggleMenuItemBrowserLayout(book.getBrowserContentType())
+        }
         contentAdapter.update(result)
     }
 
@@ -133,4 +144,8 @@ open class BrowserBaseFragmentImpl1_Content : BrowserBaseFragmentImpl0_View() {
         }
     }
 
+    open fun onSwipeRefresh() {
+        //override in children
+    }
+
 }
diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserLatestFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserLatestFragment.kt
@@ -3,7 +3,9 @@ package com.sethchhim.kuboo_client.ui.main.browser
 import android.arch.lifecycle.Observer
 import android.os.Bundle
 import android.view.View
+import com.sethchhim.kuboo_client.Constants.URL_PATH_LATEST
 import com.sethchhim.kuboo_client.Extensions.gone
+import com.sethchhim.kuboo_remote.model.Book
 
 class BrowserLatestFragment : BrowserBaseFragment() {
 
@@ -22,9 +24,14 @@ class BrowserLatestFragment : BrowserBaseFragment() {
         setStateLoading()
         resetRecyclerView()
         paginationHandler.reset()
-        viewModel.getLatestListFromServer().observe(this, Observer { handleMediaResult(null, it) })
+        viewModel.getLatestListFromServer().observe(this, Observer {
+            val book = Book().apply { linkSubsection = URL_PATH_LATEST }
+            handleMediaResult(book, it)
+        })
     }
 
-    private fun onSwipeRefresh() = populateLatest()
-
+    override fun onSwipeRefresh() {
+        super.onSwipeRefresh()
+        populateLatest()
+    }
 }
diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserRecentFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserRecentFragment.kt
@@ -3,7 +3,9 @@ package com.sethchhim.kuboo_client.ui.main.browser
 import android.arch.lifecycle.Observer
 import android.os.Bundle
 import android.view.View
+import com.sethchhim.kuboo_client.Constants
 import com.sethchhim.kuboo_client.Extensions.gone
+import com.sethchhim.kuboo_remote.model.Book
 
 class BrowserRecentFragment : BrowserBaseFragment() {
 
@@ -22,9 +24,14 @@ class BrowserRecentFragment : BrowserBaseFragment() {
         setStateLoading()
         resetRecyclerView()
         paginationHandler.reset()
-        viewModel.getRecentListFromDao().observe(this, Observer { handleMediaResult(null, it) })
+        viewModel.getRecentListFromDao().observe(this, Observer {
+            val book = Book().apply { linkSubsection = Constants.URL_PATH_GRID_DIRECTORY }
+            handleMediaResult(book, it)
+        })
     }
 
-    private fun onSwipeRefresh() = populateRecent()
-
+    override fun onSwipeRefresh() {
+        super.onSwipeRefresh()
+        populateRecent()
+    }
 }
diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserRemoteFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserRemoteFragment.kt
@@ -52,7 +52,8 @@ class BrowserRemoteFragment : BrowserBaseFragment() {
         }
     }
 
-    private fun onSwipeRefresh() {
+    override fun onSwipeRefresh() {
+        super.onSwipeRefresh()
         val book = viewModel.getCurrentBook()
         when (book != null) {
             true -> {
@@ -62,5 +63,4 @@ class BrowserRemoteFragment : BrowserBaseFragment() {
             false -> Timber.e("No licenseList available to populate swipe refresh!")
         }
     }
-
 }
diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserSearchFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserSearchFragment.kt
@@ -3,8 +3,10 @@ package com.sethchhim.kuboo_client.ui.main.browser
 import android.arch.lifecycle.Observer
 import android.os.Bundle
 import android.view.View
+import com.sethchhim.kuboo_client.Constants
 import com.sethchhim.kuboo_client.Constants.ARG_SEARCH
 import com.sethchhim.kuboo_client.Extensions.gone
+import com.sethchhim.kuboo_remote.model.Book
 
 class BrowserSearchFragment : BrowserBaseFragment() {
 
@@ -24,13 +26,19 @@ class BrowserSearchFragment : BrowserBaseFragment() {
         populateSearch()
     }
 
-    private fun onSwipeRefresh() = populateSearch()
+    override fun onSwipeRefresh() {
+        super.onSwipeRefresh()
+        populateSearch()
+    }
 
     private fun populateSearch() {
         setStateLoading()
         resetRecyclerView()
         paginationHandler.reset()
-        viewModel.getListByQuery(stringQuery).observe(this, Observer { result -> handleMediaResult(null, result) })
+        viewModel.getListByQuery(stringQuery).observe(this, Observer { result ->
+            val book = Book().apply { linkSubsection = "${Constants.URL_PATH_SEARCH}$stringQuery" }
+            handleMediaResult(book, result)
+        })
     }
 
     companion object {

diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserSeriesFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/main/browser/BrowserSeriesFragment.kt
@@ -23,15 +23,20 @@ class BrowserSeriesFragment : BrowserBaseFragment() {
         populateSeries()
     }
 
-    private fun onSwipeRefresh() = populateSeries()
+    override fun onSwipeRefresh() {
+        super.onSwipeRefresh()
+        populateSeries()
+    }
 
     private fun populateSeries() {
         setStateLoading()
         resetRecyclerView()
         paginationHandler.reset()
         val stringUrl = viewModel.getActiveServer() + seriesBook.linkXmlPath
-        val book = Book().apply { linkSubsection = seriesBook.linkXmlPath }
-        viewModel.getListByUrl(stringUrl).observe(this, Observer { result -> handleMediaResult(book, result) })
+        viewModel.getListByUrl(stringUrl).observe(this, Observer { result ->
+            val book = Book().apply { linkSubsection = seriesBook.linkXmlPath }
+            handleMediaResult(book, result)
+        })
     }
 
     companion object {