| Révision | 6942b4fb39b27c8b1507dec9af8ce6007660669f (tree) |
|---|---|
| l'heure | 2022-08-31 22:44:42 |
| Auteur | MRSa <mrsa@myad...> |
| Commiter | MRSa |
ライブラリを更新。
app/build.gradle (diff) app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelGestureListener.kt (diff) build.gradle (diff)| @@ -12,14 +12,14 @@ def camerax_version = "1.2.0-beta01" | ||
| 12 | 12 | def camerax_view_version = "1.2.0-beta01" |
| 13 | 13 | |
| 14 | 14 | android { |
| 15 | - compileSdk 32 | |
| 15 | + compileSdk 33 | |
| 16 | 16 | |
| 17 | 17 | defaultConfig { |
| 18 | 18 | applicationId "net.osdn.gokigen.objectdetection.a01f" |
| 19 | 19 | minSdk 21 |
| 20 | - targetSdk 32 | |
| 21 | - versionCode 80001 | |
| 22 | - versionName "0.8.1" | |
| 20 | + targetSdk 33 | |
| 21 | + versionCode 80002 | |
| 22 | + versionName "0.8.2" | |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | buildTypes { |
| @@ -9,32 +9,29 @@ class ConsolePanelGestureListener(private val positionArea : IDetectPositionRece | ||
| 9 | 9 | { |
| 10 | 10 | |
| 11 | 11 | // ScaleGestureDetector.OnScaleGestureListener |
| 12 | - override fun onScale(detector: ScaleGestureDetector?): Boolean | |
| 12 | + override fun onScale(detector: ScaleGestureDetector): Boolean | |
| 13 | 13 | { |
| 14 | 14 | return (false) |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | // ScaleGestureDetector.OnScaleGestureListener |
| 18 | - override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean | |
| 18 | + override fun onScaleBegin(detector: ScaleGestureDetector): Boolean | |
| 19 | 19 | { |
| 20 | 20 | return (false) |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | // ScaleGestureDetector.OnScaleGestureListener |
| 24 | - override fun onScaleEnd(detector: ScaleGestureDetector?) | |
| 24 | + override fun onScaleEnd(detector: ScaleGestureDetector) | |
| 25 | 25 | { |
| 26 | 26 | // |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - override fun onLongPress(e: MotionEvent?) | |
| 29 | + override fun onLongPress(e: MotionEvent) | |
| 30 | 30 | { |
| 31 | 31 | super.onLongPress(e) |
| 32 | 32 | try |
| 33 | 33 | { |
| 34 | - if (e != null) | |
| 35 | - { | |
| 36 | - positionArea.onLongPress(e.x, e.y) | |
| 37 | - } | |
| 34 | + positionArea.onLongPress(e.x, e.y) | |
| 38 | 35 | } |
| 39 | 36 | catch (e : Exception) |
| 40 | 37 | { |
| @@ -42,16 +39,13 @@ class ConsolePanelGestureListener(private val positionArea : IDetectPositionRece | ||
| 42 | 39 | } |
| 43 | 40 | } |
| 44 | 41 | |
| 45 | - override fun onSingleTapUp(e: MotionEvent?): Boolean | |
| 42 | + override fun onSingleTapUp(e: MotionEvent): Boolean | |
| 46 | 43 | { |
| 47 | 44 | var ret = false |
| 48 | 45 | super.onSingleTapUp(e) |
| 49 | 46 | try |
| 50 | 47 | { |
| 51 | - if (e != null) | |
| 52 | - { | |
| 53 | - ret = positionArea.onSingleTapUp(e.x, e.y) | |
| 54 | - } | |
| 48 | + ret = positionArea.onSingleTapUp(e.x, e.y) | |
| 55 | 49 | } |
| 56 | 50 | catch (e : Exception) |
| 57 | 51 | { |
| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | plugins { |
| 3 | 3 | id 'com.android.application' version '7.2.2' apply false |
| 4 | 4 | id 'com.android.library' version '7.2.2' apply false |
| 5 | - id 'org.jetbrains.kotlin.android' version '1.6.21' apply false | |
| 5 | + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false | |
| 6 | 6 | } |
| 7 | 7 | |
| 8 | 8 | task clean(type: Delete) { |
Fork