From 2ee7833ca1b401b76a04c88820589ddd527de09b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 21:51:19 +0300 Subject: reimport most material icons as uptodate vector resources --- org.fox.ttrss/src/main/res/layout/activity_gallery.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_gallery.xml') 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 7f47de50..9770c4c8 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -1,4 +1,5 @@ + android:layout_marginTop="@dimen/activity_vertical_margin" + app:tint="?colorAccent" /> Date: Wed, 7 May 2025 07:03:44 +0300 Subject: switch to static material3 colorset --- org.fox.ttrss/src/main/AndroidManifest.xml | 4 +- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 10 +- .../ttrss/offline/OfflineHeadlinesFragment.java | 8 +- .../src/main/res/layout/activity_gallery.xml | 4 +- .../src/main/res/layout/activity_master_phone.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_row.xml | 2 +- .../src/main/res/layout/feeds_row_selected.xml | 2 +- .../src/main/res/layout/headlines_row.xml | 4 +- .../src/main/res/layout/headlines_row_unread.xml | 4 +- org.fox.ttrss/src/main/res/values-night/colors.xml | 143 ++++++++++++++++++++ org.fox.ttrss/src/main/res/values-night/style.xml | 21 --- .../src/main/res/values-night/theme_overlays.xml | 98 ++++++++++++++ org.fox.ttrss/src/main/res/values-night/themes.xml | 89 +++++++++++++ org.fox.ttrss/src/main/res/values/colors.xml | 147 ++++++++++++++++++++- org.fox.ttrss/src/main/res/values/style.xml | 53 -------- .../src/main/res/values/theme_overlays.xml | 98 ++++++++++++++ org.fox.ttrss/src/main/res/values/themes.xml | 86 ++++++++++++ 18 files changed, 677 insertions(+), 100 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/values-night/colors.xml delete mode 100644 org.fox.ttrss/src/main/res/values-night/style.xml create mode 100644 org.fox.ttrss/src/main/res/values-night/theme_overlays.xml create mode 100644 org.fox.ttrss/src/main/res/values-night/themes.xml mode change 100755 => 100644 org.fox.ttrss/src/main/res/values/colors.xml delete mode 100755 org.fox.ttrss/src/main/res/values/style.xml create mode 100644 org.fox.ttrss/src/main/res/values/theme_overlays.xml create mode 100644 org.fox.ttrss/src/main/res/values/themes.xml (limited to 'org.fox.ttrss/src/main/res/layout/activity_gallery.xml') diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index b5da6cd3..b79e3b05 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -98,7 +98,7 @@ android:excludeFromRecents="true" android:label="@string/app_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > @@ -112,7 +112,7 @@ android:excludeFromRecents="true" android:label="@string/subscribe_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > 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 ef2e23a6..06e815f0 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 @@ -1032,8 +1032,8 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -1046,7 +1046,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (article.marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1077,7 +1077,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.scoreView.setIconResource(tv.resourceId); if (article.score > Article.SCORE_HIGH) - holder.scoreView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.scoreView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1137,7 +1137,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.publishedView.setIconResource(tv.resourceId); if (article.published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); 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 368ec95c..8500d7c7 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 @@ -790,8 +790,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.feedTitleView.setVisibility(View.GONE); } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -814,7 +814,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.markedView.setIconResource(tv.resourceId); if (marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -845,7 +845,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.publishedView.setIconResource(tv.resourceId); if (published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); 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 9770c4c8..9326a19e 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -20,11 +20,11 @@ android:layout_height="26dp" android:layout_weight="0" android:background="@drawable/ripple" - android:src="?ic_dots_vertical_circle" + android:src="?ic_dots_vertical" android:layout_alignParentRight="true" android:layout_marginRight="8dp" android:layout_marginTop="@dimen/activity_vertical_margin" - app:tint="?colorAccent" /> + app:tint="?colorTertiary" /> + app:tint="?colorTertiary" /> - #cccccc - - #F4511E - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/theme_overlays.xml b/org.fox.ttrss/src/main/res/values/theme_overlays.xml new file mode 100644 index 00000000..e81f18fb --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/theme_overlays.xml @@ -0,0 +1,98 @@ + + + + diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml new file mode 100644 index 00000000..54613ad9 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -0,0 +1,86 @@ + + + -- cgit v1.2.3-54-g00ecf From 01e503c7ddfffcb458de48dc73f2ffb492161153 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 8 May 2025 10:20:42 +0300 Subject: show actionbar in prefs activity so it would be more obvious how to exit it, use fullscreen view for gallery activity --- .../src/main/java/org/fox/ttrss/GalleryActivity.java | 2 ++ .../src/main/java/org/fox/ttrss/PreferencesActivity.java | 1 - org.fox.ttrss/src/main/res/layout/activity_gallery.xml | 15 ++++++--------- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_gallery.xml') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index f37d4a98..cd1677c6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -3,6 +3,7 @@ package org.fox.ttrss; import android.graphics.Bitmap; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; @@ -12,6 +13,7 @@ import android.view.View; import android.widget.PopupMenu; import android.widget.ProgressBar; +import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java index 2f8237bd..7c0c7e3e 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -24,7 +24,6 @@ public class PreferencesActivity extends CommonActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setHomeButtonEnabled(true); - getSupportActionBar().hide(); if (savedInstanceState == null) { android.app.FragmentTransaction ft = getFragmentManager().beginTransaction(); 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 9326a19e..60b6ec1e 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -1,10 +1,8 @@ - + android:layout_marginTop="48dp" + app:iconTint="?colorTertiary" /> Date: Thu, 8 May 2025 11:55:05 +0300 Subject: use immersive mode for gallery --- .../src/main/java/org/fox/ttrss/GalleryActivity.java | 13 +++++++++++++ org.fox.ttrss/src/main/res/layout/activity_gallery.xml | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_gallery.xml') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index cd1677c6..afb45bee 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -10,6 +10,7 @@ import android.util.Log; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.Window; import android.widget.PopupMenu; import android.widget.ProgressBar; @@ -17,6 +18,9 @@ import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; +import androidx.core.view.WindowCompat; +import androidx.core.view.WindowInsetsCompat; +import androidx.core.view.WindowInsetsControllerCompat; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; @@ -256,6 +260,15 @@ public class GalleryActivity extends CommonActivity { super.onCreate(savedInstanceState); + Window window = getWindow(); + WindowInsetsControllerCompat windowInsetsController = + WindowCompat.getInsetsController(window, window.getDecorView()); + if (windowInsetsController == null) { + return; + } + // Hide the system bars. + windowInsetsController.hide(WindowInsetsCompat.Type.systemBars()); + setContentView(R.layout.activity_gallery); Toolbar toolbar = findViewById(R.id.toolbar); 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 60b6ec1e..876315dd 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -19,8 +19,6 @@ android:layout_weight="0" app:icon="?ic_dots_vertical" android:layout_alignParentRight="true" - android:layout_marginRight="8dp" - android:layout_marginTop="48dp" app:iconTint="?colorTertiary" /> Date: Thu, 8 May 2025 11:56:10 +0300 Subject: adjust overflow margin a bit --- org.fox.ttrss/src/main/res/layout/activity_gallery.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'org.fox.ttrss/src/main/res/layout/activity_gallery.xml') 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 876315dd..ab383876 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -19,6 +19,7 @@ android:layout_weight="0" app:icon="?ic_dots_vertical" android:layout_alignParentRight="true" + android:layout_marginTop="16dp" app:iconTint="?colorTertiary" /> Date: Thu, 8 May 2025 12:26:19 +0300 Subject: adjust gallery view, stop hiding bars for now --- .../src/main/java/org/fox/ttrss/GalleryActivity.java | 13 ++----------- org.fox.ttrss/src/main/res/layout/activity_gallery.xml | 5 +++-- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'org.fox.ttrss/src/main/res/layout/activity_gallery.xml') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index afb45bee..eb160708 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -18,6 +18,8 @@ import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat; @@ -260,22 +262,11 @@ public class GalleryActivity extends CommonActivity { super.onCreate(savedInstanceState); - Window window = getWindow(); - WindowInsetsControllerCompat windowInsetsController = - WindowCompat.getInsetsController(window, window.getDecorView()); - if (windowInsetsController == null) { - return; - } - // Hide the system bars. - windowInsetsController.hide(WindowInsetsCompat.Type.systemBars()); - setContentView(R.layout.activity_gallery); Toolbar toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); - //m_progress = (ProgressBar) findViewById(R.id.gallery_check_progress); - getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().hide(); 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 ab383876..f44bb74b 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -19,7 +19,7 @@ android:layout_weight="0" app:icon="?ic_dots_vertical" android:layout_alignParentRight="true" - android:layout_marginTop="16dp" + android:layout_marginTop="48dp" app:iconTint="?colorTertiary" />