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

Adding the nord theme

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-22 19:27:02 -03:00
parent 28db90aa82
commit 61049a1302
7 changed files with 140 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ import android.view.WindowInsets;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.PopupMenu; import android.widget.PopupMenu;
@@ -102,7 +104,25 @@ public class SettingsFragment extends MastodonToolbarFragment{
GlobalUserPreferences.disableMarquee=i.checked; GlobalUserPreferences.disableMarquee=i.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();
})); }));
items.add(new ColorPicker()); items.add(new ButtonItem(R.string.sk_settings_color_palette, R.drawable.ic_fluent_color_24_regular, b->{
PopupMenu popupMenu=new PopupMenu(getActivity(), b, 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);
popupMenu.setOnMenuItemClickListener(SettingsFragment.this::onColorPreferenceClick);
b.setOnTouchListener(popupMenu.getDragToOpenListener());
b.setOnClickListener(v->popupMenu.show());
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;
case NORD -> R.string.sk_color_palette_nord;
});
}));
items.add(new HeaderItem(R.string.settings_behavior)); items.add(new HeaderItem(R.string.settings_behavior));
items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{ items.add(new SwitchItem(R.string.settings_gif, R.drawable.ic_fluent_gif_24_regular, GlobalUserPreferences.playGifs, i->{
@@ -248,13 +268,29 @@ public class SettingsFragment extends MastodonToolbarFragment{
restartActivityToApplyNewTheme(); restartActivityToApplyNewTheme();
} }
private void onColorPreferenceClick(GlobalUserPreferences.ColorPreference color){ private boolean onColorPreferenceClick(MenuItem item){
ColorPreference pref = null;
int id = item.getItemId();
GlobalUserPreferences.color=color; if (id == R.id.m3_color) pref = ColorPreference.MATERIAL3;
else if (id == R.id.pink_color) pref = ColorPreference.PINK;
else if (id == R.id.purple_color) pref = ColorPreference.PURPLE;
else if (id == R.id.green_color) pref = ColorPreference.GREEN;
else if (id == R.id.blue_color) pref = ColorPreference.BLUE;
else if (id == R.id.brown_color) pref = ColorPreference.BROWN;
else if (id == R.id.red_color) pref = ColorPreference.RED;
else if (id == R.id.yellow_color) pref = ColorPreference.YELLOW;
else if (id == R.id.nord_color) pref = ColorPreference.NORD;
if (pref == null) return false;
GlobalUserPreferences.color=pref;
GlobalUserPreferences.save(); GlobalUserPreferences.save();
restartActivityToApplyNewTheme(); restartActivityToApplyNewTheme();
return true;
} }
private void onTrueBlackThemeChanged(SwitchItem item){ private void onTrueBlackThemeChanged(SwitchItem item){
GlobalUserPreferences.trueBlackTheme=item.checked; GlobalUserPreferences.trueBlackTheme=item.checked;
GlobalUserPreferences.save(); GlobalUserPreferences.save();
@@ -458,6 +494,23 @@ public class SettingsFragment extends MastodonToolbarFragment{
} }
} }
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;
}
}
public class ColorPicker extends Item{ public class ColorPicker extends Item{
@Override @Override
public int getViewType(){ public int getViewType(){
@@ -549,7 +602,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 ColorPickerViewHolder(); case 8 -> new ButtonViewHolder();
default -> throw new IllegalStateException("Unexpected value: "+viewType); default -> throw new IllegalStateException("Unexpected value: "+viewType);
}; };
} }
@@ -678,78 +731,25 @@ public class SettingsFragment extends MastodonToolbarFragment{
} }
} }
} }
private class ColorPickerViewHolder extends BindableViewHolder<ColorPicker>{
private class ButtonViewHolder extends BindableViewHolder<ButtonItem>{
private final Button button; private final Button button;
private final PopupMenu popupMenu;
private final ImageView icon; private final ImageView icon;
private final TextView text;
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
public ColorPickerViewHolder(){ 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_picker_button); button=findViewById(R.id.button);
popupMenu=new PopupMenu(getActivity(), button, Gravity.CENTER_HORIZONTAL);
popupMenu.inflate(R.menu.color_picker);
popupMenu.setOnMenuItemClickListener(item->{
GlobalUserPreferences.ColorPreference pref;
int id=item.getItemId();
if(id==R.id.pink_color) {
pref = GlobalUserPreferences.ColorPreference.PINK;
onColorPreferenceClick(pref);
}
else if(id==R.id.purple_color) {
pref = GlobalUserPreferences.ColorPreference.PURPLE;
onColorPreferenceClick(pref);
}
else if(id==R.id.green_color) {
pref = GlobalUserPreferences.ColorPreference.GREEN;
onColorPreferenceClick(pref);
}
else if(id==R.id.blue_color) {
pref = GlobalUserPreferences.ColorPreference.BLUE;
onColorPreferenceClick(pref);
}
else if(id==R.id.orange_color) {
pref = ColorPreference.BROWN;
onColorPreferenceClick(pref);
}
else if(id==R.id.yellow_color) {
pref = GlobalUserPreferences.ColorPreference.YELLOW;
onColorPreferenceClick(pref);
}
else if(id==R.id.red_color) {
pref = GlobalUserPreferences.ColorPreference.RED;
onColorPreferenceClick(pref);
}
else if(id==R.id.m3_color) {
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
pref = GlobalUserPreferences.ColorPreference.MATERIAL3;
onColorPreferenceClick(pref);
}
}
else
return false;
return true;
});
// UiUtils.enablePopupMenuIcons(getActivity(), popupMenu);
popupMenu.getMenu().findItem(R.id.m3_color).setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S);
button.setOnTouchListener(popupMenu.getDragToOpenListener());
button.setOnClickListener(v->popupMenu.show());
} }
@Override @Override
public void onBind(ColorPicker 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 PINK -> R.string.sk_color_palette_pink; item.buttonConsumer.accept(button);
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 YELLOW -> R.string.sk_color_palette_yellow;
case RED -> R.string.sk_color_palette_red;
case MATERIAL3 -> R.string.sk_color_palette_material3;
});
} }
} }

