pakstr 0.6.0 → 0.7.0

package/android-template/app/src/main/java/com/pakstr/app/MainActivity.kt

@@ -3,11 +3,14 @@ package com.pakstr.app
 import android.Manifest
 import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 
 import android.view.View
 import android.webkit.PermissionRequest
 import android.webkit.WebView
 import android.widget.FrameLayout
+import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
@@ -22,8 +25,11 @@ import com.pakstr.app.debug.AppDebugLogger
 import com.pakstr.app.debug.CrashHandler
 
 import com.pakstr.app.debug.DebugReportShare
+import com.pakstr.app.debug.DeveloperToolsAccessManager
 import com.pakstr.app.debug.DeveloperToolsActivity
 import com.pakstr.app.debug.DeveloperToolsManager
+import com.pakstr.app.debug.SupportUnlock
+import com.pakstr.app.debug.SupportUnlockGestureLayout
 import com.pakstr.app.debug.WebViewDebugManager
 
 import com.pakstr.app.permissions.PermissionManager
@@ -46,6 +52,12 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
             ActivityResultLauncher<Intent>
 
     private lateinit var fab: FloatingActionButton
+    private lateinit var supportUnlockGestureLayout: SupportUnlockGestureLayout
+
+    private val diagnosticsHandler = Handler(Looper.getMainLooper())
+    private val diagnosticsExpiryCheck = Runnable {
+        showDebugFab()
+    }
 
     override fun onCreate(
 
@@ -92,6 +104,7 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         )
 
         initViews()
+        setupSupportUnlockGesture()
         showDebugFab()
 
         amberLauncher =
