summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AndroidManifest.xml4
-rw-r--r--res/layout/article_fragment.xml14
-rw-r--r--res/values/attrs.xml2
-rw-r--r--res/values/style.xml9
-rw-r--r--src/org/fox/ttrss/ArticleFragment.java11
-rw-r--r--src/org/fox/ttrss/OnlineActivity.java8
-rw-r--r--src/org/fox/ttrss/offline/OfflineArticleFragment.java6
-rw-r--r--src/org/fox/ttrss/types/Article.java3
8 files changed, 51 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 882dfb83..48922a6b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss"
- android:versionCode="223"
- android:versionName="1.27" >
+ android:versionCode="224"
+ android:versionName="1.28" >
<uses-sdk
android:minSdkVersion="8"
diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml
index 8ea27c55..70016361 100644
--- a/res/layout/article_fragment.xml
+++ b/res/layout/article_fragment.xml
@@ -92,12 +92,26 @@
android:textColor="?headlineSecondaryTextColor"
android:textSize="12sp" />
</LinearLayout>
+
</LinearLayout>
+ <TextView
+ android:id="@+id/note"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="?articleNoteBackground"
+ android:textColor="?articleNoteTextColor"
+ android:textSize="13sp"
+ android:padding="2dp"
+ android:layout_marginBottom="4dp"
+ android:text="[Article note]" />
+
<org.fox.ttrss.util.LessBrokenWebView
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
+
</LinearLayout>
</org.fox.ttrss.util.NoChildFocusScrollView>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 28c86d64..de72602a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -25,4 +25,6 @@
<attr name="loadingBackground" format="reference|color" />
<attr name="unreadCounterBackground" format="reference|color" />
<attr name="unreadSelectedCounterBackground" format="reference|color" />
+ <attr name="articleNoteBackground" format="reference|color" />
+ <attr name="articleNoteTextColor" format="reference|color" />
</resources> \ No newline at end of file
diff --git a/res/values/style.xml b/res/values/style.xml
index b84d69d2..f5cdda92 100644
--- a/res/values/style.xml
+++ b/res/values/style.xml
@@ -25,6 +25,8 @@
<item name="loadingBackground">@android:color/white</item>
<item name="unreadCounterBackground">@drawable/counter_background</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_selected_light</item>
+ <item name="articleNoteTextColor">#9a8c59</item>
+ <item name="articleNoteBackground">#fff7d5</item>
</style>
<style name="SepiaTheme" parent="LightTheme">
@@ -70,6 +72,8 @@
<item name="loadingBackground">@android:color/black</item>
<item name="unreadCounterBackground">@drawable/counter_background_dark</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
+ <item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
+ <item name="articleNoteBackground">#303030</item>
</style>
<style name="SystemTheme" parent="Theme.Sherlock.DeviceDefault">
@@ -98,6 +102,8 @@
<item name="loadingBackground">@android:color/black</item>
<item name="unreadCounterBackground">@drawable/counter_background_dark</item>
<item name="unreadSelectedCounterBackground">@drawable/counter_background_dark</item>
+ <item name="articleNoteTextColor">@android:color/secondary_text_dark</item>
+ <item name="articleNoteBackground">#303030</item>
</style>
<style name="DarkGrayTheme" parent="DarkTheme">
@@ -115,8 +121,7 @@
<item name="headlineTextColor">@android:color/secondary_text_dark</item>
<item name="actionBarStyle">@style/ActionBarDarkGray</item>
<item name="android:actionBarStyle">@style/ActionBarDarkGray</item>
- <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
-
+ <item name="headlineSelectedSecondaryTextColor">#a0a0a0</item>
</style>
<style name="ActionBarDarkGray" parent="Widget.Sherlock.ActionBar.Solid">
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index 6f87d84d..fb0e2aa8 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -162,6 +162,17 @@ public class ArticleFragment extends Fragment {
}
}
+ TextView note = (TextView)view.findViewById(R.id.note);
+
+ if (note != null) {
+ if (m_article.note != null && !"".equals(m_article.note)) {
+ note.setText(m_article.note);
+ } else {
+ note.setVisibility(View.GONE);
+ }
+
+ }
+
final WebView web = (WebView)view.findViewById(R.id.content);
if (web != null) {
diff --git a/src/org/fox/ttrss/OnlineActivity.java b/src/org/fox/ttrss/OnlineActivity.java
index 5704302d..afaa2535 100644
--- a/src/org/fox/ttrss/OnlineActivity.java
+++ b/src/org/fox/ttrss/OnlineActivity.java
@@ -1060,8 +1060,12 @@ public class OnlineActivity extends CommonActivity {
builder.setPositiveButton(R.string.article_set_note, new Dialog.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
- saveArticleNote(article, topicEdit.getText().toString().trim());
- article.published = true;
+ String note = topicEdit.getText().toString().trim();
+
+ saveArticleNote(article, note);
+ article.published = true;
+ article.note = note;
+
saveArticlePublished(article);
HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES);
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
index ad148257..de50d42c 100644
--- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -175,6 +175,12 @@ public class OfflineArticleFragment extends Fragment {
comments.setVisibility(View.GONE);
}
+ TextView note = (TextView)view.findViewById(R.id.note);
+
+ if (note != null) {
+ note.setVisibility(View.GONE);
+ }
+
final WebView web = (WebView)view.findViewById(R.id.content);
if (web != null) {
diff --git a/src/org/fox/ttrss/types/Article.java b/src/org/fox/ttrss/types/Article.java
index f5053891..9beea81a 100644
--- a/src/org/fox/ttrss/types/Article.java
+++ b/src/org/fox/ttrss/types/Article.java
@@ -27,6 +27,7 @@ public class Article implements Parcelable {
public String comments_link;
public boolean always_display_attachments;
public String author;
+ public String note;
public Article(Parcel in) {
readFromParcel(in);
@@ -68,6 +69,7 @@ public class Article implements Parcelable {
out.writeString(comments_link);
out.writeInt(always_display_attachments ? 1 : 0);
out.writeString(author);
+ out.writeString(note);
}
public void readFromParcel(Parcel in) {
@@ -96,6 +98,7 @@ public class Article implements Parcelable {
comments_link = in.readString();
always_display_attachments = in.readInt() == 1;
author = in.readString();
+ note = in.readString();
}
@SuppressWarnings("rawtypes")
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 11:40:18 +0000