Commit dda32961 authored by Thomas's avatar Thomas
Browse files

Changes action icons

parent 165f85c8

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

+7 −0
Original line number Diff line number Diff line
@@ -725,6 +725,13 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                            }

                            if (emojis == null) {

                                return;

                            } else if (emojisList == null) {

                                if (emojis.containsKey(BaseMainActivity.currentInstance)) {

                                    emojisList = emojis.get(BaseMainActivity.currentInstance);

                                    if (emojisList == null) {

                                        return;

                                    }

                                }

                            }

                            for (Emoji emoji : emojisList) {

                                if (shortcode != null && emoji.shortcode.contains(shortcode)) {

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

+12 −9
Original line number Diff line number Diff line
@@ -521,9 +521,12 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        holder.binding.actionButtonFavorite.pressOnTouch(false);

        holder.binding.actionButtonBoost.pressOnTouch(false);

        holder.binding.actionButtonBookmark.pressOnTouch(false);

        holder.binding.actionButtonFavorite.setActiveImage(R.drawable.ic_baseline_star_24);

        holder.binding.actionButtonFavorite.setInactiveImage(R.drawable.ic_star_outline);

        holder.binding.actionButtonBookmark.setInactiveImage(R.drawable.ic_baseline_bookmark_border_24);

        holder.binding.actionButtonFavorite.setActiveImage(R.drawable.ic_round_star_24);

        holder.binding.actionButtonFavorite.setInactiveImage(R.drawable.ic_round_star_border_24);

        holder.binding.actionButtonBookmark.setActiveImage(R.drawable.ic_round_bookmark_24);

        holder.binding.actionButtonBookmark.setInactiveImage(R.drawable.ic_round_bookmark_border_24);

        holder.binding.actionButtonBoost.setActiveImage(R.drawable.ic_round_repeat_24);

        holder.binding.actionButtonBoost.setInactiveImage(R.drawable.ic_round_repeat_24);

        holder.binding.actionButtonFavorite.setDisableCircle(true);

        holder.binding.actionButtonBoost.setDisableCircle(true);

        holder.binding.actionButtonBookmark.setDisableCircle(true);
@@ -880,13 +883,13 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        }

        //Button sizes depending of the defined scale

        float normalSize = Helper.convertDpToPixel(28, context);

        float normalSize2 = Helper.convertDpToPixel(24, context);



        holder.binding.actionButtonReply.getLayoutParams().width = (int) (normalSize * scaleIcon);

        holder.binding.actionButtonReply.getLayoutParams().height = (int) (normalSize * scaleIcon);

        holder.binding.actionButtonReply.requestLayout();

        holder.binding.actionButtonBoost.setImageSize((int) (normalSize * scaleIcon));

        holder.binding.actionButtonFavorite.setImageSize((int) (normalSize * scaleIcon));

        holder.binding.actionButtonBookmark.setImageSize((int) (normalSize2 * scaleIcon));

        holder.binding.actionButtonBookmark.setImageSize((int) (normalSize * scaleIcon));



        holder.binding.statusAddCustomEmoji.getLayoutParams().width = (int) (normalSize * scaleIcon);

        holder.binding.statusAddCustomEmoji.getLayoutParams().height = (int) (normalSize * scaleIcon);
@@ -2195,13 +2198,13 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            Helper.changeDrawableColor(context, holder.binding.statusAddCustomEmoji, theme_icons_color);

            Helper.changeDrawableColor(context, holder.binding.statusEmoji, theme_icons_color);

            Helper.changeDrawableColor(context, holder.binding.actionButtonMore, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_baseline_star_24, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_repeat, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_round_star_24, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_round_repeat_24, theme_icons_color);

            Helper.changeDrawableColor(context, holder.binding.visibility, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_star_outline, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_round_star_border_24, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_person, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_bot, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_baseline_reply_16, theme_icons_color);

            Helper.changeDrawableColor(context, R.drawable.ic_round_reply_24, theme_icons_color);

            holder.binding.actionButtonFavorite.setInActiveImageTintColor(theme_icons_color);

            holder.binding.actionButtonBookmark.setInActiveImageTintColor(theme_icons_color);

            holder.binding.actionButtonBoost.setInActiveImageTintColor(theme_icons_color);

app/src/main/res/drawable/ic_round_bookmark_24.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="?attr/colorControlNormal"

        android:pathData="M17,3H7c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z" />

</vector>

app/src/main/res/drawable/ic_round_bookmark_border_24.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="?attr/colorControlNormal"

        android:pathData="M17,3L7,3c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3L19,5c0,-1.1 -0.9,-2 -2,-2zM17,18l-5,-2.18L7,18L7,6c0,-0.55 0.45,-1 1,-1h8c0.55,0 1,0.45 1,1v12z" />

</vector>

app/src/main/res/drawable/ic_round_more_horiz_24.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

    android:tint="?attr/colorControlNormal"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="?attr/colorControlNormal"

        android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />

</vector>