From 01099e353ef1cc5dca96e90642cb958bca892b9f Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 2 Sep 2019 22:27:57 +0200 Subject: [PATCH] updating kotlin, commons, gradle --- app/build.gradle | 3 ++- .../com/simplemobiletools/camera/activities/MainActivity.kt | 2 +- .../com/simplemobiletools/camera/activities/SplashActivity.kt | 2 -- app/src/main/res/values/donottranslate.xml | 1 + build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 8e1dc9d4..9a7b78b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,7 @@ android { versionCode 66 versionName "5.0.2" setProperty("archivesBaseName", "camera") + vectorDrawables.useSupportLibrary = true } signingConfigs { @@ -50,5 +51,5 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.14.12' + implementation 'com.simplemobiletools:commons:5.17.0' } 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 f263f3f6..f1cdf9e8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt @@ -351,7 +351,7 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener { } private fun initVideoButtons() { - toggle_photo_video.setImageResource(R.drawable.ic_camera) + toggle_photo_video.setImageResource(R.drawable.ic_camera_vector) showToggleCameraIfNeeded() shutter.setImageResource(R.drawable.ic_video_rec) setupPreviewImage(false) 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 b29f0f09..45c1e3dc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/activities/SplashActivity.kt @@ -4,8 +4,6 @@ import android.content.Intent import com.simplemobiletools.commons.activities.BaseSplashActivity class SplashActivity : BaseSplashActivity() { - override fun getAppPackageName() = packageName - override fun initActivity() { startActivity(Intent(this, MainActivity::class.java)) finish() diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 228061ec..aaab27c1 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,5 +1,6 @@ + com.simplemobiletools.camera Allow changing the photo compression quality diff --git a/build.gradle b/build.gradle index ffc21120..fea01513 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.3.40' + ext.kotlin_version = '1.3.50' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8d092e49..2d104c1a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jul 06 15:11:08 CEST 2019 +#Mon Sep 02 22:18:50 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip