Commit bd987fe7 authored by 0xd9a's avatar 0xd9a
Browse files

Use MaterialButton for sensitive media toggle + make it larger

parent dbc5bae8

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

+2 −2
Original line number Diff line number Diff line
@@ -3016,9 +3016,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 


        RequestBuilder<Drawable> requestBuilder = prepareRequestBuilder(context, attachment, mediaW * ratio, mediaH * ratio, focusX, focusY, statusToDeal.sensitive, false);

        if (!statusToDeal.sensitive || expand_media) {

            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_24);

            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_24);

        } else {

            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_off_24);

            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_off_24);

        }

        requestBuilder.load(attachment.preview_url).into(layoutMediaBinding.media);

        if (statusToDeal.sensitive) {

app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusDirectMessageAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -162,9 +162,9 @@ public class StatusDirectMessageAdapter extends RecyclerView.Adapter<RecyclerVie 


        RequestBuilder<Drawable> requestBuilder = prepareRequestBuilder(context, attachment, mediaW * ratio, mediaH * ratio, focusX, focusY, status.sensitive, false);

        if (!status.sensitive || expand_media) {

            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_24);

            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_24);

        } else {

            layoutMediaBinding.viewHide.setImageResource(R.drawable.ic_baseline_visibility_off_24);

            layoutMediaBinding.viewHide.setIconResource(R.drawable.ic_baseline_visibility_off_24);

        }

        requestBuilder.load(attachment.preview_url).into(layoutMediaBinding.media);

        if (status.sensitive) {

app/src/main/res/layouts/mastodon/layout/layout_media.xml

+5 −7
Original line number Diff line number Diff line
@@ -60,16 +60,14 @@ 
        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@id/media" />



    <ImageView

    <com.google.android.material.button.MaterialButton

        android:id="@+id/view_hide"

        android:layout_width="24dp"

        android:layout_height="24dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:layout_margin="5dp"

        style="@style/Widget.Material3.Button.IconButton"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:contentDescription="@string/visibility"

        android:importantForAccessibility="no"

        android:src="@drawable/ic_baseline_visibility_24"

        app:icon="@drawable/ic_baseline_visibility_24"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="@id/media" />