Merge remote-tracking branch 'upstream/release' into release

.travis.yml

@@ -1,27 +1,32 @@
 language: android
+
 jdk:
+- openjdk8
 - oraclejdk8
+
 android:
   components:
   - tools
-  - build-tools-27.0.3
-  - android-27
+  - build-tools-28.0.0
+  - android-28
   - extra-google-m2repository
   - extra-android-m2repository
   licenses:
   - ".+"
+
 script:
 - "./gradlew clean assembleDebug"
+
 notifications:
   email: false
-  slack:
-    rooms:
-      secure: nzWsLhpkL9Fyw8X4SqdemmeIfG3v56ljoUSKNEffgHZPes0StVRa5oO3f8KseJeuI1CmbzzI2cek8H+7PU7kWTZ4CN7uFrcEOyJyju2co8/aK4vF+Q5/k0Q9J+11l345VTpz1diIlxj8cFoiP50S3gjMTFGuxEmRC6JqNQGwQ7G3NMcPts2bErFdsXsPfP6zzMbhlvMZUdiDDxG2OrW0mJFudIpZJNFxmyiMQLXUlBqjaF6T01VSgCGkx5J+EOnc07J1RGpdwSzGscT4cPuS2EvWpSMObOdVFCL4K96qk2ajYTq5IDr5bbdvWB7niZcbg9WUOu+voHKKxJzJc1mX4y33l+yQLbvL6kvE1gn/NxtRMOaOsu6YTb/Q1D708ZqlqJk20BNoZe3l9LVOIWk3jktXOTcRhyHkGYfqwuYki7zcHHbKAStdhSzC+SU/r8XDLaz4HCviIRupXHUVI9Bp7qr2VmbE/L5TuRdJQ7pRTDMxJQ+nP37vCcoQTwDOojhfjzmTaxUua3w80ZtT4BapmsYDt7WSGtmKMKCxIwN1luWoLVAKLzSN6I5mpwufqOS2rxdOfb0oguZll5W3xIZSKBX5BL9KBFchpPPh7s+7lBTfyVHmpjjOXJ4Jy+tWqd8YEoDbPQrP696684yy1grM6NhmfMVxO+iPMwrHbD7QUXI=
+
 sudo: false
+
 cache:
   directories:
   - "$HOME/.m2"
   - "$HOME/.gradle"
   - "$ANDROID_HOME"
+
 before_install:
-  - yes | sdkmanager "platforms;android-27"
+  - yes | sdkmanager "platforms;android-28"

app/build.gradle

