fenix/Simple-Flashlight
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Flashlight.git synced 2025-02-08 07:58:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #206 from fatihergin/feature/migrating-to-sdk-34

Browse Source 
Feature/migrating to sdk 34
This commit is contained in:
Tibor Kaputa 2023-08-30 14:22:53 +02:00 committed by GitHub
commit 10c3913fed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/build.gradle
View File

@ -8,12 +8,13 @@ if (keystorePropertiesFile.exists()) {
}
android {
compileSdkVersion 33
namespace "com.simplemobiletools.flashlight"
compileSdk 34
defaultConfig {
applicationId "com.simplemobiletools.flashlight"
minSdkVersion 23
targetSdkVersion 33
minSdk 23
targetSdk 34
versionCode 64
versionName "5.9.2"
setProperty("archivesBaseName", "flashlight")
@ -48,7 +49,16 @@ android {
}
}
flavorDimensions "variants"
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '17'
}
flavorDimensions = ["variants"]
productFlavors {
core {}
fdroid {}
@ -66,7 +76,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:fa61be64d8'
implementation 'com.github.SimpleMobileTools:Simple-Commons:7c1e5b5777'
implementation 'org.greenrobot:eventbus:3.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}

3
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/BrightDisplayActivity.kt
View File

@ -7,11 +7,12 @@ import android.view.WindowManager
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.getContrastColor
import com.simplemobiletools.commons.extensions.viewBinding
import com.simplemobiletools.flashlight.databinding.ActivityBrightDisplayBinding
import com.simplemobiletools.flashlight.extensions.config
class BrightDisplayActivity : SimpleActivity() {
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityBrightDisplayBinding.inflate(layoutInflater) }
private val binding by viewBinding(ActivityBrightDisplayBinding::inflate)
override fun onCreate(savedInstanceState: Bundle?) {
window.addFlags(

2
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
View File

@ -35,7 +35,7 @@ class MainActivity : SimpleActivity() {
private const val STROBOSCOPE_STATE = "stroboscope_state"
}
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivityMainBinding.inflate(layoutInflater) }
private val binding by viewBinding(ActivityMainBinding::inflate)
private var mBus: EventBus? = null
private var mCameraImpl: MyCameraImpl? = null

2
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
View File

@ -12,7 +12,7 @@ import java.util.Locale
import kotlin.system.exitProcess
class SettingsActivity : SimpleActivity() {
private val binding by lazy(LazyThreadSafetyMode.NONE) { ActivitySettingsBinding.inflate(layoutInflater) }
private val binding by viewBinding(ActivitySettingsBinding::inflate)
override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true

2
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt
View File

@ -17,7 +17,7 @@ import com.simplemobiletools.flashlight.extensions.config
import com.simplemobiletools.flashlight.helpers.MyWidgetBrightDisplayProvider
class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
private val binding by lazy(LazyThreadSafetyMode.NONE) { WidgetBrightDisplayConfigBinding.inflate(layoutInflater) }
private val binding by viewBinding(WidgetBrightDisplayConfigBinding::inflate)
private var mWidgetAlpha = 0f
private var mWidgetId = 0

2
app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt
View File

@ -18,7 +18,7 @@ import com.simplemobiletools.flashlight.extensions.updateBrightDisplayWidget
import com.simplemobiletools.flashlight.helpers.MyWidgetTorchProvider
class WidgetTorchConfigureActivity : SimpleActivity() {
private val binding by lazy(LazyThreadSafetyMode.NONE) { WidgetTorchConfigBinding.inflate(layoutInflater) }
private val binding by viewBinding(WidgetTorchConfigBinding::inflate)
private var mWidgetAlpha = 0f
private var mWidgetId = 0

4
build.gradle
View File

@ -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.7.10'
ext.kotlin_version = '1.9.0'
repositories {
google()
@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong

4
gradle.properties
View File

@ -1,2 +1,4 @@
android.enableJetifier=true
android.useAndroidX=true
android.useAndroidX=true
android.nonTransitiveRClass=false
org.gradle.jvmargs=-Xmx4g

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip