From ed23c6c7801d34b4e5e3348dc0fb47b05fcc7c92 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Wed, 10 Jun 2015 21:04:46 +0200
Subject: Several minor fixes

---
 app/src/main/res/drawable/separator.xml            |  9 ++++++
 app/src/main/res/layout/item_navigation_drawer.xml |  2 +-
 .../res/layout/separator_navigation_drawer.xml     | 35 +++++++++++-----------
 app/src/main/res/values/strings.xml                |  8 ++---
 app/src/main/res/values/styles.xml                 |  4 +++
 5 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 app/src/main/res/drawable/separator.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/separator.xml b/app/src/main/res/drawable/separator.xml
new file mode 100644
index 0000000..28e9a5e
--- /dev/null
+++ b/app/src/main/res/drawable/separator.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <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"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_navigation_drawer.xml b/app/src/main/res/layout/item_navigation_drawer.xml
index 4c56384..86ce8cd 100644
--- a/app/src/main/res/layout/item_navigation_drawer.xml
+++ b/app/src/main/res/layout/item_navigation_drawer.xml
@@ -21,9 +21,9 @@
     android:id="@+id/itemLayout"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
+    android:layout_alignParentStart="true"
     android:layout_alignParentLeft="true"
     android:orientation="vertical"
-
     android:layout_marginTop="0dp"
     android:background="#121212">
 
diff --git a/app/src/main/res/layout/separator_navigation_drawer.xml b/app/src/main/res/layout/separator_navigation_drawer.xml
index 99936ab..ad8baff 100644
--- a/app/src/main/res/layout/separator_navigation_drawer.xml
+++ b/app/src/main/res/layout/separator_navigation_drawer.xml
@@ -17,42 +17,43 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 -->
 <LinearLayout
-xmlns:android="http://schemas.android.com/apk/res/android"
-android:id="@+id/itemLayout"
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:layout_alignParentLeft="true"
-android:orientation="vertical"
-android:layout_marginTop="0dp"
-android:background="#252525"
-    >
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/itemLayout"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentStart="true"
+    android:orientation="vertical"
+    android:layout_marginTop="0dp">
 
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:minHeight="35dp"
-        >
+        android:background="@drawable/separator">
 
         <TextView
             android:id="@+id/separator_navigation_drawer_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#FFFFFF"
-            />
+            android:textSize="@dimen/font_size_small"/>
 
         <TextView
             android:id="@+id/separator_navigation_drawer_edit"
             android:layout_alignParentRight="true"
-            android:layout_gravity="right"
+            android:layout_alignParentEnd="true"
+            android:layout_gravity="center_vertical|end"
+            android:gravity="center_vertical|end"
             android:layout_marginRight="8dp"
+            android:layout_marginEnd="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="4dp"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#FFFFFF"
-            />
+            android:textSize="@dimen/font_size_small"/>
+
     </RelativeLayout>
 
     <View
@@ -62,8 +63,6 @@ android:background="#252525"
         android:layout_marginTop="1dp"
         android:layout_marginLeft="0dp"
         android:layout_marginRight="0dp"
-        android:background="#DADADC"
-
-        ></View>
+        android:background="#DADADC"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b2194e3..8591d7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,14 +92,14 @@
     <string name="walkthrough_text_5">Image 5 resource.</string>
     <string name="walkthrough_text_button">Skip tutorial</string>
     <string name="navigation_drawer_all_feeds">All feeds</string>
-    <string name="navigation_drawer_start">START</string>
-    <string name="navigation_drawer_edit_filters">FILTERS</string>
-    <string name="navigation_drawer_edit_feeds">FEEDS</string>
+    <string name="navigation_drawer_start">Start</string>
+    <string name="navigation_drawer_edit_filters">Filters</string>
+    <string name="navigation_drawer_edit_feeds">Feeds</string>
     <string name="article_feedback_saved">Feedback saved.</string>
     <string name="feeds_activity_add_feed">Add feed</string>
     <string name="feeds_activity_url">URL:</string>
     <string name="filter_settings_title">Title</string>
     <string name="filter_settings_new_title">New title:</string>
     <string name="menu_article_share">Share</string>
-    <string name="navigation_drawer_edit_text">(EDIT)</string>
+    <string name="navigation_drawer_edit_text">EDIT</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5554027..5cf726d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,4 +24,8 @@
     </style>
 
     <color name="loading">#ffc400</color>
+
+    <color name="separator">#353535</color>
+    <color name="separator_focused">#757575</color>
+    <color name="separator_pressed">@color/separator_focused</color>
 </resources>
-- 
cgit v1.2.3