2
mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
View File

@@ -25,7 +25,7 @@ public class ColorPalette {
ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue), ColorPreference.BLUE, new ColorPalette(R.style.ColorPalette_Blue),
ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown), ColorPreference.BROWN, new ColorPalette(R.style.ColorPalette_Brown),
ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red), ColorPreference.RED, new ColorPalette(R.style.ColorPalette_Red),
ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow); ColorPreference.YELLOW, new ColorPalette(R.style.ColorPalette_Yellow),
ColorPreference.NORD, new ColorPalette(R.style.ColorPalette_Nord) ColorPreference.NORD, new ColorPalette(R.style.ColorPalette_Nord)
); );

46
mastodon/src/main/res/layout/item_settings_button.xml Normal file
View File

@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="utf-8"?>
<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">
<ImageView
android:id="@+id/icon"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="32dp"
android:importantForAccessibility="no"
android:tint="?android:textColorPrimary"
tools:src="@drawable/ic_fluent_color_24_regular"/>
<TextView
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" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:background="@drawable/bg_inline_button"
android:elevation="0dp"
android:ellipsize="middle"
android:fontFamily="sans-serif-medium"
android:singleLine="true"
android:stateListAnimator="@null"
android:textColor="?android:textColorPrimary"
android:textSize="16sp"
tools:text="@string/sk_color_palette_pink" />
</LinearLayout>

3
mastodon/src/main/res/menu/color_picker.xml → mastodon/src/main/res/menu/color_palettes.xml
View File

