replace android_tint with app:tint

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-05-20 13:05:35 +02:00
parent 3464400c9d
commit 346c2cc60f
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 12 additions and 12 deletions

View File

@ -75,8 +75,8 @@
android:background="@color/transparent"
android:contentDescription="@string/nc_add_emojis"
android:src="@drawable/ic_insert_emoticon_black_24dp"
android:tint="@color/emoji_icons"
android:visibility="gone"
app:tint="@color/emoji_icons"
tools:visibility="visible" />
</RelativeLayout>

View File

@ -79,10 +79,10 @@
android:layout_height="30dp"
android:layout_marginLeft="@dimen/standard_half_margin"
android:layout_marginRight="@dimen/standard_half_margin"
android:tint="@color/black"
android:src="@drawable/upload"
android:background="@drawable/round_corner"
android:contentDescription="@string/upload_new_avatar_from_device" />
android:contentDescription="@string/upload_new_avatar_from_device"
android:src="@drawable/upload"
app:tint="@color/black" />
<ImageButton
android:id="@+id/avatar_choose"
@ -90,10 +90,10 @@
android:layout_height="30dp"
android:layout_marginLeft="@dimen/standard_half_margin"
android:layout_marginRight="@dimen/standard_half_margin"
android:src="@drawable/ic_mimetype_folder"
android:background="@drawable/round_corner"
android:tint="@color/colorPrimary"
android:contentDescription="@string/choose_avatar_from_cloud" />
android:contentDescription="@string/choose_avatar_from_cloud"
android:src="@drawable/ic_mimetype_folder"
app:tint="@color/colorPrimary" />
<ImageButton
android:id="@+id/avatar_delete"
@ -101,10 +101,10 @@
android:layout_height="30dp"
android:layout_marginLeft="@dimen/standard_half_margin"
android:layout_marginRight="@dimen/standard_half_margin"
android:src="@drawable/trashbin"
android:tint="@color/black"
android:background="@drawable/round_corner"
android:contentDescription="@string/delete_avatar" />
android:contentDescription="@string/delete_avatar"
android:src="@drawable/trashbin"
app:tint="@color/black" />
</LinearLayout>
</RelativeLayout>

View File

@ -19,6 +19,7 @@
-->
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -57,7 +58,7 @@
android:layout_toStartOf="@id/messageSendButton"
android:background="@color/transparent"
android:src="@drawable/ic_insert_emoticon_black_24dp"
android:tint="@color/emoji_icons"
app:tint="@color/emoji_icons"
android:contentDescription="@string/nc_add_emojis" />
<ImageButton
@ -86,5 +87,4 @@
android:layout_toStartOf="@id/smileyButton" />
</RelativeLayout>
</merge>