5 files changed, 17 insertions, 12 deletions
diff --git a/app/src/main/res/layout/activity_attachments.xml b/app/src/main/res/layout/activity_attachments.xml
index 4d1fabe17..2e9f68414 100644
--- a/app/src/main/res/layout/activity_attachments.xml
+++ b/app/src/main/res/layout/activity_attachments.xml
@@ -23,14 +23,14 @@
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="match_parent" />
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:contentDescription="@null"
-        android:transitionName="@string/transition_attachment_preview"
-        tools:src="@drawable/ic_image_grey600_24dp"
-        tools:targetApi="lollipop" />
+<!--    <androidx.appcompat.widget.AppCompatImageView-->
+<!--        android:id="@+id/image"-->
+<!--        android:layout_width="match_parent"-->
+<!--        android:layout_height="match_parent"-->
+<!--        android:contentDescription="@null"-->
+<!--        android:transitionName="@string/transition_attachment_preview"-->
+<!--        tools:src="@drawable/ic_image_grey600_24dp"-->
+<!--        tools:targetApi="lollipop" />-->
 </LinearLayout>
 \ No newline at end of file
diff --git a/app/src/main/res/layout/item_attachment.xml b/app/src/main/res/layout/item_attachment.xml
new file mode 100644
index 000000000..08a31cf7d
--- /dev/null
+++ b/app/src/main/res/layout/item_attachment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.AppCompatImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/preview"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    app:srcCompat="@drawable/ic_image_grey600_24dp" />
+\ No newline at end of file
diff --git a/app/src/main/res/layout/item_attachment_default.xml b/app/src/main/res/layout/item_attachment_default.xml
index 11d147d92..f58783559 100644
--- a/app/src/main/res/layout/item_attachment_default.xml
+++ b/app/src/main/res/layout/item_attachment_default.xml
@@ -20,7 +20,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_margin="@dimen/standard_half_margin"
-            android:transitionName="@string/transition_attachment_preview"
             app:srcCompat="@drawable/ic_attach_file_grey600_24dp" />
 
         <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/layout/item_attachment_image.xml b/app/src/main/res/layout/item_attachment_image.xml
index 42ab7bc66..476b7497d 100644
--- a/app/src/main/res/layout/item_attachment_image.xml
+++ b/app/src/main/res/layout/item_attachment_image.xml
@@ -12,7 +12,6 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:scaleType="centerCrop"
-        android:transitionName="@string/transition_attachment_preview"
         app:srcCompat="@drawable/ic_image_grey600_24dp" />
 
     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index db81c60a1..567f06b3a 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -35,5 +35,5 @@
     <integer name="minimum_server_app_patch" translatable="false">4</integer>
 
     <!-- Transitions -->
-    <string name="transition_attachment_preview" translatable="false">transition_attachment_preview</string>
+    <string name="transition_attachment_preview" translatable="false">transition_attachment_preview_%1$s</string>
 </resources>
 \ No newline at end of file