コマンド送信ダイアログ

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java
index f458ba4..3147448 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/CameraLiveImageView.java
@@ -266,7 +266,7 @@ public class CameraLiveImageView extends View implements IImageDataReceiver, IAu
                             cacheIsFull = true;
                         }
                     }
-                    catch (Exception e)
+                    catch (Throwable e)
                     {
                         e.printStackTrace();
                         cacheIsFull = true;
@@ -292,7 +292,7 @@ public class CameraLiveImageView extends View implements IImageDataReceiver, IAu
                             cachePics.remove(0);
                         }
                     }
-                    catch (Exception e)
+                    catch (Throwable e)
                     {
                         e.printStackTrace();
                         data = null;
@@ -327,7 +327,7 @@ public class CameraLiveImageView extends View implements IImageDataReceiver, IAu
                             outputStream = null;
                             System.gc();
                         }
-                        catch (Exception eee)
+                        catch (Throwable eee)
                         {
                             eee.printStackTrace();
                         }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
index 1fa828d..4133409 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/liveview/LiveViewFragment.java
@@ -39,6 +39,7 @@ import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
@@ -913,9 +914,10 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
             LoadSaveMyCameraPropertyDialog dialog = new LoadSaveMyCameraPropertyDialog();
             dialog.setTargetFragment(this, COMMAND_MY_PROPERTY);
             dialog.setPropertyOperationsHolder(new LoadSaveCameraProperties(getActivity(), interfaceProvider.getOlympusInterface()));
-            FragmentManager manager = getFragmentManager();
-            if (manager != null)
+            FragmentActivity activity = getActivity();
+            if (activity != null)
             {
+                FragmentManager manager = activity.getSupportFragmentManager();
                 dialog.show(manager, "my_dialog");
             }
         }
