owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

generalize color picker settings item

Browse Source
This commit is contained in:
sk
2022-12-21 14:49:38 +01:00
parent a6e0c877b5
commit 8a9b59c66a
2 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -102,7 +102,18 @@ public class SettingsFragment extends MastodonToolbarFragment{
GlobalUserPreferences.disableMarquee=i.checked; GlobalUserPreferences.disableMarquee=i.checked;
GlobalUserPreferences.save(); 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 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->{ 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 @Override
public int getViewType(){ public int getViewType(){
return 8; return 8;
@@ -590,7 +611,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
case 5 -> new HeaderViewHolder(true); case 5 -> new HeaderViewHolder(true);
case 6 -> new FooterViewHolder(); case 6 -> new FooterViewHolder();
case 7 -> new UpdateViewHolder(); case 7 -> new UpdateViewHolder();
case 8 -> new ColorPalettePickerViewHolder(); case 8 -> new ButtonViewHolder();
default -> throw new IllegalStateException("Unexpected value: "+viewType); 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 Button button;
private final PopupMenu popupMenu; private final PopupMenu popupMenu;
private final ImageView icon; private final ImageView icon;
private final TextView text;
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
public ColorPalettePickerViewHolder(){ public ButtonViewHolder(){
super(getActivity(), R.layout.item_settings_color_picker, list); super(getActivity(), R.layout.item_settings_button, list);
text=findViewById(R.id.text);
icon=findViewById(R.id.icon); 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=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
popupMenu.inflate(R.menu.color_palettes); popupMenu.inflate(R.menu.color_palettes);
popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S); 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 @Override
public void onBind(ColorPalettePicker item){ public void onBind(ButtonItem item){
icon.setImageResource(R.drawable.ic_fluent_color_24_regular); text.setText(item.text);
button.setText(switch(GlobalUserPreferences.color){ icon.setImageResource(item.icon);
case MATERIAL3 -> R.string.sk_color_palette_material3; item.buttonConsumer.accept(button);
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);
});
} }
} }

18
mastodon/src/main/res/layout/item_settings_color_picker.xml → mastodon/src/main/res/layout/item_settings_button.xml
View File

@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:paddingHorizontal="16dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:layoutDirection="locale"> android:layoutDirection="locale">
@@ -11,26 +13,26 @@
android:id="@+id/icon" android:id="@+id/icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
android:tint="?android:textColorPrimary" android:tint="?android:textColorPrimary"
tools:src="@drawable/ic_color_theme_preference"/> tools:src="@drawable/ic_fluent_color_24_regular"/>
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/text"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"
android:textSize="16sp" android:textSize="16sp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"/>
android:text="@string/sk_settings_color_palette"/>
<Button <Button
android:id="@+id/color_palette_button" android:id="@+id/button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="32dp"
android:background="@drawable/bg_inline_button" android:background="@drawable/bg_inline_button"
@@ -43,4 +45,4 @@
android:textSize="16sp" android:textSize="16sp"
tools:text="@string/sk_color_palette_pink" /> tools:text="@string/sk_color_palette_pink" />
</org.joinmastodon.android.ui.views.AutoOrientationLinearLayout> </LinearLayout>