drop some custom colors, replace with material3 theme stock; some tablet

fixes

19 files changed, 50 insertions, 84 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 2f5464f9..86a68d5b 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
@@ -405,8 +405,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         m_web = view.findViewById(R.id.article_content);
 
-        m_web.setBackgroundColor(Color.TRANSPARENT);
-
         m_web.setWebViewClient(new WebViewClient() {
         @Override
         public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -495,17 +493,15 @@ public class ArticleFragment extends androidx.fragment.app.Fragment  {
 
         String articleContent = m_article.content != null ? m_article.content : "";
 
-        ws.setJavaScriptEnabled(true);
+        ws.setJavaScriptEnabled(false);
 
         m_chromeClient = new FSVideoChromeClient(getView());
         m_web.setWebChromeClient(m_chromeClient);
+        m_web.setBackgroundColor(Color.TRANSPARENT);
 
         ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         ws.setMediaPlaybackRequiresUserGesture(true);
 
-        if (m_activity.isUiNightMode()) {
-            m_web.setBackgroundColor(Color.BLACK);
-        }
 
         if (m_prefs.getBoolean("justify_article_text", true)) {
             cssOverride += "body { text-align : justify; } ";
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index eb4cdd55..cdaca2dd 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -110,12 +110,22 @@ public class ArticlePager extends androidx.fragment.app.Fragment {
 	}
 
 	@Override
+	public void onSaveInstanceState(Bundle out) {
+		super.onSaveInstanceState(out);
+
+		out.putParcelable("m_article", m_article);
+		//out.putParcelable("m_articles", m_articles);
+		out.putParcelable("m_feed", m_feed);
+		out.putInt("m_firstId", m_firstId);
+	}
+
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
 		if (savedInstanceState != null) {
 			m_article = savedInstanceState.getParcelable("m_article");
-			m_articles = savedInstanceState.getParcelable("m_articles");
+			//m_articles = savedInstanceState.getParcelable("m_articles");
 			m_feed = savedInstanceState.getParcelable("m_feed");
 			m_firstId = savedInstanceState.getInt("m_firstId");
 		}
@@ -360,16 +370,6 @@ public class ArticlePager extends androidx.fragment.app.Fragment {
 		m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
 	}
 
-	@Override
-	public void onSaveInstanceState(Bundle out) {
-		super.onSaveInstanceState(out);
-
-		out.putParcelable("m_article", m_article);
-		out.putParcelable("m_articles", m_articles);
-		out.putParcelable("m_feed", m_feed);
-		out.putInt("m_firstId", m_firstId);
-	}
-	
 	@SuppressLint("NewApi")
 	@Override
 	public void onResume() {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
index 56fc1539..eda894dc 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java
@@ -114,6 +114,7 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList
                 ArticleList tmp = Application.getInstance().tmpArticleList;
 
                 if (tmp != null) {
+					m_articles.clear();
                     m_articles.addAll(tmp);
                 }
 
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 35ca0dba..f1546080 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
@@ -287,10 +287,17 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 			m_firstId = savedInstanceState.getInt("m_firstId");
 			m_lazyLoadDisabled = savedInstanceState.getBoolean("m_lazyLoadDisabled");
 
-			ArrayList<Article> list = savedInstanceState.getParcelableArrayList("m_articles");
+			/*ArrayList<Article> list = savedInstanceState.getParcelableArrayList("m_articles");
 
 			m_articles.clear(); // ?
-			m_articles.addAll(list);
+			m_articles.addAll(list);*/
+
+			ArticleList tmp = Application.getInstance().tmpArticleList;
+
+			if (tmp != null) {
+				m_articles.clear();
+				m_articles.addAll(Application.getInstance().tmpArticleList);
+			}
 
 			savedInstanceState.getBoolean("m_compactLayoutMode", m_compactLayoutMode);
 		}
@@ -309,8 +316,10 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment {
 		out.putString("m_searchQuery", m_searchQuery);
 		out.putInt("m_firstId", m_firstId);
 		out.putBoolean("m_lazyLoadDisabled", m_lazyLoadDisabled);
-		out.putParcelable("m_articles", m_articles);
+		//out.putParcelable("m_articles", m_articles);
 		out.putBoolean("m_compactLayoutMode", m_compactLayoutMode);
+
+		Application.getInstance().tmpArticleList = m_articles;
 	}
 
 	@Override
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
index 28839388..465c461d 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java
@@ -276,10 +276,6 @@ public class OfflineArticleFragment extends Fragment {
 			
 			if (m_web != null) {
 
-				if (m_activity.isUiNightMode()) {
-					m_web.setBackgroundColor(Color.BLACK);
-				}
-
 				m_web.setWebViewClient(new WebViewClient() {
 					@Override
 					public boolean shouldOverrideUrlLoading(WebView view, String url) {
@@ -312,19 +308,16 @@ public class OfflineArticleFragment extends Fragment {
                 });
 
                 String content;
-                String cssOverride = "";
 
                 WebSettings ws = m_web.getSettings();
                 ws.setSupportZoom(false);
+				ws.setJavaScriptEnabled(false);
 
-				if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-					ws.setJavaScriptEnabled(true);
+				m_chromeClient = new FSVideoChromeClient(getView());
+				m_web.setWebChromeClient(m_chromeClient);
+				m_web.setBackgroundColor(Color.TRANSPARENT);
 
-					m_chromeClient = new FSVideoChromeClient(getView());
-					m_web.setWebChromeClient(m_chromeClient);
-
-					ws.setMediaPlaybackRequiresUserGesture(true);
-				}
+				ws.setMediaPlaybackRequiresUserGesture(true);
 
 				// we need to show "insecure" file:// urls
 				if (m_prefs.getBoolean("offline_image_cache_enabled", false) &&
@@ -333,19 +326,12 @@ public class OfflineArticleFragment extends Fragment {
 					ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
 				}
 
-                TypedValue tvBackground = new TypedValue();
-                getActivity().getTheme().resolveAttribute(R.attr.articleBackground, tvBackground, true);
-
-                String backgroundHexColor = String.format("#%06X", (0xFFFFFF & tvBackground.data));
-
-                cssOverride = "body { background : "+ backgroundHexColor+"; }";
-
                 TypedValue tvTextColor = new TypedValue();
                 getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true);
 
                 String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data));
 
-                cssOverride += "body { color : "+textColor+"; }";
+                String cssOverride = "body { color : "+textColor+"; }";
 
                 TypedValue tvLinkColor = new TypedValue();
                 getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
index 386af632..258a1ddd 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java
@@ -505,7 +505,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
 		public ImageView flavorVideoKindView;
 		public View flavorImageOverflow;
 		public View headlineHeader;
-		public ImageView attachmentsView;
+		public MaterialButton attachmentsView;
 		public MaterialButton scoreView;
 
 		public ArticleViewHolder(View v) {
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
index 9ba663f6..879725c1 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml
@@ -27,14 +27,13 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="0.25"
-            android:background="?feedlistBackground" >
+            android:background="?colorSurfaceContainer">
         </FrameLayout>
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="0dp"
             android:layout_weight="0.75"
             android:elevation="4dp"
-            android:background="?headlinesBackground"
             android:layout_height="match_parent">
 
             <FrameLayout
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
index 95cb35e0..714a68d5 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml
@@ -32,8 +32,7 @@
                 android:id="@+id/headlines_fragment"
                 app:layout_behavior=".util.FabAwareScrollingViewBehavior"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?headlinesBackground" />
+                android:layout_height="wrap_content"/>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -45,7 +44,6 @@
         android:layout_width="300dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:background="@android:color/white"
         android:elevation="10dp"
         android:fitsSystemWindows="true"
         app:insetForeground="#4000">
@@ -53,7 +51,7 @@
         <FrameLayout
             android:id="@+id/feeds_fragment"
             android:layout_width="match_parent"
-            android:background="?feedlistBackground"
+            android:background="?colorSurfaceContainer"
             android:layout_height="match_parent" >
         </FrameLayout>
 
diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml
index 89ab61f5..be10ef36 100644
--- a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml
+++ b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml
@@ -26,8 +26,7 @@
             android:id="@+id/headlines_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="0.3"
-            android:background="?headlinesBackground" >
+            android:layout_weight="0.3">
         </FrameLayout>
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
index ddffc89e..1d428e5e 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml
@@ -40,8 +40,7 @@
         android:id="@+id/headlines_fragment"
         android:visibility="gone"
         android:layout_height="0dp"
-        android:layout_width="0dp"
-        android:background="?headlinesBackground">
+        android:layout_width="0dp">
     </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
index 6ae5064f..9f47eb24 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml
@@ -31,8 +31,7 @@
                 android:id="@+id/headlines_fragment"
                 app:layout_behavior=".util.FabAwareScrollingViewBehavior"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?headlinesBackground" />
+                android:layout_height="wrap_content"/>
 
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -42,7 +41,6 @@
             android:layout_width="300dp"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:background="@android:color/white"
             android:elevation="10dp"
             android:fitsSystemWindows="true"
             app:insetForeground="#4000">
@@ -50,7 +48,7 @@
         <FrameLayout
             android:id="@+id/feeds_fragment"
             android:layout_width="match_parent"
-            android:background="?feedlistBackground"
+            android:background="?colorSurfaceContainer"
             android:layout_height="match_parent" >
         </FrameLayout>
 
diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
index d5b6cb3c..6c7a4b29 100755
--- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
+++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants"
-    android:background="?feedsSelectedBackground"
+    android:background="?colorSurfaceDim"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     android:paddingTop="8dp"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
index da2401eb..bd114157 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?headlineSelectedBackground"
+    android:background="?colorPrimaryContainer"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
index 3b6436fe..3422fae6 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml
@@ -8,7 +8,7 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?headlineSelectedBackground"
+    android:background="?colorPrimaryContainer"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
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 aafad9a8..5ea05c31 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
@@ -5,7 +5,7 @@
     android:id="@+id/headlines_row"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?headlineUnreadBackground">
+    android:background="?colorSurfaceContainerLowest">
 
     <TableLayout
         android:layout_width="fill_parent"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
index e440188f..f65cee58 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread_compact.xml
@@ -2,12 +2,13 @@
 <LinearLayout
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/headlines_row"
     android:padding="@dimen/activity_horizontal_margin"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:background="?headlineUnreadBackground"
+    android:background="?colorSurfaceContainerLowest"
     tools:ignore="HardcodedText" >
 
     <FrameLayout
@@ -112,17 +113,16 @@
             />
 
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/marked"
+            style="?attr/materialIconButtonStyle"
             android:background="@drawable/ripple"
-            android:layout_width="24dp"
+            android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_height="24dp"
             android:layout_weight="0"
             android:clickable="true"
-            android:src="?ic_star_outline" />
-
-
+            app:icon="?ic_star_outline" />
 
     </LinearLayout>
 
diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml
index 3c15a0fd..9f9183e8 100644
--- a/org.fox.ttrss/src/main/res/values-night/style.xml
+++ b/org.fox.ttrss/src/main/res/values-night/style.xml
@@ -13,19 +13,13 @@
         <item name="headlineTitleHighScoreUnreadTextColor">#00FF00</item>
         <item name="headlineSelectedExcerptTextColor">#bebebe</item>
         <item name="headlineSelectedSecondaryTextColor">?headlineSelectedExcerptTextColor</item>
-        <item name="headlineSelectedBackground">#1c1c1c</item>
         <item name="headlineHeaderBackground">#99000000</item>
-        <item name="headlineUnreadBackground">#101010</item>
         <item name="linkColor">#2d92c8</item>
         <item name="loadingBackground">@android:color/black</item>
         <item name="articleNoteTextColor">#bebebe</item>
         <item name="articleNoteBackground">#303030</item>
         <item name="parentBtnBackground">#101010</item>
         <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item>
-        <item name="feedlistBackground">#1c1d1e</item>
-        <item name="headlinesBackground">#1c1d1e</item>
-        <item name="articleBackground">@android:color/black</item>
-        <item name="feedsSelectedBackground">#1c1c1c</item>
         <item name="feedlistSelectedTextColor">@android:color/white</item>
         <item name="articleHeader">@android:color/transparent</item>
         <item name="articleHeaderTextColor">@android:color/white</item>
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml
index 93892545..a16fd6f4 100755
--- a/org.fox.ttrss/src/main/res/values/attrs.xml
+++ b/org.fox.ttrss/src/main/res/values/attrs.xml
@@ -1,16 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <attr name="ttrssHorizontalDivider" format="reference|color" />
-    <attr name="feedlistBackground" format="reference|color" />
     <attr name="unreadCounterColor" format="reference|color" />
-    <attr name="headlinesBackground" format="reference|color" />
-    <attr name="articleBackground" format="reference|color" />
-    <attr name="headlineSelectedBackground" format="reference|color" />
-    <attr name="headlineUnreadBackground" format="reference|color" />
-    <attr name="feedsSelectedBackground" format="reference|color" />
     <attr name="feedlistTextColor" format="reference|color" />
     <attr name="feedlistSelectedTextColor" format="reference|color" />
-    <!-- <attr name="headlineTextColor" format="reference|color" /> -->
     <attr name="headlineHeaderBackground" format="reference|color" />
     <attr name="headlineUnreadTextColor" format="reference|color" />
     <attr name="headlineSelectedTextColor" format="reference|color" />    
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index 6a494015..ab3f39dc 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -11,14 +11,8 @@
 
         <!-- <item name="statusBarHintColor">?colorPrimary</item> -->
         <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item>
-        <item name="feedlistBackground">#e0e0e0</item>
         <item name="unreadCounterColor">#909090</item>
-        <item name="headlinesBackground">#f0f0f0</item>
-        <item name="articleBackground">@android:color/white</item>
-        <item name="headlineSelectedBackground">#dddddd</item>
         <item name="headlineHeaderBackground">#ccffffff</item>
-        <item name="headlineUnreadBackground">@android:color/white</item>
-        <item name="feedsSelectedBackground">#dddddd</item>
         <item name="feedlistTextColor">@android:color/black</item>
         <item name="feedlistSelectedTextColor">@android:color/black</item>
         <item name="headlineUnreadTextColor">@android:color/black</item>