gokigenassets から定数部分を切り離し。

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644 (file)
index 0000000..286b37f
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt" charset="windows-31j" />
+  </component>
+</project>
\ No newline at end of file

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt b/app/src/main/java/jp/osdn/gokigen/constants/IApplicationConstantConvert.kt
similarity index 99%
rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt
rename to app/src/main/java/jp/osdn/gokigen/constants/IApplicationConstantConvert.kt
index 9b67f41..76cf4f2 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IApplicationConstantConvert.kt
+++ b/app/src/main/java/jp/osdn/gokigen/constants/IApplicationConstantConvert.kt
@@ -1,4 +1,4 @@
-package jp.osdn.gokigen.gokigenassets.constants
+package jp.osdn.gokigen.constants
 
 import jp.osdn.gokigen.mangle.R
 import jp.osdn.gokigen.mangle.preference.IPreferencePropertyAccessor.Companion.CACHE_LIVE_VIEW_PICTURES

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IPreferenceConstantConvert.kt b/app/src/main/java/jp/osdn/gokigen/constants/IPreferenceConstantConvert.kt
similarity index 99%
rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IPreferenceConstantConvert.kt
rename to app/src/main/java/jp/osdn/gokigen/constants/IPreferenceConstantConvert.kt
index ec2340f..b9e551a 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IPreferenceConstantConvert.kt
+++ b/app/src/main/java/jp/osdn/gokigen/constants/IPreferenceConstantConvert.kt
@@ -1,4 +1,4 @@
-package jp.osdn.gokigen.gokigenassets.constants
+package jp.osdn.gokigen.constants
 
 import jp.osdn.gokigen.mangle.R
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IStringResourceConstantConvert.kt b/app/src/main/java/jp/osdn/gokigen/constants/IStringResourceConstantConvert.kt
similarity index 98%
rename from app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IStringResourceConstantConvert.kt
rename to app/src/main/java/jp/osdn/gokigen/constants/IStringResourceConstantConvert.kt
index eba3c16..9c2c343 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/constants/IStringResourceConstantConvert.kt
+++ b/app/src/main/java/jp/osdn/gokigen/constants/IStringResourceConstantConvert.kt
@@ -1,4 +1,4 @@
-package jp.osdn.gokigen.gokigenassets.constants
+package jp.osdn.gokigen.constants
 
 import jp.osdn.gokigen.mangle.R
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt
index e1052a8..8c41965 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/console/ConsolePanelControl.kt
@@ -30,8 +30,8 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.T
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.TORCH_MODE
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatus.Companion.WHITE_BALANCE
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ICaptureModeReceiver
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD_VALUE
 import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_CAMERAX
 import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_OMDS
 import jp.osdn.gokigen.gokigenassets.constants.ICameraConnectionMethods.Companion.PREFERENCE_CAMERA_METHOD_PANASONIC

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt
index 498d49d..3d6049f 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraClickKeyDownListener.kt
@@ -3,9 +3,8 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.camerax.operation
 import android.util.Log
 import android.view.KeyEvent
 import android.view.View
-import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraShutter
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.IKeyDown
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert
+import jp.osdn.gokigen.constants.IApplicationConstantConvert
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.utils.imagefile.FileControl
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt
index b1ad2e8..f693c14 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/operation/CameraControl.kt
@@ -18,8 +18,8 @@ import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.core.content.ContextCompat
 import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.*
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CAMERA_X_PREVIEW_LAYOUT
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CAMERA_X_PREVIEW_LAYOUT
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveView
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveViewRefresher
 import jp.osdn.gokigen.gokigenassets.liveview.image.CameraLiveViewListenerImpl

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt
index 77cdc9a..1032d83 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/camerax/preview/PreviewFragment.kt
@@ -6,8 +6,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import androidx.fragment.app.Fragment
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_LAYOUT_CAMERA_CAPTURE
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_PREVIEW_VIEW_BUTTON_SHUTTER
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_LAYOUT_CAMERA_CAPTURE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_PREVIEW_VIEW_BUTTON_SHUTTER
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraControl
 
 class PreviewFragment(private val contentLayoutId: Int = ID_LAYOUT_CAMERA_CAPTURE) : Fragment(contentLayoutId)

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt
index 8b8a2b9..d060c2f 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/OmdsCameraControl.kt
@@ -13,11 +13,11 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.operation.OmdsZoomLensCo
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.status.OmdsCameraStatusWatcher
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.wrapper.OmdsCaptureControl
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.wrapper.OmdsFocusControl
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveView

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt
index eca5759..f3ebd1f 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnectSequence.kt
@@ -7,7 +7,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.IOmdsProtocolNotify
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.status.IOmdsCommunicationInfo
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient
 import java.lang.Exception
 import java.util.HashMap
