Remove support for Android 4.4

irccloud · Jan 4, 2021 · 920af96 · 920af96
1 parent afbd663
commit 920af96
Show file tree

Hide file tree

Showing 43 changed files with 270 additions and 712 deletions.
diff --git a/README.md b/README.md
@@ -21,17 +21,16 @@ Screenshots
 
 Requirements
 ------
-* Android Studio 2.2.x
-* Gradle 2.2.x
-* Android 7.0 SDK
-* Android Support Library, revision 24 or newer
-* Google Play Services, version 9.6.0 or newer
+* Android Studio 4.1.x
+* Gradle 4.1.x
+* Android 11.0 SDK
+* Latest versions of AndroidX and Google Play Services
 * android-websockets library: https://github.com/irccloud/android-websockets
-* An Android device running Android 2.2 or newer
+* An Android device running Android 5.1 or newer
 
 Building
 ------
-* Make sure you've installed the Android 7.0 SDK and upgraded to the latest version of Android Studio
+* Make sure you've installed the Android 11.0 SDK and upgraded to the latest version of Android Studio
 * Make sure you've updated all support repository and Google Play Services repository packages in the Android SDK manager
 * Check out android-websockets and the IRCCloud Android project from github
 * Open Android studio and select the IRCCloud Android build.gradle file
@@ -43,7 +42,7 @@ _You must uninstall the Play Store version of the app first before installing a
 
 License
 ------
-Copyright (C) 2016 IRCCloud, Ltd.
+Copyright (C) 2021 IRCCloud, Ltd.
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at

