Commit 320f913c authored by Thomas's avatar Thomas
Browse files

remove useless elements

parent 4ea542c1

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+0 −4
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ import app.fedilab.android.helper.Helper; 
import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.PinnedTimelineHelper;

import app.fedilab.android.helper.PushHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;

import app.fedilab.android.ui.fragment.timeline.FragmentNotificationContainer;
@@ -191,7 +190,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                                intentCompose.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                                context.startActivity(intentCompose);

                            })

                            .setTextColor(ThemeHelper.getAttColor(BaseMainActivity.this, R.attr.mTextColor))

                            .show();

                }

            }
@@ -264,7 +262,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 
                                intentContext.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

                                startActivity(intentContext);

                            })

                            .setTextColor(ThemeHelper.getAttColor(BaseMainActivity.this, R.attr.mTextColor))

                            .show();

                    //The message was edited, we need to update the timeline

                    if (statusEditId != null) {
@@ -307,7 +304,6 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 




        mamageNewIntent(getIntent());

        ThemeHelper.initiliazeColors(BaseMainActivity.this);

        filterFetched = false;

        networkStateReceiver = new NetworkStateReceiver();

        networkStateReceiver.addListener(this);

app/src/main/java/app/fedilab/android/helper/ThemeHelper.java

+0 −20
Original line number Diff line number Diff line
@@ -88,26 +88,6 @@ public class ThemeHelper { 
        return new ColorStateList(states, colors);

    }



    /**

     * Initialize colors in a static variable

     * Currently link_color cannot be retrieved with getAttColor in ViewModel due to application and theme

     *

     * @param activity Activity

     */

    public static void initiliazeColors(Activity activity) {

        TypedValue typedValue = new TypedValue();

        Resources.Theme theme = activity.getTheme();

        theme.resolveAttribute(R.attr.linkColor, typedValue, true);

        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);

        linkColor = -1;

        if (prefs.getBoolean("use_custom_theme", false)) {

            linkColor = prefs.getInt("theme_link_color", -1);

        }

        if (linkColor == -1) {

            linkColor = typedValue.data;

        }

    }







    /**

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

+2 −7
Original line number Diff line number Diff line
@@ -209,10 +209,10 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements 
        if (linksColor != -1) {

            binding.cardUrl.setTextColor(linksColor);

        } else {

            binding.cardUrl.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.linkColor));

            binding.cardUrl.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.colorPrimary));

        }

        if (iconsColor == -1) {

            iconsColor = ThemeHelper.getAttColor(requireActivity(), R.attr.iconColor);

            iconsColor = ThemeHelper.getAttColor(requireActivity(), R.attr.colorControlNormal);

        }

        Helper.changeDrawableColor(requireActivity(), binding.actionButtonReply, iconsColor);

        Helper.changeDrawableColor(requireActivity(), binding.actionButtonMore, iconsColor);
@@ -221,15 +221,10 @@ public class FragmentThemingSettings extends PreferenceFragmentCompat implements 
        Helper.changeDrawableColor(requireActivity(), R.drawable.ic_person, iconsColor);

        if (displayNameColor != -1) {

            binding.displayName.setTextColor(displayNameColor);

        } else {

            binding.displayName.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor));

        }

        if (userNameColor != -1) {

            binding.username.setTextColor(userNameColor);

            Helper.changeDrawableColor(requireActivity(), binding.statusBoostIcon, userNameColor);

        } else {

            binding.username.setTextColor(ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor));

            Helper.changeDrawableColor(requireActivity(), binding.statusBoostIcon, ThemeHelper.getAttColor(requireActivity(), R.attr.statusTextColor));

        }

        Glide.with(binding.getRoot().getContext())

                .load(R.drawable.fedilab_logo_bubbles)

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java

+0 −5
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import app.fedilab.android.client.entities.app.Timeline; 
import app.fedilab.android.databinding.FragmentPaginationBinding;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.ui.drawer.AccountAdapter;

import app.fedilab.android.ui.pageadapter.FedilabProfileTLPageAdapter;

import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@@ -80,10 +79,6 @@ public class FragmentMastodonAccount extends Fragment { 
    @Override

    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

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

        binding.swipeContainer.setColorSchemeColors(

                c1, c1, c1

        );

        binding.loader.setVisibility(View.VISIBLE);

        binding.recyclerView.setVisibility(View.GONE);

        accountsVM = new ViewModelProvider(FragmentMastodonAccount.this).get(viewModelKey, AccountsVM.class);

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAnnouncement.java

+0 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import app.fedilab.android.BaseMainActivity; 
import app.fedilab.android.R;

import app.fedilab.android.client.entities.api.Announcement;

import app.fedilab.android.databinding.FragmentPaginationBinding;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.ui.drawer.AnnouncementAdapter;

import app.fedilab.android.viewmodel.mastodon.AnnouncementsVM;
@@ -47,10 +46,6 @@ public class FragmentMastodonAnnouncement extends Fragment { 


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

        View root = binding.getRoot();

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

        binding.swipeContainer.setColorSchemeColors(

                c1, c1, c1

        );

        announcementsVM = new ViewModelProvider(FragmentMastodonAnnouncement.this).get(AnnouncementsVM.class);

        binding.loader.setVisibility(View.VISIBLE);

        binding.recyclerView.setVisibility(View.GONE);