fenix
/
Simple-Camera
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating kotlin, common, gradle and target SDK to 33

This commit is contained in:
tibbi 2022-09-21 12:36:35 +02:00
parent 729c47a513
commit 75a8a0de76
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -9,12 +9,12 @@ if (keystorePropertiesFile.exists()) {
}
android {
compileSdkVersion 31
compileSdkVersion 33
defaultConfig {
applicationId "com.simplemobiletools.camera"
minSdkVersion 29
targetSdkVersion 31
targetSdkVersion 33
versionCode 77
versionName "5.3.1"
setProperty("archivesBaseName", "camera")
@ -63,7 +63,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:7c48da6bef'
implementation 'com.github.SimpleMobileTools:Simple-Commons:e93092b380'
implementation 'androidx.documentfile:documentfile:1.0.1'
implementation "androidx.exifinterface:exifinterface:1.3.3"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.0"

4
app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
View File

@ -271,9 +271,9 @@ class CameraXPreview(
private fun setupZoomAndFocus() {
val scaleGesture = camera?.let { ScaleGestureDetector(activity, PinchToZoomOnScaleGestureListener(it.cameraInfo, it.cameraControl)) }
val gestureDetector = GestureDetector(activity, object : SimpleOnGestureListener() {
override fun onDown(e: MotionEvent?): Boolean {
override fun onDown(event: MotionEvent): Boolean {
listener.onTouchPreview()
return super.onDown(e)
return super.onDown(event)
}
override fun onSingleTapConfirmed(event: MotionEvent): Boolean {

6
app/src/main/kotlin/com/simplemobiletools/camera/views/CameraPreview.kt
View File

@ -117,9 +117,9 @@ class CameraPreview : ViewGroup, TextureView.SurfaceTextureListener, MyPreview {
mediaSoundHelper.loadSounds()
val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
if (e != null && mIsFocusSupported && mCaptureSession != null) {
focusArea(e.rawX, e.rawY, true)
override fun onSingleTapConfirmed(event: MotionEvent): Boolean {
if (mIsFocusSupported && mCaptureSession != null) {
focusArea(event.rawX, event.rawY, true)
}
return true
}

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

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

@ -1,6 +1,6 @@
#Sat Nov 07 19:34:59 CET 2020
#Thu Nov 05 21:17:11 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip