Merge branch 'release/1.1.5'

Author: G00fY2

.gitignore

@@ -88,6 +88,7 @@ captures/
 .idea/usage.statistics.xml
 .idea/contentModel.xml
 .idea/kotlinc.xml
+.idea/jarRepositories.xml
 # optional
 .idea/dictionaries
 .idea/inspectionProfiles

.travis.yml

@@ -2,13 +2,12 @@ language: java
 os: linux
 dist: bionic
 group: edge
-jdk: openjdk10
 git:
   depth: false
 env:
   global:
-  # for updates check developer.android.com/studio#downloads (current 26.1.1)
-  - ANDROID_SDK_TOOLS=sdk-tools-linux-4333796.zip
+  # for updates check (dl.google.com/android/repository/repository2-1.xml)
+  - ANDROID_SDK_CMD_TOOLS=commandlinetools-linux-5842447_latest.zip
   # storepass, keypass, keyalias
   - secure: K4PVOrcYr6ZV16GgZWcw5RGDqxRTrilMK6pjz1r+RkQX6EPywmTsUH0y8EGP44bZc+TFMM0UfGPulHfrKzC3LDVSe+CpvNdQqq8c2Ysc9lQLubvFmVlWZ2rjHhA3jtg33FDIAWipb41WZEdmCJE1EI+OMbh8p8/7cGZ4K4tpd3B8ViXrf16ht50C56glL1lS3Jog/g9OEIPdhzYF23nYPOAeV3xJg3WBGxUUMOwp3vrpMJ/bYvnh/XLHUpPWnCcSWhKZolE3C6Itlv3CUdCyd2u8dnbTFX7KK0g4nrJdXJAyith0aE2RB6APdDDIdZkF3p2qU3aWBWVvNzjGc6tYpP9OB8sjobcx9oG8lIaO09qZnM+fLTs5b3ulvl8d3UZI0KxgSocvjxpltrqeuNODGarzwIWAmjxKr3Qnfo5LFUna1UMxKJ1ARyT7zS9yUbfE6ek42aEe7rEaqryjNFE5X6b9D2WexN+68YynvdRfDXlFx2JIW3hWTi7AG4zBI0LKhhtruwLY1hKty3JR5/Dz/dIMW6JZUmLdE7drPmLNBcKRh1H778EOcaD+1q1bzVnwbA+HLfHkO9Rzmk7UOY1ttWzFBH23W/pI6D6mn4WTFng0/iOEsw7fwHaXPGv6ZXxserC/nzmeYb0AfK3wq2p2ztEDtbSblw9lkMBYlvNi5I8=
   - secure: SEcF7dl6ImTdeUYtw6dGeHRXbS4h8Ec9+Dnt2rFeobupo4e64818Fo10Uqqf+eM/5VVF2FAJLnEiq1SgfWZKjvUz9batJZNknc2JSKEGQPFaUD55USFCt2rxoLPFJKIee07kPTiXGPM2WWA+42cD+HpXAErMTd3BESsGwjni+xj2PhJuETDGrw+0D5T4TOXgd0uXNPl4p1PE+l3SejPqGQ961Wo+hbxd/y9JyZy/jZ9WW8XA6eEXXtecRY33NspwT58mBXDgZLIM/C3W0qfrGCiOPxwk0RpMo7YMbmYVPLG75AzihDtQ2F7P5edHz7v0yCAejrN23hi1LHb4Uku8tC2jzrH5eUpKfZuqap8DRcbdXq5je3oeuLSUu39FrzsDEmennS0eaD4jTsB5Sy2wld/UCmzV0QenUtPdBaFLU2Rxos3xJW4a2KyENRm5TGVNR/NAWpoacLed3zqDmb3K13WwskTGE1/mXRl+o0T0BVOBXuHXQ+nqATnGuAbw97LhhOeBZ/jA2yWBsaTxdjhB3E3uKWYZYdGIIgOwrZdM0RrVSgepg7NP+vh9iO70ckEzP+w4yws2ElKE3ZiOexEmrkFmqlxQW08b1FMaKJwpfsNiHkwW6u1jq1oeEBIzUrAMmo92uAjDAHKfn7FOsx5RVg20EKP9Rk9l2YKRA5dGJFI=
