From 9644a0f5925fa09d5677784ba92b6710bfc29d15 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 15:55:54 +0300 Subject: drop some custom colors, replace with material3 theme stock; some tablet fixes --- .../main/java/org/fox/ttrss/ArticleFragment.java | 8 ++----- .../src/main/java/org/fox/ttrss/ArticlePager.java | 22 +++++++++--------- .../main/java/org/fox/ttrss/DetailActivity.java | 1 + .../main/java/org/fox/ttrss/HeadlinesFragment.java | 15 ++++++++++--- .../fox/ttrss/offline/OfflineArticleFragment.java | 26 +++++----------------- .../ttrss/offline/OfflineHeadlinesFragment.java | 2 +- .../res/layout-sw600dp-land/activity_master.xml | 3 +-- .../res/layout-sw600dp-port/activity_master.xml | 6 ++--- .../main/res/layout-sw600dp/activity_detail.xml | 3 +-- .../src/main/res/layout/activity_detail_phone.xml | 3 +-- .../src/main/res/layout/activity_master_phone.xml | 6 ++--- .../src/main/res/layout/feeds_row_selected.xml | 2 +- .../res/layout/headlines_row_selected_compact.xml | 2 +- .../headlines_row_selected_unread_compact.xml | 2 +- .../src/main/res/layout/headlines_row_unread.xml | 2 +- .../res/layout/headlines_row_unread_compact.xml | 12 +++++----- org.fox.ttrss/src/main/res/values-night/style.xml | 6 ----- org.fox.ttrss/src/main/res/values/attrs.xml | 7 ------ org.fox.ttrss/src/main/res/values/style.xml | 6 ----- 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 @@ -109,13 +109,23 @@ public class ArticlePager extends androidx.fragment.app.Fragment { m_searchQuery = searchQuery; } + @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
list = savedInstanceState.getParcelableArrayList("m_articles"); + /*ArrayList
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"> + android:layout_height="wrap_content"/> @@ -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 @@ 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"> + android:layout_width="0dp"> \ 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"/> @@ -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 @@ 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" > + android:background="?colorSurfaceContainerLowest"> - - - + app:icon="?ic_star_outline" /> 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 @@ #00FF00 #bebebe ?headlineSelectedExcerptTextColor - #1c1c1c #99000000 - #101010 #2d92c8 @android:color/black #bebebe #303030 #101010 @android:drawable/divider_horizontal_dark - #1c1d1e - #1c1d1e - @android:color/black - #1c1c1c @android:color/white @android:color/transparent @android:color/white 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 @@ - - - - - - - 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 @@ @android:drawable/divider_horizontal_bright - #e0e0e0 #909090 - #f0f0f0 - @android:color/white - #dddddd #ccffffff - @android:color/white - #dddddd @android:color/black @android:color/black @android:color/black -- cgit v1.2.3-54-g00ecf