about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-02-18 20:47:52 +0300
committerfox <fox@fakecake.org>2026-02-18 20:47:52 +0300
commit1e9772f2b381efd490f9a14b9e59ad990a616e14 (patch)
tree6f78bf8ebe482579e920c82b6b31f952d5058268
parent133112a5d983c51ee93627c934042ce2391f7d27 (diff)
parent1f9a51317ccc55464a0b6b584d717c6f38fcde45 (diff)
downloadtt-rss-android-26.02-1e9772f2-signed.tar.gz
tt-rss-android-26.02-1e9772f2-signed.tar.xz
Merge branch 'dev' into 'master' 26.02-1e9772f2-signed
Dev

See merge request git/tt-rss/tt-rss-android!69
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java33
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row.xml4
2 files changed, 21 insertions, 16 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
index fca38a7d..11325713 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.ColorStateList;
 import android.graphics.Point;
-import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.media.MediaPlayer;
 import android.net.ConnectivityManager;
@@ -572,7 +571,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
         public TextView excerptView;
         public ImageView flavorImageView;
         public ImageView flavorVideoKindView;
-        public TextView authorView;
+        public TextView commentsView;
         public TextView dateView;
         public CheckBox selectionBoxView;
         public MaterialButton menuButtonView;
@@ -602,7 +601,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
             excerptView = v.findViewById(R.id.excerpt);
             flavorImageView = v.findViewById(R.id.flavor_image);
             flavorVideoKindView = v.findViewById(R.id.flavor_video_kind);
-            authorView = v.findViewById(R.id.author);
+            commentsView = v.findViewById(R.id.comments);
             dateView = v.findViewById(R.id.date);
             selectionBoxView = v.findViewById(R.id.selected);
             menuButtonView = v.findViewById(R.id.article_menu_button);
@@ -1035,7 +1034,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
                 MaterialCardView card = (MaterialCardView) holder.view;
 
                 card.setCardBackgroundColor(article.unread ? m_colorSurfaceContainerLowest : m_colorSurface);
-                card.setCardElevation(article.unread ? 3 : 0);
+                card.setCardElevation(article.unread ? 8 : 0);
             }
 
             if (holder.titleView != null) {
@@ -1091,7 +1090,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
             updateAttachmentsView(article, holder);
             updateLinkHost(article, holder);
             updateExcerptView(article, holder);
-            updateAuthorView(article, holder);
+            updateCommentsView(article, holder);
             updateDateView(article, holder);
             updateSelectedView(article, holder);
 
@@ -1291,7 +1290,14 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
             if (holder.feedTitleView != null) {
                 if (article.feed_title != null && m_feed != null && (m_feed.is_cat || m_feed.id < 0)) {
                     holder.feedTitleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_headlineSmallFontSize);
-                    holder.feedTitleView.setText(article.feed_title);
+
+                    String feedTitle = article.feed_title;
+
+                    if (article.author != null && !article.author.isEmpty()) {
+                        feedTitle += " (" + getString(R.string.author_formatted, article.author) + ")";
+                    }
+
+                    holder.feedTitleView.setText(feedTitle);
 
                     if (holder.feedIcon != null) {
                         String ttrssUrl = m_prefs.getString("ttrss_url", "").trim();
@@ -1336,16 +1342,15 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
             }
         }
 
-        private void updateAuthorView(final Article article, final ArticleViewHolder holder) {
-            String articleAuthor = article.author != null ? article.author : "";
-
-            if (holder.authorView != null) {
-                holder.authorView.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_headlineSmallFontSize);
+        private void updateCommentsView(final Article article, final ArticleViewHolder holder) {
+            if (holder.commentsView != null) {
+                holder.commentsView.setTextSize(TypedValue.COMPLEX_UNIT_SP, m_headlineSmallFontSize);
 
-                if (!articleAuthor.isEmpty()) {
-                    holder.authorView.setText(getString(R.string.author_formatted, articleAuthor));
+                if (article.comments_count > 0) {
+                    String articleComments = getResources().getQuantityString(R.plurals.article_comments, article.comments_count, article.comments_count);
+                    holder.commentsView.setText(articleComments);
                 } else {
-                    holder.authorView.setText("");
+                    holder.commentsView.setText("");
                 }
             }
         }
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index 7f0077fa..38c5dbe5 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -216,7 +216,7 @@
                     android:focusable="false" />
 
                 <TextView
-                    android:id="@+id/author"
+                    android:id="@+id/comments"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
@@ -224,7 +224,7 @@
                     android:fontFamily="sans-serif-light"
                     android:gravity="center_vertical"
                     android:singleLine="true"
-                    tools:text="by Author"
+                    tools:text="12 comments"
                     android:textColor="?colorSecondary"
                     android:textSize="12sp"
                     android:textStyle="italic" />