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

Unverified Commit 1f1cdc04 authored by Álvaro Brey's avatar Álvaro Brey Committed by GitHub
Browse files

Merge pull request #1680 from nextcloud/theme-alignment 

feat(theming): Use nextcloud-common library for theming UI elements (#1648)
parents 466d0531 2558acd4

app/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ dependencies { 
    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'



    // Nextcloud SSO

    implementation 'com.github.nextcloud.android-common:ui:0.6.0'

    implementation 'com.github.nextcloud:Android-SingleSignOn:0.6.1'

    implementation 'com.github.stefan-niedermann:android-commons:0.2.9'

    implementation 'com.github.stefan-niedermann.nextcloud-commons:sso-glide:1.6.4'

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

+4 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ import androidx.preference.PreferenceManager; 


import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.branding.BrandedActivity;

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

import it.niedermann.owncloud.notes.databinding.ActivityFormattingHelpBinding;



import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;
@@ -222,7 +223,8 @@ public class FormattingHelpActivity extends BrandedActivity { 
    }



    @Override

    public void applyBrand(int mainColor, int textColor) {

        applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar);

    public void applyBrand(int color) {

        final var util = BrandingUtil.of(color, this);

        util.notes.applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar, colorAccent);

    }

}

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

+2 −17
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes;



import static androidx.preference.PreferenceManager.getDefaultSharedPreferences;



import android.app.Application;

import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.util.Log;



import androidx.appcompat.app.AppCompatDelegate;
@@ -11,8 +11,6 @@ import androidx.preference.PreferenceManager; 


import it.niedermann.owncloud.notes.preferences.DarkModeSetting;



import static androidx.preference.PreferenceManager.getDefaultSharedPreferences;



public class NotesApplication extends Application {

    private static final String TAG = NotesApplication.class.getSimpleName();
@@ -57,19 +55,6 @@ public class NotesApplication extends Application { 
        return DarkModeSetting.valueOf(mode);

    }



    public static boolean isDarkThemeActive(Context context, DarkModeSetting setting) {

        if (setting == DarkModeSetting.SYSTEM_DEFAULT) {

            return isDarkThemeActive(context);

        } else {

            return setting == DarkModeSetting.DARK;

        }

    }



    public static boolean isDarkThemeActive(Context context) {

        final int uiMode = context.getResources().getConfiguration().uiMode;

        return (uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;

    }



    public static void setLockedPreference(boolean lockedPreference) {

        Log.i(TAG, "New locked preference: " + lockedPreference);

        NotesApplication.lockedPreference = lockedPreference;

app/src/main/java/it/niedermann/owncloud/notes/about/AboutActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ public class AboutActivity extends LockedActivity { 
    }



    @Override

    public void applyBrand(int mainColor, int textColor) {

        applyBrandToPrimaryToolbar(binding.appBar, binding.toolbar);

        @ColorInt int finalMainColor = BrandingUtil.getSecondaryForegroundColorDependingOnTheme(this, mainColor);

        binding.tabs.setSelectedTabIndicatorColor(finalMainColor);

    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);

    }



    private static class TabsStateAdapter extends FragmentStateAdapter {

app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentLicenseTab.java

+3 −4
Original line number Diff line number Diff line
@@ -34,9 +34,8 @@ public class AboutFragmentLicenseTab extends BrandedFragment { 
    }



    @Override

    public void applyBrand(int mainColor, int textColor) {

        @ColorInt final int finalMainColor = BrandingUtil.getSecondaryForegroundColorDependingOnTheme(requireContext(), mainColor);

        DrawableCompat.setTintList(binding.aboutAppLicenseButton.getBackground(), ColorStateList.valueOf(finalMainColor));

        binding.aboutAppLicenseButton.setTextColor(ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(finalMainColor));

    public void applyBrand(int color) {

        final var util = BrandingUtil.of(color, requireContext());

        util.material.colorMaterialButtonPrimaryFilled(binding.aboutAppLicenseButton);

    }

}
 
 No newline at end of file