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

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

@ -26,22 +26,26 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <TextView
android:id="@+id/linerLayout3" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:orientation="horizontal" > android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineExcerptTextColor"
<TextView android:textSize="13sp" />
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>
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"
@ -49,7 +53,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingRight="4dp" >
<CheckBox <CheckBox
android:id="@+id/selected" android:id="@+id/selected"
@ -68,18 +73,6 @@
android:textSize="10sp" android:textSize="10sp"
android:textStyle="italic" /> 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 <ImageView
android:id="@+id/marked" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -26,22 +26,26 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <TextView
android:id="@+id/linerLayout3" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:orientation="horizontal" > android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineSelectedExcerptTextColor"
<TextView android:textSize="13sp" />
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>
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"
@ -49,7 +53,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingRight="4dp" >
<CheckBox <CheckBox
android:id="@+id/selected" android:id="@+id/selected"
@ -68,18 +73,6 @@
android:textSize="10sp" android:textSize="10sp"
android:textStyle="italic" /> 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 <ImageView
android:id="@+id/marked" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"

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

@ -26,22 +26,26 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<LinearLayout <TextView
android:id="@+id/linerLayout3" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_weight="1"
android:orientation="horizontal" > android:text="Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
android:textColor="?headlineExcerptTextColor"
<TextView android:textSize="13sp" />
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>
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"
@ -49,7 +53,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0" android:layout_weight="0"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" > android:orientation="horizontal"
android:paddingRight="4dp" >
<CheckBox <CheckBox
android:id="@+id/selected" android:id="@+id/selected"
@ -68,18 +73,6 @@
android:textSize="10sp" android:textSize="10sp"
android:textStyle="italic" /> 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 <ImageView
android:id="@+id/marked" android:id="@+id/marked"
android:layout_width="wrap_content" android:layout_width="wrap_content"

38
res/layout/headlines_row.xml
View File

@ -27,7 +27,8 @@
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:orientation="vertical" > android:orientation="vertical"
android:padding="3dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -75,36 +76,25 @@
</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="6dp" >
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>

38
res/layout/headlines_row_selected.xml
View File

@ -27,7 +27,8 @@
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:orientation="vertical" > android:orientation="vertical"
android:padding="3dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -75,36 +76,25 @@
</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="6dp" >
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>

38
res/layout/headlines_row_unread.xml
View File

@ -27,7 +27,8 @@
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:orientation="vertical" > android:orientation="vertical"
android:padding="3dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -75,36 +76,25 @@
</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="6dp" >
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>

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

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