me/Fedilab
1
0
Fork 0
forked from mirrors/Fedilab
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow to reset customizations

Browse source
This commit is contained in:
Thomas 2022-12-09 10:01:57 +01:00
parent d9ed098464
commit ae80a27db9
7 changed files with 59 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -82,7 +82,7 @@ dependencies {
implementation 'com.google.android.material:material:1.7.0' implementation 'com.google.android.material:material:1.7.0'
implementation "com.github.skydoves:colorpickerpreference:2.0.6" implementation 'com.jaredrummler:colorpicker:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "com.google.code.gson:gson:2.9.1" implementation "com.google.code.gson:gson:2.9.1"

2
app/src/main/java/app/fedilab/android/helper/SpannableHelper.java
View file

@ -121,7 +121,7 @@ public class SpannableHelper {
linkColor = link_color; linkColor = link_color;
} }
} else { } else {
linkColor = linkColor; linkColor = ThemeHelper.getAttColor(context, R.attr.linkColor);
} }
SpannableString initialContent; SpannableString initialContent;

35
app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentThemingSettings.java
View file

@ -18,6 +18,7 @@ package app.fedilab.android.ui.fragment.settings;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import androidx.appcompat.app.AlertDialog;
import androidx.navigation.NavOptions; import androidx.navigation.NavOptions;
import androidx.navigation.Navigation; import androidx.navigation.Navigation;
import androidx.preference.ListPreference; import androidx.preference.ListPreference;
@ -113,6 +114,40 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements
return true; return true;
}); });
} }
Preference SET_RESET_CUSTOM_COLOR = findPreference(getString(R.string.SET_RESET_CUSTOM_COLOR));
if (SET_RESET_CUSTOM_COLOR != null) {
SET_RESET_CUSTOM_COLOR.getContext().setTheme(Helper.dialogStyle());
SET_RESET_CUSTOM_COLOR.setOnPreferenceClickListener(preference -> {
AlertDialog.Builder resetConfirm = new AlertDialog.Builder(requireActivity(), Helper.dialogStyle());
resetConfirm.setMessage(getString(R.string.reset_color));
resetConfirm.setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss());
resetConfirm.setPositiveButton(R.string.reset, (dialog, which) -> {
SharedPreferences sharedPreferences = getPreferenceScreen().getSharedPreferences();
if (sharedPreferences != null) {
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_BACKGROUND)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_BOOST_HEADER)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_DISPLAY_NAME)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_USERNAME)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_TEXT)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_LINK)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_LIGHT_ICON)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_BACKGROUND)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_BOOST_HEADER)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_DISPLAY_NAME)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_USERNAME)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_TEXT)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_LINK)).apply();
sharedPreferences.edit().remove(getString(R.string.SET_DARK_ICON)).apply();
}
dialog.dismiss();
});
resetConfirm.show();
return true;
});
}
} }
} }

2
app/src/main/res/values/strings.xml
View file

@ -1302,6 +1302,8 @@
<string name="SET_CUSTOMIZE_LIGHT_COLORS_ACTION" translatable="false">SET_CUSTOMIZE_LIGHT_COLORS_ACTION</string> <string name="SET_CUSTOMIZE_LIGHT_COLORS_ACTION" translatable="false">SET_CUSTOMIZE_LIGHT_COLORS_ACTION</string>
<string name="SET_CUSTOMIZE_DARK_COLORS" translatable="false">SET_CUSTOMIZE_DARK_COLORS</string> <string name="SET_CUSTOMIZE_DARK_COLORS" translatable="false">SET_CUSTOMIZE_DARK_COLORS</string>
<string name="SET_CUSTOMIZE_DARK_COLORS_ACTION" translatable="false">SET_CUSTOMIZE_DARK_COLORS_ACTION</string> <string name="SET_CUSTOMIZE_DARK_COLORS_ACTION" translatable="false">SET_CUSTOMIZE_DARK_COLORS_ACTION</string>
<string name="SET_RESET_CUSTOM_COLOR" translatable="false">SET_RESET_CUSTOM_COLOR</string>
<string name="SET_THEME_DEFAULT_LIGHT" translatable="false">SET_THEME_DEFAULT_LIGHT</string> <string name="SET_THEME_DEFAULT_LIGHT" translatable="false">SET_THEME_DEFAULT_LIGHT</string>
<string name="SET_THEME_DEFAULT_DARK" translatable="false">SET_THEME_DEFAULT_DARK</string> <string name="SET_THEME_DEFAULT_DARK" translatable="false">SET_THEME_DEFAULT_DARK</string>

