iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix article layout when both author and comment link are visible

Browse Source
This commit is contained in:
Andrew Dolgov 2013-04-21 17:32:21 +04:00
parent 4aaaf59a41
commit f9889788fc
2 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
res/layout-sw600dp/article_fragment.xml
View File

@ -2,8 +2,8 @@
android:id="@+id/article_fragment" android:id="@+id/article_fragment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"
android:background="?articleBackground" android:background="?articleBackground"
android:orientation="vertical"
android:padding="10sp" > android:padding="10sp" >
<org.fox.ttrss.TitleWebView <org.fox.ttrss.TitleWebView
@ -19,7 +19,7 @@
android:layout_weight="0" android:layout_weight="0"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="4sp" > android:paddingBottom="4sp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -28,30 +28,37 @@
android:text="There are many variations of passages of Lorem Ipsum available" android:text="There are many variations of passages of Lorem Ipsum available"
android:textColor="?linkColor" android:textColor="?linkColor"
android:textSize="21sp" /> 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:id="@+id/author"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true"
android:gravity="right" android:gravity="right"
android:textStyle="italic" android:singleLine="true"
android:text="{Author}" android:text="{Author}"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp"
android:textStyle="italic" />
<TextView </LinearLayout>
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" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -92,4 +99,5 @@
android:paddingTop="2dip" /> android:paddingTop="2dip" />
</LinearLayout> </LinearLayout>
</org.fox.ttrss.TitleWebView> </org.fox.ttrss.TitleWebView>
</LinearLayout> </LinearLayout>

34
res/layout/article_fragment.xml
View File

@ -2,8 +2,8 @@
android:id="@+id/article_fragment" android:id="@+id/article_fragment"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"
android:background="?articleBackground" android:background="?articleBackground"
android:orientation="vertical"
android:padding="5sp" > android:padding="5sp" >
<org.fox.ttrss.TitleWebView <org.fox.ttrss.TitleWebView
@ -28,29 +28,35 @@
android:textColor="?linkColor" android:textColor="?linkColor"
android:textSize="16sp" /> android:textSize="16sp" />
<TextView <LinearLayout
android:id="@+id/comments" android:id="@+id/comments_and_author"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:orientation="horizontal" >
android:text="24 comments"
android:textColor="?linkColor"
android:textSize="13sp" />
<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:id="@+id/author"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true"
android:gravity="right" android:gravity="right"
android:textStyle="italic" android:singleLine="true"
android:text="{Author}" android:text="{Author}"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" /> android:textSize="13sp"
android:textStyle="italic" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"