Commit 542477f3 authored by Thomas's avatar Thomas
Browse files

Some cosmetic

parent 1fbce05d

app/src/main/java/app/fedilab/android/activities/PartnerShipActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import app.fedilab.android.databinding.ActivityPartnershipBinding; 
import app.fedilab.android.helper.CrossActionHelper;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.ThemeHelper;

import app.fedilab.android.viewmodel.mastodon.AccountsVM;
@@ -62,7 +61,6 @@ public class PartnerShipActivity extends BaseActivity { 
            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://masto.host"));

            startActivity(browserIntent);

        });

        binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(PartnerShipActivity.this));

        setTitle(R.string.action_partnership);

        binding.accountFollow.setIconResource(R.drawable.ic_baseline_person_add_24);

        CrossActionHelper.fetchRemoteAccount(PartnerShipActivity.this, "@mastohost@mastodon.social", new CrossActionHelper.Callback() {

app/src/main/java/app/fedilab/android/activities/ProfileActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -341,7 +341,6 @@ public class ProfileActivity extends BaseActivity { 
        else

            binding.warningContainer.setVisibility(View.GONE);



        binding.openRemoteProfile.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(ProfileActivity.this));

        if (checkRemotely) {

            binding.openRemoteProfile.setVisibility(View.GONE);

        }
@@ -521,7 +520,6 @@ public class ProfileActivity extends BaseActivity { 
                });

            }

        }

        binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(ProfileActivity.this));



        binding.accountFollow.setEnabled(true);

        //Visibility depending of the relationship
@@ -570,7 +568,6 @@ public class ProfileActivity extends BaseActivity { 
                binding.headerEditProfile.setVisibility(View.VISIBLE);

                binding.headerEditProfile.bringToFront();

            }

            binding.headerEditProfile.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(ProfileActivity.this));

            if (!relationship.following) {

                binding.accountNotification.setVisibility(View.GONE);

            } else {

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

+0 −1
Original line number Diff line number Diff line
@@ -1844,7 +1844,6 @@ public class Helper { 
                    binding.aboutSupport.setVisibility(View.GONE);

                    binding.aboutSupportPaypal.setVisibility(View.GONE);

                }

                binding.accountFollow.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(activity));

                binding.accountFollow.setImageResource(R.drawable.ic_baseline_person_add_24);

                binding.aboutSupport.setOnClickListener(v -> {

                    Intent intentLiberapay = new Intent(Intent.ACTION_VIEW);

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

+0 −3
Original line number Diff line number Diff line
@@ -362,9 +362,6 @@ public class MastodonHelper { 
        dialogBuilder.setView(binding.getRoot());

        final AlertDialog alertDialogBoost = dialogBuilder.create();

        binding.timePicker.setIs24HourView(true);

        binding.dateTimeNext.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context));

        binding.dateTimePrevious.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context));

        binding.dateTimeSet.setBackgroundTintList(ThemeHelper.getButtonActionColorStateList(context));

        //Buttons management

        binding.dateTimeCancel.setOnClickListener(v -> alertDialogBoost.dismiss());

        binding.dateTimeNext.setOnClickListener(v -> {

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

+0 −20
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.view.animation.TranslateAnimation; 
import androidx.annotation.AttrRes;

import androidx.annotation.ColorInt;

import androidx.core.content.ContextCompat;

import androidx.core.graphics.ColorUtils;

import androidx.preference.PreferenceManager;



import java.io.BufferedReader;
@@ -69,25 +68,6 @@ public class ThemeHelper { 
    }





    public static ColorStateList getButtonActionColorStateList(Context context) {

        int[][] states = new int[][]{

                new int[]{android.R.attr.state_enabled}, // enabled

                new int[]{-android.R.attr.state_enabled}, // disabled

                new int[]{-android.R.attr.state_checked}, // unchecked

                new int[]{android.R.attr.state_pressed}  // pressed

        };

        int alphaColor = ColorUtils.setAlphaComponent(ContextCompat.getColor(context, R.color.colorAccent), 0x33);

        int color = ContextCompat.getColor(context, R.color.colorAccent);

        int[] colors = new int[]{

                color,

                alphaColor,

                color,

                color

        };

        return new ColorStateList(states, colors);

    }







    /**

     * Animate two views, the current view will be hidden to left