From 4936f0429650a1ae31edaa034448bb26cdca1851 Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 29 Nov 2017 20:26:23 +0100 Subject: [PATCH] use the shared Splash activity --- app/build.gradle | 2 +- .../gallery/activities/SplashActivity.kt | 8 +++----- build.gradle | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4c8e642ac..670ff449f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:2.41.11' + implementation 'com.simplemobiletools:commons:2.42.6' implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt index 13e968dcf..a0d0c7acd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SplashActivity.kt @@ -1,12 +1,10 @@ package com.simplemobiletools.gallery.activities import android.content.Intent -import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import com.simplemobiletools.commons.activities.BaseSplashActivity -class SplashActivity : AppCompatActivity() { - 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 1323953cd..89e92a15c 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.61' + ext.kotlin_version = '1.2.0' repositories { jcenter()