diff options
| author | fox <fox@fakecake.org> | 2026-02-15 10:51:39 +0300 |
|---|---|---|
| committer | fox <fox@fakecake.org> | 2026-02-15 10:51:39 +0300 |
| commit | 6e468351ab08f6418b9df735fa34d45bbef56a94 (patch) | |
| tree | 42f8ca30074640964c31efaf8fd4c377bff3949a | |
| parent | 4faa87c7e9b4d2eb401965736524b9df906fac15 (diff) | |
| parent | 25750b38a4fdf358913a6346568f0eb43bd509bb (diff) | |
| download | tt-rss-android-26.02-6e468351-signed.tar.gz tt-rss-android-26.02-6e468351-signed.tar.xz | |
Merge branch 'dev' into 'master' 26.02-6e468351-signed
Dev See merge request git/tt-rss/tt-rss-android!66
4 files changed, 37 insertions, 4 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 1f90b57d..ac18cb47 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 @@ -586,6 +586,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { public PlayerView flavorVideoView; public MaterialButton attachmentsView; public TextView linkHost; + public ImageView feedIcon; public ArticleViewHolder(View v) { super(v); @@ -614,6 +615,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { flavorVideoView = v.findViewById(R.id.flavor_video); attachmentsView = v.findViewById(R.id.attachments); linkHost = v.findViewById(R.id.link_host); + feedIcon = v.findViewById(R.id.feed_icon); } } @@ -1036,7 +1038,8 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } if (holder.titleView != null) { - holder.titleView.setTypeface(null, article.unread ? Typeface.BOLD : Typeface.NORMAL); + // this makes header jump around + // holder.titleView.setTypeface(null, article.unread ? Typeface.BOLD : Typeface.NORMAL); holder.titleView.setTextColor(article.unread ? m_colorOnSurface : m_colorPrimary); } @@ -1288,8 +1291,23 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { 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); + + if (holder.feedIcon != null) { + String ttrssUrl = m_prefs.getString("ttrss_url", "").trim(); + String feedIconUri = ttrssUrl + "/public.php?op=feed_icon&id=" + article.feed_id; + + holder.feedIcon.setVisibility(View.VISIBLE); + + Glide.with(HeadlinesFragment.this) + .load(feedIconUri) + .diskCacheStrategy(DiskCacheStrategy.DATA) + .into(new DrawableImageViewTarget(holder.feedIcon)); + } } else { holder.feedTitleView.setVisibility(View.GONE); + + if (holder.feedIcon != null) + holder.feedIcon.setVisibility(View.GONE); } } } diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_more_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_more_24.xml new file mode 100644 index 00000000..8e656bf3 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_more_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,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/> + +</vector> diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index f1ad3f8c..3d98dc40 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" - app:icon="@drawable/baseline_more_vert_24" + app:icon="@drawable/baseline_more_24" android:layout_alignParentRight="true" android:layout_marginTop="48dp" app:iconTint="?colorTertiary" /> 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 562e3e97..7f0077fa 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -56,6 +56,7 @@ android:ellipsize="middle" android:fontFamily="sans-serif-light" android:singleLine="true" + android:textStyle="italic" android:textAlignment="viewStart" android:textColor="?colorSecondary" android:textSize="12sp" @@ -74,6 +75,16 @@ android:textSize="12sp" tools:text="Jan 01, 12:00, 1970" /> + <ImageView + android:id="@+id/feed_icon" + android:layout_width="12dp" + android:layout_height="12dp" + android:layout_weight="0" + android:layout_marginLeft="8dp" + android:scaleType="fitXY" + android:layout_gravity="center_vertical" + android:src="@drawable/baseline_rss_feed_24" /> + </LinearLayout> <TextView @@ -160,8 +171,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|end" - android:layout_marginEnd="-8dp" - app:icon="@drawable/baseline_more_vert_24" + app:icon="@drawable/baseline_more_24" app:iconTint="?colorTertiary"/> </FrameLayout> |
