From f933bdbc53ac97a639bcb09d5a5d4c250cdff4d2 Mon Sep 17 00:00:00 2001 From: sk Date: Sat, 27 May 2023 01:13:32 +0200 Subject: [PATCH] button with ripple for files and instance picker --- .../fragments/onboarding/CustomWelcomeFragment.java | 1 + mastodon/src/main/res/drawable/bg_search_button.xml | 7 +------ mastodon/src/main/res/layout/display_item_file.xml | 2 +- mastodon/src/main/res/layout/item_instance_custom.xml | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java index 32f721c3a..4132cfaf2 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java @@ -124,6 +124,7 @@ public class CustomWelcomeFragment extends InstanceCatalogFragment { super.onViewCreated(view, savedInstanceState); view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorWindowBackground)); list.setItemAnimator(new BetterItemAnimator()); + ((UsableRecyclerView) list).setSelector(null); } @Override diff --git a/mastodon/src/main/res/drawable/bg_search_button.xml b/mastodon/src/main/res/drawable/bg_search_button.xml index 9b7d630ff..717bda7ce 100644 --- a/mastodon/src/main/res/drawable/bg_search_button.xml +++ b/mastodon/src/main/res/drawable/bg_search_button.xml @@ -2,10 +2,5 @@ - - - - - - + diff --git a/mastodon/src/main/res/layout/display_item_file.xml b/mastodon/src/main/res/layout/display_item_file.xml index f206777ba..e428abf26 100644 --- a/mastodon/src/main/res/layout/display_item_file.xml +++ b/mastodon/src/main/res/layout/display_item_file.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginVertical="4dp" - android:background="@drawable/bg_search_field" + android:background="@drawable/bg_search_button" android:paddingVertical="12dp" android:orientation="horizontal"> diff --git a/mastodon/src/main/res/layout/item_instance_custom.xml b/mastodon/src/main/res/layout/item_instance_custom.xml index c8cf010f6..25a2058a3 100644 --- a/mastodon/src/main/res/layout/item_instance_custom.xml +++ b/mastodon/src/main/res/layout/item_instance_custom.xml @@ -8,7 +8,7 @@ + android:background="@drawable/bg_search_button">