From 190a3b5b08de01f5ff03c9ce67023ad361c582f4 Mon Sep 17 00:00:00 2001 From: sk Date: Sun, 15 Oct 2023 21:17:26 +0200 Subject: [PATCH] use fluent dismiss button --- .../org/joinmastodon/android/fragments/ComposeFragment.java | 2 +- .../org/joinmastodon/android/fragments/ProfileFragment.java | 2 +- .../android/fragments/report/ReportDoneFragment.java | 2 +- .../java/org/joinmastodon/android/ui/SearchViewHelper.java | 2 +- mastodon/src/main/res/drawable/ic_baseline_close_24.xml | 5 ----- mastodon/src/main/res/layout/overlay_image_alt_text.xml | 2 +- 6 files changed, 5 insertions(+), 10 deletions(-) delete mode 100644 mastodon/src/main/res/drawable/ic_baseline_close_24.xml diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 90c662733c..de6d985b8f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -977,7 +977,7 @@ private void updateNavigationBarColor(boolean emojiKeyboardVisible){ @Override protected int getNavigationIconDrawableResource(){ - return R.drawable.ic_baseline_close_24; + return R.drawable.ic_fluent_dismiss_24_regular; } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 65763bd1d8..4adea014fa 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -1101,7 +1101,7 @@ private void enterEditMode(Account account){ updateMetadataHeight(); Toolbar toolbar=getToolbar(); - Drawable close=getToolbarContext().getDrawable(R.drawable.ic_baseline_close_24).mutate(); + Drawable close=getToolbarContext().getDrawable(R.drawable.ic_fluent_dismiss_24_regular).mutate(); close.setTint(UiUtils.getThemeColor(getToolbarContext(), R.attr.colorM3OnSurfaceVariant)); toolbar.setNavigationIcon(close); toolbar.setNavigationContentDescription(R.string.discard); diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java index 1f3f9fa7cf..2dda2d609b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportDoneFragment.java @@ -227,7 +227,7 @@ private void onBlockClick(){ @Override protected int getNavigationIconDrawableResource(){ - return R.drawable.ic_baseline_close_24; + return R.drawable.ic_fluent_dismiss_24_regular; } @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java b/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java index dd69baf16d..96d4c54806 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/SearchViewHelper.java @@ -71,7 +71,7 @@ public SearchViewHelper(Context context, Context toolbarContext, String hint){ searchLayout.addView(searchEdit, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 1f)); clearSearchButton=new ImageButton(context); - clearSearchButton.setImageResource(R.drawable.ic_baseline_close_24); + clearSearchButton.setImageResource(R.drawable.ic_fluent_dismiss_24_regular); clearSearchButton.setContentDescription(context.getString(R.string.clear)); clearSearchButton.setImageTintList(ColorStateList.valueOf(UiUtils.getThemeColor(context, R.attr.colorM3OnSurfaceVariant))); clearSearchButton.setBackground(UiUtils.getThemeDrawable(toolbarContext, android.R.attr.actionBarItemBackground)); diff --git a/mastodon/src/main/res/drawable/ic_baseline_close_24.xml b/mastodon/src/main/res/drawable/ic_baseline_close_24.xml deleted file mode 100644 index 844b6b62ef..0000000000 --- a/mastodon/src/main/res/drawable/ic_baseline_close_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/mastodon/src/main/res/layout/overlay_image_alt_text.xml b/mastodon/src/main/res/layout/overlay_image_alt_text.xml index 616103359a..2117f82f06 100644 --- a/mastodon/src/main/res/layout/overlay_image_alt_text.xml +++ b/mastodon/src/main/res/layout/overlay_image_alt_text.xml @@ -35,7 +35,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="end|top" - android:src="@drawable/ic_baseline_close_24" + android:src="@drawable/ic_fluent_dismiss_24_regular" android:tint="?colorM3DarkOnSurface" android:background="?android:actionBarItemBackground"/>