@@ -19,84 +18,80 @@ cache:
   - $HOME/.gradle/wrapper/
   - $HOME/.android/build-cache/
 
-stages:
-- name: Build debug
-  if: branch IN (develop, master)
-- name: Build and deploy release on tags
-  if: tag IS present
-
-android_phases:
-- phase: &before_install
+before_install:
   # download and unzip Android SDK command line tools
-  - wget -nv https://dl.google.com/android/repository/$ANDROID_SDK_TOOLS
-  - unzip -q $ANDROID_SDK_TOOLS -d $HOME/sdk
-  # add deprecated java ee module to jdk10 to run the sdkmanager
-  - export JAVA_OPTS="-XX:+IgnoreUnrecognizedVMOptions --add-modules java.se.ee"
+  - wget -nv https://dl.google.com/android/repository/$ANDROID_SDK_CMD_TOOLS
+  - mkdir -p $HOME/sdk/cmdline-tools && unzip -q $ANDROID_SDK_CMD_TOOLS -d $HOME/sdk/cmdline-tools
   # set SDK tools path variable and ANDROID_HOME
-  - export PATH=$PATH:$HOME/sdk/tools/bin
+  - export PATH=$PATH:$HOME/sdk/cmdline-tools/tools/bin
   - export ANDROID_HOME=$HOME/sdk
   # create empty cfg file to prevent sdkmanager warning message
   - mkdir -p $HOME/.android && touch $HOME/.android/repositories.cfg
   # decrypt private keystore
   - openssl aes-256-cbc -K $encrypted_a8fbd6bbc21d_key -iv $encrypted_a8fbd6bbc21d_iv -in keystore.jks.enc -out keystore.jks -d
-- phase: &install
+install:
   # accept licenses for all available packages that have not already been accepted
   - yes | sdkmanager --licenses >/dev/null
-- phase: &before_script
+before_script:
   # set executable flag for gradle wrapper
   - chmod +x gradlew
   # create dir for gradle settings
   - mkdir -p $HOME/.gradle
-  # disable gradle daemon for current user
+  # disable gradle daemon
   - echo "org.gradle.daemon=false" >> $HOME/.gradle/gradle.properties
   # set gradle log format to plain
   - echo "org.gradle.console=plain" >> $HOME/.gradle/gradle.properties
-  # enable gradle build cache
-  - echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties
   # log all gradle warnings
   - echo "org.gradle.warning.mode=all" >> $HOME/.gradle/gradle.properties
