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

various layout readability updates

Browse Source
This commit is contained in:
Andrew Dolgov 2012-12-31 14:01:59 +04:00
parent 6510295056
commit cd2df32b45
15 changed files with 295 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
res/layout-port/headlines_row.xml
View File

@ -14,16 +14,17 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:padding="3dip" > android:padding="3dip" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
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="?headlineTextColor" android:textColor="?headlineTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linerLayout3"
@ -56,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:focusable="false" /> android:focusable="false" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -64,8 +65,9 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" /> android:textSize="10sp"
android:textStyle="italic" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,7 +78,7 @@
android:singleLine="true" android:singleLine="true"
android:text="{Feed title...}" android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" /> android:textSize="10sp" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
@ -96,16 +98,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

28
res/layout-port/headlines_row_selected.xml
View File

@ -14,16 +14,17 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:padding="3dip" > android:padding="3dip" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
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="?headlineSelectedTextColor" android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linerLayout3"
@ -56,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:focusable="false" /> android:focusable="false" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -64,8 +65,9 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="?headlineSelectedExcerptTextColor" android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="11sp" /> android:textSize="10sp"
android:textStyle="italic" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,7 +78,7 @@
android:singleLine="true" android:singleLine="true"
android:text="{Feed title...}" android:text="{Feed title...}"
android:textColor="?headlineSelectedExcerptTextColor" android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="11sp" /> android:textSize="10sp" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
@ -96,16 +98,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

28
res/layout-port/headlines_row_unread.xml
View File

@ -14,16 +14,17 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:padding="3dip" > android:padding="3dip" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
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="?headlineUnreadTextColor" android:textColor="?headlineUnreadTextColor"
android:textSize="16sp" /> android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linerLayout3"
@ -56,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:focusable="false" /> android:focusable="false" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -64,8 +65,9 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" /> android:textSize="10sp"
android:textStyle="italic" />
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,7 +78,7 @@
android:singleLine="true" android:singleLine="true"
android:text="{Feed title...}" android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" /> android:textSize="10sp" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
@ -96,16 +98,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

56
res/layout-sw600dp-port/headlines_row_selected.xml
View File

@ -4,6 +4,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?headlineSelectedBackgroundSolid" android:background="?headlineSelectedBackgroundSolid"
android:padding="4sp"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
@ -34,7 +35,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineSelectedTextColor" android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" android:textSize="16sp"
@ -53,58 +54,27 @@
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linearLayout4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:paddingRight="15px" >
android:padding="3dip" >
<TextView <ImageView
android:id="@+id/date" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Jan 01" android:clickable="true"
android:textColor="?headlineSelectedExcerptTextColor" android:src="@android:drawable/star_off" />
android:textSize="13sp" >
</TextView>
<LinearLayout <ImageView
android:id="@+id/linearLayout4" android:id="@+id/published"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:clickable="true"
android:paddingRight="2sp" > android:src="@drawable/ic_rss_bw" />
<ImageView
android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@android:drawable/star_off" >
</ImageView>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" >
</ImageView>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

120
res/layout-sw600dp/article_fragment.xml Normal file
View File

@ -0,0 +1,120 @@
<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="10sp" >
<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="4sp" >
<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="21sp" />
<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" />
<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:textColor="?headlineExcerptTextColor"
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:textColor="?headlineExcerptTextColor"
android:textSize="13sp"
android:textStyle="italic" />
</LinearLayout>
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:background="?horizontalDivider"
android:layout_marginTop="5sp"
android:layout_marginBottom="5sp"
android:paddingTop="2dip" />
</LinearLayout>
<com.nobu_games.android.view.web.TitleBarWebView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
/>
<LinearLayout
android:id="@+id/attachments_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingTop="5sp" >
<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>

42
res/layout-sw600dp/headlines_row.xml
View File

@ -4,6 +4,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?headlineNormalBackground" android:background="?headlineNormalBackground"
android:padding="4sp"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
@ -34,7 +35,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineTextColor" android:textColor="?headlineTextColor"
android:textSize="16sp" android:textSize="16sp"
@ -61,40 +62,29 @@
android:textStyle="italic" /> android:textStyle="italic" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linearLayout4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15px"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:paddingRight="15px" >
android:padding="3dip" >
<LinearLayout <ImageView
android:id="@+id/linearLayout4" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:clickable="true"
android:paddingRight="2sp" > android:src="@android:drawable/star_off" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/published"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:src="@android:drawable/star_off" > android:src="@drawable/ic_rss_bw" />
</ImageView>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" >
</ImageView>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

41
res/layout-sw600dp/headlines_row_selected.xml
View File

@ -4,6 +4,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?headlineSelectedBackground" android:background="?headlineSelectedBackground"
android:padding="4sp"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
@ -34,7 +35,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineSelectedTextColor" android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" android:textSize="16sp"
@ -60,39 +61,27 @@
android:textStyle="italic" /> android:textStyle="italic" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linearLayout4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15px"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:paddingRight="15px" >
android:padding="3dip" >
<LinearLayout <ImageView
android:id="@+id/linearLayout4" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:clickable="true"
android:paddingRight="2sp" > android:src="@android:drawable/star_off" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/published"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:src="@android:drawable/star_off" > android:src="@drawable/ic_rss_bw" />
</ImageView>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" >
</ImageView>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

