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

support showing article author (requires api 5)

Browse Source 
bump version
This commit is contained in:
Andrew Dolgov 2013-03-30 19:30:47 +04:00
parent f7c533d5d9
commit 5792022b55
21 changed files with 424 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="150" android:versionCode="151"
android:versionName="1.4.2" > android:versionName="1.4.3" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"
@ -44,10 +44,6 @@
android:name=".CommonActivity" android:name=".CommonActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
</activity> </activity>
<activity
android:name=".ArticleActivity"
android:label="@string/app_name" >
</activity>
<activity <activity
android:name=".offline.OfflineActivity" android:name=".offline.OfflineActivity"
android:label="@string/app_name" > android:label="@string/app_name" >

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

@ -27,17 +27,35 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:layout_weight="0"
android:ellipsize="end" <TextView
android:gravity="right" android:id="@+id/feed_title"
android:singleLine="true" android:layout_width="wrap_content"
android:text="{Feed title...}" android:layout_height="match_parent"
android:textColor="?headlineExcerptTextColor" android:ellipsize="end"
android:textSize="10sp" /> android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

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

@ -26,17 +26,35 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="normal" /> android:textStyle="normal" />
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:layout_weight="0"
android:ellipsize="end" <TextView
android:gravity="right" android:id="@+id/feed_title"
android:singleLine="true" android:layout_width="wrap_content"
android:text="{Feed title...}" android:layout_height="match_parent"
android:textColor="?headlineSelectedExcerptTextColor" android:ellipsize="end"
android:textSize="10sp" /> android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

40
res/layout-port/headlines_row_selected_unread.xml
View File

@ -27,17 +27,35 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:layout_weight="0"
android:ellipsize="end" <TextView
android:gravity="right" android:id="@+id/feed_title"
android:singleLine="true" android:layout_width="wrap_content"
android:text="{Feed title...}" android:layout_height="match_parent"
android:textColor="?headlineSelectedExcerptTextColor" android:ellipsize="end"
android:textSize="10sp" /> android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

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

@ -27,17 +27,35 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent" >
android:layout_weight="0"
android:ellipsize="end" <TextView
android:gravity="right" android:id="@+id/feed_title"
android:singleLine="true" android:layout_width="wrap_content"
android:text="{Feed title...}" android:layout_height="match_parent"
android:textColor="?headlineExcerptTextColor" android:ellipsize="end"
android:textSize="10sp" /> android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

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

@ -44,6 +44,36 @@
</TextView> </TextView>
<LinearLayout
android:id="@+id/feed_and_author"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -42,6 +42,36 @@
android:textStyle="normal" > android:textStyle="normal" >
</TextView> </TextView>
<LinearLayout
android:id="@+id/feed_and_author"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"
android:layout_width="match_parent" android:layout_width="match_parent"

30
res/layout-sw600dp/headlines_row_selected_unread.xml
View File

@ -41,6 +41,36 @@
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" > android:textStyle="bold" >
</TextView> </TextView>
<LinearLayout
android:id="@+id/feed_and_author"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

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

@ -43,6 +43,36 @@
android:textStyle="bold" > android:textStyle="bold" >
</TextView> </TextView>
<LinearLayout
android:id="@+id/feed_and_author"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

14
res/layout/article_fragment.xml
View File

@ -36,6 +36,20 @@
android:textColor="?linkColor" android:textColor="?linkColor"
android:textSize="13sp" /> android:textSize="13sp" />
<TextView
android:id="@+id/author"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:gravity="right"
android:textStyle="italic"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

46
res/layout/headlines_row.xml
View File

@ -21,7 +21,6 @@
android:paddingLeft="6dip" android:paddingLeft="6dip"
android:paddingRight="6dip" > android:paddingRight="6dip" >
</CheckBox> </CheckBox>
<LinearLayout <LinearLayout
android:id="@+id/linearLayout1" android:id="@+id/linearLayout1"
@ -30,7 +29,6 @@
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:padding="3dp" > android:padding="3dp" >
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
@ -42,19 +40,37 @@
android:textColor="?headlineTextColor" android:textColor="?headlineTextColor"
android:textSize="16sp" android:textSize="16sp"
android:textStyle="bold" > android:textStyle="bold" >
</TextView> </TextView>
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" >
android:ellipsize="end"
android:gravity="center_horizontal" <TextView
android:singleLine="true" android:id="@+id/feed_title"
android:text="{Feed title...}" android:layout_width="wrap_content"
android:textColor="?headlineExcerptTextColor" android:layout_height="match_parent"
android:textSize="10sp" /> android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"
@ -64,7 +80,6 @@
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="13sp" > android:textSize="13sp" >
</TextView> </TextView>
<TextView <TextView
android:id="@+id/date" android:id="@+id/date"
@ -75,10 +90,7 @@
android:textColor="?headlineExcerptTextColor" android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" android:textSize="10sp"
android:textStyle="italic" /> android:textStyle="italic" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4" android:id="@+id/linearLayout4"

3
res/layout/headlines_row_loadmore.xml
View File

@ -7,7 +7,8 @@
android:gravity="center" android:gravity="center"
android:padding="5dp" android:padding="5dp"
android:orientation="horizontal" > android:orientation="horizontal" >
<ProgressBar <ProgressBar
android:id="@+id/loadmore_progress" android:id="@+id/loadmore_progress"
style="?android:attr/progressBarStyleSmall" style="?android:attr/progressBarStyleSmall"