50
app/src/main/res/xml/pref_custom_dark.xml
View file

@ -4,82 +4,46 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_DARK_BACKGROUND" android:key="@string/SET_DARK_BACKGROUND"
app:default_color="?android:colorBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/background_status" app:summary="@string/background_status"
app:title="@string/background_status_title" /> app:title="@string/background_status_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_DARK_BOOST_HEADER" android:key="@string/SET_DARK_BOOST_HEADER"
app:default_color="?android:colorBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/boost_header_color" app:summary="@string/boost_header_color"
app:title="@string/boost_header_color_title" /> app:title="@string/boost_header_color_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_DARK_DISPLAY_NAME" android:key="@string/SET_DARK_DISPLAY_NAME"
app:default_color="?colorOnBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/displayname_title" app:summary="@string/displayname_title"
app:title="@string/display_name" /> app:title="@string/display_name" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_DARK_USERNAME" android:key="@string/SET_DARK_USERNAME"
app:default_color="?colorOnBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/username_title" app:summary="@string/username_title"
app:title="@string/username" /> app:title="@string/username" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_DARK_TEXT" android:key="@string/SET_DARK_TEXT"
app:default_color="?colorOnBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/text_color" app:summary="@string/text_color"
app:title="@string/text_color_title" /> app:title="@string/text_color_title" />
<com.jaredrummler.android.colorpicker.ColorPreferenceCompat
<com.skydoves.colorpickerpreference.ColorPickerPreference
android:key="@string/SET_DARK_LINK" android:key="@string/SET_DARK_LINK"
app:default_color="?linkColor"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/link_color" app:summary="@string/link_color"
app:title="@string/link_color_title" /> app:title="@string/link_color_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_DARK_ICON" android:key="@string/SET_DARK_ICON"
app:default_color="?colorControlNormal"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/icons_color" app:summary="@string/icons_color"
app:title="@string/icons_color_title" /> app:title="@string/icons_color_title" />

49
app/src/main/res/xml/pref_custom_light.xml
View file

@ -4,82 +4,47 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_BACKGROUND" android:key="@string/SET_LIGHT_BACKGROUND"
app:default_color="?android:colorBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/background_status" app:summary="@string/background_status"
app:title="@string/background_status_title" /> app:title="@string/background_status_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_BOOST_HEADER" android:key="@string/SET_LIGHT_BOOST_HEADER"
app:default_color="?android:colorBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/boost_header_color" app:summary="@string/boost_header_color"
app:title="@string/boost_header_color_title" /> app:title="@string/boost_header_color_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_DISPLAY_NAME" android:key="@string/SET_LIGHT_DISPLAY_NAME"
app:default_color="?colorOnBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/displayname_title" app:summary="@string/displayname_title"
app:title="@string/display_name" /> app:title="@string/display_name" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_USERNAME" android:key="@string/SET_LIGHT_USERNAME"
app:default_color="?colorOnBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/username_title" app:summary="@string/username_title"
app:title="@string/username" /> app:title="@string/username" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_TEXT" android:key="@string/SET_LIGHT_TEXT"
app:default_color="?colorOnBackground"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/text_color" app:summary="@string/text_color"
app:title="@string/text_color_title" /> app:title="@string/text_color_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_LINK" android:key="@string/SET_LIGHT_LINK"
app:default_color="?linkColor"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/link_color" app:summary="@string/link_color"
app:title="@string/link_color_title" /> app:title="@string/link_color_title" />
<com.skydoves.colorpickerpreference.ColorPickerPreference <com.jaredrummler.android.colorpicker.ColorPreferenceCompat
android:key="@string/SET_LIGHT_ICON" android:key="@string/SET_LIGHT_ICON"
app:default_color="?colorControlNormal"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:preference_attachAlphaSlideBar="false"
app:preference_attachBrightnessSlideBar="false"
app:preference_dialog_negative="@string/cancel"
app:preference_dialog_positive="@string/save"
app:summary="@string/icons_color" app:summary="@string/icons_color"
app:title="@string/icons_color_title" /> app:title="@string/icons_color_title" />

6
app/src/main/res/xml/pref_theming.xml
View file

@ -86,4 +86,10 @@
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:key="@string/SET_CUSTOMIZE_DARK_COLORS_ACTION" /> app:key="@string/SET_CUSTOMIZE_DARK_COLORS_ACTION" />
<Preference
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:title="@string/reset_color"
app:iconSpaceReserved="false"
app:key="@string/SET_RESET_CUSTOM_COLOR" />
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>