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

fixes

6 files changed, 33 insertions, 41 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) {