From a1c22c9aa6531603900b89c4d8e9690b2d4aeb5e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 27 Jun 2019 18:25:50 +0200 Subject: [PATCH 1/5] Remove useless property for a SDK --- matrix-sdk-android/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle index 83106060..d539842e 100644 --- a/matrix-sdk-android/build.gradle +++ b/matrix-sdk-android/build.gradle @@ -33,7 +33,6 @@ android { targetSdkVersion 28 versionCode 1 versionName "0.0.1" - multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" From 76fc455d9374164dc6d6bfed944098f3d40cd415 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 28 Jun 2019 10:04:43 +0200 Subject: [PATCH 2/5] Stop using textColorTertiary (fix crash on API 19) --- vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml | 4 ++-- .../res/layout/constraint_set_composer_layout_compact.xml | 2 +- .../res/layout/constraint_set_composer_layout_expanded.xml | 2 +- vector/src/main/res/layout/merge_composer_layout.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml index aeaa2fb9..feaa79e1 100644 --- a/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml +++ b/vector/src/main/res/layout/bottom_sheet_logout_and_backup.xml @@ -90,7 +90,7 @@ android:layout_marginRight="16dp" android:scaleType="fitCenter" android:src="@drawable/backup_keys" - android:tint="?android:attr/textColorTertiary" /> + android:tint="?riotx_text_primary" /> + android:tint="?riotx_text_primary" /> Date: Fri, 28 Jun 2019 10:06:36 +0200 Subject: [PATCH 3/5] minSdkVersion 19 (mainly for security reason and also because of MotionLayout only supported on API 18) --- vector/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vector/build.gradle b/vector/build.gradle index 8fc7f70a..f8498182 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -58,7 +58,9 @@ android { compileSdkVersion 28 defaultConfig { applicationId "im.vector.riotredesign" - minSdkVersion 16 + // Set to API 19 because motionLayout is min API 18. + // In the future we may consider using an alternative of MotionLayout to support API 16. But for security reason, maybe not. + minSdkVersion 19 targetSdkVersion 28 multiDexEnabled true versionCode generateVersionCodeFromTimestamp() From ee402fd328067fc94732881551057bf005106f1e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 28 Jun 2019 14:57:41 +0200 Subject: [PATCH 4/5] Now with min API set to 19, we do not need Left and Right attribute, Start and End is enougth. For the moment, just reduce the severity --- vector/lint.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vector/lint.xml b/vector/lint.xml index 3e4078d7..b6da88ae 100644 --- a/vector/lint.xml +++ b/vector/lint.xml @@ -22,7 +22,8 @@ - + + From 7af55a48f67d35398b180b0c6848e3d9cf2ccdb3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 28 Jun 2019 15:05:57 +0200 Subject: [PATCH 5/5] Fix lint warning --- .../vector/riotredesign/features/media/ImageContentRenderer.kt | 2 +- vector/src/main/res/anim/unread_marker_anim.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt index fcd7cab1..2f6ae173 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/media/ImageContentRenderer.kt @@ -16,10 +16,10 @@ package im.vector.riotredesign.features.media -import android.media.ExifInterface import android.net.Uri import android.os.Parcelable import android.widget.ImageView +import androidx.exifinterface.media.ExifInterface import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.github.piasy.biv.view.BigImageView import im.vector.matrix.android.api.Matrix diff --git a/vector/src/main/res/anim/unread_marker_anim.xml b/vector/src/main/res/anim/unread_marker_anim.xml index 6cc9d9ec..0c7ddab3 100644 --- a/vector/src/main/res/anim/unread_marker_anim.xml +++ b/vector/src/main/res/anim/unread_marker_anim.xml @@ -1,6 +1,6 @@ -