mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-23 01:00:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use 'chip' for description button in compose

Browse source
This commit is contained in:
0xd9a 2022-12-24 16:20:21 +05:30
parent c1814aa5e9
commit c63afc8097
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
View file

@ -1156,15 +1156,15 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
}); });
composeAttachmentItemBinding.preview.setOnClickListener(v -> displayAttachments(holder, position, finalMediaPosition)); composeAttachmentItemBinding.preview.setOnClickListener(v -> displayAttachments(holder, position, finalMediaPosition));
if (attachment.description == null || attachment.description.trim().isEmpty()) { 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.setTextColor(ContextCompat.getColor(context, R.color.black));
composeAttachmentItemBinding.buttonDescription.setIconTintResource(R.color.black); composeAttachmentItemBinding.buttonDescription.setChipIconTintResource(R.color.black);
composeAttachmentItemBinding.buttonDescription.setBackgroundTintList(ThemeHelper.getNoDescriptionColorStateList(context)); composeAttachmentItemBinding.buttonDescription.setChipBackgroundColor(ThemeHelper.getNoDescriptionColorStateList(context));
} else { } 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.setTextColor(ContextCompat.getColor(context, R.color.white));
composeAttachmentItemBinding.buttonDescription.setIconTintResource(R.color.white); composeAttachmentItemBinding.buttonDescription.setChipIconTintResource(R.color.white);
composeAttachmentItemBinding.buttonDescription.setBackgroundTintList(ThemeHelper.getHavingDescriptionColorStateList(context)); composeAttachmentItemBinding.buttonDescription.setChipBackgroundColor(ThemeHelper.getHavingDescriptionColorStateList(context));
} }
holder.binding.attachmentsList.addView(composeAttachmentItemBinding.getRoot()); holder.binding.attachmentsList.addView(composeAttachmentItemBinding.getRoot());
mediaPosition++; mediaPosition++;

21
app/src/main/res/layout/compose_attachment_item.xml
View file

@ -25,14 +25,14 @@
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/button_play" android:id="@+id/button_play"
app:srcCompat="@drawable/ic_compose_attachment_play"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="@id/preview" app:layout_constraintBottom_toBottomOf="@id/preview"
app:layout_constraintEnd_toEndOf="@id/preview" app:layout_constraintEnd_toEndOf="@id/preview"
app:layout_constraintStart_toStartOf="@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 <com.google.android.material.button.MaterialButton
android:id="@+id/edit_preview" android:id="@+id/edit_preview"
@ -66,22 +66,19 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/preview" /> app:layout_constraintTop_toBottomOf="@id/preview" />
<com.google.android.material.button.MaterialButton <com.google.android.material.chip.Chip
android:id="@+id/button_description" 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_height="wrap_content"
android:layout_marginStart="2dp"
android:layout_marginEnd="2dp"
android:text="@string/description" android:text="@string/description"
android:textAlignment="textStart"
android:textColor="@color/black" android:textColor="@color/black"
app:backgroundTint="@color/no_description" app:chipBackgroundColor="@color/no_description"
app:icon="@drawable/ic_baseline_warning_24" app:chipIcon="@drawable/ic_baseline_warning_24"
app:iconGravity="textStart"
app:iconTint="@color/black"
app:layout_constraintEnd_toStartOf="@id/button_order_down" app:layout_constraintEnd_toStartOf="@id/button_order_down"
app:layout_constraintStart_toEndOf="@id/button_order_up" 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 <com.google.android.material.button.MaterialButton
android:id="@+id/button_order_down" android:id="@+id/button_order_down"