42
res/layout-sw600dp/headlines_row_unread.xml
View File

@ -4,6 +4,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?headlineUnreadBackground" android:background="?headlineUnreadBackground"
android:padding="4sp"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
@ -34,7 +35,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineUnreadTextColor" android:textColor="?headlineUnreadTextColor"
android:textSize="16sp" android:textSize="16sp"
@ -61,40 +62,29 @@
android:textStyle="italic" /> android:textStyle="italic" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linerLayout3" android:id="@+id/linearLayout4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15px"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:paddingRight="15px" >
android:padding="3dip" >
<LinearLayout <ImageView
android:id="@+id/linearLayout4" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:clickable="true"
android:paddingRight="2sp" > android:src="@android:drawable/star_off" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/published"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:src="@android:drawable/star_off" > android:src="@drawable/ic_rss_bw" />
</ImageView>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" >
</ImageView>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

8
res/layout/article_fragment.xml
View File

@ -40,11 +40,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0.7" android:layout_weight="0.7"
android:textColor="?headlineExcerptTextColor"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:text="{TAGS}" android:text="{TAGS}"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -52,8 +53,11 @@
android:layout_weight="0.2" android:layout_weight="0.2"
android:gravity="right" android:gravity="right"
android:text="{DATE}" android:text="{DATE}"
android:textColor="?headlineExcerptTextColor"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="13sp" /> android:textSize="13sp"
android:textStyle="italic" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView

61
res/layout/headlines_row.xml
View File

@ -28,39 +28,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineTextColor" android:textColor="?headlineTextColor"
android:textSize="16sp" > android:textSize="16sp"
</TextView> android:textStyle="bold" >
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="{Content excerpt...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" >
</TextView> </TextView>
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@ -69,6 +53,15 @@
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" /> android:textSize="10sp" />
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="{Content excerpt...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" >
</TextView>
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,8 +69,18 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Jan 01" android:text="Jan 01"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" > android:textSize="10sp"
</TextView> android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"
@ -105,16 +108,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

61
res/layout/headlines_row_selected.xml
View File

@ -28,39 +28,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineSelectedTextColor" android:textColor="?headlineSelectedTextColor"
android:textSize="16sp" > android:textSize="16sp"
</TextView> android:textStyle="bold" >
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="{Content excerpt...}"
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" >
</TextView> </TextView>
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_horizontal|right" android:gravity="center_horizontal|right"
@ -69,6 +53,15 @@
android:textColor="?headlineSelectedExcerptTextColor" android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="10sp" /> android:textSize="10sp" />
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="{Content excerpt...}"
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" >
</TextView>
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,8 +69,18 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Jan 01" android:text="Jan 01"
android:textColor="?headlineSelectedExcerptTextColor" android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="10sp" > android:textSize="10sp"
</TextView> android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"
@ -105,16 +108,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

61
res/layout/headlines_row_unread.xml
View File

@ -28,39 +28,23 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" > android:orientation="vertical" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="false"
android:text="{Title...}" android:text="{Title...}"
android:textColor="?headlineUnreadTextColor" android:textColor="?headlineUnreadTextColor"
android:textSize="16sp" > android:textSize="16sp"
</TextView> android:textStyle="bold" >
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="{Content excerpt...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" >
</TextView> </TextView>
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
<TextView <TextView
android:id="@+id/feed_title" android:id="@+id/feed_title"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@ -69,6 +53,15 @@
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" /> android:textSize="10sp" />
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="{Content excerpt...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" >
</TextView>
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -76,8 +69,18 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Jan 01" android:text="Jan 01"
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" > android:textSize="10sp"
</TextView> android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"
@ -105,16 +108,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ImageButton
android:id="@+id/article_menu_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:paddingBottom="4dp"
android:paddingRight="4dp"
android:paddingTop="4dp"
android:scaleType="fitEnd"
android:src="@drawable/ic_mailbox_collapsed_holo_light" />
</LinearLayout> </LinearLayout>

4
src/org/fox/ttrss/ArticleFragment.java
View File

@ -126,10 +126,6 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
else else
titleStr = m_article.title; titleStr = m_article.title;
if (!m_activity.isSmallScreen()) {
title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 21f);
}
title.setText(titleStr); title.setText(titleStr);
//title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); //title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
title.setOnClickListener(new OnClickListener() { title.setOnClickListener(new OnClickListener() {

4
src/org/fox/ttrss/HeadlinesFragment.java
View File

@ -686,7 +686,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
}); });
} }
ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); /* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
if (ib != null) { if (ib != null) {
ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE); ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
@ -696,7 +696,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
getActivity().openContextMenu(v); getActivity().openContextMenu(v);
} }
}); });
} } */
return v; return v;
} }

4
src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
View File

@ -553,7 +553,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
}); });
} }
ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button); /* ImageButton ib = (ImageButton) v.findViewById(R.id.article_menu_button);
if (ib != null) { if (ib != null) {
ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE); ib.setVisibility(android.os.Build.VERSION.SDK_INT >= 10 ? View.VISIBLE : View.GONE);
@ -563,7 +563,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
getActivity().openContextMenu(v); getActivity().openContextMenu(v);
} }
}); });
} } */
return v; return v;
} }