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

various layout and code updates to support feed_title in virtual feeds

Browse Source 
(requires API 3)
This commit is contained in:
Andrew Dolgov 2012-06-20 14:16:24 +04:00
parent 1ffdbfe187
commit b7c9792ada
12 changed files with 174 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?headlineTextColor"
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:textSize="16sp" /> android:textSize="16sp" />
<LinearLayout <LinearLayout
@ -76,7 +76,19 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="#909090" android:textColor="#909090"
android:textSize="13sp" /> android:textSize="11sp" />
<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="11sp" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"

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

@ -7,7 +7,6 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout7" android:id="@+id/linearLayout7"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -34,8 +33,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?headlineSelectedTextColor"
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:textSize="16sp" /> android:textSize="16sp" />
<LinearLayout <LinearLayout
@ -77,7 +76,19 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="#909090" android:textColor="#909090"
android:textSize="13sp" /> android:textSize="11sp" />
<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="11sp" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
@ -96,15 +107,14 @@
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/content" android:id="@+id/content"
android:text="Article content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" /> android:layout_weight="1"
android:text="Article content" />
<LinearLayout <LinearLayout
android:id="@+id/attachments_holder" android:id="@+id/attachments_holder"
@ -133,4 +143,5 @@
android:layout_weight="0" android:layout_weight="0"
android:text="@string/attachment_copy" /> android:text="@string/attachment_copy" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

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

@ -7,7 +7,6 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout7" android:id="@+id/linearLayout7"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -34,8 +33,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:ellipsize="end" android:ellipsize="end"
android:singleLine="true" android:singleLine="true"
android:textColor="?headlineTextColor"
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:textSize="16sp" /> android:textSize="16sp" />
<LinearLayout <LinearLayout
@ -77,7 +76,19 @@
android:layout_weight="1" android:layout_weight="1"
android:text="Jan 01, 00:00" android:text="Jan 01, 00:00"
android:textColor="#909090" android:textColor="#909090"
android:textSize="13sp" /> android:textSize="11sp" />
<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="11sp" />
<ImageView <ImageView
android:id="@+id/marked" android:id="@+id/marked"
@ -96,10 +107,8 @@
android:src="@drawable/ic_rss_bw" /> android:src="@drawable/ic_rss_bw" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/content" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"

141
res/layout-xlarge/headlines_row.xml
View File

@ -1,141 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineNormalBackground"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<ImageView
android:id="@+id/headlines_separator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?headlineSeparatorNormal"
android:paddingRight="4dip" />
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
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" >
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="true"
android:textColor="?headlineTextColor"
android:text="{Title...}"
android:textSize="16sp" >
</TextView>
<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>
</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
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Jan 01"
android:textColor="#909090"
android:textSize="13sp" >
</TextView>
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="2sp" >
<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>
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
</TextView>
<LinearLayout
android:id="@+id/attachments_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0" >
<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_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/attachment_copy" />
</LinearLayout>
</LinearLayout>

139
res/layout-xlarge/headlines_row_selected.xml
View File

@ -1,139 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineSelectedBackground"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<ImageView
android:id="@+id/headlines_separator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?headlineSeparatorSelected"
android:paddingRight="4dip" />
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
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" >
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="true"
android:textColor="?headlineSelectedTextColor"
android:text="{Title...}"
android:textSize="16sp" >
</TextView>
<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>
</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
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Jan 01"
android:textColor="#909090"
android:textSize="13sp" >
</TextView>
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="2sp" >
<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>
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
</TextView>
<LinearLayout
android:id="@+id/attachments_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0" >
<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_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/attachment_copy" />
</LinearLayout>
</LinearLayout>

139
res/layout-xlarge/headlines_row_unread.xml
View File

