mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-25 14:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1267 from nextcloud/dependabot/gradle/androidx.appcompat-appcompat-1.3.0

Browse source 
Bump appcompat from 1.2.0 to 1.3.0
This commit is contained in:
Andy Scherzinger 2021-05-20 13:22:27 +02:00 committed by GitHub
commit c5dd505729
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -177,7 +177,7 @@ configurations.all {
dependencies { dependencies {
implementation fileTree(include: ['*'], dir: 'libs') implementation fileTree(include: ['*'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.3.0' implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'com.github.vanniktech:Emoji:0.6.0' // 0.7.0 has display issue - don't update to 0.7.0 implementation 'com.github.vanniktech:Emoji:0.6.0' // 0.7.0 has display issue - don't update to 0.7.0

2
app/src/main/res/layout/controller_entry_menu.xml
View file

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

18
app/src/main/res/layout/controller_profile.xml
View file

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

4
app/src/main/res/layout/view_message_input.xml
View file

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

2
scripts/analysis/lint-results.txt
View file

@ -1,2 +1,2 @@
DO NOT TOUCH; GENERATED BY DRONE DO NOT TOUCH; GENERATED BY DRONE
<span class="mdl-layout-title">Lint Report: 3 errors and 338 warnings</span> <span class="mdl-layout-title">Lint Report: 3 errors and 336 warnings</span>