@@ -151,33 +164,61 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     }
 
     private fun showDebugFab() {
-        if (BuildConfig.DEBUG || RuntimeConfig.debugEnabled(this)) {
+        diagnosticsHandler.removeCallbacks(diagnosticsExpiryCheck)
+
+        if (DeveloperToolsAccessManager.canOpenDeveloperTools(this)) {
 
             fab.visibility = View.VISIBLE
 
             fab.setOnClickListener {
+                if (DeveloperToolsAccessManager.canOpenDeveloperTools(this)) {
+                    startActivity(
 
-                startActivity(
+                        Intent(
 
-                    Intent(
+                            this,
 
-                        this,
+                            DeveloperToolsActivity::class.java
 
-                        DeveloperToolsActivity::class.java
+                        )
 
                     )
+                } else {
+                    showDebugFab()
+                }
+            }
 
+            val remainingDuration = SupportUnlock.remainingDuration(this)
+            if (!BuildConfig.DEBUG &&
+                !RuntimeConfig.debugEnabled(this) &&
+                remainingDuration > 0L
+            ) {
+                diagnosticsHandler.postDelayed(
+                    diagnosticsExpiryCheck,
+                    remainingDuration
                 )
-
             }
 
         } else {
 
             fab.visibility = View.GONE
+            fab.setOnClickListener(null)
 
         }
     }
 
+    private fun setupSupportUnlockGesture() {
+        supportUnlockGestureLayout.onUnlock = {
+            SupportUnlock.unlock(this)
+            Toast.makeText(
+                this,
+                R.string.diagnostics_mode_enabled,
+                Toast.LENGTH_LONG
+            ).show()
+            showDebugFab()
+        }
+    }
+
     private fun setupBackNavigation() {
         onBackPressedDispatcher.addCallback(
             this,
@@ -220,6 +261,9 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         container =
             findViewById(R.id.mainContainer)
 
+        supportUnlockGestureLayout =
+            container as SupportUnlockGestureLayout
+
         webView =
             findViewById(R.id.webView)
 
@@ -243,7 +287,29 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
         )
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (::fab.isInitialized) {
+            showDebugFab()
+        }
+    }
+
+    override fun onStop() {
+        if (::supportUnlockGestureLayout.isInitialized) {
+            supportUnlockGestureLayout.cancelHold()
+        }
+
+        super.onStop()
+    }
+
     override fun onDestroy() {
+        diagnosticsHandler.removeCallbacks(diagnosticsExpiryCheck)
+
+        if (::supportUnlockGestureLayout.isInitialized) {
+            supportUnlockGestureLayout.cancelHold()
+            supportUnlockGestureLayout.onUnlock = null
+        }
 
         if (::runtime.isInitialized) {
 

package/android-template/app/src/main/java/com/pakstr/app/debug/DeveloperToolsAccessManager.kt

@@ -0,0 +1,14 @@
+package com.pakstr.app.debug
+
+import android.content.Context
+import com.pakstr.app.BuildConfig
+import com.pakstr.app.RuntimeConfig
+
+object DeveloperToolsAccessManager {
+
+    fun canOpenDeveloperTools(context: Context): Boolean {
+        return BuildConfig.DEBUG ||
+                RuntimeConfig.debugEnabled(context) ||
+                SupportUnlock.isActive(context)
+    }
+}

package/android-template/app/src/main/java/com/pakstr/app/debug/SupportUnlock.kt

@@ -0,0 +1,44 @@
+package com.pakstr.app.debug
+
+import android.content.Context
+
+object SupportUnlock {
+
+    const val UNLOCK_DURATION_MS = 60 * 60 * 1000L
+
+    private const val PREFERENCES_NAME = "pakstr_support_unlock"
+    private const val EXPIRES_AT_KEY = "expires_at"
+
+    fun unlock(context: Context) {
+        preferences(context)
+            .edit()
+            .putLong(EXPIRES_AT_KEY, System.currentTimeMillis() + UNLOCK_DURATION_MS)
+            .apply()
+    }
+
+    fun isActive(context: Context): Boolean {
+        val remainingDuration = remainingDuration(context)
+
+        if (remainingDuration <= 0L) {
+            clear(context)
+            return false
+        }
+
+        return true
+    }
+
+    fun clear(context: Context) {
+        preferences(context)
+            .edit()
+            .remove(EXPIRES_AT_KEY)
+            .apply()
+    }
+
+    fun remainingDuration(context: Context): Long {
+        val expiresAt = preferences(context).getLong(EXPIRES_AT_KEY, 0L)
+        return (expiresAt - System.currentTimeMillis()).coerceAtLeast(0L)
+    }
+
+    private fun preferences(context: Context) =
+        context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
+}

package/android-template/app/src/main/java/com/pakstr/app/debug/SupportUnlockGestureLayout.kt

@@ -0,0 +1,87 @@
+package com.pakstr.app.debug
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import android.widget.FrameLayout
+import kotlin.math.abs
+
+class SupportUnlockGestureLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    var onUnlock: (() -> Unit)? = null
+
+    private val handler = Handler(Looper.getMainLooper())
+    private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
+    private val cornerSize = CORNER_SIZE_DP * resources.displayMetrics.density
+
+    private var tracking = false
+    private var downX = 0f
+    private var downY = 0f
+
+    private val unlockRunnable = Runnable {
+        if (tracking) {
+            tracking = false
+            onUnlock?.invoke()
+        }
+    }
+
+    override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+        observeTouch(event)
+        return super.dispatchTouchEvent(event)
+    }
+
+    fun cancelHold() {
+        tracking = false
+        handler.removeCallbacks(unlockRunnable)
+    }
+
+    override fun onDetachedFromWindow() {
+        cancelHold()
+        super.onDetachedFromWindow()
+    }
+
+    private fun observeTouch(event: MotionEvent) {
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                if (isInTopRightCorner(event.x, event.y)) {
+                    tracking = true
+                    downX = event.x
+                    downY = event.y
+                    handler.postDelayed(unlockRunnable, HOLD_DURATION_MS)
+                } else {
+                    cancelHold()
+                }
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                if (tracking && hasMovedBeyondTouchSlop(event.x, event.y)) {
+                    cancelHold()
+                }
+            }
+
+            MotionEvent.ACTION_POINTER_DOWN,
+            MotionEvent.ACTION_UP,
+            MotionEvent.ACTION_CANCEL -> cancelHold()
+        }
+    }
+
+    private fun isInTopRightCorner(x: Float, y: Float): Boolean {
+        return x >= width - cornerSize && y <= paddingTop + cornerSize
+    }
+
+    private fun hasMovedBeyondTouchSlop(x: Float, y: Float): Boolean {
+        return abs(x - downX) > touchSlop || abs(y - downY) > touchSlop
+    }
+
+    private companion object {
+        const val HOLD_DURATION_MS = 10_000L
+        const val CORNER_SIZE_DP = 72
+    }
+}

package/android-template/app/src/main/res/layout/activity_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.pakstr.app.debug.SupportUnlockGestureLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/mainContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -27,4 +27,4 @@
         android:contentDescription="@string/developer_tools"
         android:src="@android:drawable/ic_menu_info_details" />
 
-</FrameLayout>
+</com.pakstr.app.debug.SupportUnlockGestureLayout>

package/android-template/app/src/main/res/values/strings.xml

@@ -43,4 +43,5 @@
     <string name="developer_tools_browser_unavailable">No browser is available.</string>
 
     <string name="developer_tools">Open Developer Tools</string>
+    <string name="diagnostics_mode_enabled">Diagnostics mode enabled</string>
 </resources>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pakstr",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CLI for packaging Nostr web apps into Android APKs",
   "type": "commonjs",
   "main": "dist/index.js",