Commit 8a883de5 authored by Thomas's avatar Thomas
Browse files

Replacements

parent 0ab66d34

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

+11 −11
Original line number Diff line number Diff line
@@ -395,14 +395,14 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
        if (holder.getLayoutPosition() == (getItemCount() - 1)) {

            if (statusList.size() > statusCount + 1) {

                if (canBeRemoved(statusList.get(statusList.size() - 1))) {

                    holder.binding.addRemoveStatus.setImageResource(R.drawable.ic_compose_thread_remove_status);

                    holder.binding.addRemoveStatus.setIconResource(R.drawable.ic_compose_thread_remove_status);

                    holder.binding.addRemoveStatus.setContentDescription(context.getString(R.string.remove_status));

                    holder.binding.addRemoveStatus.setOnClickListener(v -> {

                        manageDrafts.onItemDraftDeleted(statusList.get(holder.getLayoutPosition()), holder.getLayoutPosition());

                        notifyItemChanged((getItemCount() - 1));

                    });

                } else {

                    holder.binding.addRemoveStatus.setImageResource(R.drawable.ic_compose_thread_add_status);

                    holder.binding.addRemoveStatus.setIconResource(R.drawable.ic_compose_thread_add_status);

                    holder.binding.addRemoveStatus.setContentDescription(context.getString(R.string.add_status));

                    holder.binding.addRemoveStatus.setOnClickListener(v -> {

                        manageDrafts.onItemDraftAdded(holder.getLayoutPosition());
@@ -410,7 +410,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
                    });

                }

            } else {

                holder.binding.addRemoveStatus.setImageResource(R.drawable.ic_compose_thread_add_status);

                holder.binding.addRemoveStatus.setIconResource(R.drawable.ic_compose_thread_add_status);

                holder.binding.addRemoveStatus.setContentDescription(context.getString(R.string.add_status));

                holder.binding.addRemoveStatus.setOnClickListener(v -> {

                    manageDrafts.onItemDraftAdded(holder.getLayoutPosition());
@@ -1251,19 +1251,19 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 


            switch (statusDraft.visibility.toLowerCase()) {

                case "public":

                    holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_public);

                    holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_public);

                    statusDraft.visibility = MastodonHelper.visibility.PUBLIC.name();

                    break;

                case "unlisted":

                    holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_unlisted);

                    holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_unlisted);

                    statusDraft.visibility = MastodonHelper.visibility.UNLISTED.name();

                    break;

                case "private":

                    holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_private);

                    holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_private);

                    statusDraft.visibility = MastodonHelper.visibility.PRIVATE.name();

                    break;

                case "direct":

                    holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_direct);

                    holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_direct);

                    statusDraft.visibility = MastodonHelper.visibility.DIRECT.name();

                    break;

            }
@@ -1273,23 +1273,23 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder 
            holder.binding.buttonCloseVisibilityPanel.setOnClickListener(v -> holder.binding.visibilityPanel.setVisibility(View.GONE));

            holder.binding.buttonVisibilityDirect.setOnClickListener(v -> {

                holder.binding.visibilityPanel.setVisibility(View.GONE);

                holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_direct);

                holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_direct);

                statusDraft.visibility = MastodonHelper.visibility.DIRECT.name();



            });

            holder.binding.buttonVisibilityPrivate.setOnClickListener(v -> {

                holder.binding.visibilityPanel.setVisibility(View.GONE);

                holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_private);

                holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_private);

                statusDraft.visibility = MastodonHelper.visibility.PRIVATE.name();

            });

            holder.binding.buttonVisibilityUnlisted.setOnClickListener(v -> {

                holder.binding.visibilityPanel.setVisibility(View.GONE);

                holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_unlisted);

                holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_unlisted);

                statusDraft.visibility = MastodonHelper.visibility.UNLISTED.name();

            });

            holder.binding.buttonVisibilityPublic.setOnClickListener(v -> {

                holder.binding.visibilityPanel.setVisibility(View.GONE);

                holder.binding.buttonVisibility.setImageResource(R.drawable.ic_compose_visibility_public);

                holder.binding.buttonVisibility.setIconResource(R.drawable.ic_compose_visibility_public);

                statusDraft.visibility = MastodonHelper.visibility.PUBLIC.name();

                unlisted_changed = true;

            });

app/src/main/res/layout/activity_about.xml

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ 
                android:layout_margin="10dp"

                android:contentDescription="@string/make_an_action"

                android:scaleType="fitCenter"

                android:tint="@color/white"

                android:visibility="gone"

                app:layout_constraintStart_toEndOf="@id/avatar_container"

                app:layout_constraintTop_toBottomOf="@id/banner_container"

app/src/main/res/layout/activity_admin_account.xml

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ 
                android:id="@+id/toolbar"

                android:layout_width="match_parent"

                android:layout_height="?attr/actionBarSize"

                android:backgroundTint="?colorPrimaryDark"

                app:layout_collapseMode="pin">



                <androidx.appcompat.widget.AppCompatImageView

app/src/main/res/layout/activity_main.xml

+1 −2
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ 
        <com.google.android.material.appbar.AppBarLayout

            android:id="@+id/appBar"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:backgroundTint="?colorPrimaryDark">

            android:layout_height="wrap_content">



            <androidx.appcompat.widget.Toolbar

                android:id="@+id/toolbar"

app/src/main/res/layout/activity_partnership.xml

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ 
                android:layout_margin="10dp"

                android:contentDescription="@string/make_an_action"

                android:scaleType="fitCenter"

                android:tint="@color/white"

                android:visibility="gone"

                app:layout_constraintStart_toEndOf="@id/avatar_container"

                app:layout_constraintTop_toBottomOf="@id/banner_container"