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

Unverified Commit ac148eb2 authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #2721 from nextcloud/style/noid/searchbar 

🎨 Update searchbar theming to m3
parents 6e03d683 d9c0dd66

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,7 @@ public class NotesViewThemeUtils extends ViewThemeUtilsBase { 
    @Deprecated

    @Deprecated

    public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) {

    public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) {

        withScheme(searchBarWrapper, scheme -> {

        withScheme(searchBarWrapper, scheme -> {

            searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(dynamicColor.surface().getArgb(scheme)));

            searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(dynamicColor.surfaceContainerHigh().getArgb(scheme)));

            return searchBarWrapper;

            return searchBarWrapper;

        });

        });

    }

    }

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ import static android.os.Build.VERSION_CODES.O; 
import static android.view.View.GONE;

import static android.view.View.GONE;

import static android.view.View.VISIBLE;

import static android.view.View.VISIBLE;

import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;

import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode;

import static it.niedermann.owncloud.notes.NotesApplication.brandingUtil;

import static it.niedermann.owncloud.notes.NotesApplication.isGridViewEnabled;

import static it.niedermann.owncloud.notes.NotesApplication.isGridViewEnabled;

import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.DEFAULT_CATEGORY;

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.FAVORITES;
@@ -603,6 +604,7 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
        util.platform.colorNavigationView(binding.navigationView);

        util.platform.colorNavigationView(binding.navigationView);

        util.material.themeFAB(activityBinding.fabCreate);

        util.material.themeFAB(activityBinding.fabCreate);

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

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

        util.platform.colorTextView(binding.activityNotesListView.searchText, ColorRole.ON_SURFACE_VARIANT);

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

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

        util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);

        util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView);
@@ -658,6 +660,7 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A 
                break;

                break;

            default: throw new IllegalStateException("Unknown method: " + method.name());

            default: throw new IllegalStateException("Unknown method: " + method.name());

        }

        }

        brandingUtil().platform.colorImageView(activityBinding.sortingMethod, ColorRole.ON_SURFACE);

    }

    }





    @Override

    @Override

app/src/main/res/layout/activity_notes_list_view.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,6 @@ 
                    android:layout_marginVertical="@dimen/spacer_1hx"

                    android:layout_marginVertical="@dimen/spacer_1hx"

                    app:cardBackgroundColor="@color/appbar"

                    app:cardBackgroundColor="@color/appbar"

                    app:cardCornerRadius="@dimen/spacer_4x"

                    app:cardCornerRadius="@dimen/spacer_4x"

                    app:cardElevation="2dp"

                    app:strokeWidth="0dp">

                    app:strokeWidth="0dp">





                    <com.google.android.material.appbar.MaterialToolbar

                    <com.google.android.material.appbar.MaterialToolbar