@@ -5,7 +5,8 @@
<item android:id="@+id/pink_color" android:title="@string/sk_color_palette_pink"/> <item android:id="@+id/pink_color" android:title="@string/sk_color_palette_pink"/>
<item android:id="@+id/green_color" android:title="@string/sk_color_palette_green"/> <item android:id="@+id/green_color" android:title="@string/sk_color_palette_green"/>
<item android:id="@+id/blue_color" android:title="@string/sk_color_palette_blue"/> <item android:id="@+id/blue_color" android:title="@string/sk_color_palette_blue"/>
<item android:id="@+id/orange_color" android:title="@string/sk_color_palette_brown"/> <item android:id="@+id/brown_color" android:title="@string/sk_color_palette_brown"/>
<item android:id="@+id/yellow_color" android:title="@string/sk_color_palette_yellow"/> <item android:id="@+id/yellow_color" android:title="@string/sk_color_palette_yellow"/>
<item android:id="@+id/red_color" android:title="@string/sk_color_palette_red"/> <item android:id="@+id/red_color" android:title="@string/sk_color_palette_red"/>
<item android:id="@+id/nord_color" android:title="@string/sk_color_palette_nord"/>
</menu> </menu>

21
mastodon/src/main/res/values/colors.xml
View File

@@ -292,4 +292,25 @@
<color name="red_gray_50t">#ffede6ca</color> <color name="red_gray_50t">#ffede6ca</color>
<color name="red_gray_50">#ffede6</color> <color name="red_gray_50">#ffede6</color>
<color name="red_gray_25">#f7f8fa</color> <color name="red_gray_25">#f7f8fa</color>
<color name="nord_primary_25">#fafaff</color>
<color name="nord_primary_50">#eff0ff</color>
<color name="nord_primary_100">#dfe1f2</color>
<color name="nord_primary_200">#c3c6d6</color>
<color name="nord_primary_300">#a8aaba</color>
<color name="nord_primary_400">#8f909f</color>
<color name="nord_primary_500">#727584</color>
<color name="nord_primary_600">#5b5e6c</color>
<color name="nord_primary_700">#434654</color>
<color name="nord_primary_800">#2d303d</color>
<color name="nord_primary_900">#181b27</color>
<color name="nord_gray_400">#aaaab4</color>
<color name="nord_gray_300">#c5c6d0</color>
<color name="nord_gray_200">#e2e2ec</color>
<color name="nord_gray_100">#eff0ff</color>
<color name="nord_gray_50t">#f0f0faca</color>
<color name="nord_gray_50">#f0f0fa</color>
<color name="nord_gray_25">#f7f8fa</color>
</resources> </resources>

2
mastodon/src/main/res/values/palettes.xml
View File

@@ -233,7 +233,7 @@
<item name="colorGray25">@color/red_gray_25</item> <item name="colorGray25">@color/red_gray_25</item>
</style> </style>
<style name="ColorPalette.Blueish"> <style name="ColorPalette.Nord">
<item name="colorPrimary25">@color/nord_primary_25</item> <item name="colorPrimary25">@color/nord_primary_25</item>
<item name="colorPrimary50">@color/nord_primary_50</item> <item name="colorPrimary50">@color/nord_primary_50</item>
<item name="colorPrimary100">@color/nord_primary_100</item> <item name="colorPrimary100">@color/nord_primary_100</item>

1
mastodon/src/main/res/values/strings_sk.xml
View File

@@ -49,6 +49,7 @@
<string name="sk_color_palette_brown">Brown</string> <string name="sk_color_palette_brown">Brown</string>
<string name="sk_color_palette_red">Red</string> <string name="sk_color_palette_red">Red</string>
<string name="sk_color_palette_yellow">Yellow</string> <string name="sk_color_palette_yellow">Yellow</string>
<string name="sk_color_palette_nord">Nord</string>
<string name="sk_poll_allow_multiple">Allow multiple choices</string> <string name="sk_poll_allow_multiple">Allow multiple choices</string>
<string name="sk_translate_post">Translate</string> <string name="sk_translate_post">Translate</string>
<string name="sk_translate_show_original">Show original</string> <string name="sk_translate_show_original">Show original</string>