From 89823f32f1e5fdac55e7dfc3487d6e2c99ff1cf1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 13 Nov 2014 21:42:10 +0300
Subject: implement compact headline mode

---
 .../src/main/res/layout/headlines_fragment.xml     |   2 -
 .../src/main/res/layout/headlines_row_compact.xml  | 119 ++++++++++++++++++++
 .../src/main/res/layout/headlines_row_selected.xml |   2 +-
 .../res/layout/headlines_row_selected_compact.xml  | 119 ++++++++++++++++++++
 .../res/layout/headlines_row_selected_unread.xml   |   2 +-
 .../headlines_row_selected_unread_compact.xml      | 120 +++++++++++++++++++++
 .../res/layout/headlines_row_unread_compact.xml    | 120 +++++++++++++++++++++
 7 files changed, 480 insertions(+), 4 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
 create mode 100644 org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml

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

diff --git a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
index 0473b915..1b9b58a8 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_fragment.xml
@@ -13,8 +13,6 @@
 	       android:id="@+id/headlines_list"
 	       android:layout_width="match_parent"
 	       android:layoutAnimation="@anim/layout_headline"
-	       android:dividerHeight="0dp"
-	       android:divider="@null"
 	       android:layout_height="match_parent" >
 	   </ListView>
 	</android.support.v4.widget.SwipeRefreshLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
new file mode 100644
index 00000000..63ff030b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines_row"
+    android:padding="8dp"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?headlineNormalBackground"
+    tools:ignore="HardcodedText" >
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:layout_gravity="center"
+        android:focusable="false" />
+
+    <LinearLayout
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:text="Sample entry title"
+            android:textColor="?headlineUnreadTextColor"
+            android:textSize="18sp"
+            android:layout_span="2" />
+
+        <TextView
+            android:id="@+id/excerpt"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="13sp"
+            android:layout_span="2" />
+
+        <LinearLayout
+            android:paddingTop="2dp"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-light"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                android:textColor="?headlineSecondaryTextColor"
+                android:textSize="12sp"
+                android:layout_weight="0.5" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/headline_footer"
+        android:orientation="vertical"
+        android:layout_weight="0"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:layout_weight="1"
+            android:text="Jan 01, 12:00, 1970"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp"
+            />
+
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="16dp"
+            android:layout_gravity="bottom|right"
+            android:layout_height="16dp"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:src="@drawable/ic_star_empty" />
+
+
+
+    </LinearLayout>
+
+    <!-- <ImageView
+        android:id="@+id/article_menu_button"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:layout_weight="0"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
index 6a66b3ad..a51ee13d 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml
@@ -150,7 +150,7 @@
                     android:gravity="center_vertical"
                     android:singleLine="true"
                     android:text="by Author"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?headlineSelectedSecondaryTextColor"
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
new file mode 100644
index 00000000..d6823d37
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines_row"
+    android:padding="8dp"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?headlineSelectedBackground"
+    tools:ignore="HardcodedText" >
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:layout_gravity="center"
+        android:focusable="false" />
+
+    <LinearLayout
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:text="Sample entry title"
+            android:textColor="?headlineSelectedTextColor"
+            android:textSize="18sp"
+            android:layout_span="2" />
+
+        <TextView
+            android:id="@+id/excerpt"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="13sp"
+            android:layout_span="2" />
+
+        <LinearLayout
+            android:paddingTop="2dp"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-light"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                android:textColor="?headlineSelectedSecondaryTextColor"
+                android:textSize="12sp"
+                android:layout_weight="0.5" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/headline_footer"
+        android:orientation="vertical"
+        android:layout_weight="0"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:layout_weight="1"
+            android:text="Jan 01, 12:00, 1970"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            />
+
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="16dp"
+            android:layout_gravity="bottom|right"
+            android:layout_height="16dp"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:src="@drawable/ic_star_empty" />
+
+
+
+    </LinearLayout>
+
+    <!-- <ImageView
+        android:id="@+id/article_menu_button"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:layout_weight="0"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
index 38538734..0c2a4dc8 100644
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml
@@ -151,7 +151,7 @@
                     android:gravity="center_vertical"
                     android:singleLine="true"
                     android:text="by Author"
