Commit 24fbf41d authored by Thomas's avatar Thomas
Browse files

Fix issue #994 - Add a scroll bar for timelines (default: disabled)

parent 75542380

app/src/main/java/app/fedilab/android/mastodon/helper/ComposeHelper.java

+2 −4
Original line number Diff line number Diff line
@@ -14,17 +14,15 @@ package app.fedilab.android.mastodon.helper; 
 * You should have received a copy of the GNU General Public License along with Fedilab; if not,

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



import static app.fedilab.android.mastodon.helper.Helper.mentionLongPattern;

import static app.fedilab.android.mastodon.helper.Helper.mentionPattern;



import static app.fedilab.android.mastodon.helper.Helper.mentionPatternALL;

import static app.fedilab.android.mastodon.helper.MastodonHelper.countWithEmoji;



import android.util.Patterns;



import java.util.ArrayList;

import java.util.regex.Matcher;



import app.fedilab.android.mastodon.ui.drawer.ComposeAdapter;





public class ComposeHelper {

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminAccount.java

+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ package app.fedilab.android.mastodon.ui.fragment.admin; 
 * see <http://www.gnu.org/licenses>. */





import android.content.SharedPreferences;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;
@@ -24,6 +25,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;

import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.DividerItemDecoration;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -63,6 +65,9 @@ public class FragmentAdminAccount extends Fragment { 
        }

        flagLoading = false;

        binding = FragmentPaginationBinding.inflate(inflater, container, false);

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

        boolean displayScrollBar = sharedpreferences.getBoolean(getString(R.string.SET_TIMELINE_SCROLLBAR), false);

        binding.recyclerView.setVerticalScrollBarEnabled(displayScrollBar);

        return binding.getRoot();

    }

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminDomain.java

+5 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ package app.fedilab.android.mastodon.ui.fragment.admin; 




import android.content.Intent;

import android.content.SharedPreferences;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;
@@ -25,6 +26,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;

import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.DividerItemDecoration;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -119,7 +121,9 @@ public class FragmentAdminDomain extends Fragment { 
        );



        adminVM = new ViewModelProvider(FragmentAdminDomain.this).get(viewModelKey, AdminVM.class);



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

        boolean displayScrollBar = sharedpreferences.getBoolean(getString(R.string.SET_TIMELINE_SCROLLBAR), false);

        binding.recyclerView.setVerticalScrollBarEnabled(displayScrollBar);

        binding.noActionText.setText(R.string.no_blocked_domains);

        binding.loader.setVisibility(View.VISIBLE);

        binding.recyclerView.setVisibility(View.GONE);

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/admin/FragmentAdminReport.java

+5 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ package app.fedilab.android.mastodon.ui.fragment.admin; 
 * see <http://www.gnu.org/licenses>. */





import android.content.SharedPreferences;

import android.os.Bundle;

import android.view.LayoutInflater;

import android.view.View;
@@ -24,6 +25,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;

import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.DividerItemDecoration;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -69,7 +71,9 @@ public class FragmentAdminReport extends Fragment { 
        }



        binding = FragmentPaginationBinding.inflate(inflater, container, false);



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

        boolean displayScrollBar = sharedpreferences.getBoolean(getString(R.string.SET_TIMELINE_SCROLLBAR), false);

        binding.recyclerView.setVerticalScrollBarEnabled(displayScrollBar);

        int c1 = ThemeHelper.getAttColor(requireActivity(), R.attr.colorAccent);

        binding.swipeContainer.setColorSchemeColors(

                c1, c1, c1

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/media/FragmentMediaProfile.java

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ package app.fedilab.android.mastodon.ui.fragment.media; 
 * 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 android.view.LayoutInflater;

import android.view.View;
@@ -23,6 +24,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;

import androidx.fragment.app.Fragment;

import androidx.lifecycle.ViewModelProvider;

import androidx.preference.PreferenceManager;

import androidx.recyclerview.widget.GridLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -63,6 +65,9 @@ public class FragmentMediaProfile extends Fragment { 
    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {



        binding = FragmentPaginationBinding.inflate(inflater, container, false);

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

        boolean displayScrollBar = sharedpreferences.getBoolean(getString(R.string.SET_TIMELINE_SCROLLBAR), false);

        binding.recyclerView.setVerticalScrollBarEnabled(displayScrollBar);

        Bundle bundle = this.getArguments();

        if (bundle != null) {

            accountTimeline = (Account) getArguments().getSerializable(Helper.ARG_ACCOUNT);