summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java62
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/fragment_headlines.xml1
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml4
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row.xml217
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row_unread.xml220
-rw-r--r--org.fox.ttrss/src/main/res/values-night/themes.xml1
-rwxr-xr-xorg.fox.ttrss/src/main/res/values/attrs.xml1
-rw-r--r--org.fox.ttrss/src/main/res/values/themes.xml1
8 files changed, 212 insertions, 295 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 a843bf39..6cc92d87 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
@@ -44,6 +44,7 @@ import android.view.WindowManager;
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.CheckBox;
import android.widget.EditText;
+import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.PopupMenu;
@@ -359,7 +360,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
m_layoutManager = new LinearLayoutManager(m_activity.getApplicationContext());
m_list.setLayoutManager(m_layoutManager);
m_list.setItemAnimator(new DefaultItemAnimator());
- m_list.addItemDecoration(new DividerItemDecoration(m_list.getContext(), m_layoutManager.getOrientation()));
ArticleListAdapter adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, m_articles);
@@ -1211,7 +1211,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
holder.flavorVideoKindView.setVisibility(View.GONE);
holder.flavorImageOverflow.setVisibility(View.GONE);
holder.flavorVideoView.setVisibility(View.GONE);
- holder.headlineHeader.setBackgroundDrawable(null);
Glide.clear(holder.flavorImageView);
@@ -1291,24 +1290,15 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
//Log.d(TAG, "TAG:" + holder.flavorImageOverflow.getTag());
holder.flavorImageView.setVisibility(View.VISIBLE);
+ holder.flavorImageView.setMaxHeight((int)(m_screenHeight * 0.6f));
- holder.flavorImageView.setMaxHeight((int)(m_screenHeight * 0.8f));
- holder.flavorProgressTarget.setModel(article.flavorImageUri);
-
+ // prevent lower listiew entries from jumping around if this row is modified
if (article.flavorViewHeight > 0) {
- RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams();
+ FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) holder.flavorImageView.getLayoutParams();
lp.height = article.flavorViewHeight;
- holder.flavorImageView.setLayoutParams(lp);
}
-
- /* TODO: maybe an option? force height for all images to reduce list jumping around
-
- RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams();
- lp.height = (int)(m_screenHeight * 0.5f);
- lp.addRule(RelativeLayout.BELOW, R.id.headline_header);
- holder.flavorImageView.setLayoutParams(lp);
- */
+ holder.flavorProgressTarget.setModel(article.flavorImageUri);
try {
@@ -1334,16 +1324,9 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
if (resource.getIntrinsicWidth() > FLAVOR_IMG_MIN_SIZE && resource.getIntrinsicHeight() > FLAVOR_IMG_MIN_SIZE) {
- //holder.flavorImageView.setVisibility(View.VISIBLE);
+ holder.flavorImageView.setVisibility(View.VISIBLE);
holder.flavorImageOverflow.setVisibility(View.VISIBLE);
- boolean forceDown = !m_activity.isSmallScreen() || article.flavorImage != null && "video".equals(article.flavorImage.tagName().toLowerCase());
-
- RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams();
- lp.height = RelativeLayout.LayoutParams.WRAP_CONTENT;
- holder.flavorImageView.setLayoutParams(lp);
-
- maybeRepositionFlavorImage(holder.flavorImageView, resource, holder, forceDown);
adjustVideoKindView(holder, article);
return false;
@@ -1684,9 +1667,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
} else if (article.flavor_kind == Article.FLAVOR_KIND_VIDEO || "video".equals(article.flavorImage.tagName().toLowerCase())) {
holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_24);
holder.flavorVideoKindView.setVisibility(View.VISIBLE);
- } else if (article.flavor_kind == Article.FLAVOR_KIND_ALBUM ||article.mediaList.size() > 1) {
- holder.flavorVideoKindView.setImageResource(R.drawable.baseline_photo_album_24);
- holder.flavorVideoKindView.setVisibility(View.VISIBLE);
} else {
holder.flavorVideoKindView.setVisibility(View.INVISIBLE);
}
@@ -1707,36 +1687,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
return px;
}
- private void maybeRepositionFlavorImage(View view, GlideDrawable resource, ArticleViewHolder holder, boolean forceDown) {
- RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) view.getLayoutParams();
-
- int w = resource.getIntrinsicWidth();
- int h = resource.getIntrinsicHeight();
- float r = h != 0 ? (float)w/h : 0;
-
- //Log.d(TAG, "XYR: " + pxToDp(w) + " " + pxToDp(h) + " " + r);
-
- if (forceDown || h < m_minimumHeightToEmbed || r >= 1) {
-
- lp.addRule(RelativeLayout.BELOW, R.id.headline_header);
-
- holder.headlineHeader.setBackgroundDrawable(null);
- holder.flavorImageEmbedded = false;
-
- } else {
- lp.addRule(RelativeLayout.BELOW, 0);
-
- TypedValue tv = new TypedValue();
- if (m_activity.getTheme().resolveAttribute(R.attr.headlineHeaderBackground, tv, true)) {
- holder.headlineHeader.setBackgroundColor(tv.data);
- }
-
- holder.flavorImageEmbedded = true;
- }
-
- view.setLayoutParams(lp);
- }
-
private void adjustTitleTextView(int score, TextView tv, int position) {
int viewType = getItemViewType(position);
if (origTitleColors[viewType] == null)
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
index 9f09290f..22bed766 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml
@@ -12,6 +12,7 @@
<org.fox.ttrss.util.ContextMenuRecyclerView
android:id="@+id/headlines_list"
+ android:background="?colorSurfaceContainer"
android:drawSelectorOnTop="true"
android:scrollbars="vertical"
android:layout_width="match_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml
index 6e43864a..25ffbb3d 100755
--- a/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml
+++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines_offline.xml
@@ -12,7 +12,11 @@
<ListView
android:id="@+id/headlines_list"
+ android:background="?colorSurfaceContainer"
android:drawSelectorOnTop="true"
+ android:padding="8dp"
+ android:dividerHeight="8dp"
+ android:divider="@null"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
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 d41e5b37..b43d0fbb 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/headlines_row"
+ android:layout_margin="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -13,160 +14,143 @@
android:shrinkColumns="0,1"
android:stretchColumns="0,1">
-
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <FrameLayout
- android:id="@+id/flavorImageHolder"
+ <RelativeLayout
+ android:id="@+id/headline_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_span="2">
+ android:clickable="true"
+ android:layout_span="2"
+ android:padding="16dp">
- <RelativeLayout
+ <TextView
+ android:id="@+id/title"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="3"
+ android:paddingBottom="8dp"
+ android:singleLine="false"
+ android:textColor="?colorPrimary"
+ android:textSize="18sp"
+ android:textStyle="normal"
+ tools:text="Sample entry title which is overwhelmingly long blah blah blah" />
- <ProgressBar
- android:id="@+id/flavorImageLoadingBar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:visibility="visible"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_alignParentTop="false"
- android:layout_alignParentRight="false"
- android:layout_alignParentEnd="true"
- android:max="100"
- android:indeterminate="false"
- android:layout_toRightOf="@+id/flavor_video"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true" />
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/title"
+ android:orientation="horizontal">
- <ImageView
- android:id="@+id/flavor_image"
- android:foreground="@drawable/ripple"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center"
- android:adjustViewBounds="true"
- android:background="@android:color/transparent"
- android:cropToPadding="true"
- android:scaleType="fitCenter"
- android:visibility="visible" />
+ android:layout_weight="0.5"
+ android:ellipsize="middle"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:textAlignment="viewStart"
+ android:textColor="?colorSecondary"
+ android:textSize="12sp"
+ tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" />
- <TextureView
- android:id="@+id/flavor_video"
- android:foreground="@null"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center"
- android:adjustViewBounds="true"
- android:background="@null"
- android:cropToPadding="true"
- android:scaleType="fitCenter"
- android:visibility="gone"
- android:layout_alignBottom="@+id/flavor_image"
- android:layout_alignTop="@+id/flavor_image" />
+ android:layout_weight="0.5"
+ android:ellipsize="none"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:textAlignment="viewEnd"
+ android:textColor="?colorSecondary"
+ android:textSize="12sp"
+ tools:text="Jan 01, 12:00, 1970" />
- <RelativeLayout
- android:id="@+id/headline_header"
- android:clickable="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?headlineHeaderBackground"
- android:padding="16dp">
+ </LinearLayout>
- <TextView
- android:id="@+id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/ripple"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:gravity="center_vertical"
- android:maxLines="3"
- android:paddingBottom="8dp"
- android:textColor="?colorPrimary"
- android:singleLine="false"
- android:textSize="18sp"
- android:textStyle="normal"
- tools:text="Sample entry title" />
+ </RelativeLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/title"
- android:orientation="horizontal"
- android:id="@+id/linearLayout2">
+ </TableRow>
- <TextView
- android:id="@+id/feed_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="0.5"
- android:ellipsize="middle"
- android:fontFamily="sans-serif-light"
- android:gravity="center_vertical"
- android:textAlignment="viewStart"
- android:singleLine="true"
- tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
- android:textColor="?colorSecondary"
- android:textSize="12sp" />
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
- <TextView
- android:id="@+id/date"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="0.5"
- android:ellipsize="none"
- android:fontFamily="sans-serif-light"
- android:gravity="center_vertical"
- android:textAlignment="viewEnd"
- android:singleLine="true"
- tools:text="Jan 01, 12:00, 1970"
- android:textColor="?colorSecondary"
- android:textSize="12sp" />
+ <FrameLayout
+ android:id="@+id/flavorImageHolder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_span="2">
- </LinearLayout>
+ <ProgressBar
+ android:id="@+id/flavorImageLoadingBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="false"
+ android:max="100"
+ android:visibility="visible" />
- </RelativeLayout>
+ <ImageView
+ android:id="@+id/flavor_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"
+ android:background="@android:color/transparent"
+ android:cropToPadding="true"
+ android:scaleType="centerCrop"
+ tools:src="@drawable/ic_launcher_background"
+ android:visibility="visible" />
- </RelativeLayout>
+ <TextureView
+ android:id="@+id/flavor_video"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"
+ android:background="@null"
+ android:cropToPadding="true"
+ android:foreground="@null"
+ android:scaleType="fitCenter"
+ android:visibility="gone" />
<ImageView
android:id="@+id/flavor_video_kind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_below="@+id/headline_header"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
android:layout_gravity="start|bottom"
+ android:layout_marginStart="8dp"
+ android:layout_marginBottom="8dp"
+ android:elevation="4dp"
android:scaleType="fitXY"
android:src="@drawable/baseline_play_circle_24"
android:visibility="visible"
- android:layout_below="@+id/headline_header"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:elevation="4dp"
- app:tint="?colorTertiary"
- android:layout_marginBottom="8dp"
- android:layout_marginStart="8dp" />
+ app:tint="?colorTertiary" />
<ImageView
android:id="@+id/gallery_overflow"
- android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="24dp"
+ android:layout_gravity="bottom|end"
+ android:layout_marginBottom="10dp"
android:layout_weight="0"
- android:background="@drawable/ripple"
+ android:clickable="true"
+ android:elevation="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:src="@drawable/baseline_more_vert_24"
- android:layout_gravity="bottom|end"
- android:elevation="4dp"
app:tint="?colorTertiary"
- android:layout_marginBottom="10dp"
tools:targetApi="lollipop" />
</FrameLayout>
@@ -277,5 +261,4 @@
</LinearLayout>
</TableRow>
</TableLayout>
-
-</FrameLayout> \ No newline at end of file
+</com.google.android.material.card.MaterialCardView> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index b00f344c..82baeec3 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/headlines_row"
- android:background="?colorSurfaceContainerLowest"
+ app:cardBackgroundColor="?colorSurfaceContainerLowest"
+ android:layout_margin="8dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
@@ -14,160 +15,143 @@
android:shrinkColumns="0,1"
android:stretchColumns="0,1">
-
<TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
- <FrameLayout
- android:id="@+id/flavorImageHolder"
+ <RelativeLayout
+ android:id="@+id/headline_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_span="2">
+ android:clickable="true"
+ android:layout_span="2"
+ android:padding="16dp">
- <RelativeLayout
+ <TextView
+ android:id="@+id/title"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:maxLines="3"
+ android:paddingBottom="8dp"
+ android:singleLine="false"
+ android:textColor="?colorOnSurface"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ tools:text="Sample entry title which is overwhelmingly long blah blah blah" />
- <ProgressBar
- android:id="@+id/flavorImageLoadingBar"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:visibility="visible"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_alignParentTop="false"
- android:layout_alignParentRight="false"
- android:layout_alignParentEnd="true"
- android:max="100"
- android:indeterminate="false"
- android:layout_toRightOf="@+id/flavor_video"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true" />
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/title"
+ android:orientation="horizontal">
- <ImageView
- android:id="@+id/flavor_image"
- android:foreground="@drawable/ripple"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/feed_title"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center"
- android:adjustViewBounds="true"
- android:background="@android:color/transparent"
- android:cropToPadding="true"
- android:scaleType="fitCenter"
- android:visibility="visible" />
+ android:layout_weight="0.5"
+ android:ellipsize="middle"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:textAlignment="viewStart"
+ android:textColor="?colorSecondary"
+ android:textSize="12sp"
+ tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" />
- <TextureView
- android:id="@+id/flavor_video"
- android:foreground="@null"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/date"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center"
- android:adjustViewBounds="true"
- android:background="@null"
- android:cropToPadding="true"
- android:scaleType="fitCenter"
- android:visibility="gone"
- android:layout_alignBottom="@+id/flavor_image"
- android:layout_alignTop="@+id/flavor_image" />
+ android:layout_weight="0.5"
+ android:ellipsize="none"
+ android:fontFamily="sans-serif-light"
+ android:singleLine="true"
+ android:textAlignment="viewEnd"
+ android:textColor="?colorSecondary"
+ android:textSize="12sp"
+ tools:text="Jan 01, 12:00, 1970" />
- <RelativeLayout
- android:id="@+id/headline_header"
- android:clickable="true"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?headlineHeaderBackground"
- android:padding="16dp">
+ </LinearLayout>
- <TextView
- android:id="@+id/title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/ripple"
- android:ellipsize="end"
- android:textAlignment="viewStart"
- android:gravity="center_vertical"
- android:maxLines="3"
- android:paddingBottom="8dp"
- android:singleLine="false"
- android:textSize="18sp"
- android:textColor="?colorOnSurface"
- android:textStyle="bold"
- tools:text="Sample entry title" />
+ </RelativeLayout>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/title"
- android:orientation="horizontal"
- android:id="@+id/linearLayout2">
+ </TableRow>
- <TextView
- android:id="@+id/feed_title"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="0.5"
- android:ellipsize="middle"
- android:fontFamily="sans-serif-light"
- android:gravity="center_vertical"
- android:textAlignment="viewStart"
- android:singleLine="true"
- tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA"
- android:textColor="?colorSecondary"
- android:textSize="12sp" />
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
- <TextView
- android:id="@+id/date"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="0.5"
- android:ellipsize="none"
- android:fontFamily="sans-serif-light"
- android:gravity="center_vertical"
- android:textAlignment="viewEnd"
- android:singleLine="true"
- tools:text="Jan 01, 12:00, 1970"
- android:textColor="?colorSecondary"
- android:textSize="12sp" />
+ <FrameLayout
+ android:id="@+id/flavorImageHolder"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_span="2">
- </LinearLayout>
+ <ProgressBar
+ android:id="@+id/flavorImageLoadingBar"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:indeterminate="false"
+ android:max="100"
+ android:visibility="visible" />
- </RelativeLayout>
+ <ImageView
+ android:id="@+id/flavor_image"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"
+ android:background="@android:color/transparent"
+ android:cropToPadding="true"
+ android:scaleType="centerCrop"
+ tools:src="@drawable/ic_launcher_background"
+ android:visibility="visible" />
- </RelativeLayout>
+ <TextureView
+ android:id="@+id/flavor_video"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:adjustViewBounds="true"
+ android:background="@null"
+ android:cropToPadding="true"
+ android:foreground="@null"
+ android:scaleType="fitCenter"
+ android:visibility="gone" />
<ImageView
android:id="@+id/flavor_video_kind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_below="@+id/headline_header"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
android:layout_gravity="start|bottom"
+ android:layout_marginStart="8dp"
+ android:layout_marginBottom="8dp"
+ android:elevation="4dp"
android:scaleType="fitXY"
android:src="@drawable/baseline_play_circle_24"
android:visibility="visible"
- android:layout_below="@+id/headline_header"
- android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true"
- android:elevation="4dp"
- app:tint="?colorTertiary"
- android:layout_marginBottom="8dp"
- android:layout_marginStart="8dp" />
+ app:tint="?colorTertiary" />
<ImageView
android:id="@+id/gallery_overflow"
- android:clickable="true"
android:layout_width="wrap_content"
android:layout_height="24dp"
+ android:layout_gravity="bottom|end"
+ android:layout_marginBottom="10dp"
android:layout_weight="0"
- android:background="@drawable/ripple"
+ android:clickable="true"
+ android:elevation="4dp"
android:paddingLeft="4dp"
android:paddingRight="4dp"
android:src="@drawable/baseline_more_vert_24"
- android:layout_gravity="bottom|end"
- android:elevation="4dp"
app:tint="?colorTertiary"
- android:layout_marginBottom="10dp"
tools:targetApi="lollipop" />
</FrameLayout>
@@ -188,7 +172,6 @@
android:maxLines="5"
android:padding="16dp"
tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."
- android:textColor="?colorOnSurface"
android:textSize="13sp" />
</TableRow>
@@ -279,5 +262,4 @@
</LinearLayout>
</TableRow>
</TableLayout>
-
-</FrameLayout> \ No newline at end of file
+</com.google.android.material.card.MaterialCardView> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml
index a84ed131..fc82117e 100644
--- a/org.fox.ttrss/src/main/res/values-night/themes.xml
+++ b/org.fox.ttrss/src/main/res/values-night/themes.xml
@@ -28,7 +28,6 @@
<item name="feedlistTextColor">@android:color/white</item>
<item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
- <item name="headlineHeaderBackground">#99000000</item>
<item name="articleNoteTextColor">#bebebe</item>
<item name="articleNoteBackground">#303030</item>
<item name="parentBtnBackground">#101010</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index f5fac361..4b469913 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -3,7 +3,6 @@
<attr name="ttrssHorizontalDivider" format="reference|color" />
<attr name="feedlistTextColor" format="reference|color" />
<attr name="feedlistSelectedTextColor" format="reference|color" />
- <attr name="headlineHeaderBackground" format="reference|color" />
<attr name="headlineTitleHighScoreUnreadTextColor" format="reference|color" />
<attr name="articleNoteBackground" format="reference|color" />
<attr name="articleNoteTextColor" format="reference|color" />
diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml
index 1e348393..b5e5d313 100644
--- a/org.fox.ttrss/src/main/res/values/themes.xml
+++ b/org.fox.ttrss/src/main/res/values/themes.xml
@@ -24,7 +24,6 @@
<item name="ic_action_trending_down">@drawable/baseline_trending_down_24</item>
<item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
- <item name="headlineHeaderBackground">#ccffffff</item>
<item name="feedlistTextColor">@android:color/black</item>
<item name="feedlistSelectedTextColor">@android:color/black</item>
<item name="headlineTitleHighScoreUnreadTextColor">#008000</item>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-14 20:18:41 +0000