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

various more layout tweaks

Browse Source
This commit is contained in:
Andrew Dolgov 2012-12-31 14:21:57 +04:00
parent f29014eb2f
commit 09c3fdf39c
7 changed files with 116 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,30 +26,35 @@
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/linerLayout3"
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal" >
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
</LinearLayout>
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center"
android:orientation="horizontal" >
android:orientation="horizontal"
android:paddingRight="4dp" >
<CheckBox
android:id="@+id/selected"
@ -67,18 +72,6 @@
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp"
android:textStyle="italic" />
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<ImageView
android:id="@+id/marked"

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

@ -26,30 +26,35 @@
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/linerLayout3"
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal" >
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" />
</LinearLayout>
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="13sp" />
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center"
android:orientation="horizontal" >
android:orientation="horizontal"
android:paddingRight="4dp" >
<CheckBox
android:id="@+id/selected"
@ -67,18 +72,6 @@
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="10sp"
android:textStyle="italic" />
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineSelectedExcerptTextColor"
android:textSize="10sp" />
<ImageView
android:id="@+id/marked"

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

@ -26,30 +26,35 @@
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/linerLayout3"
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal" >
<TextView
android:id="@+id/excerpt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
</LinearLayout>
android:layout_weight="1"
android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center"
android:orientation="horizontal" >
android:orientation="horizontal"
android:paddingRight="4dp" >
<CheckBox
android:id="@+id/selected"
@ -67,18 +72,6 @@
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp"
android:textStyle="italic" />
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<ImageView
android:id="@+id/marked"

42
res/layout/headlines_row.xml
View File

@ -21,13 +21,14 @@
android:paddingLeft="6dip"
android:paddingRight="6dip" >
</CheckBox>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
android:orientation="vertical"
android:padding="3dp" >
<TextView
android:id="@+id/title"
@ -73,38 +74,27 @@
android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
android:paddingRight="6dp" >
<LinearLayout
android:id="@+id/linearLayout4"
<ImageView
android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="2sp" >
android:clickable="true"
android:src="@android:drawable/star_off" />
<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>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>

42
res/layout/headlines_row_selected.xml
View File

@ -21,13 +21,14 @@
android:paddingLeft="6dip"
android:paddingRight="6dip" >
</CheckBox>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
android:orientation="vertical"
android:padding="3dp" >
<TextView
android:id="@+id/title"
@ -73,38 +74,27 @@
android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
android:paddingRight="6dp" >
<LinearLayout
android:id="@+id/linearLayout4"
<ImageView
android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="2sp" >
android:clickable="true"
android:src="@android:drawable/star_off" />
<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>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>

44
res/layout/headlines_row_unread.xml
View File

@ -5,7 +5,7 @@
android:layout_height="wrap_content"
android:background="?headlineUnreadBackground"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
@ -21,13 +21,14 @@
android:paddingLeft="6dip"
android:paddingRight="6dip" >
</CheckBox>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical" >
android:orientation="vertical"
android:padding="3dp" >
<TextView
android:id="@+id/title"
@ -73,38 +74,27 @@
android:textStyle="italic" />
</LinearLayout>
<LinearLayout
android:id="@+id/linerLayout3"
android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical"
android:padding="3dip" >
android:paddingRight="6dp" >
<LinearLayout
android:id="@+id/linearLayout4"
<ImageView
android:id="@+id/marked"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="2sp" >
android:clickable="true"
android:src="@android:drawable/star_off" />
<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>
<ImageView
android:id="@+id/published"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="true"
android:src="@drawable/ic_rss_bw" />
</LinearLayout>
</LinearLayout>

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

@ -589,10 +589,11 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (ft != null) {
if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) {
if (article.feed_title.length() > 20)
/* if (article.feed_title.length() > 20)
ft.setText(article.feed_title.substring(0, 20) + "...");
else
ft.setText(article.feed_title);
else */
ft.setText(article.feed_title);
} else {
ft.setVisibility(View.GONE);