TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 12:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix invite drawable on API 21."

Browse Source 
This reverts commit 78fbfe40736dd8c9ccafb402aa7fc6921c1d4496.

We have turned on AppCompatDelegate.setCompatVectorFromResourcesEnabled(true) now for API19.
This commit is contained in:
Alan Evans 2019-10-18 09:15:20 -04:00 committed by GitHub
parent 42967dab13
commit ef585eba42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/drawable/circle_invite.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="#70707C" />
</shape>

14
res/drawable/ic_invite_circle.xml Normal file
View File

@ -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>

32
res/layout/contact_selection_invite_action_item.xml
View File

@ -1,37 +1,17 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <TextView 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/contact_selection_item_height"
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" style="@style/Signal.Text.Body"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/contact_selection_item_height" android:layout_height="@dimen/contact_selection_item_height"
android:layout_marginStart="16dp" android:drawableStart="@drawable/ic_invite_circle"
android:drawablePadding="16dp"
android:ellipsize="marquee" android:ellipsize="marquee"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:gravity="center_vertical|start" android:gravity="center_vertical|start"
android:labelFor="@id/action_icon" android:labelFor="@id/action_icon"
android:paddingStart="@dimen/selection_item_header_width"
android:singleLine="true" android:singleLine="true"
android:text="@string/contact_selection_activity__invite_to_signal" android:text="@string/contact_selection_activity__invite_to_signal"
android:textAlignment="viewStart" /> android:textAlignment="viewStart"
tools:ignore="RtlSymmetry" />
</LinearLayout>