Layout changes and optimizations

4 files changed, 17 insertions, 28 deletions

diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml
index e942d1b08..38f4f21aa 100644
--- a/app/src/main/res/layout/nav_feedlistitem.xml
+++ b/app/src/main/res/layout/nav_feedlistitem.xml
@@ -18,8 +18,8 @@
         android:adjustViewBounds="true"
         android:cropToPadding="true"
         android:scaleType="fitXY"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
         tools:src="@drawable/ic_stat_antenna_default"
         tools:background="@android:color/holo_green_dark"/>
@@ -36,8 +36,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding"
-        android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding"
         android:layout_marginRight="@dimen/listitem_icon_rightpadding"
         android:layout_toRightOf="@id/imgvCover"
         tools:text="Navigation feed item title"
diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml
index 8c46e456d..e366a65b2 100644
--- a/app/src/main/res/layout/nav_list.xml
+++ b/app/src/main/res/layout/nav_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_layout"
     android:layout_width="@dimen/drawer_width"
@@ -12,7 +13,7 @@
     <ListView
         android:id="@+id/nav_list"
         android:layout_width="@dimen/drawer_width"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:choiceMode="singleChoice"
         android:clipToPadding="false"
@@ -24,17 +25,11 @@
         tools:listitem="@layout/nav_listitem"
         tools:background="@android:color/holo_purple" />
 
-    <View
-        android:layout_width="@dimen/drawer_width"
-        android:layout_height="1dp"
-        android:layout_centerVertical="true"
-        android:background="?android:attr/listDivider"
-        tools:background="@android:color/holo_red_dark" />
-
     <LinearLayout
         android:id="@+id/nav_settings"
         android:layout_width="@dimen/drawer_width"
         android:layout_height="@dimen/listitem_iconwithtext_height"
+        android:layout_alignParentBottom="true"
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/settings_label"
         android:orientation="horizontal">
@@ -45,9 +40,9 @@
             android:layout_height="@dimen/thumbnail_length_navlist"
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
-            android:layout_marginBottom="8dp"
+            android:layout_marginBottom="4dp"
             android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="4dp"
             android:adjustViewBounds="true"
             android:contentDescription="@string/cover_label"
             android:cropToPadding="true"
@@ -58,10 +53,10 @@
             tools:background="@android:color/holo_orange_dark" />
 
         <TextView
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_margin="16dp"
+            android:layout_marginLeft="16dp"
             android:layout_weight="1"
             android:gravity="center_vertical"
             android:text="@string/settings_label"
@@ -71,4 +66,4 @@
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml
index bb5865ee6..d62672c34 100644
--- a/app/src/main/res/layout/nav_listitem.xml
+++ b/app/src/main/res/layout/nav_listitem.xml
@@ -16,11 +16,11 @@
         android:layout_centerVertical="true"
         android:adjustViewBounds="true"
         android:cropToPadding="true"
-        android:scaleType="centerCrop"
-        android:padding="8dp"
+        android:scaleType="centerInside"
+        android:padding="4dp"
         android:layout_marginLeft="@dimen/listitem_icon_leftpadding"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginTop="4dp"
+        android:layout_marginBottom="4dp"
         tools:src="@drawable/ic_new_releases_white_24dp"
         tools:background="@android:color/holo_green_dark"/>
 
@@ -36,8 +36,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding"
-        android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding"
-        android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding"
         android:layout_marginRight="48dp"
         android:layout_toRightOf="@id/imgvCover"
         tools:text="Navigation item title"
@@ -52,8 +50,6 @@
         android:textColor="?android:attr/textColorTertiary"
         android:textSize="@dimen/text_size_navdrawer"
         android:layout_marginLeft="12dp"
-        android:layout_marginTop="14dp"
-        android:layout_marginBottom="14dp"
         android:layout_marginRight="@dimen/listitem_icon_rightpadding"
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml
index 77b2ff253..fa1db865d 100644
--- a/app/src/main/res/layout/nav_section_item.xml
+++ b/app/src/main/res/layout/nav_section_item.xml
@@ -3,7 +3,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="24dp"
+    android:layout_height="16dp"
     android:background="@android:color/transparent"
     android:orientation="vertical">