Load custom shutter buttons + only show notifications at end

kylecorry31 · Oct 20, 2024 · d68dd0d · d68dd0d
1 parent 487ab70
commit d68dd0d
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/...c/main/java/com/kylecorry/intervalometer/infrastructure/services/IntervalometerService.kt b/...c/main/java/com/kylecorry/intervalometer/infrastructure/services/IntervalometerService.kt
@@ -19,14 +19,18 @@ import com.kylecorry.luna.timer.CoroutineTimer
 class IntervalometerService : AccessibilityService() {
 
     private val prefs by lazy { SharedPreferences(this) }
-    private val knownShutterButtons = listOf(
+    private val knownShutterButtonIds = listOf(
         "com.android.camera:id/shutter_button",
         "com.android.camera2:id/shutter_button",
         "com.google.android.GoogleCamera:id/shutter_button",
         "com.riseupgames.proshot2:id/cameraButton",
-        "net.sourceforge.opencamera:id/take_photo",
+        "net.sourceforge.opencamera:id/take_photo"
     )
 
+    private val shutterButtonIds: List<String>
+        get() = (prefs.getString("shutter_buttons") ?: "").split(",").map { it.trim() }
+            .filter { it.isNotBlank() } + knownShutterButtonIds
+
     private var stopReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
             timer.stop()
@@ -39,7 +43,11 @@ class IntervalometerService : AccessibilityService() {
     private val timer = CoroutineTimer {
         // Trigger a notification with the remaining time
         secondsUntilNextPhoto--
-        Notify.cancel(this, 2)
+
+        // Only cancel and reshow when the time is less than 5 seconds
+        if (secondsUntilNextPhoto <= 5) {
+            Notify.cancel(this, 2)
+        }
         Notify.send(
             this,
             2,
@@ -49,7 +57,13 @@ class IntervalometerService : AccessibilityService() {
                 secondsUntilNextPhoto.toString(),
                 null,
                 R.drawable.bubble,
-                group = "alerts"
+                group = "alerts",
+                intent = PendingIntent.getActivity(
+                    this,
+                    0,
+                    Intent(this, MainActivity::class.java),
+                    PendingIntent.FLAG_IMMUTABLE
+                )
             )
         )
         if (secondsUntilNextPhoto <= 0) {
@@ -61,7 +75,7 @@ class IntervalometerService : AccessibilityService() {
 
     override fun onAccessibilityEvent(event: AccessibilityEvent?) {
         // Start the timer when a shutter button is clicked
-        if (!timer.isRunning() && knownShutterButtons.contains(
+        if (!timer.isRunning() && shutterButtonIds.contains(
                 event?.source?.viewIdResourceName ?: ""
             )
         ) {
@@ -135,7 +149,7 @@ class IntervalometerService : AccessibilityService() {
 
     private fun clickShutterButton() {
         val nodeInfo = rootInActiveWindow
-        for (shutterButton in knownShutterButtons) {
+        for (shutterButton in shutterButtonIds) {
             val nodes = nodeInfo?.findAccessibilityNodeInfosByViewId(shutterButton)
             if (nodes != null && nodes.isNotEmpty()) {
                 nodes.forEach {

diff --git a/app/src/main/java/com/kylecorry/intervalometer/ui/MainFragment.kt b/app/src/main/java/com/kylecorry/intervalometer/ui/MainFragment.kt
@@ -34,6 +34,12 @@ class MainFragment : BoundFragment<FragmentMainBinding>() {
         }
 
         binding.interval.setText(prefs.getLong("interval")?.toString())
+
+        binding.shutterButtonIds.doOnTextChanged { text, _, _, _ ->
+            prefs.putString("shutter_buttons", text.toString())
+        }
+
+        binding.shutterButtonIds.setText(prefs.getString("shutter_buttons"))
     }
 
     override fun generateBinding(

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -28,9 +28,21 @@
         android:id="@+id/grant_permission"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
         android:text="Start / Stop"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/interval" />
 
+    <EditText
+        android:id="@+id/shutter_button_ids"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:hint="Shutter button IDs"
+        android:inputType="text|textNoSuggestions"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/grant_permission" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>