Preferenceの初期化部分を統合した。

[gokigen/PKRemote.git] / app / src / main / java / net / osdn / gokigen / pkremote / preference / olympus / OpcPreferenceFragment.java

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java
index 17a1a92..275a5e5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java
@@ -18,6 +18,7 @@ import net.osdn.gokigen.pkremote.camera.vendor.olympus.wrapper.property.IOlyCame
 import net.osdn.gokigen.pkremote.camera.vendor.olympus.wrapper.property.IOlyCameraPropertyProvider;
 import net.osdn.gokigen.pkremote.logcat.LogCatViewer;
 import net.osdn.gokigen.pkremote.preference.IPreferencePropertyAccessor;
+import net.osdn.gokigen.pkremote.preference.PreferencePropertyInitializer;
 import net.osdn.gokigen.pkremote.scene.IChangeScene;
 
 import java.util.HashMap;
@@ -106,131 +107,13 @@ public class OpcPreferenceFragment extends PreferenceFragmentCompat implements S
         }
 
         // Preference を初期設定する
-        initializePreferences();
+        PreferencePropertyInitializer initializer = new PreferencePropertyInitializer(activity);
+        initializer.initializePreferences();
 
         preferences.registerOnSharedPreferenceChangeListener(this);
     }
 
     /**
-     * Preferenceの初期化...
-     */
-    private void initializePreferences()
-    {
-        Map<String, ?> items = preferences.getAll();
-        SharedPreferences.Editor editor = preferences.edit();
-
-        if (!items.containsKey(IPreferencePropertyAccessor.LIVE_VIEW_QUALITY))
-        {
-            editor.putString(IPreferencePropertyAccessor.LIVE_VIEW_QUALITY, IPreferencePropertyAccessor.LIVE_VIEW_QUALITY_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.SOUND_VOLUME_LEVEL))
-        {
-            editor.putString(IPreferencePropertyAccessor.SOUND_VOLUME_LEVEL, IPreferencePropertyAccessor.SOUND_VOLUME_LEVEL_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.RAW))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.RAW, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.AUTO_CONNECT_TO_CAMERA))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.AUTO_CONNECT_TO_CAMERA, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.CONNECTION_METHOD))
-        {
-            editor.putString(IPreferencePropertyAccessor.CONNECTION_METHOD, IPreferencePropertyAccessor.CONNECTION_METHOD_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.SHARE_AFTER_SAVE)) {
-            editor.putBoolean(IPreferencePropertyAccessor.SHARE_AFTER_SAVE, false);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.USE_PLAYBACK_MENU)) {
-            editor.putBoolean(IPreferencePropertyAccessor.USE_PLAYBACK_MENU, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.GR2_DISPLAY_CAMERA_VIEW)) {
-            editor.putBoolean(IPreferencePropertyAccessor.GR2_DISPLAY_CAMERA_VIEW, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.GR2_LCD_SLEEP)) {
-            editor.putBoolean(IPreferencePropertyAccessor.GR2_LCD_SLEEP, false);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.USE_GR2_SPECIAL_COMMAND)) {
-            editor.putBoolean(IPreferencePropertyAccessor.USE_GR2_SPECIAL_COMMAND, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.PENTAX_CAPTURE_AFTER_AF)) {
-            editor.putBoolean(IPreferencePropertyAccessor.PENTAX_CAPTURE_AFTER_AF, false);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.SMALL_PICTURE_SIZE)) {
-            editor.putString(IPreferencePropertyAccessor.SMALL_PICTURE_SIZE, IPreferencePropertyAccessor.SMALL_PICTURE_SIZE_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.PEN_SMALL_PICTURE_SIZE)) {
-            editor.putString(IPreferencePropertyAccessor.PEN_SMALL_PICTURE_SIZE, IPreferencePropertyAccessor.PEN_SMALL_PICTURE_SIZE_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.GET_SMALL_PICTURE_AS_VGA))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.GET_SMALL_PICTURE_AS_VGA, false);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.USE_SMARTPHONE_TRANSFER_MODE))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.USE_SMARTPHONE_TRANSFER_MODE, false);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.RICOH_GET_PICS_LIST_TIMEOUT))
-        {
-            editor.putString(IPreferencePropertyAccessor.RICOH_GET_PICS_LIST_TIMEOUT, IPreferencePropertyAccessor.RICOH_GET_PICS_LIST_TIMEOUT_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.USE_OSC_THETA_V21))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.USE_OSC_THETA_V21, false);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.PIXPRO_HOST_IP))
-        {
-            editor.putString(IPreferencePropertyAccessor.PIXPRO_HOST_IP, IPreferencePropertyAccessor.PIXPRO_HOST_IP_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.PIXPRO_COMMAND_PORT))
-        {
-            editor.putString(IPreferencePropertyAccessor.PIXPRO_COMMAND_PORT, IPreferencePropertyAccessor.PIXPRO_COMMAND_PORT_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.PIXPRO_GET_PICS_LIST_TIMEOUT))
-        {
-            editor.putString(IPreferencePropertyAccessor.PIXPRO_GET_PICS_LIST_TIMEOUT, IPreferencePropertyAccessor.PIXPRO_GET_PICS_LIST_TIMEOUT_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.THUMBNAIL_IMAGE_CACHE_SIZE))
-        {
-            editor.putString(IPreferencePropertyAccessor.THUMBNAIL_IMAGE_CACHE_SIZE, IPreferencePropertyAccessor.THUMBNAIL_IMAGE_CACHE_SIZE_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.CANON_HOST_IP)) {
-            editor.putString(IPreferencePropertyAccessor.CANON_HOST_IP, IPreferencePropertyAccessor.CANON_HOST_IP_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.CANON_AUTO_DETECT_HOST_IP)) {
-            editor.putBoolean(IPreferencePropertyAccessor.CANON_AUTO_DETECT_HOST_IP, true);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.CANON_CONNECTION_SEQUENCE)) {
-            editor.putString(IPreferencePropertyAccessor.CANON_CONNECTION_SEQUENCE, IPreferencePropertyAccessor.CANON_CONNECTION_SEQUENCE_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.CANON_SMALL_PICTURE_TYPE)) {
-            editor.putString(IPreferencePropertyAccessor.CANON_SMALL_PICTURE_TYPE, IPreferencePropertyAccessor.CANON_SMALL_PICTURE_TYPE_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.VISIONKIDS_HOST_IP)) {
-            editor.putString(IPreferencePropertyAccessor.VISIONKIDS_HOST_IP, IPreferencePropertyAccessor.VISIONKIDS_HOST_IP_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.VISIONKIDS_FTP_USER)) {
-            editor.putString(IPreferencePropertyAccessor.VISIONKIDS_FTP_USER, IPreferencePropertyAccessor.VISIONKIDS_FTP_USER_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.VISIONKIDS_FTP_PASS)) {
-            editor.putString(IPreferencePropertyAccessor.VISIONKIDS_FTP_PASS, IPreferencePropertyAccessor.VISIONKIDS_FTP_PASS_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.VISIONKIDS_LIST_TIMEOUT)) {
-            editor.putString(IPreferencePropertyAccessor.VISIONKIDS_LIST_TIMEOUT, IPreferencePropertyAccessor.VISIONKIDS_LIST_TIMEOUT_DEFAULT_VALUE);
-        }
-        if (!items.containsKey(IPreferencePropertyAccessor.VISIONKIDS_AUTO_SET_HOST_IP))
-        {
-            editor.putBoolean(IPreferencePropertyAccessor.VISIONKIDS_AUTO_SET_HOST_IP, true);
-        }
-        editor.apply();
-    }
-
-    /**
      *
      *
      */