Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05a4fad5 authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

feat(theming): Get rid of textColor property

parent c9f50bf4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -223,8 +223,8 @@ public class FormattingHelpActivity extends BrandedActivity {
    }

    @Override
    public void applyBrand(int mainColor, int textColor) {
        final var util = BrandingUtil.of(mainColor, this);
    public void applyBrand(int color) {
        final var util = BrandingUtil.of(color, this);
        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
    }
}
+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ public class AboutActivity extends LockedActivity {
    }

    @Override
    public void applyBrand(int mainColor, int textColor) {
        final var util = BrandingUtil.of(mainColor, this);
    public void applyBrand(int color) {
        final var util = BrandingUtil.of(color, this);
        util.material.themeTabLayout(binding.tabs);
        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);
    }
+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ public class AboutFragmentLicenseTab extends BrandedFragment {
    }

    @Override
    public void applyBrand(int mainColor, int textColor) {
        final var util = BrandingUtil.of(mainColor, requireContext());
    public void applyBrand(int color) {
        final var util = BrandingUtil.of(color, requireContext());
        util.material.colorMaterialButtonPrimaryFilled(binding.aboutAppLicenseButton);
    }
}
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ public class AccountPickerDialogFragment extends BrandedDialogFragment {
    }

    @Override
    public void applyBrand(int mainColor, int textColor) {
    public void applyBrand(int color) {
        // Nothing to do...
    }
}
+3 −3
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ public class AccountSwitcherDialog extends BrandedDialogFragment {
    }

    @Override
    public void applyBrand(int mainColor, int textColor) {
        final var util = BrandingUtil.of(mainColor, requireContext());
        util.notes.colorLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, mainColor);
    public void applyBrand(int color) {
        final var util = BrandingUtil.of(color, requireContext());
        util.notes.colorLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, color);
    }
}
Loading