From 45de2b8f245a767a368c6af60a193474285c8ebe Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 11 Feb 2015 15:54:04 +0300
Subject: more drawer-y sidebar with header and adjusted row styles

---
 .../src/main/res/layout/drawer_header.xml          | 46 ++++++++++++++++++++++
 org.fox.ttrss/src/main/res/layout/feeds_goback.xml |  6 +--
 org.fox.ttrss/src/main/res/layout/feeds_row.xml    | 12 +++---
 .../src/main/res/layout/feeds_row_selected.xml     | 12 +++---
 org.fox.ttrss/src/main/res/layout/headlines.xml    |  2 +-
 org.fox.ttrss/src/main/res/values/style.xml        |  0
 org.fox.ttrss/src/main/res/xml/preferences.xml     |  4 +-
 7 files changed, 64 insertions(+), 18 deletions(-)
 create mode 100755 org.fox.ttrss/src/main/res/layout/drawer_header.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/feeds_goback.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/feeds_row.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/layout/headlines.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/values/style.xml
 mode change 100644 => 100755 org.fox.ttrss/src/main/res/xml/preferences.xml

(limited to 'org.fox.ttrss/src/main/res')

diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
new file mode 100755
index 00000000..f60cd3ea
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="96dp"
+    android:orientation="vertical"
+    android:background="?articleHeader"
+    android:weightSum="1">
+
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="56dp"
+        android:orientation="vertical"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+
+        <TextView
+            android:id="@+id/drawer_header_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:textColor="?articleHeaderTextColor"
+            android:text="test"
+            android:textSize="14sp"
+            android:textStyle="bold"
+
+            />
+
+        <TextView
+            android:id="@+id/drawer_header_server"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?articleHeaderTextColor"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="5dp"
+            android:text="example.org"
+            android:textSize="14sp"
+            android:textStyle="normal"
+
+            />
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
old mode 100644
new mode 100755
index bace3d5f..39525829
--- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml
@@ -23,17 +23,17 @@
         android:src="@drawable/ic_unpublished" />
 
     <TextView
-        android:fontFamily="sans-serif-light"
+        android:fontFamily="sans-serif-medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="16dp"
+        android:paddingLeft="40dp"
         android:singleLine="true"
         android:text=".."
         android:paddingBottom="2dp"
         android:textColor="?feedlistTextColor"
-        android:textSize="18sp" />
+        android:textSize="14sp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
old mode 100644
new mode 100755
index 362dffa9..3cb5433f
--- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml
@@ -19,25 +19,26 @@
         android:layout_height="16dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_unpublished" />
+        android:src="@drawable/ic_menu_published_dark" />
 
     <TextView
         android:id="@+id/title"
-        android:fontFamily="sans-serif-light"
+        android:fontFamily="sans-serif-medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="16dp"
+        android:paddingLeft="40dp"
         android:singleLine="true"
         android:text="Feed"
         android:paddingBottom="2dp"
         android:textColor="?feedlistTextColor"
-        android:textSize="18sp" />
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/unread_counter"
+        android:fontFamily="sans-serif-medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
@@ -45,8 +46,7 @@
         android:text="3200"
         android:layout_marginLeft="16dp"
         android:textColor="?unreadCounterColor"
-        android:textSize="14sp"
-        android:textStyle="bold" />
+        android:textSize="14sp" />
 
     <ImageButton
         android:id="@+id/feed_menu_button"
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
old mode 100644
new mode 100755
index 77c3f59e..eacf3e96
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -20,25 +20,26 @@
         android:layout_height="16dp"
         android:layout_weight="0"
         android:scaleType="fitXY"
-        android:src="@drawable/ic_unpublished" />
+        android:src="@drawable/ic_menu_published_dark" />
 
     <TextView
         android:id="@+id/title"
-        android:fontFamily="sans-serif-light"
+        android:fontFamily="sans-serif-medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:layout_weight="1"
         android:ellipsize="end"
-        android:paddingLeft="16dp"
+        android:paddingLeft="40dp"
         android:singleLine="true"
         android:text="Feed"
         android:paddingBottom="2dp"
         android:textColor="?feedlistSelectedTextColor"
-        android:textSize="18sp" />
+        android:textSize="14sp" />
 
     <TextView
         android:id="@+id/unread_counter"
+        android:fontFamily="sans-serif-medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
@@ -46,8 +47,7 @@
         android:text="3200"
         android:layout_marginLeft="16dp"
         android:textColor="?unreadCounterColor"
-        android:textSize="14sp"
-        android:textStyle="bold" />
+        android:textSize="14sp" />
 
     <ImageButton
         android:id="@+id/feed_menu_button"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines.xml b/org.fox.ttrss/src/main/res/layout/headlines.xml
old mode 100644
new mode 100755
index 36270e01..f62822dd
--- a/org.fox.ttrss/src/main/res/layout/headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines.xml
@@ -16,7 +16,7 @@
 
         <FrameLayout
             android:id="@+id/feeds_fragment"
-            android:layout_width="240dp"
+            android:layout_width="match_parent"
             android:layout_gravity="start"
             android:background="?feedlistBackground"
             android:layout_height="match_parent" >
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
old mode 100644
new mode 100755
diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml
old mode 100644
new mode 100755
index 682224c1..a97c2566
--- a/org.fox.ttrss/src/main/res/xml/preferences.xml
+++ b/org.fox.ttrss/src/main/res/xml/preferences.xml
@@ -64,10 +64,10 @@
             android:defaultValue="false"
             android:key="sort_feeds_by_unread"
             android:title="@string/sort_feeds_by_unread" />
-        <CheckBoxPreference
+        <!-- <CheckBoxPreference
             android:defaultValue="false"
             android:key="download_feed_icons"
-            android:title="@string/download_feed_icons" />
+            android:title="@string/download_feed_icons" /> -->
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="enable_cats"
-- 
cgit v1.2.3