@ -1,139 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/headlines_row"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="?headlineUnreadBackground"
android:orientation="vertical" >
<LinearLayout
android:id="@+id/linearLayout6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal" >
<ImageView
android:id="@+id/headlines_separator"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?headlineSeparatorUnread"
android:paddingRight="4dip" />
<CheckBox
android:id="@+id/selected"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
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" >
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:singleLine="true"
android:text="{Title...}"
android:textColor="?headlineTextColor"
android:textSize="16sp" >
</TextView>
<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>
</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
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Jan 01"
android:textColor="#909090"
android:textSize="13sp" >
</TextView>
<LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingRight="2sp" >
<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>
<TextView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="3dip" >
</TextView>
<LinearLayout
android:id="@+id/attachments_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0" >
<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_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/attachment_copy" />
</LinearLayout>
</LinearLayout>

15
res/layout/headlines_row.xml
View File

@ -67,13 +67,25 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="3dip" > android:padding="3dip" >
<TextView
android:id="@+id/feed_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_horizontal"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Jan 01" android:text="Jan 01"
android:textColor="#909090" android:textColor="#909090"
android:textSize="13sp" > android:textSize="11sp" >
</TextView> </TextView>
<LinearLayout <LinearLayout
@ -100,6 +112,7 @@
</ImageView> </ImageView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView

15
res/layout/headlines_row_selected.xml
View File

@ -65,13 +65,25 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="3dip" > android:padding="3dip" >
<TextView
android:id="@+id/feed_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_horizontal|right"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Jan 01" android:text="Jan 01"
android:textColor="#909090" android:textColor="#909090"
android:textSize="13sp" > android:textSize="11sp" >
</TextView> </TextView>
<LinearLayout <LinearLayout
@ -98,6 +110,7 @@
</ImageView> </ImageView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView

15
res/layout/headlines_row_unread.xml
View File

@ -65,13 +65,25 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="3dip" > android:padding="3dip" >
<TextView
android:id="@+id/feed_title"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:ellipsize="end"
android:gravity="center_horizontal"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="11sp" />
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Jan 01" android:text="Jan 01"
android:textColor="#909090" android:textColor="#909090"
android:textSize="13sp" > android:textSize="11sp" >
</TextView> </TextView>
<LinearLayout <LinearLayout
@ -98,6 +110,7 @@
</ImageView> </ImageView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView

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

@ -281,7 +281,9 @@ public class ArticleFragment extends Fragment {
TextView tagv = (TextView)view.findViewById(R.id.tags); TextView tagv = (TextView)view.findViewById(R.id.tags);
if (tagv != null) { if (tagv != null) {
if (m_article.tags != null) { if (m_article.feed_title != null) {
tagv.setText(m_article.feed_title);
} else if (m_article.tags != null) {
String tagsStr = ""; String tagsStr = "";
for (String tag : m_article.tags) for (String tag : m_article.tags)

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

@ -399,6 +399,17 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
} }
} }
TextView ft = (TextView)v.findViewById(R.id.feed_title);
if (ft != null) {
if (article.feed_title != null && (m_feed.is_cat || m_feed.id < 0)) {
ft.setText(article.feed_title);
} else {
ft.setVisibility(View.GONE);
}
}
ImageView marked = (ImageView)v.findViewById(R.id.marked); ImageView marked = (ImageView)v.findViewById(R.id.marked);
if (marked != null) { if (marked != null) {

4
src/org/fox/ttrss/types/Article.java
View File

@ -21,6 +21,7 @@ public class Article implements Parcelable {
public List<Attachment> attachments; public List<Attachment> attachments;
public String content; public String content;
public List<List<String>> labels; public List<List<String>> labels;
public String feed_title;
public Article(Parcel in) { public Article(Parcel in) {
readFromParcel(in); readFromParcel(in);
@ -52,6 +53,7 @@ public class Article implements Parcelable {
out.writeStringList(tags); out.writeStringList(tags);
out.writeString(content); out.writeString(content);
out.writeList(attachments); out.writeList(attachments);
out.writeString(feed_title);
} }
public void readFromParcel(Parcel in) { public void readFromParcel(Parcel in) {
@ -72,6 +74,8 @@ public class Article implements Parcelable {
attachments = new ArrayList<Attachment>(); attachments = new ArrayList<Attachment>();
in.readList(attachments, Attachment.class.getClassLoader()); in.readList(attachments, Attachment.class.getClassLoader());
feed_title = in.readString();
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")