diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java index 301a9319d..a9b362f4e 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java @@ -657,10 +657,12 @@ public class SettingsFragment extends MastodonToolbarFragment{ private class ColorPickerViewHolder extends BindableViewHolder{ private final Button button; private final PopupMenu popupMenu; + private final ImageView icon; @SuppressLint("ClickableViewAccessibility") public ColorPickerViewHolder(){ super(getActivity(), R.layout.item_settings_color_picker, list); + icon=findViewById(R.id.icon); button=findViewById(R.id.color_picker_button); popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL); popupMenu.inflate(R.menu.color_picker); @@ -694,6 +696,7 @@ public class SettingsFragment extends MastodonToolbarFragment{ @Override public void onBind(ColorPicker item){ + icon.setImageResource(R.drawable.ic_color_theme_preference); button.setText(switch(GlobalUserPreferences.color){ case PINK -> R.string.pink_color; case PURPLE -> R.string.purple_color; diff --git a/mastodon/src/main/res/drawable/ic_color_theme_preference.xml b/mastodon/src/main/res/drawable/ic_color_theme_preference.xml new file mode 100644 index 000000000..cede296bc --- /dev/null +++ b/mastodon/src/main/res/drawable/ic_color_theme_preference.xml @@ -0,0 +1,23 @@ + + + + + + + + + \ No newline at end of file diff --git a/mastodon/src/main/res/layout/item_settings_color_picker.xml b/mastodon/src/main/res/layout/item_settings_color_picker.xml index f4c37d26b..23702be36 100644 --- a/mastodon/src/main/res/layout/item_settings_color_picker.xml +++ b/mastodon/src/main/res/layout/item_settings_color_picker.xml @@ -3,14 +3,24 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="horizontal" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layoutDirection="locale" - android:paddingLeft="16dp" - android:paddingRight="16dp"> + android:layout_height="48dp" + android:gravity="center_vertical" + android:layoutDirection="locale"> + + + + tools:text="@string/pink_color" /> \ No newline at end of file