update note view in article

3 files changed, 42 insertions, 14 deletions

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
index 959ef7bf..aa623b6c 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java
@@ -354,15 +354,16 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
         }
 
         TextView note = view.findViewById(R.id.note);
+        View noteContainer = view.findViewById(R.id.note_container);
 
-        if (note != null) {
-            if (m_article.note != null && !"".equals(m_article.note)) {
+        if (note != null && noteContainer != null) {
+            if (m_article.note != null && m_article.note.length() > 0) {
                 note.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_articleSmallFontSize);
                 note.setText(m_article.note);
+                noteContainer.setVisibility(View.VISIBLE);
             } else {
-                note.setVisibility(View.GONE);
+                noteContainer.setVisibility(View.GONE);
             }
-
         }
 
         TextView dv = view.findViewById(R.id.date);
diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml
new file mode 100644
index 00000000..1e502e2f
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable/baseline_note_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M22,10l-6,-6L4,4c-1.1,0 -2,0.9 -2,2v12.01c0,1.1 0.9,1.99 2,1.99l16,-0.01c1.1,0 2,-0.89 2,-1.99v-8zM15,5.5l5.5,5.5L15,11L15,5.5z"/>
+    
+</vector>
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
index 0f156245..197a8077 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml
@@ -147,18 +147,42 @@
                     android:layout_height="wrap_content"
                     android:background="?colorSurfaceContainer">
 
-                    <TextView
-                        android:id="@+id/note"
-                        tools:text="Article note (if any...)"
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/note_container"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="?colorSecondaryContainer"
+                        app:cardBackgroundColor="?colorTertiaryContainer"
                         android:layout_marginTop="8dp"
                         android:layout_marginStart="8dp"
                         android:layout_marginEnd="8dp"
-                        android:padding="8dp"
-                        android:textColor="?colorOnSecondaryContainer"
-                        android:textSize="12sp"/>
+                        app:strokeWidth="0dp"
+                        android:layout_height="match_parent">
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_margin="8dp"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/note"
+                                tools:text="Article note (if any...)"
+                                android:layout_gravity="center_vertical"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="8dp"
+                                android:textColor="?colorOnTertiaryContainer"
+                                android:layout_weight="1"
+                                android:textSize="12sp"/>
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center_vertical"
+                                app:tint="?colorOnTertiaryContainer"
+                                android:src="@drawable/baseline_note_24"/>
+
+                        </LinearLayout>
+                    </com.google.android.material.card.MaterialCardView>
+
                 </LinearLayout>
             </LinearLayout>
 
@@ -167,8 +191,6 @@
         <com.telefonica.nestedscrollwebview.NestedScrollWebView
             android:id="@+id/article_content"
             android:layout_marginTop="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />