mirror of
https://github.com/SimpleMobileTools/Simple-Flashlight.git
synced 2025-03-10 16:40:22 +01:00
updating commons, set minimal Android version to 6
This commit is contained in:
parent
dcb34c2f08
commit
869fb11171
app
@ -13,7 +13,7 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "com.simplemobiletools.flashlight"
|
applicationId "com.simplemobiletools.flashlight"
|
||||||
minSdkVersion 21
|
minSdkVersion 23
|
||||||
targetSdkVersion 33
|
targetSdkVersion 33
|
||||||
versionCode 61
|
versionCode 61
|
||||||
versionName "5.8.4"
|
versionName "5.8.4"
|
||||||
@ -62,7 +62,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.github.SimpleMobileTools:Simple-Commons:f538687d6e'
|
implementation 'com.github.SimpleMobileTools:Simple-Commons:31cb0b37cf'
|
||||||
implementation 'org.greenrobot:eventbus:3.3.1'
|
implementation 'org.greenrobot:eventbus:3.3.1'
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
|
||||||
}
|
}
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
@file:Suppress("DEPRECATION")
|
|
||||||
|
|
||||||
package com.simplemobiletools.flashlight.helpers
|
|
||||||
|
|
||||||
import android.graphics.SurfaceTexture
|
|
||||||
import android.hardware.Camera
|
|
||||||
|
|
||||||
class LollipopCameraFlash : CameraFlash {
|
|
||||||
private var camera: Camera? = null
|
|
||||||
private var params: Camera.Parameters? = null
|
|
||||||
|
|
||||||
override fun toggleFlashlight(enable: Boolean) {
|
|
||||||
try {
|
|
||||||
if (camera == null || params == null || camera!!.parameters == null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
} catch (e: Exception) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val flashMode = if (enable) Camera.Parameters.FLASH_MODE_ON else Camera.Parameters.FLASH_MODE_OFF
|
|
||||||
params!!.flashMode = flashMode
|
|
||||||
camera!!.parameters = params
|
|
||||||
if (enable) {
|
|
||||||
val dummy = SurfaceTexture(1)
|
|
||||||
camera!!.setPreviewTexture(dummy)
|
|
||||||
camera!!.startPreview()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun initialize() {
|
|
||||||
camera = Camera.open()
|
|
||||||
params = camera!!.parameters
|
|
||||||
params!!.flashMode = Camera.Parameters.FLASH_MODE_OFF
|
|
||||||
camera!!.parameters = params
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun release() {
|
|
||||||
camera?.release()
|
|
||||||
camera = null
|
|
||||||
}
|
|
||||||
}
|
|
@ -12,7 +12,6 @@ import com.simplemobiletools.flashlight.extensions.config
|
|||||||
import com.simplemobiletools.flashlight.models.Events
|
import com.simplemobiletools.flashlight.models.Events
|
||||||
import org.greenrobot.eventbus.EventBus
|
import org.greenrobot.eventbus.EventBus
|
||||||
|
|
||||||
@RequiresApi(Build.VERSION_CODES.M)
|
|
||||||
internal class MarshmallowPlusCameraFlash(
|
internal class MarshmallowPlusCameraFlash(
|
||||||
private val context: Context,
|
private val context: Context,
|
||||||
private var cameraTorchListener: CameraTorchListener? = null,
|
private var cameraTorchListener: CameraTorchListener? = null,
|
||||||
|
@ -4,7 +4,6 @@ import android.content.Context
|
|||||||
import android.os.Handler
|
import android.os.Handler
|
||||||
import com.simplemobiletools.commons.extensions.showErrorToast
|
import com.simplemobiletools.commons.extensions.showErrorToast
|
||||||
import com.simplemobiletools.commons.extensions.toast
|
import com.simplemobiletools.commons.extensions.toast
|
||||||
import com.simplemobiletools.commons.helpers.isMarshmallowPlus
|
|
||||||
import com.simplemobiletools.flashlight.R
|
import com.simplemobiletools.flashlight.R
|
||||||
import com.simplemobiletools.flashlight.extensions.config
|
import com.simplemobiletools.flashlight.extensions.config
|
||||||
import com.simplemobiletools.flashlight.extensions.updateWidgets
|
import com.simplemobiletools.flashlight.extensions.updateWidgets
|
||||||
@ -133,7 +132,7 @@ class MyCameraImpl private constructor(val context: Context, private var cameraT
|
|||||||
fun handleCameraSetup() {
|
fun handleCameraSetup() {
|
||||||
try {
|
try {
|
||||||
if (cameraFlash == null) {
|
if (cameraFlash == null) {
|
||||||
cameraFlash = if (isMarshmallowPlus()) MarshmallowPlusCameraFlash(context, cameraTorchListener) else LollipopCameraFlash()
|
cameraFlash = MarshmallowPlusCameraFlash(context, cameraTorchListener)
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
EventBus.getDefault().post(Events.CameraUnavailable())
|
EventBus.getDefault().post(Events.CameraUnavailable())
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
<item
|
<item
|
||||||
android:id="@+id/more_apps_from_us"
|
android:id="@+id/more_apps_from_us"
|
||||||
android:showAsAction="never"
|
android:icon="@drawable/ic_google_play_vector"
|
||||||
android:title="@string/more_apps_from_us"
|
android:title="@string/more_apps_from_us"
|
||||||
app:showAsAction="never" />
|
app:showAsAction="always" />
|
||||||
<item
|
<item
|
||||||
android:id="@+id/settings"
|
android:id="@+id/settings"
|
||||||
android:icon="@drawable/ic_settings_cog_vector"
|
android:icon="@drawable/ic_settings_cog_vector"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user