Commit 2164c2fe authored by Thomas's avatar Thomas
Browse files

comment #702 - Separated settings

parent 9466a760

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -392,8 +392,8 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        boolean confirmFav = sharedpreferences.getBoolean(context.getString(R.string.SET_NOTIF_VALIDATION_FAV), false);

        boolean confirmBoost = sharedpreferences.getBoolean(context.getString(R.string.SET_NOTIF_VALIDATION), true);

        boolean fullAttachement = sharedpreferences.getBoolean(context.getString(R.string.SET_FULL_PREVIEW), false);

        boolean displayBookmark = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_BOOKMARK), true);

        boolean displayTranslate = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_TRANSLATE), false);

        boolean displayBookmark = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_BOOKMARK) + MainActivity.currentUserID + MainActivity.currentInstance, true);

        boolean displayTranslate = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_TRANSLATE) + MainActivity.currentUserID + MainActivity.currentInstance, false);

        boolean displayCounters = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_COUNTER_FAV_BOOST), false);

        boolean removeLeftMargin = sharedpreferences.getBoolean(context.getString(R.string.SET_REMOVE_LEFT_MARGIN), false);

        boolean extraFeatures = sharedpreferences.getBoolean(context.getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, false);

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentExtraFeaturesSettings.java

0 → 100644
+103 −0
Original line number Diff line number Diff line 
package app.fedilab.android.ui.fragment.settings;

/* Copyright 2022 Thomas Schneider

 *

 * This file is a part of Fedilab

 *

 * This program is free software; you can redistribute it and/or modify it under the terms of the

 * GNU General Public License as published by the Free Software Foundation; either version 3 of the

 * License, or (at your option) any later version.

 *

 * Fedilab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even

 * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General

 * Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along with Fedilab; if not,

 * see <http://www.gnu.org/licenses>. */



import android.content.SharedPreferences;

import android.os.Bundle;



import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreferenceCompat;



import app.fedilab.android.R;

import app.fedilab.android.activities.MainActivity;



public class FragmentExtraFeaturesSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {





    @Override

    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {

        addPreferencesFromResource(R.xml.pref_extra_features);

        createPref();

    }



    private void createPref() {



        getPreferenceScreen().removeAll();

        addPreferencesFromResource(R.xml.pref_extra_features);

        PreferenceScreen preferenceScreen = getPreferenceScreen();

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

        SwitchPreferenceCompat SET_EXTAND_EXTRA_FEATURES = findPreference(getString(R.string.SET_EXTAND_EXTRA_FEATURES));

        if (SET_EXTAND_EXTRA_FEATURES != null) {

            boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, false);

            SET_EXTAND_EXTRA_FEATURES.setChecked(checked);

        }

        SwitchPreferenceCompat SET_DISPLAY_BOOKMARK = findPreference(getString(R.string.SET_DISPLAY_BOOKMARK));

