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

Commit 1dbde30c authored by Stefan Niedermann's avatar Stefan Niedermann Committed by Andy Scherzinger
Browse files

feat(theming): Align theming closer to files app 

Follow-Up to https://github.com/nextcloud/notes-android/pull/1680



Signed-off-by: default avatarStefan Niedermann <info@niedermann.it>
parent 6b336e4d

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

+4 −5
Original line number Diff line number Diff line 
package it.niedermann.owncloud.notes;



import android.content.SharedPreferences;

import static it.niedermann.owncloud.notes.shared.util.NoteUtil.getFontSizeFromPreferences;



import android.graphics.Typeface;

import android.os.Bundle;

import android.text.method.LinkMovementMethod;
@@ -10,13 +11,10 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

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;



public class FormattingHelpActivity extends BrandedActivity {



    private ActivityFormattingHelpBinding binding;
@@ -225,6 +223,7 @@ public class FormattingHelpActivity extends BrandedActivity { 
    @Override

    public void applyBrand(int color) {

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

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

        util.platform.themeStatusBar(this);

        util.material.themeToolbar(binding.toolbar);

    }

}

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

+3 −2
Original line number Diff line number Diff line
@@ -52,8 +52,9 @@ public class AboutActivity extends LockedActivity { 
    @Override

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

        util.platform.themeStatusBar(this);

        util.material.themeToolbar(binding.toolbar);

        util.material.themeTabLayoutOnSurface(binding.tabs);

    }



    private static class TabsStateAdapter extends FragmentStateAdapter {

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

+25 −2
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ import static com.nextcloud.android.common.ui.util.ColorStateListUtilsKt.buildCo 
import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;



import android.content.Context;

import android.content.res.ColorStateList;

import android.graphics.Color;

import android.graphics.PorterDuff;

import android.graphics.drawable.LayerDrawable;
@@ -21,9 +22,9 @@ import androidx.core.graphics.drawable.DrawableCompat; 


import com.google.android.material.appbar.AppBarLayout;

import com.google.android.material.appbar.MaterialToolbar;

import com.google.android.material.card.MaterialCardView;

import com.nextcloud.android.common.ui.theme.MaterialSchemes;

import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase;

import com.nextcloud.android.common.ui.theme.utils.ColorRole;

import com.nextcloud.android.common.ui.theme.utils.MaterialViewThemeUtils;



import it.niedermann.android.util.ColorUtil;
@@ -31,7 +32,6 @@ import it.niedermann.owncloud.notes.R; 
import it.niedermann.owncloud.notes.main.navigation.NavigationItem;

import it.niedermann.owncloud.notes.shared.util.NotesColorUtil;

import kotlin.Pair;

import scheme.Scheme;



public class NotesViewThemeUtils extends ViewThemeUtilsBase {
@@ -148,4 +148,27 @@ public class NotesViewThemeUtils extends ViewThemeUtilsBase { 
            }

        }

    }



    /**

     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} component.

     */

    @Deprecated

    public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) {

        withScheme(searchBarWrapper, scheme -> {

            searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(scheme.getSurface()));

            return searchBarWrapper;

        });

    }



    /**

     * @deprecated Should be replaced with {@link com.google.android.material.search.SearchBar} or {@link MaterialViewThemeUtils#themeToolbar(MaterialToolbar)}

     */

    @Deprecated

    public void themeSearchToolbar(@NonNull MaterialToolbar toolbar) {

        withScheme(toolbar, scheme -> {

            toolbar.setNavigationIconTint(scheme.getOnSurface());

            toolbar.setTitleTextColor(scheme.getOnSurface());

            return toolbar;

        });

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -420,6 +420,7 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment 
    @Override

    public void applyBrand(int color) {

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

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

        util.platform.themeStatusBar(this);

        util.material.themeToolbar(binding.toolbar);

    }

}

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

+2 −1
Original line number Diff line number Diff line
@@ -598,7 +598,8 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
        util.androidx.themeSwipeRefreshLayout(activityBinding.swiperefreshlayout);

        util.platform.colorCircularProgressBar(activityBinding.progressCircular, ColorRole.PRIMARY);

        util.platform.colorNavigationView(binding.navigationView);

        util.notes.applyBrandToPrimaryToolbar(activityBinding.appBar, activityBinding.searchToolbar, colorAccent);

        util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper);

        util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar);



        binding.headerView.setBackgroundColor(color);

        @ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(color);