-                    android:textColor="?headlineSecondaryTextColor"
+                    android:textColor="?headlineSelectedSecondaryTextColor"
                     android:textSize="12sp"
                     android:textStyle="italic" />
 
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
new file mode 100644
index 00000000..0a1bf830
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines_row"
+    android:padding="8dp"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?headlineSelectedBackground"
+    tools:ignore="HardcodedText" >
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:layout_gravity="center"
+        android:focusable="false" />
+
+    <LinearLayout
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:text="Sample entry title"
+            android:textColor="?headlineSelectedTextColor"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            android:layout_span="2" />
+
+        <TextView
+            android:id="@+id/excerpt"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?headlineSelectedExcerptTextColor"
+            android:textSize="13sp"
+            android:layout_span="2" />
+
+        <LinearLayout
+            android:paddingTop="2dp"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-light"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                android:textColor="?headlineSelectedSecondaryTextColor"
+                android:textSize="12sp"
+                android:layout_weight="0.5" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/headline_footer"
+        android:orientation="vertical"
+        android:layout_weight="0"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:layout_weight="1"
+            android:text="Jan 01, 12:00, 1970"
+            android:textColor="?headlineSelectedSecondaryTextColor"
+            android:textSize="12sp"
+            />
+
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="16dp"
+            android:layout_gravity="bottom|right"
+            android:layout_height="16dp"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:src="@drawable/ic_star_empty" />
+
+
+
+    </LinearLayout>
+
+    <!-- <ImageView
+        android:id="@+id/article_menu_button"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:layout_weight="0"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
new file mode 100644
index 00000000..ac9b2b81
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/headlines_row"
+    android:padding="8dp"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:background="?headlineUnreadBackground"
+    tools:ignore="HardcodedText" >
+
+    <CheckBox
+        android:id="@+id/selected"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:layout_gravity="center"
+        android:focusable="false" />
+
+    <LinearLayout
+        android:layout_weight="1"
+        android:orientation="vertical"
+        android:layout_gravity="center"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:text="Sample entry title"
+            android:textColor="?headlineUnreadTextColor"
+            android:textStyle="bold"
+            android:textSize="18sp"
+            android:layout_span="2" />
+
+        <TextView
+            android:id="@+id/excerpt"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
+            android:textColor="?headlineExcerptTextColor"
+            android:textSize="13sp"
+            android:layout_span="2" />
+
+        <LinearLayout
+            android:paddingTop="2dp"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:id="@+id/feed_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-light"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
+                android:textColor="?headlineSecondaryTextColor"
+                android:textSize="12sp"
+                android:layout_weight="0.5" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/headline_footer"
+        android:orientation="vertical"
+        android:layout_weight="0"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="sans-serif-light"
+            android:singleLine="true"
+            android:ellipsize="none"
+            android:layout_weight="1"
+            android:text="Jan 01, 12:00, 1970"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="12sp"
+            />
+
+
+        <ImageView
+            android:id="@+id/marked"
+            android:layout_width="16dp"
+            android:layout_gravity="bottom|right"
+            android:layout_height="16dp"
+            android:layout_weight="0"
+            android:clickable="true"
+            android:src="@drawable/ic_star_empty" />
+
+
+
+    </LinearLayout>
+
+    <!-- <ImageView
+        android:id="@+id/article_menu_button"
+        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="16dp"
+        android:layout_weight="0"
+        android:paddingLeft="4dp"
+        android:paddingRight="4dp"
+        android:src="@drawable/ic_action_overflow" /> -->
+
+
+</LinearLayout>
\ No newline at end of file
-- 
cgit v1.2.3