Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0af6c7e5 authored by tibbi's avatar tibbi
Browse files

update commons to 3.0.3

parent f9a64bf6

app/build.gradle

+6 −19
Original line number Diff line number Diff line
@@ -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))

app/src/main/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    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.FLASHLIGHT"/>

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SplashActivity.kt

+3 −5
Original line number Diff line number Diff line 
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()

    }

app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetConfigureActivity.kt

+2 −2
Original line number Diff line number Diff line
@@ -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)

app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MarshmallowCamera.kt

+1 −1
Original line number Diff line number Diff line
@@ -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) {

        }

    }