empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add outlined view-once close icon.

Browse source
This commit is contained in:
Alex Hart 2020-06-02 16:05:16 -03:00 • committed by GitHub
parent 6102e9aa72
commit 3192cc0aac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-mdpi/ic_x_24_outlined.webp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 400 B

BIN
app/src/main/res/drawable-xhdpi/ic_x_24_outlined.webp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 854 B

BIN
app/src/main/res/drawable-xxhdpi/ic_x_24_outlined.webp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_x_24_outlined.webp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

19
app/src/main/res/layout/view_once_message_activity.xml
View file

@ -1,22 +1,22 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/core_black"> android:background="@color/core_black">
<ImageView <ImageView
android:id="@+id/view_once_image" android:id="@+id/view_once_image"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:scaleType="fitCenter"/> android:scaleType="fitCenter" />
<org.thoughtcrime.securesms.video.VideoPlayer <org.thoughtcrime.securesms.video.VideoPlayer
android:id="@+id/view_once_video" android:id="@+id/view_once_video"
android:visibility="gone"
android:layout_width="match_parent" 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 --> <!-- Need this wrapper layout to get the ripple to show correctly. https://issuetracker.google.com/issues/111819099 -->
<FrameLayout <FrameLayout
@ -28,12 +28,11 @@
android:id="@+id/view_once_close_button" android:id="@+id/view_once_close_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:padding="4dp" android:layout_marginTop="15dp"
android:tint="@color/core_white"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
app:srcCompat="@drawable/ic_x"/> android:padding="4dp"
android:src="@drawable/ic_x_24_outlined" />
</FrameLayout> </FrameLayout>
@ -46,7 +45,7 @@
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:textAppearance="@style/ViewOnceVideo.Duration" android:textAppearance="@style/ViewOnceVideo.Duration"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:text="00:23"
tools:text="00:23" /> tools:visibility="visible" />
</FrameLayout> </FrameLayout>