次バージョンに向けて整理。Vibratorのdeprecatedに対応。

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
deleted file mode 100644 (file)
index cb13bd8..0000000
--- a/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="3e50111c1220" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-02-18T12:36:26.894010400Z" />
-  </component>
-</project>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 042f9f0..5a8ed44 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "jp.osdn.gokigen.mangle"
         minSdkVersion 21
         targetSdkVersion 32
-        versionCode 1006000
-        versionName "1.6.0"
+        versionCode 1006001
+        versionName "1.6.1"
         //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app/src/main/java/jp/osdn/gokigen/mangle/MainActivity.kt b/app/src/main/java/jp/osdn/gokigen/mangle/MainActivity.kt
index 3d6b8a1..f91d5fe 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/mangle/MainActivity.kt
+++ b/app/src/main/java/jp/osdn/gokigen/mangle/MainActivity.kt
@@ -3,10 +3,7 @@ package jp.osdn.gokigen.mangle
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.os.Build
-import android.os.Bundle
-import android.os.VibrationEffect
-import android.os.Vibrator
+import android.os.*
 import android.util.Log
 import android.view.KeyEvent
 import android.view.WindowManager
@@ -24,6 +21,7 @@ import jp.osdn.gokigen.mangle.preference.PreferenceValueInitializer
 import jp.osdn.gokigen.mangle.scene.MainButtonHandler
 import jp.osdn.gokigen.mangle.scene.SceneChanger
 
+
 class MainActivity : AppCompatActivity(), IVibrator, ICameraStatusReceiver
 {
     private lateinit var mainButtonHandler : MainButtonHandler// = MainButtonHandler(this)
@@ -122,7 +120,16 @@ class MainActivity : AppCompatActivity(), IVibrator, ICameraStatusReceiver
         try
         {
             // バイブレータをつかまえる
-            val vibrator = getSystemService(VIBRATOR_SERVICE) as Vibrator
+            val vibrator  = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+            {
+                val vibratorManager =  this.getSystemService(VIBRATOR_MANAGER_SERVICE) as VibratorManager
+                vibratorManager.defaultVibrator
+            }
+            else
+            {
+                @Suppress("DEPRECATION")
+                getSystemService(VIBRATOR_SERVICE) as Vibrator
+            }
             if (!vibrator.hasVibrator())
             {
                 Log.v(TAG, " not have Vibrator...")