From 0b01a7994220efa09de055e46aaf9fddd7a4c7cf Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 29 Nov 2017 21:51:05 +0100
Subject: [PATCH] update commons, kotlin, gradle

---
 app/build.gradle                                          | 2 +-
 app/src/main/AndroidManifest.xml                          | 3 ++-
 .../main/kotlin/com/simplemobiletools/camera/Preview.kt   | 2 +-
 .../simplemobiletools/camera/activities/MainActivity.kt   | 2 ++
 .../simplemobiletools/camera/activities/SplashActivity.kt | 8 +++-----
 build.gradle                                              | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 81eb5c77..5e2c9756 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -46,7 +46,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:2.41.5'
+    implementation 'com.simplemobiletools:commons:3.0.0'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"
     releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6e3fb1bc..e6f0acbf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/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.simplemobiletools.camera">
+          package="com.simplemobiletools.camera"
+          android:installLocation="auto">
 
     <uses-feature
         android:name="android.hardware.camera"
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
index e0739dc6..17a3818d 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt
@@ -256,8 +256,8 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan
                 try {
                     mParameters!!.zoom = newZoomFactor
                 } catch (ignored: Exception) {
+                    mCamera?.parameters = mParameters
                 }
-                mCamera?.parameters = mParameters
                 return true
             }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
index af130be3..9ff0d508 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
@@ -53,6 +53,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setTheme(R.style.FullScreenTheme)
         requestWindowFeature(Window.FEATURE_NO_TITLE)
         window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN)
         if (config.alwaysOpenBackCamera)
@@ -68,6 +69,7 @@ class MainActivity : SimpleActivity(), PreviewListener, PhotoProcessor.MediaSave
 
     override fun onResume() {
         super.onResume()
+        setTheme(R.style.FullScreenTheme)
         if (hasStorageAndCameraPermissions()) {
             resumeCameraItems()
             setupPreviewImage(mIsInPhotoMode)
diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt
index 87581419..45c1e3dc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt
@@ -1,12 +1,10 @@
 package com.simplemobiletools.camera.activities
 
 import android.content.Intent
-import android.os.Bundle
-import com.simplemobiletools.commons.activities.BaseSimpleActivity
+import com.simplemobiletools.commons.activities.BaseSplashActivity
 
-open class SplashActivity : BaseSimpleActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+class SplashActivity : BaseSplashActivity() {
+    override fun initActivity() {
         startActivity(Intent(this, MainActivity::class.java))
         finish()
     }
diff --git a/build.gradle b/build.gradle
index e0982e11..ed7ef617 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.1.60'
+    ext.kotlin_version = '1.2.0'
 
     repositories {
         jcenter()