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 eea2358b2f..e6f67e9032 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,7 +1,6 @@
package eu.kanade.tachiyomi.ui.main
import android.content.Intent
-import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v4.view.GravityCompat
@@ -14,8 +13,6 @@ import eu.kanade.tachiyomi.ui.download.DownloadFragment
import eu.kanade.tachiyomi.ui.library.LibraryFragment
import eu.kanade.tachiyomi.ui.recent.RecentChaptersFragment
import eu.kanade.tachiyomi.ui.setting.SettingsActivity
-import eu.kanade.tachiyomi.util.getResourceColor
-import eu.kanade.tachiyomi.util.setVectorCompat
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.toolbar.*
@@ -31,22 +28,17 @@ class MainActivity : BaseActivity() {
return
}
- // Inflate activity_edit_categories.xml.
+ // Inflate activity_main.xml.
setContentView(R.layout.activity_main)
// Handle Toolbar
setupToolbar(toolbar, backNavigation = false)
supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_menu_white_24dp)
- if (Build.VERSION.SDK_INT >= 21) {
- window.statusBarColor = android.R.color.transparent
- }
-
// Set behavior of Navigation drawer
nav_view.setNavigationItemSelectedListener { item ->
// Make information view invisible
- image_view.setImageResource(android.R.color.transparent)
- text_label.text = ""
+ empty_view.hide()
when (item.itemId) {
R.id.nav_drawer_library -> setFragment(LibraryFragment.newInstance())
@@ -91,12 +83,6 @@ class MainActivity : BaseActivity() {
}
fun updateEmptyView(show: Boolean, textResource: Int, drawable: Int) {
- if (show) {
- image_view.setVectorCompat(drawable, theme.getResourceColor(android.R.attr.textColorHint))
- text_label.text = getString(textResource)
- } else {
- image_view.setImageResource(android.R.color.transparent)
- text_label.text = ""
- }
+ if (show) empty_view.show(drawable, textResource) else empty_view.hide()
}
}
\ No newline at end of file
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
new file mode 100644
index 0000000000..0a3e8eb236
--- /dev/null
+++ b/app/src/main/java/eu/kanade/tachiyomi/widget/EmptyView.kt
@@ -0,0 +1,36 @@
+package eu.kanade.tachiyomi.widget
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.RelativeLayout
+import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.util.getResourceColor
+import eu.kanade.tachiyomi.util.setVectorCompat
+import kotlinx.android.synthetic.main.view_empty.view.*
+
+class EmptyView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
+ RelativeLayout (context, attrs) {
+
+ init {
+ inflate(context, R.layout.view_empty, this)
+ }
+
+ /**
+ * Hide the information view
+ */
+ fun hide() {
+ this.visibility = View.GONE
+ }
+
+ /**
+ * Show the information view
+ * @param drawable icon of information view
+ * @param textResource text of information view
+ */
+ fun show(drawable: Int, textResource: Int) {
+ image_view.setVectorCompat(drawable, context.theme.getResourceColor(android.R.attr.textColorHint))
+ text_label.text = context.getString(textResource)
+ this.visibility = View.VISIBLE
+ }
+}
diff --git a/app/src/main/res/drawable-v21/library_item_selector_dark.xml b/app/src/main/res/drawable-v21/library_item_selector_dark.xml
new file mode 100644
index 0000000000..e78c6ec16e
--- /dev/null
+++ b/app/src/main/res/drawable-v21/library_item_selector_dark.xml
@@ -0,0 +1,23 @@
+
+
+ -
+
+
-
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-v21/library_item_selector_light.xml b/app/src/main/res/drawable-v21/library_item_selector_light.xml
new file mode 100644
index 0000000000..c85ee39136
--- /dev/null
+++ b/app/src/main/res/drawable-v21/library_item_selector_light.xml
@@ -0,0 +1,23 @@
+
+
+ -
+
+
-
+
+
+
+ -
+
+
+
+ -
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-v21/list_item_selector_dark.xml b/app/src/main/res/drawable-v21/list_item_selector_dark.xml
index d1152832e7..3757b9bf58 100644
--- a/app/src/main/res/drawable-v21/list_item_selector_dark.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_dark.xml
@@ -14,7 +14,7 @@
-
-
+
diff --git a/app/src/main/res/drawable-v21/list_item_selector_light.xml b/app/src/main/res/drawable-v21/list_item_selector_light.xml
index d17e5bf434..ab9d9b675b 100644
--- a/app/src/main/res/drawable-v21/list_item_selector_light.xml
+++ b/app/src/main/res/drawable-v21/list_item_selector_light.xml
@@ -14,7 +14,7 @@
-
-
+
diff --git a/app/src/main/res/drawable/library_item_selector_dark.xml b/app/src/main/res/drawable/library_item_selector_dark.xml
new file mode 100644
index 0000000000..73de4df076
--- /dev/null
+++ b/app/src/main/res/drawable/library_item_selector_dark.xml
@@ -0,0 +1,10 @@
+
+
+
+ - true
- - ?colorPrimaryDark
- - @style/Theme.ActionBar
- - @style/ThemeOverlay.AppCompat.Light
+ - @style/Theme.ActionBar.Light
- @style/PreferenceThemeOverlay.v14.Material
- @drawable/list_item_selector_light
+ - @drawable/library_item_selector_light
- @drawable/line_divider_light
@@ -58,7 +57,6 @@
- true
- - ?colorPrimaryDark
- @style/ThemeOverlay.AppCompat.Dark.ActionBar
- @style/ThemeOverlay.AppCompat
- @style/PreferenceThemeOverlay.v14.Material
@@ -66,6 +64,7 @@
- @style/Theme.Widget.NavigationView.Dark
- @drawable/list_item_selector_dark
+ - @drawable/library_item_selector_dark
- @drawable/line_divider_dark