@@ -81,7 +81,8 @@ class OmdsCameraConnectSequence(private val context: AppCompatActivity, private
             }
             else
             {
-                cameraConnection.alertConnectingFailed(context.getString(IStringResourceConstantConvert.ID_STRING_CAMERA_NOT_FOUND))
+                cameraConnection.alertConnectingFailed(context.getString(
+                    IStringResourceConstantConvert.ID_STRING_CAMERA_NOT_FOUND))
             }
         }
         catch (e: Exception)

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnection.kt
index 17a0991..8b1eb20 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnection.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/connection/OmdsCameraConnection.kt
@@ -11,7 +11,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.*
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.IOmdsProtocolNotify
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.liveview.IOmdsLiveViewControl
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.status.IOmdsCommunicationInfo
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import java.lang.Exception
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/wrapper/OmdsCameraPowerOff.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/wrapper/OmdsCameraPowerOff.kt
index 4f6de39..a1edc01 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/wrapper/OmdsCameraPowerOff.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/omds/wrapper/OmdsCameraPowerOff.kt
@@ -3,9 +3,9 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.omds.wrapper
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.Preference
 import jp.osdn.gokigen.gokigenassets.camera.vendor.omds.connection.OmdsCameraDisconnectSequence
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
 import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic
 import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt
