From de1cb9b2cb07616ef42aef54a42b46e0ce97293f Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Tue, 6 Jul 2021 23:22:47 +0900
Subject: [PATCH] =?utf8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88?=
 =?utf8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E5=80=A4=E3=82=92=E5=A4=89=E6=9B=B4?=
 =?utf8?q?=E3=81=99=E3=82=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                                  | 4 ++--
 .../osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt | 8 ++++----
 app/src/main/res/xml/preference_main.xml                          | 7 ++++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 414c9da..54b3e7b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "jp.osdn.gokigen.mangle"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1000000
-        versionName "1.0.0"
+        versionCode 1000001
+        versionName "1.0.1"
         //testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt b/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt
index fd39174..e7f24b6 100644
--- a/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt
+++ b/app/src/main/java/jp/osdn/gokigen/mangle/preference/IPreferencePropertyAccessor.kt
@@ -17,7 +17,7 @@ interface IPreferencePropertyAccessor
         const val CACHE_LIVE_VIEW_PICTURES_DEFAULT_VALUE = false
 
         const val USE_ONLY_SINGLE_CAMERA_X = "only_one_camera_x"
-        const val USE_ONLY_SINGLE_CAMERA_X_DEFAULT_VALUE = false
+        const val USE_ONLY_SINGLE_CAMERA_X_DEFAULT_VALUE = true
 
         const val NUMBER_OF_CACHE_PICTURES = "number_of_cache_pictures"
         const val NUMBER_OF_CACHE_PICTURES_DEFAULT_VALUE = "500"
@@ -77,7 +77,7 @@ interface IPreferencePropertyAccessor
 
         // --- CAMERA 2  PREFERENCES
         const val PREFERENCE_CAMERA_METHOD_2 = "camera_method2"
-        const val PREFERENCE_CAMERA_METHOD_2_DEFAULT_VALUE = "camerax"
+        const val PREFERENCE_CAMERA_METHOD_2_DEFAULT_VALUE = "NONE"
         const val PREFERENCE_CAMERA_SEQUENCE_2 = "camera_sequence2"
         const val PREFERENCE_CAMERA_SEQUENCE_2_DEFAULT_VALUE = "0"
         const val PREFERENCE_CAMERA_OPTION1_2 = "camera_option12"
@@ -93,7 +93,7 @@ interface IPreferencePropertyAccessor
 
         // --- CAMERA 3  PREFERENCES
         const val PREFERENCE_CAMERA_METHOD_3 = "camera_method3"
-        const val PREFERENCE_CAMERA_METHOD_3_DEFAULT_VALUE = "camerax"
+        const val PREFERENCE_CAMERA_METHOD_3_DEFAULT_VALUE = "NONE"
         const val PREFERENCE_CAMERA_SEQUENCE_3 = "camera_sequence3"
         const val PREFERENCE_CAMERA_SEQUENCE_3_DEFAULT_VALUE = "0"
         const val PREFERENCE_CAMERA_OPTION1_3 = "camera_option13"
@@ -109,7 +109,7 @@ interface IPreferencePropertyAccessor
 
         // --- CAMERA 4  PREFERENCES
         const val PREFERENCE_CAMERA_METHOD_4 = "camera_method4"
-        const val PREFERENCE_CAMERA_METHOD_4_DEFAULT_VALUE = "camerax"
+        const val PREFERENCE_CAMERA_METHOD_4_DEFAULT_VALUE = "NONE"
         const val PREFERENCE_CAMERA_SEQUENCE_4 = "camera_sequence4"
         const val PREFERENCE_CAMERA_SEQUENCE_4_DEFAULT_VALUE = "0"
         const val PREFERENCE_CAMERA_OPTION1_4 = "camera_option14"
diff --git a/app/src/main/res/xml/preference_main.xml b/app/src/main/res/xml/preference_main.xml
index 25a43d0..4fed77a 100644
--- a/app/src/main/res/xml/preference_main.xml
+++ b/app/src/main/res/xml/preference_main.xml
@@ -86,6 +86,7 @@
         <SwitchPreferenceCompat
             android:key="only_one_camera_x"
             app:isPreferenceVisible="true"
+            android:defaultValue="true"
             android:summary="@string/pref_summary_only_one_camera_x"
             android:title="@string/pref_only_one_camera_x"/>
     </PreferenceCategory>
@@ -154,7 +155,7 @@
             android:entryValues="@array/connection_method_value"
             android:key="camera_method2"
             android:title="@string/pref_connection_method2"
-            android:defaultValue="camerax"
+            android:defaultValue="NONE"
             />
 
         <DropDownPreference
@@ -210,7 +211,7 @@
             android:entryValues="@array/connection_method_value"
             android:key="camera_method3"
             android:title="@string/pref_connection_method3"
-            android:defaultValue="camerax"
+            android:defaultValue="NONE"
             />
 
         <DropDownPreference
@@ -267,7 +268,7 @@
             android:entryValues="@array/connection_method_value"
             android:key="camera_method4"
             android:title="@string/pref_connection_method4"
-            android:defaultValue="camerax"
+            android:defaultValue="NONE"
             />
 
         <DropDownPreference
-- 
2.11.0