diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt index 137eafd5..88db1771 100644 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt +++ b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanel.kt @@ -21,10 +21,9 @@ public object DebugPanel { public fun initialize( application: Application, plugins: List, - config: DebugPanelConfig = DebugPanelConfig.defaultConfig ) { createDebugPanelInstance(application, plugins) - ApplicationLifecycleHandler(application, config.shakerMode).start() + ApplicationLifecycleHandler(application).start() } public fun subscribeToEvents(lifecycleOwner: LifecycleOwner, onEvent: (DebugEvent) -> Unit) { diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt deleted file mode 100644 index b049c7ec..00000000 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/DebugPanelConfig.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.redmadrobot.debug.core - -public class DebugPanelConfig( - public val shakerMode: Boolean -) { - internal companion object { - internal val defaultConfig = DebugPanelConfig(shakerMode = true) - } -} diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt deleted file mode 100644 index 11d15dfd..00000000 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeController.kt +++ /dev/null @@ -1,26 +0,0 @@ -package com.redmadrobot.debug.core.inapp.shake - -import android.app.Activity -import android.content.Context -import android.hardware.Sensor -import android.hardware.SensorManager -import com.redmadrobot.debug.core.DebugPanel - -internal class ShakeController(context: Context) { - private val sensorManager = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager - private val shakeDetector = ShakeListener { openDebugPanelAction?.invoke() } - private val accelerometer = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) - - private var openDebugPanelAction: (() -> Unit)? = null - - fun register(activity: Activity) { - unregister() - openDebugPanelAction = { DebugPanel.showPanel(activity) } - sensorManager.registerListener(shakeDetector, accelerometer, SensorManager.SENSOR_DELAY_UI) - } - - fun unregister() { - sensorManager.unregisterListener(shakeDetector) - openDebugPanelAction = null - } -} diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt deleted file mode 100644 index 46c170b2..00000000 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/shake/ShakeListener.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.redmadrobot.debug.core.inapp.shake - -import android.hardware.Sensor -import android.hardware.SensorEvent -import android.hardware.SensorEventListener -import android.hardware.SensorManager - -internal class ShakeListener(private val onAction: () -> Unit) : SensorEventListener { - private var lastTimestamp: Long = System.currentTimeMillis() - - override fun onAccuracyChanged(sensor: Sensor?, accuracy: Int) = Unit - - override fun onSensorChanged(event: SensorEvent?) { - event?.let { sensorEvent -> - val values = sensorEvent.values - val commonVector = values - .take(VECTOR_COUNT) - .map { value -> - val valueWithoutGravity = value / SensorManager.GRAVITY_EARTH - valueWithoutGravity * valueWithoutGravity - } - .sum() - val currentTime = System.currentTimeMillis() - val isSignificantEvent = commonVector > TRIGGER_MOTION_BORDER - val isNewEvent = currentTime > lastTimestamp + EVENT_TIME_DELAY - if (isSignificantEvent && isNewEvent) { - lastTimestamp = currentTime - onAction.invoke() - } - } - } - - companion object { - private const val TRIGGER_MOTION_BORDER = 10.0f - private const val VECTOR_COUNT = 3 - private const val EVENT_TIME_DELAY = 1000L - } -} diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt index bf129be2..7a3391f0 100644 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt +++ b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/util/ApplicationLifecycleHandler.kt @@ -6,24 +6,18 @@ import android.content.BroadcastReceiver import android.content.IntentFilter import androidx.activity.ComponentActivity import androidx.core.content.ContextCompat -import com.redmadrobot.debug.core.inapp.shake.ShakeController import timber.log.Timber internal class ApplicationLifecycleHandler( private val application: Application, - private val shakerMode: Boolean, ) { // open Activity counter private var openActivityCount = 0 - private var shakeController: ShakeController? = null private var debugPanelBroadcastReceiver: BroadcastReceiver? = null private val debugPanelNotification = DebugPanelNotification(application.applicationContext) fun start() { - if (shakerMode) { - shakeController = ShakeController(application.applicationContext) - } registerActivityLifecycleCallback() } @@ -34,8 +28,6 @@ internal class ApplicationLifecycleHandler( if (openActivityCount == 0) onAppResumed() ++openActivityCount - shakeController?.register(activity) - // register BroadcastReceiver for debug panel inner actions debugPanelBroadcastReceiver = DebugPanelBroadcastReceiver(activity) val filter = IntentFilter(DebugPanelBroadcastReceiver.ACTION_OPEN_DEBUG_PANEL) @@ -61,7 +53,6 @@ internal class ApplicationLifecycleHandler( private fun onAppPaused() { debugPanelNotification.hide() - shakeController?.unregister() } private fun onAppResumed() { diff --git a/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt index ac0a2b41..9837168d 100644 --- a/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt +++ b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanel.kt @@ -13,7 +13,6 @@ object DebugPanel { fun initialize( application: Application, plugins: List, - config: DebugPanelConfig = DebugPanelConfig.defaultConfig ) = Unit fun subscribeToEvents(lifecycleOwner: LifecycleOwner, onEvent: (DebugEvent) -> Unit) = Unit diff --git a/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt b/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt deleted file mode 100644 index b049c7ec..00000000 --- a/panel-no-op/src/main/kotlin/com/redmadrobot/debug/noop/core/DebugPanelConfig.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.redmadrobot.debug.core - -public class DebugPanelConfig( - public val shakerMode: Boolean -) { - internal companion object { - internal val defaultConfig = DebugPanelConfig(shakerMode = true) - } -} diff --git a/sample/src/main/kotlin/com/redmadrobot/debug_sample/App.kt b/sample/src/main/kotlin/com/redmadrobot/debug_sample/App.kt index 9118d706..168c76a5 100644 --- a/sample/src/main/kotlin/com/redmadrobot/debug_sample/App.kt +++ b/sample/src/main/kotlin/com/redmadrobot/debug_sample/App.kt @@ -2,7 +2,6 @@ package com.redmadrobot.debug_sample import android.app.Application import com.redmadrobot.debug.core.DebugPanel -import com.redmadrobot.debug.core.DebugPanelConfig import com.redmadrobot.debug.plugin.aboutapp.AboutAppPlugin import com.redmadrobot.debug.plugin.konfeature.KonfeatureDebugPanelInterceptor import com.redmadrobot.debug.plugin.konfeature.KonfeaturePlugin @@ -19,7 +18,6 @@ class App : Application() { DebugPanel.initialize( application = this, - config = DebugPanelConfig(shakerMode = false), plugins = listOf( ServersPlugin( preInstalledServers = DebugServersProvider().provideData()