diff --git a/app/build.gradle b/app/build.gradle
index 6b272b21ae..cf15138ddb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,7 +113,7 @@ dependencies {
// Android support library
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
- implementation 'com.google.android.material:material:1.0.0'
+ implementation 'com.google.android.material:material:1.2.0-alpha04'
implementation 'androidx.recyclerview:recyclerview:1.1.0'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.annotation:annotation:1.1.0'
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index 842733af35..2dde9c1836 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -3,6 +3,7 @@ package eu.kanade.tachiyomi.ui.library
import android.content.Context
import android.content.res.Configuration
import android.graphics.Color
+import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.Menu
@@ -11,6 +12,7 @@ import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.view.WindowInsets
+import android.view.WindowManager
import android.view.inputmethod.InputMethodManager
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode
@@ -41,6 +43,7 @@ import eu.kanade.tachiyomi.ui.base.controller.SecondaryDrawerController
import eu.kanade.tachiyomi.ui.base.controller.TabbedController
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.ui.category.CategoryController
+import eu.kanade.tachiyomi.ui.download.DownloadController
import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaController
import eu.kanade.tachiyomi.ui.migration.MigrationController
@@ -443,9 +446,6 @@ class LibraryController(
searchView.clearFocus()
}
- // Mutate the filter icon because it needs to be tinted and the resource is shared.
- menu.findItem(R.id.action_filter).icon.mutate()
-
searchViewSubscription?.unsubscribe()
searchViewSubscription = searchView.queryTextChanges()
// Ignore events if this controller isn't at the top
@@ -468,8 +468,10 @@ class LibraryController(
val filterItem = menu.findItem(R.id.action_filter)
// Tint icon if there's a filter active
- val filterColor = if (navView.hasActiveFilters()) Color.rgb(255, 238, 7) else Color.WHITE
- DrawableCompat.setTint(filterItem.icon, filterColor)
+ if (navView.hasActiveFilters())
+ DrawableCompat.setTint(filterItem.icon, Color.rgb(255, 238, 7))
+ else
+ DrawableCompat.clearColorFilter(filterItem.icon)
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -481,6 +483,9 @@ class LibraryController(
R.id.action_edit_categories -> {
router.pushController(CategoryController().withFadeTransaction())
}
+ R.id.action_downloads -> {
+ router.pushController(DownloadController().withFadeTransaction())
+ }
R.id.action_source_migration -> {
router.pushController(MigrationController().withFadeTransaction())
}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
index d34c7a0c11..e90bfb4095 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
@@ -1,6 +1,5 @@
package eu.kanade.tachiyomi.ui.main
-import android.animation.ObjectAnimator
import android.app.SearchManager
import android.content.Intent
import android.content.res.Configuration
@@ -8,12 +7,12 @@ import android.graphics.Color
import android.graphics.Rect
import android.os.Build
import android.os.Bundle
+import android.provider.Settings
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.webkit.WebView
import android.widget.FrameLayout
-import android.widget.LinearLayout
import android.widget.TextView
import androidx.appcompat.graphics.drawable.DrawerArrowDrawable
import androidx.biometric.BiometricManager
@@ -126,7 +125,7 @@ open class MainActivity : BaseActivity() {
setSupportActionBar(toolbar)
drawerArrow = DrawerArrowDrawable(this)
- drawerArrow?.color = Color.WHITE
+ drawerArrow?.color = getResourceColor(R.attr.actionBarTintColor)
toolbar.navigationIcon = drawerArrow
tabAnimator = TabsAnimator(tabs)
@@ -158,9 +157,33 @@ open class MainActivity : BaseActivity() {
true
}
+ navigationView.setOnNavigationItemSelectedListener { item ->
+ val id = item.itemId
+
+ val currentRoot = router.backstack.firstOrNull()
+ if (currentRoot?.tag()?.toIntOrNull() != id) {
+ when (id) {
+ R.id.nav_drawer_library -> setRoot(LibraryController(), id)
+ R.id.nav_drawer_recent_updates -> setRoot(RecentChaptersController(), id)
+ R.id.nav_drawer_recently_read -> setRoot(RecentlyReadController(), id)
+ R.id.nav_drawer_catalogues -> setRoot(CatalogueController(), id)
+ R.id.nav_drawer_extensions -> setRoot(ExtensionController(), id)
+ R.id.nav_drawer_downloads -> {
+ setRoot(DownloadController(), id)
+ }
+ R.id.nav_drawer_settings -> {
+ setRoot(SettingsMainController(), id)
+ }
+ R.id.nav_drawer_help -> {
+ openInBrowser(URL_HELP)
+ }
+ }
+ }
+ true
+ }
val container: ViewGroup = findViewById(R.id.controller_container)
- val content: LinearLayout = findViewById(R.id.main_content)
+ val content: ViewGroup = findViewById(R.id.main_content)
container.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
@@ -209,6 +232,8 @@ open class MainActivity : BaseActivity() {
if (Build.VERSION.SDK_INT >= 26 && currentNightMode == Configuration.UI_MODE_NIGHT_NO) {
content.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
}
+// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && currentNightMode == Configuration.UI_MODE_NIGHT_NO) {
+// content.systemUiVisibility = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
val drawerContainer: FrameLayout = findViewById(R.id.drawer_container)
drawerContainer.setOnApplyWindowInsetsListener { v, insets ->
@@ -273,6 +298,23 @@ open class MainActivity : BaseActivity() {
setExtensionsBadge()
}
+ override fun startSupportActionMode(callback: androidx.appcompat.view.ActionMode.Callback): androidx.appcompat.view.ActionMode? {
+ window?.statusBarColor = getResourceColor(R.attr.colorPrimary)
+ return super.startSupportActionMode(callback)
+ }
+
+ override fun onSupportActionModeFinished(mode: androidx.appcompat.view.ActionMode) {
+ launchUI {
+ val scale = Settings.Global.getFloat(contentResolver, Settings.Global
+ .ANIMATOR_DURATION_SCALE, 1.0f)
+ val duration = resources.getInteger(android.R.integer.config_mediumAnimTime) * scale
+ delay(duration.toLong())
+ delay(100)
+ window?.statusBarColor = Color.TRANSPARENT
+ }
+ super.onSupportActionModeFinished(mode)
+ }
+
private fun setExtensionsBadge() {
val extUpdateText: TextView = nav_view.menu.findItem(
@@ -283,10 +325,12 @@ open class MainActivity : BaseActivity() {
if (updates > 0) {
extUpdateText.text = updates.toString()
extUpdateText.visible()
+ navigationView.getOrCreateBadge(R.id.nav_drawer_settings).number = updates
}
else {
extUpdateText.text = null
extUpdateText.gone()
+ navigationView.getOrCreateBadge(R.id.nav_drawer_settings).clearNumber()
}
}
@@ -390,8 +434,8 @@ open class MainActivity : BaseActivity() {
val backstackSize = router.backstackSize
if (drawer.isDrawerOpen(GravityCompat.START) || drawer.isDrawerOpen(GravityCompat.END)) {
drawer.closeDrawers()
- } else if (backstackSize == 1 && router.getControllerWithTag("$startScreenId") == null) {
- setSelectedDrawerItem(startScreenId)
+ //} else if (backstackSize == 1 && router.getControllerWithTag("$startScreenId") == null) {
+ // setSelectedDrawerItem(startScreenId)
} else if (!router.handleBack()) {
unlocked = false
super.onBackPressed()
@@ -401,7 +445,9 @@ open class MainActivity : BaseActivity() {
fun setSelectedDrawerItem(itemId: Int) {
if (!isFinishing) {
nav_view.setCheckedItem(itemId)
+ navigationView.selectedItemId = itemId
nav_view.menu.performIdentifierAction(itemId, 0)
+ //navigationView.menu.performIdentifierAction(itemId, 0)
}
}
@@ -441,13 +487,16 @@ open class MainActivity : BaseActivity() {
}
val showHamburger = router.backstackSize == 1
+ drawer.setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
if (showHamburger) {
- drawer.setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_UNLOCKED)
+ toolbar.navigationIcon = null
+ //drawer.setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_UNLOCKED)
} else {
- drawer.setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+ toolbar.navigationIcon = drawerArrow
+ // drawer.setDrawerLockMode(androidx.drawerlayout.widget.DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
}
-
- ObjectAnimator.ofFloat(drawerArrow, "progress", if (showHamburger) 0f else 1f).start()
+ drawerArrow?.progress = 1f
+ //ObjectAnimator.ofFloat(drawerArrow, "alpha", if (showHamburger) 0f else 1f).start()
if (from is TabbedController) {
from.cleanupTabs(tabs)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
index 2ac8ea26ca..34cb4ab6c1 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsMainController.kt
@@ -1,17 +1,39 @@
package eu.kanade.tachiyomi.ui.setting
import androidx.preference.PreferenceScreen
+import com.bluelinelabs.conductor.Controller
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.preference.PreferenceKeys
+import eu.kanade.tachiyomi.data.preference.PreferencesHelper
+import eu.kanade.tachiyomi.data.preference.getOrDefault
+import eu.kanade.tachiyomi.data.track.TrackManager
import eu.kanade.tachiyomi.data.updater.UpdaterJob
import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
import eu.kanade.tachiyomi.util.system.getResourceColor
+import eu.kanade.tachiyomi.ui.extension.ExtensionController
+import uy.kohesive.injekt.injectLazy
class SettingsMainController : SettingsController() {
override fun setupPreferenceScreen(screen: PreferenceScreen) = with(screen) {
titleRes = R.string.label_settings
val tintColor = context.getResourceColor(R.attr.colorAccent)
+ val preferencesH: PreferencesHelper by injectLazy()
+
+ val updateCount = preferencesH.extensionUpdatesCount().getOrDefault()
+ preference {
+ iconRes = R.drawable.ic_extension_black_24dp
+ iconTint = tintColor
+ if (updateCount == 0) {
+ titleRes = R.string.label_extensions
+ }
+ else {
+ title = "${resources?.getString(R.string.label_extensions)} ${resources
+ ?.getQuantityString(R.plurals.extensions_updates_pendings, updateCount,
+ updateCount)}"
+ }
+ onClick { navigateTo(ExtensionController()) }
+ }
preference {
iconRes = R.drawable.ic_tune_black_24dp
@@ -63,7 +85,7 @@ class SettingsMainController : SettingsController() {
}
}
- private fun navigateTo(controller: SettingsController) {
+ private fun navigateTo(controller: Controller) {
router.pushController(controller.withFadeTransaction())
}
}
diff --git a/app/src/main/res/drawable/action_mode_bg.xml b/app/src/main/res/drawable/action_mode_bg.xml
new file mode 100644
index 0000000000..297a3310c1
--- /dev/null
+++ b/app/src/main/res/drawable/action_mode_bg.xml
@@ -0,0 +1,17 @@
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_nav_item_selector.xml b/app/src/main/res/drawable/bottom_nav_item_selector.xml
new file mode 100644
index 0000000000..e4e0225719
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_nav_item_selector.xml
@@ -0,0 +1,10 @@
+
+
+