update commons to 3.0.3

This commit is contained in:
tibbi 2017-11-29 23:24:00 +01:00
parent f9a64bf6cc
commit 0af6c7e5ba
6 changed files with 21 additions and 30 deletions

View File

@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 26 compileSdkVersion 27
buildToolsVersion "26.0.2" buildToolsVersion "27.0.1"
defaultConfig { defaultConfig {
applicationId "com.simplemobiletools.flashlight" applicationId "com.simplemobiletools.flashlight"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 26 targetSdkVersion 27
versionCode 23 versionCode 23
versionName "2.0.0" versionName "2.0.0"
} }
@ -37,24 +37,11 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.35.7' implementation 'com.simplemobiletools:commons:3.0.3'
compile 'com.squareup:otto:1.3.8' implementation 'com.squareup:otto:1.3.8'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
buildscript { Properties props = new Properties()
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()
def propFile = new File('signing.properties') def propFile = new File('signing.properties')
if (propFile.canRead()) { if (propFile.canRead()) {
props.load(new FileInputStream(propFile)) props.load(new FileInputStream(propFile))

View File

@ -2,7 +2,8 @@
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.simplemobiletools.flashlight"> package="com.simplemobiletools.flashlight"
android:installLocation="auto">
<uses-permission android:name="android.permission.CAMERA"/> <uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.FLASHLIGHT"/> <uses-permission android:name="android.permission.FLASHLIGHT"/>

View File

@ -1,12 +1,10 @@
package com.simplemobiletools.flashlight.activities package com.simplemobiletools.flashlight.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import com.simplemobiletools.commons.activities.BaseSplashActivity
import android.support.v7.app.AppCompatActivity
class SplashActivity : AppCompatActivity() { class SplashActivity : BaseSplashActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun initActivity() {
super.onCreate(savedInstanceState)
startActivity(Intent(this, MainActivity::class.java)) startActivity(Intent(this, MainActivity::class.java))
finish() finish()
} }

View File

@ -6,7 +6,6 @@ import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.graphics.PorterDuff import android.graphics.PorterDuff
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.widget.SeekBar import android.widget.SeekBar
import com.simplemobiletools.commons.dialogs.ColorPickerDialog import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.adjustAlpha
@ -15,13 +14,14 @@ import com.simplemobiletools.flashlight.extensions.config
import com.simplemobiletools.flashlight.helpers.MyWidgetProvider import com.simplemobiletools.flashlight.helpers.MyWidgetProvider
import kotlinx.android.synthetic.main.widget_config.* import kotlinx.android.synthetic.main.widget_config.*
class WidgetConfigureActivity : AppCompatActivity() { class WidgetConfigureActivity : SimpleActivity() {
private var mWidgetAlpha = 0f private var mWidgetAlpha = 0f
private var mWidgetId = 0 private var mWidgetId = 0
private var mWidgetColor = 0 private var mWidgetColor = 0
private var mWidgetColorWithoutTransparency = 0 private var mWidgetColorWithoutTransparency = 0
public override fun onCreate(savedInstanceState: Bundle?) { public override fun onCreate(savedInstanceState: Bundle?) {
useDynamicTheme = false
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setResult(Activity.RESULT_CANCELED) setResult(Activity.RESULT_CANCELED)
setContentView(R.layout.widget_config) setContentView(R.layout.widget_config)

View File

@ -17,7 +17,7 @@ internal class MarshmallowCamera constructor(val context: Context) {
init { init {
try { try {
cameraId = manager.cameraIdList[0] cameraId = manager.cameraIdList[0] ?: "0"
} catch (ignored: CameraAccessException) { } catch (ignored: CameraAccessException) {
} }
} }

View File

@ -1,11 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.0'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,8 +20,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
} }
} }