Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

give media previews a rounded outline (#1617) 

* give media previews a rounded outline

* give media previews a rounded outline in ReportActivity
This commit is contained in:
Konrad Pozniak 2020-01-03 20:22:16 +01:00 committed by GitHub
parent 426e7edb73
commit 352ff3a2d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -111,6 +111,8 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
bookmarkButton = itemView.findViewById(R.id.status_bookmark); bookmarkButton = itemView.findViewById(R.id.status_bookmark);
moreButton = itemView.findViewById(R.id.status_more); moreButton = itemView.findViewById(R.id.status_more);
itemView.findViewById(R.id.status_media_preview_container).setClipToOutline(true);
mediaPreviews = new MediaPreviewImageView[]{ mediaPreviews = new MediaPreviewImageView[]{
itemView.findViewById(R.id.status_media_preview_0), itemView.findViewById(R.id.status_media_preview_0),
itemView.findViewById(R.id.status_media_preview_1), itemView.findViewById(R.id.status_media_preview_1),

1
app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusViewHolder.kt
View File

@ -61,6 +61,7 @@ class StatusViewHolder(
adapterHandler.setStatusChecked(status, isChecked) adapterHandler.setStatusChecked(status, isChecked)
} }
} }
itemView.status_media_preview_container.clipToOutline = true
} }
fun bind(status: Status) { fun bind(status: Status) {

4
app/src/main/res/drawable/media_preview_outline.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="8dp" />
</shape>

8
app/src/main/res/layout/item_conversation.xml
View File

@ -243,6 +243,7 @@
android:layout_height="@dimen/status_media_preview_height" android:layout_height="@dimen/status_media_preview_height"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:background="@drawable/media_preview_outline"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/status_media_preview_2" app:layout_constraintStart_toEndOf="@+id/status_media_preview_2"
@ -314,11 +315,14 @@
android:id="@+id/status_sensitive_media_warning" android:id="@+id/status_sensitive_media_warning"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="?attr/sensitive_media_warning_background_color" android:background="@drawable/media_warning_bg"
android:gravity="center" android:gravity="center"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp" android:paddingLeft="12dp"
android:paddingTop="8dp"
android:paddingRight="12dp"
android:paddingBottom="8dp"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="?attr/status_text_medium" android:textSize="?attr/status_text_medium"

1
app/src/main/res/layout/item_report_status.xml
View File

@ -90,6 +90,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/status_media_preview_margin_top" android:layout_marginTop="@dimen/status_media_preview_margin_top"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@drawable/media_preview_outline"
app:layout_constraintEnd_toStartOf="@id/barrierEnd" app:layout_constraintEnd_toStartOf="@id/barrierEnd"
app:layout_constraintStart_toStartOf="@id/guideBegin" app:layout_constraintStart_toStartOf="@id/guideBegin"
app:layout_constraintTop_toBottomOf="@id/buttonToggleContent" app:layout_constraintTop_toBottomOf="@id/buttonToggleContent"

1
app/src/main/res/layout/item_status.xml
View File

@ -184,6 +184,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/status_media_preview_margin_top" android:layout_marginTop="@dimen/status_media_preview_margin_top"
android:background="@drawable/media_preview_outline"
android:importantForAccessibility="noHideDescendants" android:importantForAccessibility="noHideDescendants"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/status_display_name" app:layout_constraintStart_toStartOf="@id/status_display_name"

6
app/src/main/res/layout/item_status_detailed.xml
View File

@ -203,6 +203,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="12dp" android:layout_marginTop="12dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:background="@drawable/media_preview_outline"
android:importantForAccessibility="noHideDescendants" android:importantForAccessibility="noHideDescendants"
app:layout_constraintTop_toBottomOf="@id/card_view"> app:layout_constraintTop_toBottomOf="@id/card_view">
@ -319,7 +320,10 @@
android:gravity="center" android:gravity="center"
android:lineSpacingMultiplier="1.2" android:lineSpacingMultiplier="1.2"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp" android:paddingLeft="12dp"
android:paddingTop="8dp"
android:paddingRight="12dp"
android:paddingBottom="8dp"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textSize="?attr/status_text_medium" android:textSize="?attr/status_text_medium"