        if (SET_DISPLAY_BOOKMARK != null) {

            boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_BOOKMARK) + MainActivity.currentUserID + MainActivity.currentInstance, true);

            SET_DISPLAY_BOOKMARK.setChecked(checked);

        }

        SwitchPreferenceCompat SET_DISPLAY_TRANSLATE = findPreference(getString(R.string.SET_DISPLAY_TRANSLATE));

        if (SET_DISPLAY_TRANSLATE != null) {

            boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_TRANSLATE) + MainActivity.currentUserID + MainActivity.currentInstance, false);

            SET_DISPLAY_TRANSLATE.setChecked(checked);

        }

    }



    @Override

    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {

        if (getActivity() != null) {

            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

            SharedPreferences.Editor editor = sharedpreferences.edit();

            if (key.compareToIgnoreCase(getString(R.string.SET_EXTAND_EXTRA_FEATURES)) == 0) {

                SwitchPreferenceCompat SET_EXTAND_EXTRA_FEATURES = findPreference(getString(R.string.SET_EXTAND_EXTRA_FEATURES));

                if (SET_EXTAND_EXTRA_FEATURES != null) {

                    editor.putBoolean(getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, SET_EXTAND_EXTRA_FEATURES.isChecked());

                }

            }

            if (key.compareToIgnoreCase(getString(R.string.SET_DISPLAY_BOOKMARK)) == 0) {

                SwitchPreferenceCompat SET_DISPLAY_BOOKMARK = findPreference(getString(R.string.SET_DISPLAY_BOOKMARK));

                if (SET_DISPLAY_BOOKMARK != null) {

                    editor.putBoolean(getString(R.string.SET_DISPLAY_BOOKMARK) + MainActivity.currentUserID + MainActivity.currentInstance, SET_DISPLAY_BOOKMARK.isChecked());

                }

            }

            if (key.compareToIgnoreCase(getString(R.string.SET_DISPLAY_TRANSLATE)) == 0) {

                SwitchPreferenceCompat SET_DISPLAY_TRANSLATE = findPreference(getString(R.string.SET_DISPLAY_TRANSLATE));

                if (SET_DISPLAY_TRANSLATE != null) {

                    editor.putBoolean(getString(R.string.SET_DISPLAY_TRANSLATE) + MainActivity.currentUserID + MainActivity.currentInstance, SET_DISPLAY_TRANSLATE.isChecked());

                }

            }

            editor.apply();

        }

    }



    @Override

    public void onResume() {

        super.onResume();



        getPreferenceScreen().getSharedPreferences()

                .registerOnSharedPreferenceChangeListener(this);

    }



    @Override

    public void onPause() {

        super.onPause();

        getPreferenceScreen().getSharedPreferences()

                .unregisterOnSharedPreferenceChangeListener(this);

    }





}

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentInterfaceSettings.java

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class FragmentInterfaceSettings extends PreferenceFragmentCompat implemen 
                if (SET_EXTAND_EXTRA_FEATURES != null) {

                    editor.putBoolean(getString(R.string.SET_EXTAND_EXTRA_FEATURES) + MainActivity.currentUserID + MainActivity.currentInstance, SET_EXTAND_EXTRA_FEATURES.isChecked());

                }

                recreate = true;

            }

            if (key.compareToIgnoreCase(getString(R.string.SET_LOGO_LAUNCHER)) == 0) {

                ListPreference SET_LOGO_LAUNCHER = findPreference(getString(R.string.SET_LOGO_LAUNCHER));

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentSettingsCategories.java

+10 −0
Original line number Diff line number Diff line
@@ -121,6 +121,16 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat { 
                return false;

            });

        }



        Preference pref_category_key_extra_features = findPreference(getString(R.string.pref_category_key_extra_features));

        if (pref_category_key_extra_features != null) {

            pref_category_key_extra_features.setOnPreferenceClickListener(preference -> {

                NavController navController = Navigation.findNavController(requireActivity(), R.id.fragment_container);

                navController.navigate(FragmentSettingsCategoriesDirections.Companion.categoriesToExtraFeatures());

                return false;

            });

        }



        ActivityResultLauncher<String> permissionLauncher = registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> {

            if (isGranted) {

                try {

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentTimelinesSettings.java

+26 −1
Original line number Diff line number Diff line
@@ -22,8 +22,10 @@ import androidx.preference.ListPreference; 
import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreferenceCompat;



import app.fedilab.android.R;

import app.fedilab.android.activities.MainActivity;

import app.fedilab.android.helper.Helper;



public class FragmentTimelinesSettings extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -37,6 +39,7 @@ public class FragmentTimelinesSettings extends PreferenceFragmentCompat implemen 
    private void createPref() {



        getPreferenceScreen().removeAll();

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

        addPreferencesFromResource(R.xml.pref_timelines);

        PreferenceScreen preferenceScreen = getPreferenceScreen();

        ListPreference SET_LOAD_MEDIA_TYPE = findPreference(getString(R.string.SET_LOAD_MEDIA_TYPE));
@@ -60,6 +63,16 @@ public class FragmentTimelinesSettings extends PreferenceFragmentCompat implemen 
                preferenceScreen.removePreferenceRecursively("SET_TRANSLATOR_VERSION");

            }

        }

        SwitchPreferenceCompat SET_DISPLAY_BOOKMARK = findPreference(getString(R.string.SET_DISPLAY_BOOKMARK));

        if (SET_DISPLAY_BOOKMARK != null) {

            boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_BOOKMARK) + MainActivity.currentUserID + MainActivity.currentInstance, true);

            SET_DISPLAY_BOOKMARK.setChecked(checked);

        }

        SwitchPreferenceCompat SET_DISPLAY_TRANSLATE = findPreference(getString(R.string.SET_DISPLAY_TRANSLATE));

        if (SET_DISPLAY_TRANSLATE != null) {

            boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_TRANSLATE) + MainActivity.currentUserID + MainActivity.currentInstance, false);

            SET_DISPLAY_TRANSLATE.setChecked(checked);

        }

    }



    @Override
@@ -67,10 +80,22 @@ public class FragmentTimelinesSettings extends PreferenceFragmentCompat implemen 
        if (getActivity() != null) {

            SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(requireActivity());

            SharedPreferences.Editor editor = sharedpreferences.edit();

            editor.apply();

            if (key.compareToIgnoreCase(getString(R.string.SET_TRANSLATOR)) == 0) {

                createPref();

            }

            if (key.compareToIgnoreCase(getString(R.string.SET_DISPLAY_BOOKMARK)) == 0) {

                SwitchPreferenceCompat SET_DISPLAY_BOOKMARK = findPreference(getString(R.string.SET_DISPLAY_BOOKMARK));

                if (SET_DISPLAY_BOOKMARK != null) {

                    editor.putBoolean(getString(R.string.SET_DISPLAY_BOOKMARK) + MainActivity.currentUserID + MainActivity.currentInstance, SET_DISPLAY_BOOKMARK.isChecked());

                }

            }

            if (key.compareToIgnoreCase(getString(R.string.SET_DISPLAY_TRANSLATE)) == 0) {

                SwitchPreferenceCompat SET_DISPLAY_TRANSLATE = findPreference(getString(R.string.SET_DISPLAY_TRANSLATE));

                if (SET_DISPLAY_TRANSLATE != null) {

                    editor.putBoolean(getString(R.string.SET_DISPLAY_TRANSLATE) + MainActivity.currentUserID + MainActivity.currentInstance, SET_DISPLAY_TRANSLATE.isChecked());

                }

            }

            editor.apply();

        }

    }