diff --git a/build.gradle b/build.gradle
@@ -70,9 +70,8 @@ android {
     defaultConfig {
         versionCode 298
         versionName "4.24"
-        minSdkVersion 17
+        minSdkVersion 22
         targetSdkVersion 30
-        multiDexEnabled true
         applicationId "com.irccloud.android"
         testApplicationId "com.irccloud.android.test"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -359,14 +358,14 @@ dependencies {
     implementation "androidx.browser:browser:1.3.0"
     implementation "androidx.emoji:emoji:1.1.0"
     implementation "androidx.exifinterface:exifinterface:1.3.2"
-    implementation "androidx.room:room-runtime:2.2.5"
-    annotationProcessor "androidx.room:room-compiler:2.2.5"
+    implementation "androidx.room:room-runtime:2.2.6"
+    annotationProcessor "androidx.room:room-compiler:2.2.6"
     implementation "com.google.android.gms:play-services-base:17.5.0"
     implementation "com.google.android.gms:play-services-auth:19.0.0"
     implementation "com.google.android.gms:play-services-identity:17.0.0"
-    implementation 'com.google.firebase:firebase-messaging:21.0.0'
+    implementation 'com.google.firebase:firebase-messaging:21.0.1'
     implementation 'com.google.firebase:firebase-analytics:18.0.0'
-    implementation 'com.google.firebase:firebase-perf:19.0.10'
+    implementation 'com.google.firebase:firebase-perf:19.0.11'
     implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
     implementation 'com.vandalsoftware.android:dslv:0.6.3'
     implementation 'com.damnhandy:handy-uri-templates:2.1.7'

diff --git a/irccloud-android.iml b/irccloud-android.iml
@@ -84,14 +84,15 @@
     <orderEntry type="library" name="Gradle: ./libs/sdk-v1.0.0.jar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-common:4.1.1" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.room:room-common:2.2.5" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders:16.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.room:room-common:2.2.6" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders:16.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: com.google.guava:listenablefuture:1.0" level="project" />
     <orderEntry type="library" name="Gradle: javax.inject:javax.inject:1" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-javalite:3.11.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-annotations:16.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.protobuf:protobuf-javalite:3.14.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.1" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0" level="project" />
     <orderEntry type="library" name="Gradle: com.damnhandy:handy-uri-templates:2.1.7" level="project" />
@@ -101,10 +102,9 @@
     <orderEntry type="library" name="Gradle: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-adapters:4.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:4.1.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:4.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.2.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-perf:19.0.10@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-perf:19.0.11@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.theartofdev.edmodo:android-image-cropper:2.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.vandalsoftware.android:dslv:0.6.3@aar" level="project" />
@@ -124,21 +124,21 @@
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-api-phone:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-auth-base:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-clearcut:17.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging:21.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:21.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-messaging:21.0.1@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid:21.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-iid-interop:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-phenotype:17.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-base:17.5.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-crashlytics:17.3.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-cloud-messaging:16.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-datatransport:17.0.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-datatransport:17.0.10@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-analytics:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-api:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-config:20.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations:16.3.4@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations:16.3.5@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.firebase:firebase-abt:20.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:19.4.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations-interop:16.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-common:19.5.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-installations-interop:16.0.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-tasks:17.2.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement:18.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.gms:play-services-measurement-sdk:18.0.0@aar" level="project" />
@@ -168,26 +168,26 @@
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.2.5@aar" level="project" />
+    <orderEntry type="library" name="Gradle: androidx.room:room-runtime:2.2.6@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite-framework:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.sqlite:sqlite:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.work:work-runtime:2.4.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-livedata-core:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-runtime:2.1.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-backend-cct:2.3.2@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-backend-cct:2.3.3@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-runtime:2.2.5@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.datatransport:transport-api:2.2.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-components:16.0.1@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders-json:17.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-components:16.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:firebase-encoders-json:17.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.savedstate:savedstate:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-viewmodel:2.1.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.interpolator:interpolator:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.documentfile:documentfile:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.localbroadcastmanager:localbroadcastmanager:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.print:print:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.annotation:annotation-experimental:1.0.0@aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.google.firebase:protolite-well-known-types:17.1.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.google.firebase:protolite-well-known-types:17.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.commonsware.cwac:richedit:0.5.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: pl.droidsonroids.gif:android-gif-drawable:1.2.19@aar" level="project" />
     <orderEntry type="library" name="Gradle: pl.droidsonroids:relinker:1.3.1@aar" level="project" />

diff --git a/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...le-hdpi/scrollbar_handle_mtrl_alpha.9.png b/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...le-hdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...le-ldpi/scrollbar_handle_mtrl_alpha.9.png b/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...le-ldpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...le-mdpi/scrollbar_handle_mtrl_alpha.9.png b/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...le-mdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable-v21/dismiss_bg.xml b/res/drawable-v21/dismiss_bg.xml
diff --git a/res/drawable-v21/row_failed_bg.xml b/res/drawable-v21/row_failed_bg.xml
diff --git a/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...e-xhdpi/scrollbar_handle_mtrl_alpha.9.png b/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...e-xhdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...-xxhdpi/scrollbar_handle_mtrl_alpha.9.png b/...dpi-v21/scrollbar_handle_mtrl_alpha.9.png → ...-xxhdpi/scrollbar_handle_mtrl_alpha.9.png
diff --git a/res/drawable/dismiss_bg.xml b/res/drawable/dismiss_bg.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2015 IRCCloud, Ltd.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +15,7 @@
   ~ limitations under the License.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/dismiss_blue" />
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="@drawable/dismiss_blue"/>
+</ripple>
diff --git a/res/drawable-v21/ic_action_reply_tinted.xml → res/drawable/ic_action_reply_tinted.xml b/res/drawable-v21/ic_action_reply_tinted.xml → res/drawable/ic_action_reply_tinted.xml
diff --git a/res/drawable-v21/notification_action_bg.xml → res/drawable/notification_action_bg.xml b/res/drawable-v21/notification_action_bg.xml → res/drawable/notification_action_bg.xml
diff --git a/res/drawable/row_failed_bg.xml b/res/drawable/row_failed_bg.xml
@@ -15,9 +15,7 @@
   ~ limitations under the License.
   -->
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:drawable="@drawable/status_fail_bg" android:state_pressed="true"/>
-    <item android:drawable="@drawable/status_fail_bg" android:state_selected="true"/>
-    <item android:drawable="@drawable/status_fail_bg" android:state_focused="true"/>
-    <item android:drawable="@drawable/network_fail_bg"/>
-</selector>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+    <item android:drawable="@drawable/row_failed_bgcolor"/>
+</ripple>
diff --git a/res/drawable-v21/row_failed_bgcolor.xml → res/drawable/row_failed_bgcolor.xml b/res/drawable-v21/row_failed_bgcolor.xml → res/drawable/row_failed_bgcolor.xml
diff --git a/res/layout-v19/dialog_textprompt.xml b/res/layout-v19/dialog_textprompt.xml