Merge branch 'release/1.1.2'

.gitignore

@@ -1,11 +1,9 @@
-# Created by https://www.gitignore.io/api/androidstudio
-
-### AndroidStudio ###
-# Covers files to be ignored for android development using Android Studio.
+# Reference gitignore https://gist.github.com/G00fY2/81c0aa67943cca021e915840bf73ee1b
 
 # Built application files
 *.apk
 *.ap_
+*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -43,106 +41,173 @@ proguard/
 /*/out
 /*/*/build
 /*/*/production
-captures/
-.navigation/
+/*/*/staging
 *.ipr
 *~
 *.swp
 
 # Android Patch
 gen-external-apklibs
 
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
+# Android Studio Navigation editor temp files
+.navigation/
 
-# NDK
-obj/
+# Android Studio captures folder
+captures/
 
-# IntelliJ IDEA
+# IntelliJ
 *.iml
 *.iws
-/out/
-
-# User-specific or generated
-.idea/libraries/
+.idea/artifacts
+.idea/modules
+.idea/modules.xml
 .idea/workspace.xml
+.idea/navEditor.xml
 .idea/tasks.xml
 .idea/gradle.xml
-.idea/usage.statistics.xml
 .idea/assetWizardSettings.xml
+.idea/libraries
+.idea/caches
+.idea/shelf
 .idea/.name
 .idea/compiler.xml
 .idea/copyright/profiles_settings.xml
 .idea/encodings.xml
 .idea/misc.xml
-.idea/caches
-.idea/modules
-.idea/modules.xml
 .idea/scopes/scope_settings.xml
-.idea/dictionaries
-.idea/shelf
 .idea/vcs.xml
 .idea/jsLibraryMappings.xml
-.idea/datasources
+.idea/dataSources
 .idea/datasources.xml
+.idea/dataSources.local.xml
 .idea/dataSources.ids
-.idea/datasources.local.xml
 .idea/sqlDataSources.xml
+.idea/dbnavigator.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
-.idea/dbnavigator.xml
+.idea/usage.statistics.xml
 .idea/contentModel.xml
 .idea/kotlinc.xml
+# optional
+.idea/dictionaries
 .idea/inspectionProfiles
+.idea/runConfigurations
+.idea/runConfigurations.xml
 
 # Keystore files
 *.jks
+*.keystore
 
-# OS-specific files
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-ehthumbs.db
-Thumbs.db
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
 
-# Legacy Eclipse project files
-.classpath
-.project
+# NDK
+obj/
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# CMake
+cmake-build-*/
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
 
-# Package Files #
-*.jar
-*.war
-*.ear
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
 
-# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
-hs_err_pid*
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+#Crashlytics
+crashlytics-build.properties
+com_crashlytics_export_strings.xml
+crashlytics.properties
+fabric.properties
 
 ## Plugin-specific files:
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
 # JIRA plugin
 atlassian-ide-plugin.xml
 
-# Mongo Explorer plugin
-.idea/mongoSettings.xml
+# Cursive Clojure plugin
+.idea/replstate.xml
 
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
+# Editor-based Rest Client
+.idea/httpRequests
 
-### AndroidStudio Patch ###
-# Google Services plugin
-google-services.json
+## OS specific files:
+
+# General
+.DS_Store
+.DS_Store?
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Dump file
+*.stackdump
+
+# Folder config file
+[Dd]esktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
 
-!/gradle/wrapper/gradle-wrapper.jar
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
 
-# End of https://www.gitignore.io/api/androidstudio
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*

.travis.yml

@@ -1,8 +1,8 @@
-language: minimal
+language: java
 os: linux
-dist: xenial
+dist: bionic
 group: edge
-sudo: required
+jdk: openjdk10
 git:
   depth: false
 env:
@@ -27,16 +27,11 @@ stages:
 
 android_phases:
 - phase: &before_install
-  # check if OpenJDK8 is installed and install if missing
-  - if ! dpkg -s openjdk-8-jdk >/dev/null 2>&1; then sudo apt-get update; sudo apt-get install openjdk-8-jdk; fi
-  - java -version
-  # print available Java versions with their path (must contain java-8-openjdk-amd64)
-  - sudo update-alternatives --config java
-  # set JAVA_HOME path
-  - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
   # 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"
   # set SDK tools path variable and ANDROID_HOME
   - export PATH=$PATH:$HOME/sdk/tools/bin
   - export ANDROID_HOME=$HOME/sdk

app/build.gradle

@@ -60,6 +60,12 @@ android {
   kotlinOptions {
     jvmTarget = '1.8'
   }
+  kapt {
+    javacOptions {
+      option("-source", "8")
+      option("-target", "8")
+    }
+  }
 }
 
 dependencies {
@@ -73,10 +79,10 @@ dependencies {
   implementation "androidx.activity:activity:$activityVersion"
   implementation "androidx.recyclerview:recyclerview:$recyclerviewVersion"
   implementation "androidx.constraintlayout:constraintlayout:$constraintlayoutVersion"
+  implementation "androidx.vectordrawable:vectordrawable:$vectorDrawableVersion"
 
   // UI
   implementation "com.google.android.material:material:$materialVersion"
-  implementation "androidx.vectordrawable:vectordrawable:$vectorDrawableVersion"
 
   // Misc
   implementation "com.jakewharton.timber:timber:$timberVersion"

app/src/main/kotlin/com/g00fy2/developerwidget/activities/about/AboutActivity.kt

@@ -13,15 +13,6 @@ import com.g00fy2.developerwidget.R
 import com.g00fy2.developerwidget.activities.widgetconfig.ConfigLauncherActivity
 import com.g00fy2.developerwidget.base.BaseActivity
 import com.g00fy2.developerwidget.base.BaseContract.BasePresenter
-import com.g00fy2.developerwidget.utils.CHANGES
-import com.g00fy2.developerwidget.utils.GITHUB_ISSUE
-import com.g00fy2.developerwidget.utils.GITHUB_PROJECT
-import com.g00fy2.developerwidget.utils.GITHUB_USER
-import com.g00fy2.developerwidget.utils.ICON_CREDITS
-import com.g00fy2.developerwidget.utils.MIT_LICENSE
-import com.g00fy2.developerwidget.utils.OSS_LICENSES
-import com.g00fy2.developerwidget.utils.PRIVACY_POLICY
-import com.g00fy2.developerwidget.utils.TWITTER_USER
 import kotlinx.android.synthetic.main.activity_about.*
 import javax.inject.Inject
 

app/src/main/kotlin/com/g00fy2/developerwidget/activities/about/AboutPresenterImpl.kt

@@ -5,7 +5,6 @@ import com.g00fy2.developerwidget.base.BasePresenterImpl
 import com.g00fy2.developerwidget.controllers.DayNightController
 import com.g00fy2.developerwidget.controllers.IntentController
 import com.g00fy2.developerwidget.controllers.ToastController
-import com.g00fy2.developerwidget.utils.GITHUB_PROJECT_IO
 import javax.inject.Inject
 
 class AboutPresenterImpl @Inject constructor() : BasePresenterImpl(), AboutContract.AboutPresenter {