diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java | 12 | ||||
| -rw-r--r-- | app/src/main/res/layout/compose_attachment_item.xml | 21 |
2 files changed, 15 insertions, 18 deletions
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java index 88ae84242..3938b4fc3 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java @@ -1156,15 +1156,15 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder }); composeAttachmentItemBinding.preview.setOnClickListener(v -> displayAttachments(holder, position, finalMediaPosition)); if (attachment.description == null || attachment.description.trim().isEmpty()) { - composeAttachmentItemBinding.buttonDescription.setIconResource(R.drawable.ic_baseline_warning_24); + composeAttachmentItemBinding.buttonDescription.setChipIconResource(R.drawable.ic_baseline_warning_24); composeAttachmentItemBinding.buttonDescription.setTextColor(ContextCompat.getColor(context, R.color.black)); - composeAttachmentItemBinding.buttonDescription.setIconTintResource(R.color.black); - composeAttachmentItemBinding.buttonDescription.setBackgroundTintList(ThemeHelper.getNoDescriptionColorStateList(context)); + composeAttachmentItemBinding.buttonDescription.setChipIconTintResource(R.color.black); + composeAttachmentItemBinding.buttonDescription.setChipBackgroundColor(ThemeHelper.getNoDescriptionColorStateList(context)); } else { - composeAttachmentItemBinding.buttonDescription.setIconResource(R.drawable.ic_baseline_check_circle_24); + composeAttachmentItemBinding.buttonDescription.setChipIconResource(R.drawable.ic_baseline_check_circle_24); composeAttachmentItemBinding.buttonDescription.setTextColor(ContextCompat.getColor(context, R.color.white)); - composeAttachmentItemBinding.buttonDescription.setIconTintResource(R.color.white); - composeAttachmentItemBinding.buttonDescription.setBackgroundTintList(ThemeHelper.getHavingDescriptionColorStateList(context)); + composeAttachmentItemBinding.buttonDescription.setChipIconTintResource(R.color.white); + composeAttachmentItemBinding.buttonDescription.setChipBackgroundColor(ThemeHelper.getHavingDescriptionColorStateList(context)); } holder.binding.attachmentsList.addView(composeAttachmentItemBinding.getRoot()); mediaPosition++; diff --git a/app/src/main/res/layout/compose_attachment_item.xml b/app/src/main/res/layout/compose_attachment_item.xml index ebf9c3b08..4beca2ea6 100644 --- a/app/src/main/res/layout/compose_attachment_item.xml +++ b/app/src/main/res/layout/compose_attachment_item.xml @@ -25,14 +25,14 @@ <androidx.appcompat.widget.AppCompatImageView android:id="@+id/button_play" - app:srcCompat="@drawable/ic_compose_attachment_play" android:layout_width="36dp" android:layout_height="36dp" android:scaleType="fitCenter" app:layout_constraintBottom_toBottomOf="@id/preview" app:layout_constraintEnd_toEndOf="@id/preview" app:layout_constraintStart_toStartOf="@id/preview" - app:layout_constraintTop_toTopOf="@id/preview" /> + app:layout_constraintTop_toTopOf="@id/preview" + app:srcCompat="@drawable/ic_compose_attachment_play" /> <com.google.android.material.button.MaterialButton android:id="@+id/edit_preview" @@ -66,22 +66,19 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/preview" /> - <com.google.android.material.button.MaterialButton + <com.google.android.material.chip.Chip android:id="@+id/button_description" - android:layout_width="match_parent" + style="@style/Widget.Material3.Chip.Assist.Elevated" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="2dp" - android:layout_marginEnd="2dp" android:text="@string/description" - android:textAlignment="textStart" android:textColor="@color/black" - app:backgroundTint="@color/no_description" - app:icon="@drawable/ic_baseline_warning_24" - app:iconGravity="textStart" - app:iconTint="@color/black" + app:chipBackgroundColor="@color/no_description" + app:chipIcon="@drawable/ic_baseline_warning_24" app:layout_constraintEnd_toStartOf="@id/button_order_down" app:layout_constraintStart_toEndOf="@id/button_order_up" - app:layout_constraintTop_toBottomOf="@id/preview" /> + app:layout_constraintTop_toBottomOf="@id/preview" + app:textEndPadding="0dp" /> <com.google.android.material.button.MaterialButton android:id="@+id/button_order_down" |