From 6942b4fb39b27c8b1507dec9af8ce6007660669f Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Wed, 31 Aug 2022 22:44:42 +0900
Subject: [PATCH] =?utf8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA?=
 =?utf8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                     |  8 ++++----
 .../camera/console/ConsolePanelGestureListener.kt    | 20 +++++++-------------
 build.gradle                                         |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5e389b1..a85ec2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -12,14 +12,14 @@ def camerax_version = "1.2.0-beta01"
 def camerax_view_version = "1.2.0-beta01"
 
 android {
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "net.osdn.gokigen.objectdetection.a01f"
         minSdk 21
-        targetSdk 32
-        versionCode 80001
-        versionName "0.8.1"
+        targetSdk 33
+        versionCode 80002
+        versionName "0.8.2"
     }
 
     buildTypes {
diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelGestureListener.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelGestureListener.kt
index 14e8b49..66f6a23 100644
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelGestureListener.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelGestureListener.kt
@@ -9,32 +9,29 @@ class ConsolePanelGestureListener(private val positionArea : IDetectPositionRece
 {
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScale(detector: ScaleGestureDetector?): Boolean
+    override fun onScale(detector: ScaleGestureDetector): Boolean
     {
         return (false)
     }
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScaleBegin(detector: ScaleGestureDetector?): Boolean
+    override fun onScaleBegin(detector: ScaleGestureDetector): Boolean
     {
         return (false)
     }
 
     // ScaleGestureDetector.OnScaleGestureListener
-    override fun onScaleEnd(detector: ScaleGestureDetector?)
+    override fun onScaleEnd(detector: ScaleGestureDetector)
     {
         //
     }
 
-    override fun onLongPress(e: MotionEvent?)
+    override fun onLongPress(e: MotionEvent)
     {
         super.onLongPress(e)
         try
         {
-            if (e != null)
-            {
-                positionArea.onLongPress(e.x, e.y)
-            }
+            positionArea.onLongPress(e.x, e.y)
         }
         catch (e : Exception)
         {
@@ -42,16 +39,13 @@ class ConsolePanelGestureListener(private val positionArea : IDetectPositionRece
         }
     }
 
-    override fun onSingleTapUp(e: MotionEvent?): Boolean
+    override fun onSingleTapUp(e: MotionEvent): Boolean
     {
         var ret = false
         super.onSingleTapUp(e)
         try
         {
-            if (e != null)
-            {
-                ret = positionArea.onSingleTapUp(e.x, e.y)
-            }
+            ret = positionArea.onSingleTapUp(e.x, e.y)
         }
         catch (e : Exception)
         {
diff --git a/build.gradle b/build.gradle
index 34c315f..64f119e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 plugins {
     id 'com.android.application' version '7.2.2' apply false
     id 'com.android.library' version '7.2.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 
 task clean(type: Delete) {
-- 
2.11.0