Fix menu icon tints in EditActivity (27bccd57) · Commits · e / os / Notes

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ import it.niedermann.owncloud.notes.util.ShareUtil;

		import static androidx.core.content.pm.ShortcutManagerCompat.isRequestPinShortcutSupported;
		import static it.niedermann.owncloud.notes.android.activity.EditNoteActivity.ACTION_SHORTCUT;
		import static it.niedermann.owncloud.notes.branding.BrandingUtil.tintMenuIcon;
		import static it.niedermann.owncloud.notes.util.ColorUtil.isColorDark;
		import static it.niedermann.owncloud.notes.util.Notes.isDarkThemeActive;

		@@ -149,12 +150,14 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
		}

		@Override
		public void onCreateOptionsMenu(@NonNull Menu menu, MenuInflater inflater) {
		public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
		inflater.inflate(R.menu.menu_note_fragment, menu);

		if (isRequestPinShortcutSupported(requireActivity()) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
		menu.add(Menu.NONE, MENU_ID_PIN, 110, R.string.pin_to_homescreen);
		}

		super.onCreateOptionsMenu(menu, inflater);
		}

		@Override
		@@ -169,6 +172,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
		private void prepareFavoriteOption(MenuItem item) {
		item.setIcon(note.isFavorite() ? R.drawable.ic_star_white_24dp : R.drawable.ic_star_border_white_24dp);
		item.setChecked(note.isFavorite());
		tintMenuIcon(item, colorAccent);
		}

		/**

+3 −7

Original line number	Diff line number	Diff line
		@@ -10,12 +10,13 @@ import androidx.annotation.ColorInt;
		import androidx.annotation.NonNull;
		import androidx.appcompat.app.AppCompatActivity;
		import androidx.appcompat.widget.Toolbar;
		import androidx.core.graphics.drawable.DrawableCompat;

		import com.google.android.material.floatingactionbutton.FloatingActionButton;

		import it.niedermann.owncloud.notes.R;

		import static it.niedermann.owncloud.notes.branding.BrandingUtil.tintMenuIcon;

		public abstract class BrandedActivity extends AppCompatActivity implements Branded {

		@ColorInt
		@@ -44,12 +45,7 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand
		@Override
		public boolean onCreateOptionsMenu(Menu menu) {
		for (int i = 0; i < menu.size(); i++) {
		Drawable drawable = menu.getItem(i).getIcon();
		if (drawable != null) {
		drawable = DrawableCompat.wrap(drawable);
		DrawableCompat.setTint(drawable, colorAccent);
		menu.getItem(i).setIcon(drawable);
		}
		tintMenuIcon(menu.getItem(i), colorAccent);
		}
		return super.onCreateOptionsMenu(menu);
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -2,13 +2,18 @@ package it.niedermann.owncloud.notes.branding;

		import android.content.Context;
		import android.util.TypedValue;
		import android.view.Menu;
		import android.view.MenuInflater;

		import androidx.annotation.ColorInt;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.fragment.app.Fragment;

		import it.niedermann.owncloud.notes.R;

		import static it.niedermann.owncloud.notes.branding.BrandingUtil.tintMenuIcon;

		public abstract class BrandedFragment extends Fragment implements Branded {

		@ColorInt
		@@ -33,4 +38,12 @@ public abstract class BrandedFragment extends Fragment implements Branded {
		applyBrand(mainColor, textColor);
		}
		}

		@Override
		public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
		super.onCreateOptionsMenu(menu, inflater);
		for (int i = 0; i < menu.size(); i++) {
		tintMenuIcon(menu.getItem(i), colorAccent);
		}
		}
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -4,7 +4,9 @@ import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.ColorStateList;
		import android.graphics.Color;
		import android.graphics.drawable.Drawable;
		import android.util.Log;
		import android.view.MenuItem;
		import android.widget.EditText;

		import androidx.annotation.ColorInt;
		@@ -109,4 +111,13 @@ public class BrandingUtil {
		}
		));
		}

		public static void tintMenuIcon(@NonNull MenuItem menuItem, @ColorInt int color) {
		Drawable drawable = menuItem.getIcon();
		if (drawable != null) {
		drawable = DrawableCompat.wrap(drawable);
		DrawableCompat.setTint(drawable, color);
		menuItem.setIcon(drawable);
		}
		}
		}