DeviceHelper로 로직 분리

Author: kimdohun0104

src/main/kotlin/kr/co/finda/androidtemplate/feature/showLayoutBound/action/ShowLayoutBoundsAction.kt

@@ -5,12 +5,14 @@ import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.Project
 import kr.co.finda.androidtemplate.ext.showMessageDialog
+import kr.co.finda.androidtemplate.util.DeviceHelper
+import kr.co.finda.androidtemplate.util.DeviceHelperImpl
 import org.jetbrains.android.sdk.AndroidSdkUtils
 
 class ShowLayoutBoundsAction : AnAction(), ShowLayoutBoundsActionContract.View {
 
     private val presenter: ShowLayoutBoundsActionContract.Presenter by lazy {
-        ShowLayoutBoundsActionPresenter(this)
+        ShowLayoutBoundsActionPresenter(this, DeviceHelperImpl())
     }
 
     override fun actionPerformed(e: AnActionEvent) {

src/main/kotlin/kr/co/finda/androidtemplate/feature/showLayoutBound/action/ShowLayoutBoundsActionPresenter.kt

@@ -3,42 +3,24 @@ package kr.co.finda.androidtemplate.feature.showLayoutBound.action
 import com.android.ddmlib.MultiLineReceiver
 import com.android.ddmlib.NullOutputReceiver
 import com.intellij.openapi.project.Project
+import kr.co.finda.androidtemplate.util.DeviceHelper
 import org.jetbrains.android.sdk.AndroidSdkUtils
 
 class ShowLayoutBoundsActionPresenter(
-    private val view: ShowLayoutBoundsActionContract.View
+    private val view: ShowLayoutBoundsActionContract.View,
+    private val deviceHelper: DeviceHelper
 ) : ShowLayoutBoundsActionContract.Presenter {
 
     override fun onShowLayoutBoundsActionPerformed(project: Project) {
-        val devices = AndroidSdkUtils.getDebugBridge(project)?.devices
+        val devices = deviceHelper.getDebugDevices(project)
 
-        if (devices == null) {
+        if (devices.isNullOrEmpty()) {
             view.showDialog(project, "연결된 디바이스가 없습니다", "디바이스 연결 상태를 확인해주세요")
             return
         }
 
-        devices.forEach { device ->
-            device.executeShellCommand(
-                "getprop debug.layout",
-                object : MultiLineReceiver() {
-                    var cancelled = false
-
-                    override fun isCancelled(): Boolean {
-                        return cancelled
-                    }
-
-                    override fun processNewLines(lines: Array<out String>?) {
-                        lines?.firstOrNull()?.let { first ->
-                            device.executeShellCommand(
-                                "setprop debug.layout ${!first.toBoolean()} ; service call activity 1599295570",
-                                NullOutputReceiver()
-                            )
-                        }
-                        cancelled = true
-                    }
-
-                }
-            )
+        deviceHelper.getDebugLayoutBoundsEnabled(devices[0]) { isEnabled ->
+            deviceHelper.setDebugLayoutBoundsEnabled(devices, !isEnabled)
         }
     }
 }

src/main/kotlin/kr/co/finda/androidtemplate/util/DeviceHelper.kt

@@ -0,0 +1,50 @@
+package kr.co.finda.androidtemplate.util
+
+import com.android.ddmlib.IDevice
+import com.android.ddmlib.MultiLineReceiver
+import com.android.ddmlib.NullOutputReceiver
+import com.intellij.openapi.project.Project
+import org.jetbrains.android.sdk.AndroidSdkUtils
+
+interface DeviceHelper {
+
+    fun getDebugLayoutBoundsEnabled(device: IDevice, on: (isEnabled: Boolean) -> Unit)
+
+    fun setDebugLayoutBoundsEnabled(devices: List<IDevice>, isEnabled: Boolean)
+
+    fun getDebugDevices(project: Project): List<IDevice>?
+}
+
+class DeviceHelperImpl : DeviceHelper {
+    override fun getDebugLayoutBoundsEnabled(device: IDevice, on: (isEnabled: Boolean) -> Unit) {
+        device.executeShellCommand(
+            "getprop debug.layout",
+            object : MultiLineReceiver() {
+                var cancelled = false
+
+                override fun isCancelled(): Boolean {
+                    return cancelled
+                }
+
+                override fun processNewLines(lines: Array<out String>?) {
+                    val firstLine = lines?.firstOrNull()
+                    on(firstLine?.toBoolean() ?: false)
+                    cancelled = true
+                }
+            }
+        )
+    }
+
+    override fun setDebugLayoutBoundsEnabled(devices: List<IDevice>, isEnabled: Boolean) {
+        devices.forEach { device ->
+            device.executeShellCommand(
+                "setprop debug.layout $isEnabled ; service call activity 1599295570",
+                NullOutputReceiver()
+            )
+        }
+    }
+
+    override fun getDebugDevices(project: Project): List<IDevice>? {
+        return AndroidSdkUtils.getDebugBridge(project)?.devices?.toList()
+    }
+}