From efd45ba4ccf0ec198ed7ea76aba201347e99e3f2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 11 May 2018 10:42:51 +0200
Subject: [PATCH] update commons to 4.0.3

---
 app/build.gradle                                         | 8 ++++----
 .../simplemobiletools/gallery/activities/MainActivity.kt | 2 +-
 .../gallery/activities/SimpleActivity.kt                 | 9 ++++++++-
 build.gradle                                             | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5584b3101..3fef7c4df 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,16 +47,16 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.19.21'
+    implementation 'com.simplemobiletools:commons:4.0.3'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
     implementation 'com.android.support:multidex:1.0.3'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
 
-    kapt "android.arch.persistence.room:compiler:1.0.0"
-    implementation "android.arch.persistence.room:runtime:1.0.0"
-    annotationProcessor "android.arch.persistence.room:compiler:1.0.0"
+    kapt "android.arch.persistence.room:compiler:1.1.0"
+    implementation "android.arch.persistence.room:runtime:1.1.0"
+    annotationProcessor "android.arch.persistence.room:compiler:1.1.0"
 
     //implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.github.tibbi:subsampling-scale-image-view:v3.10.0-fork'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 76e45fc22..c12085f0d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -72,7 +72,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        appLaunched()
+        appLaunched(BuildConfig.APPLICATION_ID)
 
         mIsPickImageIntent = isPickImageIntent(intent)
         mIsPickVideoIntent = isPickVideoIntent(intent)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt
index 42e8828dc..6d3eff97b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SimpleActivity.kt
@@ -1,5 +1,12 @@
 package com.simplemobiletools.gallery.activities
 
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.gallery.R
 
-open class SimpleActivity : BaseSimpleActivity()
+open class SimpleActivity : BaseSimpleActivity() {
+    override fun getAppIconIDs() = arrayListOf(
+            R.mipmap.ic_launcher
+    )
+
+    override fun getAppLauncherName() = getString(R.string.app_launcher_name)
+}
diff --git a/build.gradle b/build.gradle
index 1a38f0b61..0a7f22883 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.2.41'
 
     repositories {
         jcenter()