aboutsummaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorSize432015-06-10 21:22:16 +0200
committerSize432015-06-10 21:22:16 +0200
commit1fa2fca7e8cc32c30f159badaedd2d43f9fe802e (patch)
tree3ca9d005e0b6bc80ce222c14309f40713a6315fe /app/src
parentMerge branch 'master' of http://github.com/camilstaps/RSSin (diff)
Highlighting hamburger menu items
Diffstat (limited to 'app/src')
-rwxr-xr-xapp/src/main/res/drawable/menuitem.xml8
-rwxr-xr-xapp/src/main/res/drawable/navigation_drawer_item_selector.xml20
-rwxr-xr-xapp/src/main/res/drawable/navigation_drawer_separator_selector.xml20
-rwxr-xr-x[-rw-r--r--]app/src/main/res/drawable/separator.xml1
-rwxr-xr-xapp/src/main/res/layout/item_navigation_drawer.xml2
-rwxr-xr-x[-rw-r--r--]app/src/main/res/values/styles.xml6
6 files changed, 16 insertions, 41 deletions
diff --git a/app/src/main/res/drawable/menuitem.xml b/app/src/main/res/drawable/menuitem.xml
new file mode 100755
index 0000000..34baaf5
--- /dev/null
+++ b/app/src/main/res/drawable/menuitem.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:state_activated="true" android:drawable="@color/menuitem_activated"/>
+ <item android:state_focused="true" android:drawable="@color/menuitem_focused"/>
+ <item android:state_pressed="true" android:drawable="@color/menuitem_pressed"/>
+ <item android:drawable="@color/menuitem"/>
+</selector> \ No newline at end of file
diff --git a/app/src/main/res/drawable/navigation_drawer_item_selector.xml b/app/src/main/res/drawable/navigation_drawer_item_selector.xml
deleted file mode 100755
index 4672bbb..0000000
--- a/app/src/main/res/drawable/navigation_drawer_item_selector.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_pressed="true">
- <shape>
- <solid android:color="#757575" />
- </shape>
- </item>
- <item
- android:state_activated="true">
- <shape>
- <solid android:color="#454545" />
- </shape>
- </item>
- <item>
- <shape>
- <solid android:color="#121212" />
- </shape>
- </item>
-</selector> \ No newline at end of file
diff --git a/app/src/main/res/drawable/navigation_drawer_separator_selector.xml b/app/src/main/res/drawable/navigation_drawer_separator_selector.xml
deleted file mode 100755
index 516b1e0..0000000
--- a/app/src/main/res/drawable/navigation_drawer_separator_selector.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_pressed="true">
- <shape>
- <solid android:color="#555555" />
- </shape>
- </item>
- <item
- android:state_activated="true">
- <shape>
- <solid android:color="#343434" />
- </shape>
- </item>
- <item>
- <shape>
- <solid android:color="#252525" />
- </shape>
- </item>
-</selector> \ No newline at end of file
diff --git a/app/src/main/res/drawable/separator.xml b/app/src/main/res/drawable/separator.xml
index 28e9a5e..4da44ad 100644..100755
--- a/app/src/main/res/drawable/separator.xml
+++ b/app/src/main/res/drawable/separator.xml
@@ -2,6 +2,7 @@
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_activated="true" android:drawable="@color/separator_activated"/>
<item android:state_focused="true" android:drawable="@color/separator_focused"/>
<item android:state_pressed="true" android:drawable="@color/separator_pressed"/>
<item android:drawable="@color/separator"/>
diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml
index e1e996c..6185af8 100755
--- a/app/src/main/res/layout/item_navigation_drawer.xml
+++ b/app/src/main/res/layout/item_navigation_drawer.xml
@@ -25,7 +25,7 @@
android:layout_alignParentLeft="true"
android:orientation="vertical"
android:layout_marginTop="0dp"
- android:background="@drawable/navigation_drawer_item_selector">
+ android:background="@drawable/menuitem">
<TextView
android:id="@+id/item_navigation_drawer_text"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5cf726d..fd8a498 100644..100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,6 +26,12 @@
<color name="loading">#ffc400</color>
<color name="separator">#353535</color>
+ <color name="separator_activated">#555555</color>
<color name="separator_focused">#757575</color>
<color name="separator_pressed">@color/separator_focused</color>
+
+ <color name="menuitem">#121212</color>
+ <color name="menuitem_activated">#555555</color>
+ <color name="menuitem_focused">#757575</color>
+ <color name="menuitem_pressed">@color/menuitem_focused</color>
</resources>