-- phase: &before_cache
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
-  - rm -f  $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
-  - rm -f  $HOME/.gradle/caches/*/javaCompile/javaCompile.lock
-  - rm -f  $HOME/.gradle/caches/*/executionHistory/executionHistory.lock
-  - rm -f  $HOME/.gradle/caches/journal-1/file-access.bin
-  - rm -f  $HOME/.gradle/caches/journal-1/journal-1.lock
-  - rm -f  $HOME/.gradle/caches/transforms-1/transforms-1.lock
-  - rm -f  $HOME/.gradle/caches/user-id.txt.lock
+  # control gradle build cache
+  - if [[ $CACHING == "true" ]]; then
+      echo "org.gradle.caching=true" >> $HOME/.gradle/gradle.properties;
+      echo "android.enableBuildCache=true" >> $HOME/.gradle/gradle.properties;
+    else
+      echo "org.gradle.caching=false" >> $HOME/.gradle/gradle.properties;
+      echo "android.enableBuildCache=false" >> $HOME/.gradle/gradle.properties;
+    fi
+before_cache:
+  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
+  - rm -f $HOME/.gradle/caches/*/fileHashes/fileHashes.bin
+  - rm -f $HOME/.gradle/caches/*/fileHashes/fileHashes.lock
+  - rm -f $HOME/.gradle/caches/*/javaCompile/javaCompile.lock
+  - rm -f $HOME/.gradle/caches/*/executionHistory/executionHistory.bin
+  - rm -f $HOME/.gradle/caches/*/executionHistory/executionHistory.lock
+  - rm -f $HOME/.gradle/caches/journal-1/file-access.bin
+  - rm -f $HOME/.gradle/caches/journal-1/journal-1.lock
+  - rm -f $HOME/.gradle/caches/transforms-1/transforms-1.lock
+  - rm -f $HOME/.gradle/caches/user-id.txt.lock
   # only cache latest gradle version used by the wrapper
   # list content in wrapper/dist sorted by modification time and remove entries starting by the second entry
   - ls -d $HOME/.gradle/wrapper/dists/* -1t | tail -n +2 | xargs rm -rf
-- phase: &deploy
-    provider: releases
-    api_key:
-      secure: J5U/QxYAcGZn/pZeU8+YK7ani5dn64McDEVj5BxTBbywfhfpabzug+6H8k6Mnvs8m8CEvi2NsgptyvsxMt6952dNFI9F0URRsDkDdBvKQKdBmhCmCWVckRushfrn5k8RTjpJFYExiuDw6mSPZVtVzdXgHTgiZzPW20skROgoOq6Jb2CMa9awyI1Pbni7Emirkdl3N+h8krCyi/T06va1QebbWYsdLem8EvPgREBV+fDZ8RR+ABnT68aV7Jyq5YWortThT0TRAQ5f17C/T/aDWU7TqL4+HbfGEMvlO4vFYKUHNhxB6ZssaOpLSRVZKq4kecr2PQWIzQX+VFo4Fyxe3kTqfgidR2ptihkAERFz5FCHsEDDSRliatUUFpXxNLaa4ZIooo5p5uThRniu9COjdwuJZtFUIqstL1IrLntv4+3P2SY2BfdsTkgSuq7NT37u6MbT/cdr+dO7jgCoRIyxRzQGoeViALjzwIdXS2iBCwEpex9IDdvjsHmFJIo+8IsJGeGUCRsJL0tFBtZ8lIks1bh+t7pxKywhS3vXGny2ZCaIdA55g0b5N0D64P12ibWI80B7EAEv43Xmb5oVkVYdq9PdPJFoG/b4nDy8NfbQCWv9P/xgP6KwogAPsCJJ7tS4qn2HV6eUKrsj7ioBwpHsn/3ZEL0gU3sBnGJk20hyZyc=
-    file_glob: true
-    file:
-      - $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/*.apk
-      - $TRAVIS_BUILD_DIR/app/build/outputs/mapping/release/mapping.txt
-    skip_cleanup: true
-    draft: false
-    on:
-      tags: true
-    name: $TRAVIS_TAG
-    tag_name: $TRAVIS_TAG
-    body: "Generated release from Travis CI for build $TRAVIS_BUILD_NUMBER"
 
 jobs:
   include:
-  - stage: Build debug
-    before_install: *before_install
-    install: *install
-    before_script: *before_script
+  - # Build debug
+    if: branch IN (develop, master)
+    env: CACHING=true
     script: "./gradlew assembleDebug --scan"
-    before_cache: *before_cache
-  - stage: Build and deploy release on tags
-    before_install: *before_install
-    install: *install
-    before_script: *before_script
-    script: "./gradlew assembleRelease -Pmy_storepass=$storepass -Pmy_keyalias=$keyalias -Pmy_keypass=$keypass --scan"
-    before_cache: *before_cache
-    deploy: *deploy
+  - # Build and deploy release on tags
+    if: tag IS present
+    env: CACHING=false
+    script:
+      - "./gradlew assembleRelease -Pmy_storepass=$storepass -Pmy_keyalias=$keyalias -Pmy_keypass=$keypass --scan"
+      - "./gradlew :app:bundleRelease -Pmy_storepass=$storepass -Pmy_keyalias=$keyalias -Pmy_keypass=$keypass"
+    deploy:
+      provider: releases
+      edge: true
+      token:
+        secure: J5U/QxYAcGZn/pZeU8+YK7ani5dn64McDEVj5BxTBbywfhfpabzug+6H8k6Mnvs8m8CEvi2NsgptyvsxMt6952dNFI9F0URRsDkDdBvKQKdBmhCmCWVckRushfrn5k8RTjpJFYExiuDw6mSPZVtVzdXgHTgiZzPW20skROgoOq6Jb2CMa9awyI1Pbni7Emirkdl3N+h8krCyi/T06va1QebbWYsdLem8EvPgREBV+fDZ8RR+ABnT68aV7Jyq5YWortThT0TRAQ5f17C/T/aDWU7TqL4+HbfGEMvlO4vFYKUHNhxB6ZssaOpLSRVZKq4kecr2PQWIzQX+VFo4Fyxe3kTqfgidR2ptihkAERFz5FCHsEDDSRliatUUFpXxNLaa4ZIooo5p5uThRniu9COjdwuJZtFUIqstL1IrLntv4+3P2SY2BfdsTkgSuq7NT37u6MbT/cdr+dO7jgCoRIyxRzQGoeViALjzwIdXS2iBCwEpex9IDdvjsHmFJIo+8IsJGeGUCRsJL0tFBtZ8lIks1bh+t7pxKywhS3vXGny2ZCaIdA55g0b5N0D64P12ibWI80B7EAEv43Xmb5oVkVYdq9PdPJFoG/b4nDy8NfbQCWv9P/xgP6KwogAPsCJJ7tS4qn2HV6eUKrsj7ioBwpHsn/3ZEL0gU3sBnGJk20hyZyc=
+      file:
+        - $TRAVIS_BUILD_DIR/app/build/outputs/bundle/release/*.aab
+        - $TRAVIS_BUILD_DIR/app/build/outputs/apk/release/*.apk
+        - $TRAVIS_BUILD_DIR/app/build/outputs/mapping/release/mapping.txt
+      draft: false
+      on:
+        tags: true
+      name: $TRAVIS_TAG
+      tag_name: $TRAVIS_TAG
+      release_notes: "Generated release from Travis CI for build $TRAVIS_BUILD_NUMBER"
+      prerelease: true

README.md

@@ -12,6 +12,8 @@
 [<img src="https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_4.png" width=160>](https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_4.png)
 [<img src="https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_5.png" width=160>](https://raw.githubusercontent.com/G00fY2/DeveloperWidget/gh-pages/media/store_screenshot_5.png)
 
+created with [App Mockup](https://app-mockup.com)
+
 ## Description
 The app was built from a developer for developers. You may know the hassle of having multiple physical devices running different software. This app will help you keep track of important device information and allows you to organize your apps and local APK files. You will never again struggle to find APK files using a file browser or search for the app settings menu on a custom manufacturer UI.
 

app/build.gradle

@@ -1,13 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'eu.appcom.gradle.android-versioning'
 
-androidExtensions {
-  experimental = true
-}
-
 android {
   compileSdkVersion rootProject.compileSdkVersion
   buildToolsVersion rootProject.buildToolsVersion
@@ -41,6 +36,9 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
   }
+  buildFeatures {
+    viewBinding = true
+  }
   versioning {
     baseName = 'developerwidget'
   }
@@ -61,14 +59,18 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
-  kapt {
-    javacOptions {
-      option('-source', '8')
-      option('-target', '8')
+}
+
+repositories {
+  google()
+  mavenCentral()
+  jcenter {
+    content {
+      includeModule 'com.g00fy2', 'versioncompare'
+      includeModule 'org.jetbrains.trove4j', 'trove4j' // required by com.android.tools.lint:lint-gradle
     }
   }
 }
-
 dependencies {
   // Kotlin
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
@@ -78,6 +80,7 @@ dependencies {
   implementation "androidx.appcompat:appcompat:$appcompatVersion"
   implementation "androidx.core:core-ktx:$coreKtxVersion"
   implementation "androidx.activity:activity:$activityVersion"
+  implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
   implementation "androidx.recyclerview:recyclerview:$recyclerviewVersion"
   implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
   implementation "androidx.vectordrawable:vectordrawable:$vectorDrawableVersion"
@@ -95,4 +98,5 @@ dependencies {
   implementation "com.google.dagger:dagger-android:$daggerVersion"
   implementation "com.google.dagger:dagger-android-support:$daggerVersion"
   kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
+  compileOnly 'javax.annotation:javax.annotation-api:1.3.2'
 }

app/proguard-rules.pro

@@ -1,5 +1 @@
-# Ensure the custom, fast service loader implementation is removed.
--assumevalues class kotlinx.coroutines.internal.MainDispatcherLoader {
-  boolean FAST_SERVICE_LOADER_ENABLED return false;
-}
--checkdiscard class kotlinx.coroutines.internal.FastServiceLoader
+# Add project specific ProGuard rules here.

app/src/main/AndroidManifest.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.g00fy2.developerwidget">
+    package="com.g00fy2.developerwidget"
+    tools:ignore="LockedOrientationActivity">
 
   <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>