diff options
-rw-r--r-- | res/layout-sw600dp/article_fragment.xml | 44 | ||||
-rw-r--r-- | res/layout/article_fragment.xml | 34 |
2 files changed, 46 insertions, 32 deletions
diff --git a/res/layout-sw600dp/article_fragment.xml b/res/layout-sw600dp/article_fragment.xml index bcbd74e7..7cde45f4 100644 --- a/res/layout-sw600dp/article_fragment.xml +++ b/res/layout-sw600dp/article_fragment.xml @@ -2,8 +2,8 @@ android:id="@+id/article_fragment" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" android:background="?articleBackground" + android:orientation="vertical" android:padding="10sp" > <org.fox.ttrss.TitleWebView @@ -19,7 +19,7 @@ android:layout_weight="0" android:orientation="vertical" android:paddingBottom="4sp" > - + <TextView android:id="@+id/title" android:layout_width="match_parent" @@ -28,30 +28,37 @@ android:text="There are many variations of passages of Lorem Ipsum available" android:textColor="?linkColor" android:textSize="21sp" /> - - <TextView + + <LinearLayout + android:id="@+id/comments_and_author" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" > + + <TextView + android:id="@+id/comments" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingBottom="2sp" + android:paddingTop="2sp" + 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:singleLine="true" android:text="{Author}" android:textColor="?headlineExcerptTextColor" - android:textSize="13sp" /> - - <TextView - android:id="@+id/comments" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingBottom="2sp" - android:paddingTop="2sp" - android:text="24 comments" - android:textColor="?linkColor" - android:textSize="13sp" /> + android:textSize="13sp" + android:textStyle="italic" /> + </LinearLayout> <LinearLayout android:layout_width="match_parent" @@ -92,4 +99,5 @@ android:paddingTop="2dip" /> </LinearLayout> </org.fox.ttrss.TitleWebView> + </LinearLayout>
\ No newline at end of file diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index abf84f27..aa9efa25 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -2,8 +2,8 @@ android:id="@+id/article_fragment" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical" android:background="?articleBackground" + android:orientation="vertical" android:padding="5sp" > <org.fox.ttrss.TitleWebView @@ -28,29 +28,35 @@ android:textColor="?linkColor" android:textSize="16sp" /> - <TextView - android:id="@+id/comments" + <LinearLayout + android:id="@+id/comments_and_author" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="24 comments" - android:textColor="?linkColor" - android:textSize="13sp" /> + android:layout_height="match_parent" + android:orientation="horizontal" > - <TextView + <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:singleLine="true" android:text="{Author}" android:textColor="?headlineExcerptTextColor" - android:textSize="13sp" /> - - + android:textSize="13sp" + android:textStyle="italic" /> + </LinearLayout> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" |