index f07406d..5e237da 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnectSequence.kt
@@ -9,9 +9,9 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCameraHolder
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_DETECTED
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_START
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_DETECTED
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_START
 
 class PanasonicCameraConnectSequence(private val context: AppCompatActivity, private val cameraStatusReceiver: ICameraStatusReceiver, private val cameraConnection: ICameraConnection, private val cameraHolder: IPanasonicCameraHolder, private val listener: ICameraChangeListener, cameraCoordinator: ICameraControlCoordinator, number : Int) : Runnable, PanasonicSsdpClient.ISearchResultCallback
 {

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt
index d7ce1cd..7e40938 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicCameraConnection.kt
@@ -14,7 +14,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ILiveViewController
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraChangeListener
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCameraHolder
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt
index 039d339..50dce69 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/connection/PanasonicSsdpClient.kt
@@ -6,12 +6,12 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.IPanasonicCamera
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.wrapper.PanasonicCameraDeviceProvider
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_FOUND
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_REJECTED
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_SEARCH_REQUEST
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_WAIT_REPLY_CAMERA
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_FOUND
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_REJECTED
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_SEARCH_REQUEST
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_WAIT_REPLY_CAMERA
 import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient
 import jp.osdn.gokigen.gokigenassets.utils.communication.XmlElement
 import java.net.DatagramPacket

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt
index 68a5b2e..ea84334 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/operation/CameraPowerOffPanasonic.kt
@@ -2,9 +2,9 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation
 
 import android.content.Context
 import androidx.preference.Preference
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
 import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic
 import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt
index ff3dafb..e899360 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/panasonic/wrapper/PanasonicCameraControl.kt
@@ -16,11 +16,11 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.Panasonic
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.PanasonicCameraFocusControl
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.operation.PanasonicCameraZoomLensControl
 import jp.osdn.gokigen.gokigenassets.camera.vendor.panasonic.status.CameraEventObserver
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveView

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt
index 89afe7c..e9d8d4b 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/PixproCameraControl.kt
@@ -20,12 +20,12 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.Pixpro
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.connection.PixproCameraConnection
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.liveview.PixproLiveViewControl
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status.PixproStatusChecker
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_COMMAND_LINE_DISCONNECTED
+import jp.osdn.gokigen.constants.IApplicationConstantConvert
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_COMMAND_LINE_DISCONNECTED
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveView

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt
index 1cfd77b..f6e596a 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/operation/CameraPowerOffPixpro.kt
@@ -2,9 +2,9 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.operation
 
 import android.content.Context
 import androidx.preference.Preference
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
 import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic
 import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt
index a354a75..13c70e4 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnectSequence.kt
@@ -29,7 +29,7 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messag
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproFlashOff
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.command.messages.specific.PixproFlashOn
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status.PixproStatusChecker
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 
 class PixproCameraConnectSequence(private val context: AppCompatActivity, private val cameraStatusReceiver: ICameraStatusReceiver, private val cameraConnection : ICameraConnection, private val interfaceProvider : IPixproInternalInterfaces, private val statusChecker: PixproStatusChecker) : Runnable, IPixproCommandCallback, IPixproMessages, PixproConnectionClient.ISearchResultCallback
 {
@@ -246,7 +246,8 @@ class PixproCameraConnectSequence(private val context: AppCompatActivity, privat
 
     private fun startConnectSequence()
     {
-        interfaceProvider.getInformationReceiver().updateMessage(context.getString(IStringResourceConstantConvert.ID_STRING_CONNECT_START),
+        interfaceProvider.getInformationReceiver().updateMessage(context.getString(
+            IStringResourceConstantConvert.ID_STRING_CONNECT_START),
             isBold = false,
             isColor = false,
             color = 0

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnection.kt
index aa01ee2..831655d 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnection.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproCameraConnection.kt
@@ -12,7 +12,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.IPixproInternalInterfaces
 import jp.osdn.gokigen.gokigenassets.camera.vendor.pixpro.wrapper.status.PixproStatusChecker
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import java.lang.Exception
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt
index 268ea1f..35c9420 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/pixpro/wrapper/connection/PixproConnectionClient.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.net.wifi.WifiManager
 import android.util.Log
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import java.net.DatagramPacket
 import java.net.DatagramSocket
 import java.net.InetSocketAddress
@@ -133,7 +133,8 @@ class PixproConnectionClient(private val context: Context, private val interface
                 else
                 {
                     // カメラが見つからない...
-                    cameraStatusReceiver.onStatusNotify(context.getString(IStringResourceConstantConvert.ID_STRING_CAMERA_NOT_FOUND))
+                    cameraStatusReceiver.onStatusNotify(context.getString(
+                        IStringResourceConstantConvert.ID_STRING_CAMERA_NOT_FOUND))
                 }
                 currentTime = System.currentTimeMillis()
             }

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt
index a60f81e..9a352e1 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/RicohPentaxCameraControl.kt
@@ -16,11 +16,11 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation.*
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.status.RicohGr2StatusChecker
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.RicohGr2RunMode
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.wrapper.playback.RicohGr2PlaybackControl
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl
 import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt
index 0163f1b..ad0a3bd 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraConnectSequence.kt
@@ -6,10 +6,10 @@ import androidx.preference.PreferenceManager
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_RICOH_GR2_LCD_SLEEP
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_USE_GR2_SPECIAL_COMMAND
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_RICOH_GR2_LCD_SLEEP
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_USE_GR2_SPECIAL_COMMAND
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED
 import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient
 
 class RicohGr2CameraConnectSequence(private val context: Activity, private val cameraStatusReceiver: ICameraStatusReceiver, private val cameraConnection: ICameraConnection, private val gr2CommandNotify: IUseGR2CommandNotify, private val executeUrl : String = "http://192.168.0.1") : Runnable

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt
index e195ea7..db8b117 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2CameraDisconnectSequence.kt
@@ -3,7 +3,7 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.connection
 import android.app.Activity
 import android.util.Log
 import androidx.preference.PreferenceManager
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_RICOH_GR2_LCD_SLEEP
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_RICOH_GR2_LCD_SLEEP
 import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient
 
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt
index 970ef7e..e252c20 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/connection/RicohGr2Connection.kt
@@ -8,10 +8,10 @@ import android.util.Log
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.FragmentActivity
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.*
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CHECK_WIFI
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_NETWORK_SETTINGS
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_RETRY
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_TITLE_CONNECT_FAILED
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CHECK_WIFI
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_NETWORK_SETTINGS
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_RETRY
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_TITLE_CONNECT_FAILED
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt
index 3ee04c7..8aefed4 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/ricohpentax/operation/RicohGr2CameraPowerOff.kt
@@ -2,9 +2,9 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.ricohpentax.operation
 
 import android.content.Context
 import androidx.preference.Preference
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
 import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic
 import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt
index 67e34d3..7fe1eab 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/SonyCameraControl.kt
@@ -7,7 +7,7 @@ import androidx.appcompat.app.AppCompatActivity
 import jp.osdn.gokigen.gokigenassets.camera.preference.ICameraPreferenceProvider
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.*
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert
+import jp.osdn.gokigen.constants.IApplicationConstantConvert
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.liveview.IIndicatorControl
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveView
@@ -30,10 +30,10 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCamera
 import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.SonyCameraApi
 import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener.ISonyCameraEventObserver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.eventlistener.SonyStatus
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
 import org.json.JSONObject
 import kotlin.collections.ArrayList
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt
index 347eece..f780607 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/CameraPowerOffSony.kt
@@ -2,9 +2,9 @@ package jp.osdn.gokigen.gokigenassets.camera.vendor.sony.operation
 
 import android.content.Context
 import androidx.preference.Preference
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_EXIT_POWER_OFF
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_TITLE_CONFIRMATION
 import jp.osdn.gokigen.gokigenassets.scene.IChangeSceneBasic
 import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt
index 170135a..2e88d8c 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/operation/SonyCameraCaptureControl.kt
@@ -30,7 +30,7 @@ class SonyCameraCaptureControl(frameDisplayer: IAutoFocusFrameDisplay, indicator
     }
 
     /**
-     *
+     * 撮影する
      *
      */
     override fun doCapture(kind: Int)
@@ -43,11 +43,13 @@ class SonyCameraCaptureControl(frameDisplayer: IAutoFocusFrameDisplay, indicator
                 val status = cameraStatus.getStatus(ICameraStatus.DRIVE_MODE).lowercase()
                 if (status.contains("cont"))  // 'Continuous' or 'Spd Priority Cont.'
                 {
+                    // 連写の場合...
                     continuousShotControl.continuousShot(isStarted)
                     isStarted = !isStarted
                     return
                 }
             }
+            // 単写の場合...
             singleShotControl.singleShot()
             return
         }

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt
index 9a17aa9..c4ef927 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnectSequence.kt
@@ -7,9 +7,9 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCameraHolde
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_FOUND
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_START
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CAMERA_FOUND
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_START
 import java.lang.Exception
 
 class SonyCameraConnectSequence(private val context: AppCompatActivity,

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt
index 60331e9..617e0bf 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonyCameraConnection.kt
@@ -12,7 +12,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import java.lang.Exception
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt
index 159aad1..a8aa2ba 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/sony/wrapper/connection/SonySsdpClient.kt
@@ -6,7 +6,7 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.ICameraControlCoordinator
 import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.ISonyCamera
 import jp.osdn.gokigen.gokigenassets.camera.vendor.sony.wrapper.SonyCameraDeviceProvider
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert
 import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient
 import jp.osdn.gokigen.gokigenassets.utils.communication.XmlElement
 import java.net.DatagramPacket
@@ -98,7 +98,8 @@ class SonySsdpClient(private val context: Context, private val callback: ISearch
                 {
                     ddUsn = findParameterValue(ssdpReplyMessage, "USN")
                     Log.v(TAG, "- - - - - - - USN : $ddUsn")
-                    cameraStatusReceiver.onStatusNotify(context.getString(IStringResourceConstantConvert.ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY))
+                    cameraStatusReceiver.onStatusNotify(context.getString(
+                        IStringResourceConstantConvert.ID_STRING_CONNECT_CAMERA_RECEIVED_REPLY))
                     if ((ddUsn.isNotEmpty())&&(!foundDevices.contains(ddUsn))&&(!cameraCoordinator.isAssignedCameraControl(ddUsn)))
                     {
                         val ddLocation = findParameterValue(ssdpReplyMessage, "LOCATION")
@@ -111,7 +112,8 @@ class SonySsdpClient(private val context: Context, private val callback: ISearch
                             val device: ISonyCamera? = searchSonyCameraDevice(ddLocation)
                             if ((device != null)&&(device.hasApiService("camera")))
                             {
-                                cameraStatusReceiver.onStatusNotify(context.getString(IStringResourceConstantConvert.ID_STRING_CONNECT_CAMERA_FOUND) + " " + device.getFriendlyName())
+                                cameraStatusReceiver.onStatusNotify(context.getString(
+                                    IStringResourceConstantConvert.ID_STRING_CONNECT_CAMERA_FOUND) + " " + device.getFriendlyName())
                                 cameraCoordinator.assignCameraControl(number, ddUsn)
                                 callback.onDeviceFound(device)
                                 // カメラが見つかった場合は breakする
@@ -122,14 +124,16 @@ class SonySsdpClient(private val context: Context, private val callback: ISearch
                             {
                                 if (useSmartphoneTransfer && device != null)
                                 {
-                                    cameraStatusReceiver.onStatusNotify(context.getString(IStringResourceConstantConvert.ID_STRING_CONNECT_CAMERA_FOUND) + " " + device.getFriendlyName() + " (Smartphone Transfer)")
+                                    cameraStatusReceiver.onStatusNotify(context.getString(
+                                        IStringResourceConstantConvert.ID_STRING_CONNECT_CAMERA_FOUND) + " " + device.getFriendlyName() + " (Smartphone Transfer)")
                                     Log.v(TAG, " SMARTPHONE TRANSFER : $ssdpReplyMessage")
                                     callback.onDeviceFound(device)
                                     break
                                 }
 
                                 // カメラが見つからない...
-                                cameraStatusReceiver.onStatusNotify(context.getString(IStringResourceConstantConvert.ID_STRING_CAMERA_NOT_FOUND))
+                                cameraStatusReceiver.onStatusNotify(context.getString(
+                                    IStringResourceConstantConvert.ID_STRING_CAMERA_NOT_FOUND))
                             }
                         }
                     }

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt
index 1e74b06..1afb9c3 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/ThetaCameraControl.kt
@@ -14,11 +14,11 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaSingleSh
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ICaptureModeReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ThetaCameraStatusWatcher
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.ThetaSessionHolder
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_BUTTON_SHUTTER
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_BUTTON_SHUTTER
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.ICachePositionProvider
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveView
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveViewRefresher

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt
index c521bd6..8aa4c81 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnectSequence.kt
@@ -6,9 +6,9 @@ import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnection
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraConnectionStatus
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraStatusReceiver
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdNotifier
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_CONNECT_RESPONSE_NG
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_CONNECT_RESPONSE_NG
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CAMERA_NOT_FOUND
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CONNECTED
 import jp.osdn.gokigen.gokigenassets.utils.communication.SimpleHttpClient
 import org.json.JSONObject
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt
index fadd4b9..f25f9c6 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/vendor/theta/connection/ThetaCameraConnection.kt
@@ -16,12 +16,12 @@ import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.IOperationCal
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.operation.ThetaOptionSetControl
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdNotifier
 import jp.osdn.gokigen.gokigenassets.camera.vendor.theta.status.IThetaSessionIdProvider
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CHECK_WIFI
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_NETWORK_SETTINGS
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_RETRY
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_TITLE_CONNECT_FAILED
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_CONNECT_CHECK_WIFI
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_NETWORK_SETTINGS
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_BUTTON_RETRY
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_STRING_DIALOG_TITLE_CONNECT_FAILED
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt
index ad6acd7..cae6cd5 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageView.kt
@@ -15,8 +15,8 @@ import android.widget.SeekBar
 import android.widget.SeekBar.OnSeekBarChangeListener
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraControl
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.IFocusingModeNotify
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.MAX_VALUE_SEEKBAR
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.MAX_VALUE_SEEKBAR
 import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IAutoFocusFrameDisplay
 import jp.osdn.gokigen.gokigenassets.liveview.focusframe.IFocusFrameDrawer
 import jp.osdn.gokigen.gokigenassets.liveview.gridframe.GridFrameFactory

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
index 36f47c5..75f1d57 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
@@ -14,41 +14,41 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.preference.PreferenceManager
 import jp.osdn.gokigen.gokigenassets.camera.interfaces.ICameraControl
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_BUTTON_SHUTTER
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_0
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_1
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_2
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_3
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_4
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_5
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_6
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_7
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_LIVE_VIEW_LAYOUT_DEFAULT
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CACHE_LIVE_VIEW_PICTURES
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_SECONDS
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_SECONDS_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SHOW_GRID
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SHOW_GRID_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_0
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_1
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_2
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_3
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_4
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_5
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_6
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_7
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_0
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_1
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_2
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_3
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_4
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_5
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_6
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_7
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_LOWERMIDDLE_AREA
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_LOWER_AREA
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_UPPERMIDDLE_AREA
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_VIEW_UPPER_AREA
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_BUTTON_SHUTTER
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_0
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_1
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_2
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_3
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_4
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_5
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_6
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_CACHE_SEEKBAR_7
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_LIVE_VIEW_LAYOUT_DEFAULT
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CACHE_LIVE_VIEW_PICTURES
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_SECONDS
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_SECONDS_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SHOW_GRID
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SHOW_GRID_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_0
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_1
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_2
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_3
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_4
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_5
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_6
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_AREA_7
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_0
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_1
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_2
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_3
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_4
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_5
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_6
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_FINDER_7
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_LOWERMIDDLE_AREA
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_LOWER_AREA
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_UPPERMIDDLE_AREA
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_VIEW_UPPER_AREA
 import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper
 import jp.osdn.gokigen.gokigenassets.scene.IInformationReceiver
 

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/glrenderer/EquirectangularDrawer.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/glrenderer/EquirectangularDrawer.kt
index b413dbd..b872291 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/glrenderer/EquirectangularDrawer.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/glrenderer/EquirectangularDrawer.kt
@@ -4,11 +4,11 @@ import android.content.Context
 import android.opengl.GLUtils
 import android.util.Log
 import androidx.preference.PreferenceManager
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE_THETA_0
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE_THETA_1
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE_THETA_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE_THETA_0
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE_THETA_1
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_BACKGROUND_IMAGE_THETA_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_THETA_LIVEVIEW_RESOLUTION_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.image.IImageProvider
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt
index 457c264..db79081 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/image/CameraLiveViewListenerImpl.kt
@@ -7,10 +7,10 @@ import android.graphics.ImageFormat.NV21
 import android.util.Log
 import androidx.camera.core.ImageAnalysis
 import androidx.camera.core.ImageProxy
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_SPLASH_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CACHE_LIVE_VIEW_PICTURES
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_NUMBER_OF_CACHE_PICTURES
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_NUMBER_OF_CACHE_PICTURES_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_DRAWABLE_SPLASH_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CACHE_LIVE_VIEW_PICTURES
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_NUMBER_OF_CACHE_PICTURES
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_NUMBER_OF_CACHE_PICTURES_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.ILiveViewRefresher
 import jp.osdn.gokigen.gokigenassets.liveview.bitmapconvert.IPreviewImageConverter
 import jp.osdn.gokigen.gokigenassets.liveview.bitmapconvert.ImageConvertFactory

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/storeimage/StoreImage.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/storeimage/StoreImage.kt
index 170a14d..67e4340 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/storeimage/StoreImage.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/storeimage/StoreImage.kt
@@ -9,9 +9,9 @@ import android.os.Environment
 import android.provider.MediaStore
 import android.util.Log
 import androidx.fragment.app.FragmentActivity
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.image.IImageProvider
 import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper
 import java.io.ByteArrayOutputStream

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 fc8b859..6414764 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
@@ -4,77 +4,77 @@ import android.content.Context
 import android.os.Bundle
 import android.util.Log
 import androidx.preference.*
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_LAYOUT_PREFERENCE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_SHOW_GRID
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_SHOW_GRID_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_1
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_2
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_3
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_4
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_5
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_6
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_7
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_8
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_DEBUG_INFO
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_SELECT_CAMERA_CONNECTION_METHOD
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_WIFI_SETTINGS
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_ARRAY
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_ARRAY_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_SECONDS
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SHOW_GRID
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_LAYOUT_PREFERENCE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_METHOD_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_CAMERA_SEQUENCE_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_SHOW_GRID
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_ARRAY_SHOW_GRID_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_METHOD_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION1_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION2_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION3_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION4_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_OPTION5_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_1
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_2
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_3
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_4
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_5
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_6
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_7
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAMERA_SEQUENCE_8
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_DEBUG_INFO
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_EXIT_APPLICATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_SELECT_CAMERA_CONNECTION_METHOD
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_LABEL_WIFI_SETTINGS
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_ARRAY
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_ARRAY_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SELF_TIMER_SECONDS
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SHOW_GRID
 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

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/scene/ShowMessage.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/scene/ShowMessage.kt
index a4d4277..6c6c1d0 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/scene/ShowMessage.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/scene/ShowMessage.kt
@@ -4,7 +4,7 @@ import android.graphics.Color
 import android.graphics.Typeface
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_AREA_MESSAGE
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_AREA_MESSAGE
 
 class ShowMessage(private val activity : AppCompatActivity) : IInformationReceiver
 {

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/ConfirmationDialog.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/ConfirmationDialog.kt
index e309a43..8f3dd0d 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/ConfirmationDialog.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/ConfirmationDialog.kt
@@ -3,8 +3,8 @@ package jp.osdn.gokigen.gokigenassets.utils
 import android.content.Context
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_BUTTON_LABEL_NEGATIVE
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_BUTTON_LABEL_POSITIVE
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_BUTTON_LABEL_NEGATIVE
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_DIALOG_BUTTON_LABEL_POSITIVE
 
 class ConfirmationDialog : DialogFragment()
 {

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/communication/SimpleLogDumper.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/communication/SimpleLogDumper.kt
index a92d638..1dd561a 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/communication/SimpleLogDumper.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/communication/SimpleLogDumper.kt
@@ -3,7 +3,7 @@ package jp.osdn.gokigen.gokigenassets.utils.communication
 import android.app.Activity
 import android.os.Environment
 import android.util.Log
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
 import java.io.File
 import java.io.FileOutputStream
 import java.text.SimpleDateFormat
@@ -58,7 +58,7 @@ object SimpleLogDumper
             val extendName = SimpleDateFormat("yyyyMMdd-HHmmss", Locale.getDefault()).format(calendar.time)
             @Suppress("DEPRECATION") val directoryPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).path + "/" + activity.getString(ID_LABEL_APP_LOCATION) + "/"
             val outputFileName = fileNamePrefix + "_" + extendName + ".bin"
-            val filepath = File(directoryPath.toLowerCase(Locale.ROOT), outputFileName.toLowerCase(Locale.ROOT)).path
+            val filepath = File(directoryPath.lowercase(), outputFileName.lowercase()).path
             val outputStream = FileOutputStream(filepath)
             outputStream.write(rx_body, 0, rx_body.size)
             outputStream.flush()

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/FileControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/FileControl.kt
index 887a9e4..9fa625d 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/FileControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/FileControl.kt
@@ -4,12 +4,12 @@ import android.os.Build
 import android.util.Log
 import androidx.camera.core.ImageCapture
 import androidx.fragment.app.FragmentActivity
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_CAPTURE_ONLY_LIVEVIEW_IMAGE_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_SAVE_LOCAL_LOCATION_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.liveview.storeimage.IStoreImage
 import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper
 import jp.osdn.gokigen.gokigenassets.scene.IVibrator

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternal.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternal.kt
index c25d648..21b907b 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternal.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternal.kt
@@ -13,10 +13,10 @@ import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_MESSAGE_LABEL_CAPTURE_SUCCESS
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_EXTERNAL_STORAGE_LOCATION
-import jp.osdn.gokigen.gokigenassets.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_EXTERNAL_STORAGE_LOCATION_DEFAULT_VALUE
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_MESSAGE_LABEL_CAPTURE_SUCCESS
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_EXTERNAL_STORAGE_LOCATION
+import jp.osdn.gokigen.constants.IPreferenceConstantConvert.Companion.ID_PREFERENCE_EXTERNAL_STORAGE_LOCATION_DEFAULT_VALUE
 import jp.osdn.gokigen.gokigenassets.preference.PreferenceAccessWrapper
 import java.io.File
 import java.io.OutputStream

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternalLegacy.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternalLegacy.kt
index c70e20a..209b2f8 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternalLegacy.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreExternalLegacy.kt
@@ -9,8 +9,8 @@ import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_MESSAGE_LABEL_CAPTURE_SUCCESS
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_LOCATION
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_MESSAGE_LABEL_CAPTURE_SUCCESS
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreLocal.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreLocal.kt
index eeeb0c1..14ede00 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreLocal.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/imagefile/ImageStoreLocal.kt
@@ -8,7 +8,7 @@ import androidx.camera.core.ImageCapture
 import androidx.camera.core.ImageCaptureException
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_MESSAGE_LABEL_CAPTURE_SUCCESS
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_MESSAGE_LABEL_CAPTURE_SUCCESS
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatExporter.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatExporter.kt
index 0fd543a..c2da81f 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatExporter.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatExporter.kt
@@ -6,9 +6,9 @@ import android.util.Log
 import android.view.View
 import android.widget.AdapterView
 import android.widget.AdapterView.OnItemLongClickListener
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_NAME
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_MESSAGE_CONFIRMATION_FOR_EXPORT_LOG
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_TITLE_CONFIRMATION_FOR_EXPORT_LOG
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_APP_NAME
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_MESSAGE_CONFIRMATION_FOR_EXPORT_LOG
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_TITLE_CONFIRMATION_FOR_EXPORT_LOG
 import jp.osdn.gokigen.gokigenassets.utils.ConfirmationDialog
 
 class LogCatExporter(private val activity: Activity) : OnItemLongClickListener

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatFragment.kt
index d29e9f0..07f8821 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatFragment.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/utils/logcat/LogCatFragment.kt
@@ -7,9 +7,9 @@ import android.view.*
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import android.widget.Toast
-import jp.osdn.gokigen.gokigenassets.constants.IStringResourceConstantConvert.Companion.ID_LABEL_FINISHED_REFRESH
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_MENU_ACTION_REFRESH
-import jp.osdn.gokigen.gokigenassets.constants.IApplicationConstantConvert.Companion.ID_MENU_LAYOUT_DEBUG_VIEW
+import jp.osdn.gokigen.constants.IStringResourceConstantConvert.Companion.ID_LABEL_FINISHED_REFRESH
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_MENU_ACTION_REFRESH
+import jp.osdn.gokigen.constants.IApplicationConstantConvert.Companion.ID_MENU_LAYOUT_DEBUG_VIEW
 import java.util.*
 
 class LogCatFragment : androidx.fragment.app.ListFragment()
@@ -38,6 +38,8 @@ class LogCatFragment : androidx.fragment.app.ListFragment()
         return (myView)
     }
 
+    @Suppress("DEPRECATION")
+    @Deprecated("Deprecated in Java")
     override fun onActivityCreated(savedInstanceState: Bundle?)
     {
         super.onActivityCreated(savedInstanceState)