revert new article fragment layout

2 files changed, 84 insertions, 182 deletions

diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 4fe8d669..0b847017 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -1,98 +1,101 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

     android:id="@+id/article_fragment"

     android:layout_width="fill_parent"

+    android:padding="5sp"

     android:layout_height="fill_parent"

-    android:orientation="vertical"

-    android:padding="5sp" >

+    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" />

+        <LinearLayout

+            android:id="@+id/article_header"

+            android:layout_width="match_parent"

+            android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:orientation="vertical"

+            android:paddingBottom="5sp" >

 

-    <TextView

-        android:id="@+id/tags"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_below="@id/title"

-        android:layout_weight="0.7"

-        android:ellipsize="end"

-        android:singleLine="true"

-        android:text="{TAGS}"

-        android:textSize="13sp" />

+            <TextView

+                android:id="@+id/title"

+                android:textColor="?linkColor"

+                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:textSize="16sp" />

 

-    <TextView

-        android:id="@+id/date"

-        android:layout_width="wrap_content"

-        android:layout_height="wrap_content"

-        android:layout_alignBaseline="@+id/tags"

-        android:layout_alignBottom="@+id/tags"

-        android:layout_alignRight="@+id/title"

-        android:layout_weight="0.2"

-        android:gravity="right"

-        android:text="{DATE}"

-        android:textAppearance="?android:attr/textAppearanceSmall"

-        android:textSize="13sp" />

+            <LinearLayout

+                android:layout_width="match_parent"

+                android:layout_height="wrap_content"

+                android:layout_weight="1" >

 

-    <ImageView

-        android:id="@+id/separator"

-        android:layout_width="match_parent"

-        android:layout_height="wrap_content"

-        android:layout_alignBottom="@id/tags"

-        android:layout_alignParentLeft="true"

-        android:layout_weight="0"

-        android:background="?horizontalDivider"

-        android:paddingTop="2dip" />

-



-    <WebView

-        android:id="@+id/content"

-        android:layout_width="match_parent"

-        android:layout_height="wrap_content"

-        android:layout_above="@+id/attachments_holder"

-        android:layout_alignLeft="@+id/tags"

-        android:layout_below="@+id/separator"

-        android:layout_weight="1"

-        android:padding="5sp" />

+                <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:textSize="13sp" />

 

-    <LinearLayout

-        android:id="@+id/attachments_holder"

-        android:layout_width="match_parent"

-        android:layout_height="wrap_content"

-        android:layout_alignParentBottom="true"

-        android:layout_alignParentRight="true"

-        android:layout_weight="0" >

+                <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:textSize="13sp" />

+            </LinearLayout>

+        </LinearLayout>

 

-        <Spinner

-            android:id="@+id/attachments"

+        <ImageView

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

+            android:layout_weight="0"

+            android:background="?horizontalDivider"

+            android:paddingTop="2dip" />

+

+        <WebView

+            android:id="@+id/content"

+            android:layout_width="match_parent"

+            android:layout_height="match_parent"

             android:layout_weight="1"

-            android:prompt="@string/attachments_prompt" />

+            android:padding="5sp" />

 

-        <Button

-            android:id="@+id/attachment_view"

-            android:layout_width="wrap_content"

+        <LinearLayout

+            android:id="@+id/attachments_holder"

+            android:layout_width="match_parent"

             android:layout_height="wrap_content"

-            android:layout_weight="0"

-            android:text="@string/attachment_view" />

+            android:layout_weight="0" >

 

-        <Button

-            android:id="@+id/attachment_share"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_weight="0"

-            android:text="@string/attachment_share" />

+            <Spinner

+                android:id="@+id/attachments"

+                android:layout_width="match_parent"

+                android:layout_height="wrap_content"

+                android:layout_weight="1"

+                android:prompt="@string/attachments_prompt" />

 

-        <Button

-            android:id="@+id/attachment_copy"

-            android:layout_width="wrap_content"

-            android:layout_height="wrap_content"

-            android:layout_weight="0"

-            android:text="@string/attachment_copy" />

-    </LinearLayout>

+            <Button

+                android:id="@+id/attachment_view"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:text="@string/attachment_view" />

 

-</RelativeLayout>
\ No newline at end of file
+            <Button

+                android:id="@+id/attachment_share"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:text="@string/attachment_share" />

+            

+            <Button

+                android:id="@+id/attachment_copy"

+                android:layout_width="wrap_content"

+                android:layout_height="wrap_content"

+                android:layout_weight="0"

+                android:text="@string/attachment_copy" />

+        </LinearLayout>

+    

+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/article_fragment_old.xml b/res/layout/article_fragment_old.xml
deleted file mode 100644
index 0b847017..00000000
--- a/res/layout/article_fragment_old.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

-    android:id="@+id/article_fragment"

-    android:layout_width="fill_parent"

-    android:padding="5sp"

-    android:layout_height="fill_parent"

-    android:orientation="vertical" >
-

-        <LinearLayout

-            android:id="@+id/article_header"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:layout_weight="0"

-            android:orientation="vertical"

-            android:paddingBottom="5sp" >

-

-            <TextView

-                android:id="@+id/title"

-                android:textColor="?linkColor"

-                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:textSize="16sp" />

-

-            <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: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:textSize="13sp" />

-            </LinearLayout>

-        </LinearLayout>

-

-        <ImageView

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:layout_weight="0"

-            android:background="?horizontalDivider"

-            android:paddingTop="2dip" />

-

-        <WebView

-            android:id="@+id/content"

-            android:layout_width="match_parent"

-            android:layout_height="match_parent"

-            android:layout_weight="1"

-            android:padding="5sp" />

-

-        <LinearLayout

-            android:id="@+id/attachments_holder"

-            android:layout_width="match_parent"

-            android:layout_height="wrap_content"

-            android:layout_weight="0" >

-

-            <Spinner

-                android:id="@+id/attachments"

-                android:layout_width="match_parent"

-                android:layout_height="wrap_content"

-                android:layout_weight="1"

-                android:prompt="@string/attachments_prompt" />

-

-            <Button

-                android:id="@+id/attachment_view"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:text="@string/attachment_view" />

-

-            <Button

-                android:id="@+id/attachment_share"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:text="@string/attachment_share" />

-            

-            <Button

-                android:id="@+id/attachment_copy"

-                android:layout_width="wrap_content"

-                android:layout_height="wrap_content"

-                android:layout_weight="0"

-                android:text="@string/attachment_copy" />

-        </LinearLayout>

-    

-</LinearLayout>
\ No newline at end of file