From d9c0dd661d13b569f0a1363abd31ddef316a8669 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 16 Jul 2025 16:02:03 +0200 Subject: [PATCH] style(searchbar): Migrate to M3 style Signed-off-by: Andy Scherzinger --- .../owncloud/notes/branding/NotesViewThemeUtils.java | 2 +- .../java/it/niedermann/owncloud/notes/main/MainActivity.java | 3 +++ app/src/main/res/layout/activity_notes_list_view.xml | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java index a28e68126..59c1fde7b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java @@ -171,7 +171,7 @@ public int getTextHighlightBackgroundColor(@NonNull Context context, @Deprecated public void themeSearchCardView(@NonNull MaterialCardView searchBarWrapper) { withScheme(searchBarWrapper, scheme -> { - searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(dynamicColor.surface().getArgb(scheme))); + searchBarWrapper.setBackgroundTintList(ColorStateList.valueOf(dynamicColor.surfaceContainerHigh().getArgb(scheme))); return searchBarWrapper; }); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index c94f2ba44..9af168c37 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -11,6 +11,7 @@ import static android.view.View.GONE; import static android.view.View.VISIBLE; 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.shared.model.ENavigationCategoryType.DEFAULT_CATEGORY; import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.FAVORITES; @@ -603,6 +604,7 @@ public void applyBrand(int color) { util.platform.colorNavigationView(binding.navigationView); util.material.themeFAB(activityBinding.fabCreate); util.notes.themeSearchCardView(binding.activityNotesListView.searchBarWrapper); + util.platform.colorTextView(binding.activityNotesListView.searchText, ColorRole.ON_SURFACE_VARIANT); util.notes.themeSearchToolbar(binding.activityNotesListView.searchToolbar); util.notes.themeToolbarSearchView(binding.activityNotesListView.searchView); @@ -658,6 +660,7 @@ private void updateSortMethodIcon(CategorySortingMethod method) { break; default: throw new IllegalStateException("Unknown method: " + method.name()); } + brandingUtil().platform.colorImageView(activityBinding.sortingMethod, ColorRole.ON_SURFACE); } @Override diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml index 3a7ef9f0c..398abcc4e 100644 --- a/app/src/main/res/layout/activity_notes_list_view.xml +++ b/app/src/main/res/layout/activity_notes_list_view.xml @@ -36,7 +36,6 @@ android:layout_marginVertical="@dimen/spacer_1hx" app:cardBackgroundColor="@color/appbar" app:cardCornerRadius="@dimen/spacer_4x" - app:cardElevation="2dp" app:strokeWidth="0dp">