Preferenceアイテムの折り畳みを実装。

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt
index 9eef653..beabe7d 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt
@@ -165,7 +165,6 @@ interface IApplicationConstantConvert
         const val ID_PREFERENCE_CAMERA_OPTION3_4 = PREFERENCE_CAMERA_OPTION3_4
         const val ID_PREFERENCE_CAMERA_OPTION4_4 = PREFERENCE_CAMERA_OPTION4_4
         const val ID_PREFERENCE_CAMERA_OPTION5_4 = PREFERENCE_CAMERA_OPTION5_4
-
     }
 
 }

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConnectionMethods.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConnectionMethods.kt
index 44d6ac6..bb9b011 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConnectionMethods.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/ICameraConnectionMethods.kt
@@ -5,7 +5,7 @@ interface ICameraConnectionMethods
     companion object
     {
         // --- CONNECTION METHOD
-        const val PREFERENCE_CAMERA_METHOD_NONE = "none"
+        const val PREFERENCE_CAMERA_METHOD_NONE = "NONE"
         const val PREFERENCE_CAMERA_METHOD_EXAMPLE = "EXAMPLE"
         const val PREFERENCE_CAMERA_METHOD_CAMERAX = "camerax"
         const val PREFERENCE_CAMERA_METHOD_THETA = "THETA"

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IActionReceiver.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IActionReceiver.kt
index 8bdeac4..4a90d96 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IActionReceiver.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IActionReceiver.kt
@@ -7,4 +7,5 @@ interface IActionReceiver
 {
     fun getPreferenceChangeListener() : SharedPreferences.OnSharedPreferenceChangeListener
     fun getPreferenceClickListener() : Preference.OnPreferenceClickListener
+    fun setPreferenceViewUpdater(updater: IPreferenceViewUpdater)
 }

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IPreferenceViewUpdater.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IPreferenceViewUpdater.kt
new file mode 100644 (file)
index 0000000..1ed8dc7
--- /dev/null
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/IPreferenceViewUpdater.kt
@@ -0,0 +1,6 @@
+package jp.osdn.gokigen.gokigenassets.preference
+
+interface IPreferenceViewUpdater
+{
+    fun onPreferenceUpdated(key : String)
+}
\ No newline at end of file

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/MainPreferenceFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/MainPreferenceFragment.kt
index e7e0268..6138cc3 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/MainPreferenceFragment.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/preference/MainPreferenceFragment.kt
@@ -13,6 +13,26 @@ import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Compa
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_2
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_3
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_4
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_1
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_2
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_3
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_4
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_1
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_2
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_3
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_4
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_1
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_2
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_3
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_4
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_1
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_2
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_3
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_4
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_1
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_2
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_3
+import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_4
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_1
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_2
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_3
@@ -21,8 +41,14 @@ import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Compa
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_LABEL_SELECT_CAMERA_CONNECTION_METHOD
 import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREFERENCE_LABEL_WIFI_SETTINGS
+import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_CAMERAX
+import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_EXAMPLE
+import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_NONE
+import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_PANASONIC
+import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_PENTAX
+import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_THETA
 
-class MainPreferenceFragment : PreferenceFragmentCompat()
+class MainPreferenceFragment : PreferenceFragmentCompat(), IPreferenceViewUpdater
 {
     private lateinit var actionReceiver : IActionReceiver
     private lateinit var valueInitializer : IPreferenceValueInitializer
@@ -30,6 +56,7 @@ class MainPreferenceFragment : PreferenceFragmentCompat()
     private fun setActionReceiver(receiver : IActionReceiver)
     {
         actionReceiver = receiver
+        actionReceiver.setPreferenceViewUpdater(this)
     }
 
     private fun setValueInitializer(initializer : IPreferenceValueInitializer)
@@ -63,6 +90,11 @@ class MainPreferenceFragment : PreferenceFragmentCompat()
         setMethodSummary(ID_PREFERENCE_CAMERA_SEQUENCE_2, ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE, ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE_VALUE)
         setMethodSummary(ID_PREFERENCE_CAMERA_SEQUENCE_3, ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE, ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE_VALUE)
         setMethodSummary(ID_PREFERENCE_CAMERA_SEQUENCE_4, ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE, ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE_VALUE)
+
+        updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_1, ID_PREFERENCE_CAMERA_SEQUENCE_1, ID_PREFERENCE_CAMERA_OPTION1_1, ID_PREFERENCE_CAMERA_OPTION2_1, ID_PREFERENCE_CAMERA_OPTION3_1, ID_PREFERENCE_CAMERA_OPTION4_1, ID_PREFERENCE_CAMERA_OPTION5_1)
+        updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_2, ID_PREFERENCE_CAMERA_SEQUENCE_2, ID_PREFERENCE_CAMERA_OPTION1_2, ID_PREFERENCE_CAMERA_OPTION2_2, ID_PREFERENCE_CAMERA_OPTION3_2, ID_PREFERENCE_CAMERA_OPTION4_2, ID_PREFERENCE_CAMERA_OPTION5_2)
+        updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_3, ID_PREFERENCE_CAMERA_SEQUENCE_3, ID_PREFERENCE_CAMERA_OPTION1_3, ID_PREFERENCE_CAMERA_OPTION2_3, ID_PREFERENCE_CAMERA_OPTION3_3, ID_PREFERENCE_CAMERA_OPTION4_3, ID_PREFERENCE_CAMERA_OPTION5_3)
+        updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_4, ID_PREFERENCE_CAMERA_SEQUENCE_4, ID_PREFERENCE_CAMERA_OPTION1_4, ID_PREFERENCE_CAMERA_OPTION2_4, ID_PREFERENCE_CAMERA_OPTION3_4, ID_PREFERENCE_CAMERA_OPTION4_4, ID_PREFERENCE_CAMERA_OPTION5_4)
     }
 
     private fun setMethodSummary(itemKey : String, listArray : Int, listArrayValue : Int)
