Add outlined view-once close icon.

signalapp · Jun 2, 2020 · 3192cc0 · 3192cc0
1 parent 6102e9a
commit 3192cc0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/app/src/main/res/drawable-mdpi/ic_x_24_outlined.webp b/app/src/main/res/drawable-mdpi/ic_x_24_outlined.webp
diff --git a/app/src/main/res/drawable-xhdpi/ic_x_24_outlined.webp b/app/src/main/res/drawable-xhdpi/ic_x_24_outlined.webp
diff --git a/app/src/main/res/drawable-xxhdpi/ic_x_24_outlined.webp b/app/src/main/res/drawable-xxhdpi/ic_x_24_outlined.webp
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_x_24_outlined.webp b/app/src/main/res/drawable-xxxhdpi/ic_x_24_outlined.webp
diff --git a/app/src/main/res/layout/view_once_message_activity.xml b/app/src/main/res/layout/view_once_message_activity.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/core_black">
 
     <ImageView
         android:id="@+id/view_once_image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="fitCenter"/>
+        android:scaleType="fitCenter" />
 
     <org.thoughtcrime.securesms.video.VideoPlayer
         android:id="@+id/view_once_video"
-        android:visibility="gone"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:visibility="gone" />
 
     <!-- Need this wrapper layout to get the ripple to show correctly. https://issuetracker.google.com/issues/111819099 -->
     <FrameLayout
@@ -28,12 +28,11 @@
             android:id="@+id/view_once_close_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
             android:layout_marginStart="15dp"
-            android:padding="4dp"
-            android:tint="@color/core_white"
+            android:layout_marginTop="15dp"
             android:background="?selectableItemBackgroundBorderless"
-            app:srcCompat="@drawable/ic_x"/>
+            android:padding="4dp"
+            android:src="@drawable/ic_x_24_outlined" />
 
     </FrameLayout>
 
@@ -46,7 +45,7 @@
         android:layout_marginEnd="16dp"
         android:textAppearance="@style/ViewOnceVideo.Duration"
         android:visibility="gone"
-        tools:visibility="visible"
-        tools:text="00:23" />
+        tools:text="00:23"
+        tools:visibility="visible" />
 
 </FrameLayout>