diff --git a/app/build.gradle b/app/build.gradle index 2919b56..f693ea2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,13 +3,13 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.1" defaultConfig { applicationId "com.simplemobiletools.flashlight" minSdkVersion 16 - targetSdkVersion 26 + targetSdkVersion 27 versionCode 23 versionName "2.0.0" } @@ -37,24 +37,11 @@ android { } dependencies { - compile 'com.simplemobiletools:commons:2.35.7' - compile 'com.squareup:otto:1.3.8' - compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation 'com.simplemobiletools:commons:3.0.3' + implementation 'com.squareup:otto:1.3.8' } -buildscript { - ext.kotlin_version = '1.1.51' - repositories { - mavenCentral() - } - - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" - } -} - -def Properties props = new Properties() +Properties props = new Properties() def propFile = new File('signing.properties') if (propFile.canRead()) { props.load(new FileInputStream(propFile)) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 452fd54..6648322 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,7 +2,8 @@ + package="com.simplemobiletools.flashlight" + android:installLocation="auto"> diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt index a2dd423..4ba4513 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt @@ -1,12 +1,10 @@ package com.simplemobiletools.flashlight.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/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetConfigureActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetConfigureActivity.kt index 95dd333..e739f17 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetConfigureActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetConfigureActivity.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.graphics.Color import android.graphics.PorterDuff import android.os.Bundle -import android.support.v7.app.AppCompatActivity import android.widget.SeekBar import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.extensions.adjustAlpha @@ -15,13 +14,14 @@ import com.simplemobiletools.flashlight.extensions.config import com.simplemobiletools.flashlight.helpers.MyWidgetProvider import kotlinx.android.synthetic.main.widget_config.* -class WidgetConfigureActivity : AppCompatActivity() { +class WidgetConfigureActivity : SimpleActivity() { private var mWidgetAlpha = 0f private var mWidgetId = 0 private var mWidgetColor = 0 private var mWidgetColorWithoutTransparency = 0 public override fun onCreate(savedInstanceState: Bundle?) { + useDynamicTheme = false super.onCreate(savedInstanceState) setResult(Activity.RESULT_CANCELED) setContentView(R.layout.widget_config) diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MarshmallowCamera.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MarshmallowCamera.kt index a4bb352..5d35921 100644 --- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MarshmallowCamera.kt +++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MarshmallowCamera.kt @@ -17,7 +17,7 @@ internal class MarshmallowCamera constructor(val context: Context) { init { try { - cameraId = manager.cameraIdList[0] + cameraId = manager.cameraIdList[0] ?: "0" } catch (ignored: CameraAccessException) { } } diff --git a/build.gradle b/build.gradle index 8c22f11..89e92a1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { + ext.kotlin_version = '1.2.0' + repositories { jcenter() + google() } + dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,8 +20,8 @@ buildscript { allprojects { repositories { jcenter() + google() maven { url "https://jitpack.io" } - maven { url "https://maven.google.com" } } }