@@ -930,10 +932,11 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo
     {
         try
         {
-            // FUJI X用のステータス表示ダイアログを表示する
-            FragmentManager manager = getFragmentManager();
-            if (manager != null)
+            FragmentActivity activity = getActivity();
+            if (activity != null)
             {
+                // FUJI X用のステータス表示ダイアログを表示する
+                FragmentManager manager = activity.getSupportFragmentManager();
                 FujiXCameraStatusDialog.newInstance(interfaceProvider.getFujiXInterface()).show(manager, "statusDialog");
             }
         }

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java
index e0a5367..800679e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/IPreferencePropertyAccessor.java
@@ -99,6 +99,10 @@ public interface IPreferencePropertyAccessor
     String NUMBER_OF_CACHE_PICTURES = "number_of_cache_pictures";
     String NUMBER_OF_CACHE_PICTURES_DEFAULT_VALUE = "500";
 
+    String SEND_MESSAGE_DIALOG = "dialog_message_send";
+
+
+
  /*
     int CHOICE_SPLASH_SCREEN = 10;
 

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java
index c75c5b8..b14660d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/canon/CanonPreferenceFragment.java
@@ -24,6 +24,7 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 import java.util.Map;
 
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.EXIT_APPLICATION;
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 /**
@@ -34,6 +35,7 @@ public class CanonPreferenceFragment extends PreferenceFragmentCompat implements
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private PtpIpCameraPowerOff powerOffController = null;
 
@@ -67,6 +69,7 @@ public class CanonPreferenceFragment extends PreferenceFragmentCompat implements
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -199,6 +202,12 @@ public class CanonPreferenceFragment extends PreferenceFragmentCompat implements
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+
+            Preference ptpIpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (ptpIpDialog != null)
+            {
+                ptpIpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -343,6 +352,14 @@ public class CanonPreferenceFragment extends PreferenceFragmentCompat implements
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // コマンド送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java
index 09fc852..6a80351 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/fujix/FujiXPreferenceFragment.java
@@ -24,6 +24,7 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.EXIT_APPLICATION;
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 /**
@@ -34,6 +35,7 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private CameraPowerOffFujiX powerOffController = null;
 
@@ -67,6 +69,7 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -215,6 +218,12 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+
+            Preference httpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (httpDialog != null)
+            {
+                httpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -360,6 +369,14 @@ public class FujiXPreferenceFragment  extends PreferenceFragmentCompat implement
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // コマンド送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java
index e284e15..e4ce75a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/nikon/NikonPreferenceFragment.java
@@ -24,6 +24,7 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 import java.util.Map;
 
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.EXIT_APPLICATION;
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 /**
@@ -34,6 +35,7 @@ public class NikonPreferenceFragment extends PreferenceFragmentCompat implements
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private PtpIpCameraPowerOff powerOffController = null;
 
@@ -67,6 +69,7 @@ public class NikonPreferenceFragment extends PreferenceFragmentCompat implements
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -201,6 +204,12 @@ public class NikonPreferenceFragment extends PreferenceFragmentCompat implements
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+
+            Preference ptpIpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (ptpIpDialog != null)
+            {
+                ptpIpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -343,6 +352,14 @@ public class NikonPreferenceFragment extends PreferenceFragmentCompat implements
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // コマンド送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java
index eac3837..cde6a3a 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/olympuspen/OlympusPreferenceFragment.java
@@ -24,6 +24,7 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 import java.util.Map;
 
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.EXIT_APPLICATION;
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 /**
@@ -34,6 +35,7 @@ public class OlympusPreferenceFragment extends PreferenceFragmentCompat implemen
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private OlympusPenCameraPowerOff powerOffController = null;
 
@@ -67,6 +69,7 @@ public class OlympusPreferenceFragment extends PreferenceFragmentCompat implemen
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -193,6 +196,12 @@ public class OlympusPreferenceFragment extends PreferenceFragmentCompat implemen
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+
+            Preference httpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (httpDialog != null)
+            {
+                httpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -336,6 +345,14 @@ public class OlympusPreferenceFragment extends PreferenceFragmentCompat implemen
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // HTTP送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java
index 8654f9f..6087feb 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/panasonic/PanasonicPreferenceFragment.java
@@ -23,6 +23,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 /**
@@ -33,6 +34,7 @@ public class PanasonicPreferenceFragment  extends PreferenceFragmentCompat imple
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private CameraPowerOffPanasonic powerOffController = null;
 
@@ -66,6 +68,7 @@ public class PanasonicPreferenceFragment  extends PreferenceFragmentCompat imple
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -189,6 +192,12 @@ public class PanasonicPreferenceFragment  extends PreferenceFragmentCompat imple
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+
+            Preference httpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (httpDialog != null)
+            {
+                httpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -332,6 +341,14 @@ public class PanasonicPreferenceFragment  extends PreferenceFragmentCompat imple
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // コマンド送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
index f23a6d1..cfb7d11 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/ricohgr2/RicohGr2PreferenceFragment.java
@@ -25,12 +25,14 @@ import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceManager;
 
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.EXIT_APPLICATION;
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, Preference.OnPreferenceClickListener
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private CameraPowerOffRicohGr2 powerOffController = null;
 
@@ -64,6 +66,7 @@ public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implem
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -234,6 +237,12 @@ public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implem
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+
+            Preference httpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (httpDialog != null)
+            {
+                httpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -382,6 +391,14 @@ public class RicohGr2PreferenceFragment  extends PreferenceFragmentCompat implem
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // HTTP送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/summary/PreferenceFragmentSummary.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/summary/PreferenceFragmentSummary.java
index 48e731f..51101f2 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/summary/PreferenceFragmentSummary.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/summary/PreferenceFragmentSummary.java
@@ -281,7 +281,6 @@ public class PreferenceFragmentSummary extends PreferenceFragmentCompat implemen
             {
                 nikon_settings.setOnPreferenceClickListener(this);
             }
-
             Preference exitApplication = findPreference(EXIT_APPLICATION);
             if (exitApplication != null)
             {

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java
index 2606b96..1aedfe9 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/theta/ThetaPreferenceFragment.java
@@ -24,6 +24,7 @@ import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor;
 import java.util.Map;
 
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.EXIT_APPLICATION;
+import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.SEND_MESSAGE_DIALOG;
 import static net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor.WIFI_SETTINGS;
 
 /**
@@ -34,6 +35,7 @@ public class ThetaPreferenceFragment extends PreferenceFragmentCompat implements
 {
     private final String TAG = toString();
     private AppCompatActivity context = null;
+    private IChangeScene changeScene = null;
     private SharedPreferences preferences = null;
     private PtpIpCameraPowerOff powerOffController = null;
 
@@ -67,6 +69,7 @@ public class ThetaPreferenceFragment extends PreferenceFragmentCompat implements
             powerOffController.prepare();
 
             this.context = context;
+            this.changeScene = changeScene;
         }
         catch (Exception e)
         {
@@ -198,6 +201,11 @@ public class ThetaPreferenceFragment extends PreferenceFragmentCompat implements
             {
                 exitApplication.setOnPreferenceClickListener(powerOffController);
             }
+            Preference httpDialog = findPreference(SEND_MESSAGE_DIALOG);
+            if (httpDialog != null)
+            {
+                httpDialog.setOnPreferenceClickListener(this);
+            }
         }
         catch (Exception e)
         {
@@ -344,6 +352,14 @@ public class ThetaPreferenceFragment extends PreferenceFragmentCompat implements
                     context.startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS));
                 }
             }
+            else if (preferenceKey.contains(SEND_MESSAGE_DIALOG))
+            {
+                // HTTP送信ダイアログを表示する
+                if (changeScene != null)
+                {
+                    changeScene.changeSceneToCameraPropertyList();
+                }
+            }
             return (true);
         }
         catch (Exception e)

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e29ca91..5eb40a4 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -303,4 +303,6 @@
     <string name="pref_capture_only_live_view">カメラのシャッターを使用しない</string>
     <string name="pref_summary_capture_only_live_view">チェックを入れると、シャッターを押してもリモート(カメラ)側で撮影を行いません。</string>
 
+    <string name="pref_open_send_command_dialog">メッセージ送信</string>
+
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb2f32a..9cb45d1 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -307,4 +307,7 @@
 
     <string name="pref_capture_only_live_view">DO NOT USE REMOTE SHUTTER</string>
     <string name="pref_summary_capture_only_live_view"> </string>
+
+    <string name="pref_open_send_command_dialog">SEND COMMAND DIALOG</string>
+
 </resources>

diff --git a/app/src/main/res/xml/preferences_canon.xml b/app/src/main/res/xml/preferences_canon.xml
index 8400592..02115db 100644 (file)
--- a/app/src/main/res/xml/preferences_canon.xml
+++ b/app/src/main/res/xml/preferences_canon.xml
@@ -20,6 +20,11 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
     </PreferenceCategory>
 
     <PreferenceCategory

diff --git a/app/src/main/res/xml/preferences_fuji_x.xml b/app/src/main/res/xml/preferences_fuji_x.xml
index 64a8fa9..6c29e67 100644 (file)
--- a/app/src/main/res/xml/preferences_fuji_x.xml
+++ b/app/src/main/res/xml/preferences_fuji_x.xml
@@ -20,6 +20,11 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
     </PreferenceCategory>
 
     <PreferenceCategory

diff --git a/app/src/main/res/xml/preferences_nikon.xml b/app/src/main/res/xml/preferences_nikon.xml
index c690fa2..d59fc56 100644 (file)
--- a/app/src/main/res/xml/preferences_nikon.xml
+++ b/app/src/main/res/xml/preferences_nikon.xml
@@ -20,6 +20,11 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
     </PreferenceCategory>
 
     <PreferenceCategory

diff --git a/app/src/main/res/xml/preferences_olympuspen.xml b/app/src/main/res/xml/preferences_olympuspen.xml
index 9b8bb26..c483446 100644 (file)
--- a/app/src/main/res/xml/preferences_olympuspen.xml
+++ b/app/src/main/res/xml/preferences_olympuspen.xml
@@ -20,17 +20,25 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
+
     </PreferenceCategory>
+
 <!--
     <PreferenceCategory
         android:title="@string/pref_cat_camera">
-
-        <CheckBoxPreference
-            android:key="capture_both_camera_and_live_view"
-            android:title="@string/pref_capture_both_camera_and_live_view" />
-
+                <CheckBoxPreference
+                    android:key="capture_both_camera_and_live_view"
+                    android:title="@string/pref_capture_both_camera_and_live_view" />
     </PreferenceCategory>
+-->
 
+<!--
     <PreferenceCategory
         android:title="@string/pref_cat_initialize">
 

diff --git a/app/src/main/res/xml/preferences_panasonic.xml b/app/src/main/res/xml/preferences_panasonic.xml
index c115ad7..1637df8 100644 (file)
--- a/app/src/main/res/xml/preferences_panasonic.xml
+++ b/app/src/main/res/xml/preferences_panasonic.xml
@@ -20,6 +20,12 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
+
     </PreferenceCategory>
 
 <!--

diff --git a/app/src/main/res/xml/preferences_ricoh_gr2.xml b/app/src/main/res/xml/preferences_ricoh_gr2.xml
index 369d559..495e9f4 100644 (file)
--- a/app/src/main/res/xml/preferences_ricoh_gr2.xml
+++ b/app/src/main/res/xml/preferences_ricoh_gr2.xml
@@ -20,6 +20,11 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
     </PreferenceCategory>
 
 <!--

diff --git a/app/src/main/res/xml/preferences_sony.xml b/app/src/main/res/xml/preferences_sony.xml
index ec3c731..173679c 100644 (file)
--- a/app/src/main/res/xml/preferences_sony.xml
+++ b/app/src/main/res/xml/preferences_sony.xml
@@ -20,22 +20,22 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/pref_cat_camera">
-
         <PreferenceScreen
             android:key="sony_api_list"
             android:title="@string/pref_sony_api_list"
             android:summary="@string/pref_summary_sony_api_list" />
+
+    </PreferenceCategory>
 <!--
+    <PreferenceCategory
+        android:title="@string/pref_cat_camera">
+
         <CheckBoxPreference
             android:key="capture_both_camera_and_live_view"
             android:title="@string/pref_capture_both_camera_and_live_view" />
--->
-    </PreferenceCategory>
 
+    </PreferenceCategory>
+-->
 <!--
     <PreferenceCategory
         android:title="@string/pref_cat_initialize">

diff --git a/app/src/main/res/xml/preferences_theta.xml b/app/src/main/res/xml/preferences_theta.xml
index 55595a5..f7a6a67 100644 (file)
--- a/app/src/main/res/xml/preferences_theta.xml
+++ b/app/src/main/res/xml/preferences_theta.xml
@@ -21,6 +21,12 @@
             android:title="@string/pref_wifi_settings"
             android:summary="@string/pref_summary_wifi_settings" />
 -->
+        <PreferenceScreen
+            android:key="dialog_message_send"
+            android:icon="@drawable/ic_linked_camera_black_24dp"
+            android:title="@string/pref_open_send_command_dialog"
+            />
+
     </PreferenceCategory>
 
     <PreferenceCategory