39
res/layout/headlines_row_selected.xml
View File

@ -45,16 +45,35 @@
</TextView> </TextView>
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" >
android:ellipsize="end"
android:gravity="center_horizontal|right" <TextView
android:singleLine="true" android:id="@+id/feed_title"
android:text="{Feed title...}" android:layout_width="wrap_content"
android:textColor="?headlineSelectedExcerptTextColor" android:layout_height="match_parent"
android:textSize="10sp" /> android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

39
res/layout/headlines_row_selected_unread.xml
View File

@ -45,16 +45,35 @@
</TextView> </TextView>
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" >
android:ellipsize="end"
android:gravity="center_horizontal|right" <TextView
android:singleLine="true" android:id="@+id/feed_title"
android:text="{Feed title...}" android:layout_width="wrap_content"
android:textColor="?headlineSelectedExcerptTextColor" android:layout_height="match_parent"
android:textSize="10sp" /> android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

58
res/layout/headlines_row_unread.xml
View File

@ -47,16 +47,54 @@
</TextView> </TextView>
<TextView <LinearLayout
android:id="@+id/feed_title" android:id="@+id/feed_and_author"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent" >
android:ellipsize="end"
android:gravity="center_horizontal" <LinearLayout
android:singleLine="true" android:id="@+id/feed_and_author"
android:text="{Feed title...}" android:layout_width="match_parent"
android:textColor="?headlineExcerptTextColor" android:layout_height="match_parent" >
android:textSize="10sp" />
<TextView
android:id="@+id/feed_title"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:ellipsize="end"
android:layout_weight="0.5"
android:singleLine="true"
android:text="{Feed title...}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView
android:id="@+id/author"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0.5"
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:text="{Author}"
android:textColor="?headlineExcerptTextColor"
android:textSize="10sp" />
</LinearLayout>
<TextView <TextView
android:id="@+id/excerpt" android:id="@+id/excerpt"

3
res/layout/loading_fragment.xml
View File

@ -2,7 +2,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" > android:layout_height="fill_parent" >
<ProgressBar <ProgressBar
android:id="@+id/progressBar1" android:id="@+id/progressBar1"
style="?android:attr/progressBarStyleLarge" style="?android:attr/progressBarStyleLarge"

6
res/layout/share.xml
View File

@ -25,7 +25,8 @@
android:ems="10" android:ems="10"
android:hint="@string/share_url_hint" android:hint="@string/share_url_hint"
android:singleLine="true" /> android:singleLine="true" />
<EditText <EditText
android:id="@+id/content" android:id="@+id/content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -40,7 +41,8 @@
<requestFocus /> <requestFocus />
</EditText> </EditText>
<Button <Button
android:id="@+id/share_button" android:id="@+id/share_button"
android:layout_width="100dp" android:layout_width="100dp"

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

@ -291,7 +291,17 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl
} else { } else {
tagv.setVisibility(View.GONE); tagv.setVisibility(View.GONE);
} }
} }
TextView author = (TextView)view.findViewById(R.id.author);
if (author != null) {
if (m_article.author != null && m_article.author.length() > 0) {
author.setText(m_article.author);
} else {
author.setVisibility(View.GONE);
}
}
} }
return view; return view;

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

@ -664,6 +664,14 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
} }
} }
String articleAuthor = article.author != null ? article.author : "";
TextView author = (TextView)v.findViewById(R.id.author);
if (author != null) {
author.setText(articleAuthor);
}
/* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator); /* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);
if (separator != null && m_onlineServices.isSmallScreen()) { if (separator != null && m_onlineServices.isSmallScreen()) {

8
src/org/fox/ttrss/offline/OfflineArticleFragment.java
View File

@ -279,7 +279,13 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector.
String tagsStr = m_cursor.getString(m_cursor.getColumnIndex("tags")); String tagsStr = m_cursor.getString(m_cursor.getColumnIndex("tags"));
tagv.setText(tagsStr); tagv.setText(tagsStr);
} }
} }
TextView author = (TextView)view.findViewById(R.id.author);
if (author != null) {
author.setVisibility(View.GONE);
}
} }
return view; return view;

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

@ -25,6 +25,7 @@ public class Article implements Parcelable {
public int comments_count; public int comments_count;
public String comments_link; public String comments_link;
public boolean always_display_attachments; public boolean always_display_attachments;
public String author;
public Article(Parcel in) { public Article(Parcel in) {
readFromParcel(in); readFromParcel(in);
@ -64,6 +65,7 @@ public class Article implements Parcelable {
out.writeInt(comments_count); out.writeInt(comments_count);
out.writeString(comments_link); out.writeString(comments_link);
out.writeInt(always_display_attachments ? 1 : 0); out.writeInt(always_display_attachments ? 1 : 0);
out.writeString(author);
} }
public void readFromParcel(Parcel in) { public void readFromParcel(Parcel in) {
@ -90,6 +92,7 @@ public class Article implements Parcelable {
comments_count = in.readInt(); comments_count = in.readInt();
comments_link = in.readString(); comments_link = in.readString();
always_display_attachments = in.readInt() == 1; always_display_attachments = in.readInt() == 1;
author = in.readString();
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")