From 0b2345344bb16bdb70470b630008e194e3a0133c Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Sun, 21 Apr 2013 17:01:26 +0400
Subject: support actionbarsherlock

---
 res/layout/article_fragment.xml     | 182 ++++++++++++++++++------------------
 res/layout/headlines_row_unread.xml |  21 +----
 2 files changed, 92 insertions(+), 111 deletions(-)

(limited to 'res/layout')

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 611386dc..c39be6df 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,92 +1,92 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/article_fragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:padding="5sp" >
-
-    <org.fox.ttrss.TitleWebView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" >
-
-        <LinearLayout
-            android:id="@+id/article_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?linkColor"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/comments"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="24 comments"
-                android:textColor="?linkColor"
-                android:textSize="13sp" />
-
-            <TextView
-                    android:id="@+id/author"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:gravity="right"
-                    android:textStyle="italic"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-            
-            
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <TextView
-                    android:id="@+id/tags"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:text="{TAGS}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2"
-                    android:gravity="right"
-                    android:text="{DATE}"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp"
-                    android:textStyle="italic" />
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5sp"
-                android:layout_weight="0"
-                android:background="?horizontalDivider"
-                android:paddingTop="2dip" />
-        </LinearLayout>
-    </org.fox.ttrss.TitleWebView>
-
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/article_fragment"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:padding="5sp" >
+
+    <org.fox.ttrss.TitleWebView
+        android:id="@+id/content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_weight="1" >
+
+        <LinearLayout
+            android:id="@+id/article_header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:orientation="vertical" >
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="There are many variations of passages of Lorem Ipsum available"
+                android:textColor="?linkColor"
+                android:textSize="16sp" />
+
+            <TextView
+                android:id="@+id/comments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="24 comments"
+                android:textColor="?linkColor"
+                android:textSize="13sp" />
+
+            <TextView
+                    android:id="@+id/author"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:gravity="right"
+                    android:textStyle="italic"
+                    android:text="{Author}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="13sp" />
+            
+            
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" >
+
+                <TextView
+                    android:id="@+id/tags"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.7"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:text="{TAGS}"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="13sp" />
+
+                <TextView
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0.2"
+                    android:gravity="right"
+                    android:text="{DATE}"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?headlineExcerptTextColor"
+                    android:textSize="13sp"
+                    android:textStyle="italic" />
+            </LinearLayout>
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5sp"
+                android:layout_weight="0"
+                android:background="?ttrssHorizontalDivider"
+                android:paddingTop="2dip" />
+        </LinearLayout>
+    </org.fox.ttrss.TitleWebView>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/headlines_row_unread.xml b/res/layout/headlines_row_unread.xml
index d7cb0e08..186048e6 100644
--- a/res/layout/headlines_row_unread.xml
+++ b/res/layout/headlines_row_unread.xml
@@ -53,36 +53,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
 
-                <LinearLayout
-                android:id="@+id/feed_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
                 <TextView
                     android:id="@+id/feed_title"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:ellipsize="end"
-                    android:layout_weight="0.5"
-                    android:singleLine="true"
-                    android:text="{Feed title...}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="10sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
                     android:layout_weight="0.5"
                     android:ellipsize="end"
-                    android:gravity="right"
                     android:singleLine="true"
-                    android:text="{Author}"
+                    android:text="{Feed title...}"
                     android:textColor="?headlineExcerptTextColor"
                     android:textSize="10sp" />
 
-            </LinearLayout>
-
                 <TextView
                     android:id="@+id/author"
                     android:layout_width="wrap_content"
-- 
cgit v1.2.3-54-g00ecf