From 8a9b59c66a4bda63fa6dd5863c29f9197bf31658 Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Wed, 21 Dec 2022 14:49:38 +0100
Subject: [PATCH] generalize color picker settings item

---
 .../android/fragments/SettingsFragment.java   | 54 ++++++++++++-------
 ...or_picker.xml => item_settings_button.xml} | 18 ++++---
 2 files changed, 44 insertions(+), 28 deletions(-)
 rename mastodon/src/main/res/layout/{item_settings_color_picker.xml => item_settings_button.xml} (73%)

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 ca0165403..e6f10dd99 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -102,7 +102,18 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			GlobalUserPreferences.disableMarquee=i.checked;
 			GlobalUserPreferences.save();
 		}));
-		items.add(new ColorPalettePicker());
+		items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
+			b.setText(switch(GlobalUserPreferences.color){
+				case MATERIAL3 -> R.string.sk_color_palette_material3;
+				case PINK -> R.string.sk_color_palette_pink;
+				case PURPLE -> R.string.sk_color_palette_purple;
+				case GREEN -> R.string.sk_color_palette_green;
+				case BLUE -> R.string.sk_color_palette_blue;
+				case BROWN -> R.string.sk_color_palette_brown;
+				case RED -> R.string.sk_color_palette_red;
+				case YELLOW -> R.string.sk_color_palette_yellow;
+			});
+		}));
 
 		items.add(new HeaderItem(R.string.settings_behavior));
 		items.add(new SwitchItem(R.string.sk_settings_show_federated_timeline, R.drawable.ic_fluent_earth_24_regular, GlobalUserPreferences.showFederatedTimeline, i->{
@@ -489,7 +500,17 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 	}
 
-	public class ColorPalettePicker extends Item{
+	public class ButtonItem extends Item{
+		private int text;
+		private int icon;
+		private Consumer<Button> buttonConsumer;
+
+		public ButtonItem(@StringRes int text, @DrawableRes int icon, Consumer<Button> buttonConsumer) {
+			this.text = text;
+			this.icon = icon;
+			this.buttonConsumer = buttonConsumer;
+		}
+
 		@Override
 		public int getViewType(){
 			return 8;
@@ -590,7 +611,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case 5 -> new HeaderViewHolder(true);
 				case 6 -> new FooterViewHolder();
 				case 7 -> new UpdateViewHolder();
-				case 8 -> new ColorPalettePickerViewHolder();
+				case 8 -> new ButtonViewHolder();
 				default -> throw new IllegalStateException("Unexpected value: "+viewType);
 			};
 		}
@@ -719,16 +740,18 @@ public class SettingsFragment extends MastodonToolbarFragment{
 			}
 		}
 	}
-	private class ColorPalettePickerViewHolder extends BindableViewHolder<ColorPalettePicker>{
+	private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
 		private final Button button;
 		private final PopupMenu popupMenu;
 		private final ImageView icon;
+		private final TextView text;
 
 		@SuppressLint("ClickableViewAccessibility")
-		public ColorPalettePickerViewHolder(){
-			super(getActivity(), R.layout.item_settings_color_picker, list);
+		public ButtonViewHolder(){
+			super(getActivity(), R.layout.item_settings_button, list);
+			text=findViewById(R.id.text);
 			icon=findViewById(R.id.icon);
-			button=findViewById(R.id.color_palette_button);
+			button=findViewById(R.id.button);
 			popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
 			popupMenu.inflate(R.menu.color_palettes);
 			popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
@@ -738,19 +761,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 		}
 
 		@Override
-		public void onBind(ColorPalettePicker item){
-			icon.setImageResource(R.drawable.ic_fluent_color_24_regular);
-			button.setText(switch(GlobalUserPreferences.color){
-				case MATERIAL3 -> R.string.sk_color_palette_material3;
-				case PINK -> R.string.sk_color_palette_pink;
-				case PURPLE -> R.string.sk_color_palette_purple;
-				case GREEN -> R.string.sk_color_palette_green;
-				case BLUE -> R.string.sk_color_palette_blue;
-				case BROWN -> R.string.sk_color_palette_brown;
-				case RED -> R.string.sk_color_palette_red;
-				case YELLOW -> R.string.sk_color_palette_yellow;
-				default -> throw new IllegalStateException("Unexpected value: "+GlobalUserPreferences.color);
-			});
+		public void onBind(ButtonItem item){
+			text.setText(item.text);
+			icon.setImageResource(item.icon);
+			item.buttonConsumer.accept(button);
 		}
 	}
 
diff --git a/mastodon/src/main/res/layout/item_settings_color_picker.xml b/mastodon/src/main/res/layout/item_settings_button.xml
similarity index 73%
rename from mastodon/src/main/res/layout/item_settings_color_picker.xml
rename to mastodon/src/main/res/layout/item_settings_button.xml
index b05092794..6a3a1e6bf 100644
--- a/mastodon/src/main/res/layout/item_settings_color_picker.xml
+++ b/mastodon/src/main/res/layout/item_settings_button.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.joinmastodon.android.ui.views.AutoOrientationLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="48dp"
+    android:paddingHorizontal="16dp"
     android:gravity="center_vertical"
     android:layoutDirection="locale">
 
@@ -11,26 +13,26 @@
         android:id="@+id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginStart="16dp"
         android:layout_marginEnd="32dp"
         android:importantForAccessibility="no"
         android:tint="?android:textColorPrimary"
-        tools:src="@drawable/ic_color_theme_preference"/>
+        tools:src="@drawable/ic_fluent_color_24_regular"/>
 
 
     <TextView
-        android:layout_width="wrap_content"
+        android:id="@+id/text"
         android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
         android:layout_marginEnd="8dp"
         android:gravity="center_vertical"
         android:textColor="?android:textColorPrimary"
         android:textSize="16sp"
         android:singleLine="true"
-        android:ellipsize="end"
-        android:text="@string/sk_settings_color_palette"/>
+        android:ellipsize="end"/>
 
     <Button
-        android:id="@+id/color_palette_button"
+        android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="32dp"
         android:background="@drawable/bg_inline_button"
@@ -43,4 +45,4 @@
         android:textSize="16sp"
         tools:text="@string/sk_color_palette_pink" />
 
-</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file