@@ -1,22 +1,12 @@
 /*
- * Copyright (c) 2016-2017 Projekt Substratum
+ * Copyright (c) 2016-2018 Projekt Substratum
  * This file is part of Substratum.
  *
- * Substratum is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Substratum is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Substratum.  If not, see <http://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-Or-Later
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'io.fabric'
 
 final def gitHash = { ->
     final def stdout = new ByteArrayOutputStream()
@@ -34,8 +24,11 @@ final def keystorePropertiesFile = rootProject.file("keystore.properties")
 android {
     compileSdkVersion 28
     lintOptions {
-        checkReleaseBuilds false
         abortOnError false
+        checkAllWarnings false
+        checkReleaseBuilds false
+        ignoreWarnings true
+        quiet true
     }
     dataBinding.enabled true
     android.applicationVariants.all { final variant ->
@@ -47,10 +40,11 @@ android {
         applicationId "projekt.substratum"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 997
-        versionName "nine hundred ninety seven"
+        versionCode 1001
+        versionName "one thousand one"
         buildConfigField "java.util.Date", "buildTime", "new java.util.Date(" + System.currentTimeMillis() + "L)"
         buildConfigField "String", "GIT_HASH", "\"${gitHash()}\""
+        buildConfigField "boolean", "ENHANCED_LOGGING", "false"
     }
 
     // If the keystore file exists
@@ -99,29 +93,34 @@ android {
 }
 
 ext {
-    supportLibsVersion = '27.1.1'
+    databindingVersion = '3.3.0-alpha05'
+    androidXVersion = '1.0.0-rc01'
     firebaseVersion = '16.0.1'
+    crashlyticsVersion = '2.9.4'
     glideVersion = '4.7.1'
 }
+
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
 
     // Android Support Libraries
-    implementation "com.android.support:appcompat-v7:$supportLibsVersion"
-    implementation "com.android.support:exifinterface:$supportLibsVersion"
-    implementation "com.android.support:cardview-v7:$supportLibsVersion"
-    implementation "com.android.support:recyclerview-v7:$supportLibsVersion"
-    implementation "com.android.support:support-v13:$supportLibsVersion"
-    implementation "com.android.support:design:$supportLibsVersion"
-    implementation "com.android.support:palette-v7:$supportLibsVersion"
-    implementation "com.android.support:preference-v14:$supportLibsVersion"
+    implementation "androidx.databinding:databinding-runtime:$databindingVersion"
+    implementation "androidx.appcompat:appcompat:$androidXVersion"
+    implementation "androidx.exifinterface:exifinterface:$androidXVersion"
+    implementation "androidx.cardview:cardview:$androidXVersion"
+    implementation "androidx.recyclerview:recyclerview:$androidXVersion"
+    implementation "androidx.legacy:legacy-support-v13:$androidXVersion"
+    implementation "com.google.android.material:material:$androidXVersion"
+    implementation "androidx.palette:palette:$androidXVersion"
+    implementation "androidx.legacy:legacy-preference-v14:$androidXVersion"
 
     // Firebase
     implementation "com.google.firebase:firebase-core:$firebaseVersion"
-    implementation "com.google.firebase:firebase-crash:$firebaseVersion"
     implementation "com.google.firebase:firebase-database:$firebaseVersion"
 
+    // Crashlytics
+    implementation "com.crashlytics.sdk.android:crashlytics:$crashlyticsVersion"
+
     // Image Downloading and Caching
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
@@ -131,7 +130,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.5'
 
     // APK Signer
-    implementation 'com.android.tools.build:apksig:3.1.3'
+    implementation 'com.android.tools.build:apksig:3.1.4'
 
     // App Intro
     implementation 'com.stephentuso:welcome:1.4.1'

app/proguard-rules.pro

@@ -19,7 +19,7 @@
 -keep class com.stephentuso.welcome.** { *; }
 
 # About libraries
--keep class .R
+-keep class **.R
 -keep class **.R$* {
     <fields>;
 }
@@ -44,6 +44,10 @@
 -dontwarn org.slf4j.impl.**
 -dontwarn junit.textui.TestRunner
 
+# Crashlytics
+-keep public class com.crashlytics.android.Crashlytics { *; }
+-keep public class io.fabric.sdk.android.Fabric { *; }
+
 # Android support libraries
 -keep public class android.support.v7.widget.** { *; }
 -keep public class android.support.v7.internal.widget.** { *; }

app/src/main/AndroidManifest.xml

@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2016-2017 Projekt Substratum
+  ~ Copyright (c) 2016-2018 Projekt Substratum
   ~ This file is part of Substratum.
   ~
-  ~ Substratum is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ Substratum is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with Substratum.  If not, see <http://www.gnu.org/licenses/>.
+  ~ SPDX-License-Identifier: GPL-3.0-Or-Later
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
@@ -51,6 +40,10 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <!-- App shortcut creation permission -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <!-- Uninstall apps on Android P -->
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <!-- Start foreground services on Android P -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!-- Interfacer use only -->
     <uses-permission android:name="android.permission.MODIFY_OVERLAYS" />
     <uses-permission android:name="projekt.interfacer.permission.ACCESS_SERVICE" />
@@ -243,7 +236,7 @@
         </activity>
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">

app/src/main/assets/fonts.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2016-2018 Projekt Substratum
+  ~ This file is part of Substratum.
+  ~
+  ~ SPDX-License-Identifier: GPL-3.0-Or-Later
+  -->
+
+<!--
     NOTE: this is the newer (L) version of the system font configuration,
     supporting richer weight selection. Some apps will expect the older
     version, so please keep system_fonts.xml and fallback_fonts.xml in sync