Skip to content

Commit

Permalink
Revert "Fix invite drawable on API 21."
Browse files Browse the repository at this point in the history
This reverts commit 78fbfe40736dd8c9ccafb402aa7fc6921c1d4496.

We have turned on AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) now for API19.
  • Loading branch information
alan-signal committed Oct 18, 2019
1 parent 42967da commit ef585eb
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 37 deletions.
5 changes: 0 additions & 5 deletions res/drawable/circle_invite.xml

This file was deleted.

14 changes: 14 additions & 0 deletions res/drawable/ic_invite_circle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="oval">
<solid android:color="#70707C" />
</shape>
</item>
<item
android:bottom="10dp"
android:drawable="@drawable/ic_invite_28dp"
android:left="10dp"
android:right="10dp"
android:top="10dp" />
</layer-list>
44 changes: 12 additions & 32 deletions res/layout/contact_selection_invite_action_item.xml
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="@dimen/contact_selection_item_height"
android:drawableStart="@drawable/ic_invite_circle"
android:drawablePadding="16dp"
android:ellipsize="marquee"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|start"
android:labelFor="@id/action_icon"
android:paddingStart="@dimen/selection_item_header_width"
tools:ignore="RtlSymmetry,UseCompoundDrawables">

<FrameLayout
android:layout_width="@dimen/selection_item_header_width"
android:layout_height="@dimen/selection_item_header_width"
android:layout_gravity="center_vertical"
android:background="@drawable/circle_invite">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp"
app:srcCompat="@drawable/ic_invite_28dp"
tools:ignore="ContentDescription" />
</FrameLayout>

<TextView
style="@style/Signal.Text.Body"
android:layout_width="match_parent"
android:layout_height="@dimen/contact_selection_item_height"
android:layout_marginStart="16dp"
android:ellipsize="marquee"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|start"
android:labelFor="@id/action_icon"
android:singleLine="true"
android:text="@string/contact_selection_activity__invite_to_signal"
android:textAlignment="viewStart" />

</LinearLayout>
android:singleLine="true"
android:text="@string/contact_selection_activity__invite_to_signal"
android:textAlignment="viewStart"
tools:ignore="RtlSymmetry" />

0 comments on commit ef585eb

Please sign in to comment.