@@ -112,6 +144,63 @@ class MainPreferenceFragment : PreferenceFragmentCompat()
         }
     }
 
+    private fun updatePreferenceVisibility(methodKey: String, sequenceKey: String, option1Key: String, option2Key: String, option3Key: String, option4Key: String, option5Key: String)
+    {
+        try
+        {
+            val myContext = context
+            if (myContext != null)
+            {
+                val preference = PreferenceAccessWrapper(myContext)
+                when (preference.getString(methodKey, "")) {
+                    PREFERENCE_CAMERA_METHOD_NONE -> updatePreferenceItemVisibility(false, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                    PREFERENCE_CAMERA_METHOD_EXAMPLE -> updatePreferenceItemVisibility(false, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                    PREFERENCE_CAMERA_METHOD_CAMERAX -> updatePreferenceItemVisibility(true, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                    PREFERENCE_CAMERA_METHOD_THETA -> updatePreferenceItemVisibility(true, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                    PREFERENCE_CAMERA_METHOD_PENTAX -> updatePreferenceItemVisibility(true, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                    PREFERENCE_CAMERA_METHOD_PANASONIC  -> updatePreferenceItemVisibility(true, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                    else -> updatePreferenceItemVisibility(false, sequenceKey, option1Key, option2Key, option3Key, option4Key, option5Key)
+                }
+            }
+        }
+        catch (e : Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
+    private fun updatePreferenceItemVisibility(visibility: Boolean, sequenceKey: String, option1Key: String, option2Key: String, option3Key: String, option4Key: String, option5Key: String)
+    {
+        try
+        {
+            val myContext = context
+            if (myContext != null)
+            {
+                val sequencePreference: DropDownPreference? = findPreference(sequenceKey)
+                sequencePreference?.isVisible = visibility
+
+                val option1Preference: EditTextPreference? = findPreference(option1Key)
+                option1Preference?.isVisible = visibility
+
+                val option2Preference: EditTextPreference? = findPreference(option2Key)
+                option2Preference?.isVisible = visibility
+
+                val option3Preference: EditTextPreference? = findPreference(option3Key)
+                option3Preference?.isVisible = visibility
+
+                val option4Preference: EditTextPreference? = findPreference(option4Key)
+                option4Preference?.isVisible = visibility
+
+                val option5Preference: EditTextPreference? = findPreference(option5Key)
+                option5Preference?.isVisible = visibility
+            }
+        }
+        catch (e : Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
     private fun prepareChangeListener(context: Context)
     {
         try
@@ -139,6 +228,25 @@ class MainPreferenceFragment : PreferenceFragmentCompat()
         }
     }
 
+    override fun onPreferenceUpdated(key: String)
+    {
+        Log.v(TAG, " onPreferenceUpdated($key)")
+        try
+        {
+            when (key)
+            {
+                ID_PREFERENCE_CAMERA_METHOD_1 -> updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_1, ID_PREFERENCE_CAMERA_SEQUENCE_1, ID_PREFERENCE_CAMERA_OPTION1_1, ID_PREFERENCE_CAMERA_OPTION2_1, ID_PREFERENCE_CAMERA_OPTION3_1, ID_PREFERENCE_CAMERA_OPTION4_1, ID_PREFERENCE_CAMERA_OPTION5_1)
+                ID_PREFERENCE_CAMERA_METHOD_2 -> updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_2, ID_PREFERENCE_CAMERA_SEQUENCE_2, ID_PREFERENCE_CAMERA_OPTION1_2, ID_PREFERENCE_CAMERA_OPTION2_2, ID_PREFERENCE_CAMERA_OPTION3_2, ID_PREFERENCE_CAMERA_OPTION4_2, ID_PREFERENCE_CAMERA_OPTION5_2)
+                ID_PREFERENCE_CAMERA_METHOD_3 -> updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_3, ID_PREFERENCE_CAMERA_SEQUENCE_3, ID_PREFERENCE_CAMERA_OPTION1_3, ID_PREFERENCE_CAMERA_OPTION2_3, ID_PREFERENCE_CAMERA_OPTION3_3, ID_PREFERENCE_CAMERA_OPTION4_3, ID_PREFERENCE_CAMERA_OPTION5_3)
+                ID_PREFERENCE_CAMERA_METHOD_4 -> updatePreferenceVisibility(ID_PREFERENCE_CAMERA_METHOD_4, ID_PREFERENCE_CAMERA_SEQUENCE_4, ID_PREFERENCE_CAMERA_OPTION1_4, ID_PREFERENCE_CAMERA_OPTION2_4, ID_PREFERENCE_CAMERA_OPTION3_4, ID_PREFERENCE_CAMERA_OPTION4_4, ID_PREFERENCE_CAMERA_OPTION5_4)
+            }
+        }
+        catch (e : Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
     companion object
     {
         fun newInstance(receiver : IActionReceiver, initializer : IPreferenceValueInitializer) = MainPreferenceFragment().apply {
@@ -147,4 +255,5 @@ class MainPreferenceFragment : PreferenceFragmentCompat()
         }
         private val TAG = MainPreferenceFragment::class.java.simpleName
     }
+
 }

diff --git a/app/src/main/java/jp/osdn/gokigen/mangle/preference/PreferenceChanger.kt b/app/src/main/java/jp/osdn/gokigen/mangle/preference/PreferenceChanger.kt
index 456645e..aeee946 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/mangle/preference/PreferenceChanger.kt
+++ b/app/src/main/java/jp/osdn/gokigen/mangle/preference/PreferenceChanger.kt
@@ -1,6 +1,5 @@
 package jp.osdn.gokigen.mangle.preference
 
-
 import android.content.Intent
 import android.content.SharedPreferences
 import android.provider.Settings
@@ -9,12 +8,14 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import jp.osdn.gokigen.gokigenassets.preference.IActionReceiver
+import jp.osdn.gokigen.gokigenassets.preference.IPreferenceViewUpdater
 import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic
 import jp.osdn.gokigen.mangle.scene.IChangeScene
 
 class PreferenceChanger(private val activity : AppCompatActivity, private val changeSceneBasic : IChangeSceneBasic, private val changeScene : IChangeScene) : SharedPreferences.OnSharedPreferenceChangeListener, Preference.OnPreferenceClickListener, IActionReceiver
 {
     private var preferences : SharedPreferences = PreferenceManager.getDefaultSharedPreferences(activity)
+    private lateinit var preferenceViewUpdater : IPreferenceViewUpdater
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?)
     {
@@ -30,6 +31,20 @@ class PreferenceChanger(private val activity : AppCompatActivity, private val ch
             // else -> Log.v(TAG, " onSharedPreferenceChanged() : + $key ")
         }
         Log.v(TAG, " onSharedPreferenceChanged() : + $key, $value")
+        try
+        {
+            if (key != null)
+            {
+                if (::preferenceViewUpdater.isInitialized)
+                {
+                    preferenceViewUpdater.onPreferenceUpdated(key)
+                }
+            }
+        }
+        catch (e : Exception)
+        {
+            e.printStackTrace()
+        }
     }
 
     override fun onPreferenceClick(preference: Preference?): Boolean
@@ -59,9 +74,13 @@ class PreferenceChanger(private val activity : AppCompatActivity, private val ch
         return (this)
     }
 
+    override fun setPreferenceViewUpdater(updater: IPreferenceViewUpdater)
+    {
+        preferenceViewUpdater = updater
+    }
+
     companion object
     {
         private val TAG = PreferenceChanger::class.java.simpleName
     }
-
 }
\ No newline at end of file

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index e4435b2..1e38d33 100644 (file)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,6 +15,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="2dp"
         android:src="@drawable/ic_baseline_cloud_off_24"
+        android:visibility="visible"
         />
 
     <ImageButton
@@ -38,6 +39,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginRight="2dp"
         android:src="@drawable/ic_baseline_settings_24"
+        android:visibility="visible"
         />
 
     <ImageButton
@@ -50,6 +52,7 @@
         android:layout_alignTop="@id/button_configure"
         android:layout_alignParentBottom="true"
         android:src="@drawable/ic_baseline_camera_alt_24"
+        android:visibility="invisible"
         />
 
     <ImageButton
@@ -79,6 +82,7 @@
         android:layout_toLeftOf="@id/button_camera"
         android:layout_alignTop="@id/button_camera"
         android:layout_marginRight="2dp"
+        android:visibility="visible"
         />
 
     <FrameLayout
@@ -91,6 +95,7 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_above="@id/message"
+        android:visibility="visible"
         />
 
 </RelativeLayout>

diff --git a/app/src/main/res/layout/liveimage_view.xml b/app/src/main/res/layout/liveimage_view.xml
index fb01a0b..b0a9257 100644 (file)
--- a/app/src/main/res/layout/liveimage_view.xml
+++ b/app/src/main/res/layout/liveimage_view.xml
@@ -42,7 +42,6 @@
                 android:visibility="visible"
                 android:orientation="vertical">
 
-
                 <view
                     android:id="@+id/liveViewFinder0"
                     class="jp.osdn.gokigen.gokigenassets.liveview.LiveImageView"
@@ -59,7 +58,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:max="1000"
-                    android:minHeight="11pt"
+                    android:minHeight="14pt"
                     android:layout_marginTop="1dp"
                     android:layout_marginBottom="1dp"
                     android:visibility="visible" />
@@ -89,7 +88,7 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:minHeight="11pt"
+                    android:minHeight="14pt"
                     android:layout_marginTop="1dp"
                     android:layout_marginBottom="1dp"
                     android:max="1000"
@@ -130,7 +129,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:max="1000"
-                    android:minHeight="11pt"
+                    android:minHeight="14pt"
                     android:layout_marginTop="1dp"
                     android:layout_marginBottom="1dp"
                     android:visibility="visible" />
@@ -161,7 +160,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:max="1000"
-                    android:minHeight="11pt"
+                    android:minHeight="14pt"
                     android:layout_marginTop="1dp"
                     android:layout_marginBottom="1dp"
                     android:visibility="visible" />

diff --git a/app/src/main/res/values-ja/arrays.xml b/app/src/main/res/values-ja/arrays.xml
index 9a00a87..567caca 100644 (file)
--- a/app/src/main/res/values-ja/arrays.xml
+++ b/app/src/main/res/values-ja/arrays.xml
@@ -13,4 +13,59 @@
         <item >180</item>
         <item >270</item>
     </string-array>
+
+    <string-array name="connection_method">
+        <item>未使用</item>
+        <item>作例表示</item>
+        <item>内蔵カメラ</item>
+        <item>Ricoh GR / PENTAX</item>
+        <item>Ricoh Theta(OSC)</item>
+        <item>Panasonic (MFT)</item>
+<!--
+        <item>OPC(Olympus Air)</item>
+        <item>Olympus(OM-D/PEN)</item>
+        <item>KODAK PIXPRO</item>
+        <item>Fuji X Series</item>
+        <item>Sony</item>
+        <item>Canon</item>
+        <item>Nikon</item>
+-->
+    </string-array>
+
+    <string-array name="connection_method_value">
+        <item>NONE</item>
+        <item>EXAMPLE</item>
+        <item>camerax</item>
+        <item>RICOH</item>
+        <item>THETA</item>
+        <item>PANASONIC</item>
+<!--
+        <item>OPC</item>
+        <item>OLYMPUS</item>
+        <item>PIXPRO</item>
+        <item>FUJI_X</item>
+        <item>SONY</item>
+        <item>CANON</item>
+        <item>NIKON</item>
+-->
+    </string-array>
+
+    <string-array name="connection_sequence">
+        <item>TYPE0</item>
+        <item>TYPE1</item>
+        <item>TYPE2</item>
+        <item>TYPE3</item>
+        <item>TYPE4</item>
+        <item>TYPE5</item>
+    </string-array>
+
+    <string-array name="connection_sequence_value">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
 </resources>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index cf72603..13aa902 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -50,10 +50,10 @@
     <string name="pref_connection_method">接続方式設定</string>
     <string name="pref_summary_connection_method">接続するカメラを設定します。</string>
 
-    <string name="label_connection_method1">カメラ 1</string>
-    <string name="label_connection_method2">カメラ 2</string>
-    <string name="label_connection_method3">カメラ 3</string>
-    <string name="label_connection_method4">カメラ 4</string>
+    <string name="label_connection_method1">カメラ 1 (左上)</string>
+    <string name="label_connection_method2">カメラ 2 (右上)</string>
+    <string name="label_connection_method3">カメラ 3 (左下)</string>
+    <string name="label_connection_method4">カメラ 4 (右下)</string>
 
     <string name="pref_connection_method1">接続タイプ</string>
     <string name="pref_connection_method2">接続タイプ</string>

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index db43ccc..5cab483 100644 (file)
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -21,6 +21,7 @@
         <item>Ricoh GR / PENTAX</item>
         <item>Ricoh Theta(OSC)</item>
         <item>Panasonic (MFT)</item>
+<!--
         <item>OPC(Olympus Air)</item>
         <item>Olympus(OM-D/PEN)</item>
         <item>KODAK PIXPRO</item>
@@ -28,6 +29,7 @@
         <item>Sony</item>
         <item>Canon</item>
         <item>Nikon</item>
+-->
     </string-array>
 
     <string-array name="connection_method_value">
@@ -37,6 +39,7 @@
         <item>RICOH</item>
         <item>THETA</item>
         <item>PANASONIC</item>
+<!--
         <item>OPC</item>
         <item>OLYMPUS</item>
         <item>PIXPRO</item>
@@ -44,6 +47,7 @@
         <item>SONY</item>
         <item>CANON</item>
         <item>NIKON</item>
+-->
     </string-array>
 
     <string-array name="connection_sequence">

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index abaf805..0acb2d2 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,10 +50,10 @@
     <string name="pref_connection_method">Camera Connection Method</string>
     <string name="pref_summary_connection_method"> </string>
 
-    <string name="label_connection_method1">CAMERA 1</string>
-    <string name="label_connection_method2">CAMERA 2</string>
-    <string name="label_connection_method3">CAMERA 3</string>
-    <string name="label_connection_method4">CAMERA 4</string>
+    <string name="label_connection_method1">CAMERA 1 (LEFT UP)</string>
+    <string name="label_connection_method2">CAMERA 2 (RIGHT UP)</string>
+    <string name="label_connection_method3">CAMERA 3 (LEFT DOWN)</string>
+    <string name="label_connection_method4">CAMERA 4 (RIGHT DOWN)</string>
 
     <string name="pref_connection_method1">CONNECTION METHOD</string>
     <string name="pref_connection_method2">CONNECTION METHOD</string>

diff --git a/app/src/main/res/xml/preference_main.xml b/app/src/main/res/xml/preference_main.xml
index 22c2929..b4af518 100644 (file)
--- a/app/src/main/res/xml/preference_main.xml
+++ b/app/src/main/res/xml/preference_main.xml
@@ -17,23 +17,29 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:title="@string/pref_cat_application_settings">
-<!--
+        app:title="@string/pref_cat_application_settings"
+        app:isPreferenceVisible="false"
+        >
+
         <SwitchPreferenceCompat
             android:key="show_notifications"
+            app:isPreferenceVisible="false"
             android:title="@string/notification_title"/>
--->
+
         <SwitchPreferenceCompat
             android:key="use_camera_x_preview"
+            app:isPreferenceVisible="false"
             android:title="@string/pref_use_camerax_preview"/>
 
         <SwitchPreferenceCompat
             android:key="save_local_location"
+            app:isPreferenceVisible="false"
             android:title="@string/save_local_location"/>
 
         <PreferenceScreen
             android:key="connection_method"
             android:title="@string/pref_connection_method"
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_connection_method" />
 
     </PreferenceCategory>
@@ -68,7 +74,6 @@
     <PreferenceCategory
         app:title="@string/label_connection_method1">
 
-
         <DropDownPreference
             android:entries="@array/connection_method"
             android:entryValues="@array/connection_method_value"
@@ -77,58 +82,48 @@
             android:defaultValue="camerax"
             />
 
-<!--
-        <ListPreference
-            android:title="@string/pref_connection_method1"
-            android:entryValues="@array/connection_method_value"
-            android:entries="@array/connection_method"
-            android:key="camera_method1"
-            android:defaultValue="camerax"/>
-
-        <ListPreference
-            android:title="@string/pref_connection_sequence1"
-            android:entryValues="@array/connection_sequence_value"
-            android:entries="@array/connection_sequence"
-            android:key="camera_sequence1"
-            android:defaultValue="0"/>
--->
-
         <DropDownPreference
             android:entries="@array/connection_sequence"
             android:entryValues="@array/connection_sequence_value"
             android:key="camera_sequence1"
             android:title="@string/pref_connection_sequence1"
             android:defaultValue="0"
+            app:isPreferenceVisible="false"
             />
 
         <EditTextPreference
             android:key="camera_option11"
             android:title="@string/pref_camera_option11"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option11" />
 
         <EditTextPreference
             android:key="camera_option21"
             android:title="@string/pref_camera_option21"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option21" />
 
         <EditTextPreference
             android:key="camera_option31"
             android:title="@string/pref_camera_option31"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option31" />
 
         <EditTextPreference
             android:key="camera_option41"
             android:title="@string/pref_camera_option41"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option41" />
 
         <EditTextPreference
             android:key="camera_option51"
             android:title="@string/pref_camera_option51"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option51" />
 
     </PreferenceCategory>
@@ -150,36 +145,42 @@
             android:key="camera_sequence2"
             android:title="@string/pref_connection_sequence2"
             android:defaultValue="0"
+            app:isPreferenceVisible="false"
             />
 
         <EditTextPreference
             android:key="camera_option12"
             android:title="@string/pref_camera_option12"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option12" />
 
         <EditTextPreference
             android:key="camera_option22"
             android:title="@string/pref_camera_option22"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option22" />
 
         <EditTextPreference
             android:key="camera_option32"
             android:title="@string/pref_camera_option32"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option32" />
 
         <EditTextPreference
             android:key="camera_option42"
             android:title="@string/pref_camera_option42"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option42" />
 
         <EditTextPreference
             android:key="camera_option52"
             android:title="@string/pref_camera_option52"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option52" />
 
     </PreferenceCategory>
@@ -199,6 +200,7 @@
             android:entryValues="@array/connection_sequence_value"
             android:key="camera_sequence3"
             android:title="@string/pref_connection_sequence3"
+            app:isPreferenceVisible="false"
             android:defaultValue="0"
             />
 
@@ -206,30 +208,35 @@
             android:key="camera_option13"
             android:title="@string/pref_camera_option13"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option13" />
 
         <EditTextPreference
             android:key="camera_option23"
             android:title="@string/pref_camera_option23"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option23" />
 
         <EditTextPreference
             android:key="camera_option33"
             android:title="@string/pref_camera_option33"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option33" />
 
         <EditTextPreference
             android:key="camera_option43"
             android:title="@string/pref_camera_option43"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option43" />
 
         <EditTextPreference
             android:key="camera_option53"
             android:title="@string/pref_camera_option53"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option53" />
 
     </PreferenceCategory>
@@ -251,36 +258,42 @@
             android:key="camera_sequence4"
             android:title="@string/pref_connection_sequence4"
             android:defaultValue="0"
+            app:isPreferenceVisible="false"
             />
 
         <EditTextPreference
             android:key="camera_option14"
             android:title="@string/pref_camera_option14"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option14" />
 
         <EditTextPreference
             android:key="camera_option24"
             android:title="@string/pref_camera_option24"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option24" />
 
         <EditTextPreference
             android:key="camera_option34"
             android:title="@string/pref_camera_option34"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option34" />
 
         <EditTextPreference
             android:key="camera_option44"
             android:title="@string/pref_camera_option44"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option44" />
 
         <EditTextPreference
             android:key="camera_option54"
             android:title="@string/pref_camera_option54"
             android:defaultValue=""
+            app:isPreferenceVisible="false"
             android:summary="@string/pref_summary_camera_option54" />
 
     </PreferenceCategory>