Material 3: Refactor settings dialog (4f5e0b70) · Commits · e / os / Notes

app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java

+45 −7

Original line number	Diff line number	Diff line
		package it.niedermann.owncloud.notes.branding;

		import static it.niedermann.owncloud.notes.NotesApplication.isDarkThemeActive;
		import static it.niedermann.owncloud.notes.shared.util.NotesColorUtil.contrastRatioIsSufficient;
		import static it.niedermann.owncloud.notes.shared.util.NotesColorUtil.contrastRatioIsSufficientBigAreas;

		import android.content.Context;
		import android.content.SharedPreferences;
		import android.content.res.ColorStateList;
		import android.graphics.Color;
		import android.graphics.drawable.Drawable;
		import android.graphics.drawable.LayerDrawable;
		import android.util.Log;
		import android.util.TypedValue;
		@@ -23,14 +25,13 @@ import androidx.lifecycle.LiveData;
		import androidx.lifecycle.MediatorLiveData;
		import androidx.preference.PreferenceManager;

		import com.google.android.material.textfield.TextInputLayout;

		import it.niedermann.android.sharedpreferences.SharedPreferenceIntLiveData;
		import it.niedermann.android.util.ColorUtil;
		import it.niedermann.owncloud.notes.NotesApplication;
		import it.niedermann.owncloud.notes.R;

		import static it.niedermann.owncloud.notes.shared.util.NotesColorUtil.contrastRatioIsSufficient;
		import static it.niedermann.owncloud.notes.shared.util.NotesColorUtil.contrastRatioIsSufficientBigAreas;

		import com.google.android.material.textfield.TextInputLayout;
		import it.niedermann.owncloud.notes.shared.util.NotesColorUtil;

		public class BrandingUtil {

		@@ -158,6 +159,10 @@ public class BrandingUtil {
		til.setErrorTextColor(colorDanger);
		til.setBoxStrokeErrorColor(colorDanger);
		til.setErrorIconTintList(colorDanger);
		final var editText = til.getEditText();
		if (editText != null) {
		editText.setHighlightColor(getTextHighlightBackgroundColor(editText.getContext(), color, colorPrimary, colorAccent));
		}
		}

		public static void tintMenuIcon(@NonNull MenuItem menuItem, @ColorInt int color) {
		@@ -184,4 +189,37 @@ public class BrandingUtil {
		context.getTheme().resolveAttribute(id, typedValue, true);
		return typedValue.data;
		}

		@ColorInt
		public static int getTextHighlightBackgroundColor(@NonNull Context context, @ColorInt int mainColor, @ColorInt int colorPrimary, @ColorInt int colorAccent) {
		if (isDarkThemeActive(context)) { // Dark background
		if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorPrimary)) { // But also dark text
		return mainColor;
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		} else { // Light brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorAccent)) { // But also dark text
		return Color.argb(77, Color.red(mainColor), Color.green(mainColor), Color.blue(mainColor));
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		}
		} else { // Light background
		if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorAccent)) { // But also dark text
		return Color.argb(77, Color.red(mainColor), Color.green(mainColor), Color.blue(mainColor));
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		} else { // Light brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorPrimary)) { // But also dark text
		return mainColor;
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		}
		}
		}
		}

app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java

+0 −33

Original line number	Diff line number	Diff line
		@@ -370,39 +370,6 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
		listener.close();
		}

		@ColorInt
		protected static int getTextHighlightBackgroundColor(@NonNull Context context, @ColorInt int mainColor, @ColorInt int colorPrimary, @ColorInt int colorAccent) {
		if (isDarkThemeActive(context)) { // Dark background
		if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorPrimary)) { // But also dark text
		return mainColor;
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		} else { // Light brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorAccent)) { // But also dark text
		return Color.argb(77, Color.red(mainColor), Color.green(mainColor), Color.blue(mainColor));
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		}
		} else { // Light background
		if (ColorUtil.INSTANCE.isColorDark(mainColor)) { // Dark brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorAccent)) { // But also dark text
		return Color.argb(77, Color.red(mainColor), Color.green(mainColor), Color.blue(mainColor));
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		} else { // Light brand color
		if (NotesColorUtil.contrastRatioIsSufficient(mainColor, colorPrimary)) { // But also dark text
		return mainColor;
		} else {
		return ContextCompat.getColor(context, R.color.defaultTextHighlightBackground);
		}
		}
		}
		}

		public interface NoteFragmentListener {
		void close();

app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import it.niedermann.owncloud.notes.shared.model.ISyncCallback;
		import it.niedermann.owncloud.notes.shared.util.DisplayUtils;

		import static androidx.core.view.ViewCompat.isAttachedToWindow;
		import static it.niedermann.owncloud.notes.branding.BrandingUtil.getTextHighlightBackgroundColor;
		import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;

		public class NoteEditFragment extends SearchableBaseNoteFragment {

app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import it.niedermann.owncloud.notes.persistence.entity.Note;
		import it.niedermann.owncloud.notes.shared.util.SSOUtil;

		import static androidx.core.view.ViewCompat.isAttachedToWindow;
		import static it.niedermann.owncloud.notes.branding.BrandingUtil.getTextHighlightBackgroundColor;
		import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;

		public class NotePreviewFragment extends SearchableBaseNoteFragment implements OnRefreshListener {

app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ import static android.view.View.VISIBLE;
		import static it.niedermann.owncloud.notes.NotesApplication.isDarkThemeActive;
		import static it.niedermann.owncloud.notes.NotesApplication.isGridViewEnabled;
		import static it.niedermann.owncloud.notes.branding.BrandingUtil.getSecondaryForegroundColorDependingOnTheme;
		import static it.niedermann.owncloud.notes.branding.BrandingUtil.getTextHighlightBackgroundColor;
		import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.DEFAULT_CATEGORY;
		import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.FAVORITES;
		import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.RECENT;
		@@ -607,6 +608,11 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A
		adapter.applyBrand(mainColor, textColor);
		adapterCategories.applyBrand(mainColor, textColor);
		invalidateOptionsMenu();

		// FIXME doesn't work
		final int colorPrimary = ContextCompat.getColor(this, R.color.primary);
		final int colorAccent = ContextCompat.getColor(this, R.color.accent);
		activityBinding.searchText.setHighlightColor(getTextHighlightBackgroundColor(this, mainColor, colorPrimary, colorAccent));
		}

		@Override