Refactor menus

enaboapps · Jan 11, 2024 · 35ac418 · 35ac418
1 parent 5591ab2
commit 35ac418
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 46 deletions.
diff --git a/app/src/main/java/com/enaboapps/switchify/service/menu/menus/GesturesMenu.kt b/app/src/main/java/com/enaboapps/switchify/service/menu/menus/GesturesMenu.kt
@@ -7,7 +7,7 @@ import com.enaboapps.switchify.service.menu.MenuManager
 import com.enaboapps.switchify.service.menu.MenuView
 
 class GesturesMenu(accessibilityService: SwitchifyAccessibilityService) {
-    private var items: List<MenuItem> = listOf(
+    private val items: List<MenuItem> = listOf(
         MenuItem("Tap", {
             GestureManager.getInstance().performTap()
         }),
@@ -25,15 +25,6 @@ class GesturesMenu(accessibilityService: SwitchifyAccessibilityService) {
         })
     )
 
-    val menuView = MenuView(accessibilityService, items.toMutableList())
+    val menuView = MenuView(accessibilityService, items)
 
-    // This function is called when the menu is opened
-    fun open() {
-        menuView.open()
-    }
-
-    // This function is called when the menu is closed
-    fun close() {
-        menuView.close()
-    }
 }
diff --git a/app/src/main/java/com/enaboapps/switchify/service/menu/menus/MainMenu.kt b/app/src/main/java/com/enaboapps/switchify/service/menu/menus/MainMenu.kt
@@ -7,7 +7,7 @@ import com.enaboapps.switchify.service.menu.MenuManager
 import com.enaboapps.switchify.service.menu.MenuView
 
 class MainMenu(accessibilityService: SwitchifyAccessibilityService) {
-    private var items: List<MenuItem> = listOf(
+    private val items: List<MenuItem> = listOf(
         MenuItem("Tap", {
             GestureManager.getInstance().performTap()
         }),
@@ -22,15 +22,6 @@ class MainMenu(accessibilityService: SwitchifyAccessibilityService) {
         })
     )
 
-    val menuView = MenuView(accessibilityService, items.toMutableList())
+    val menuView = MenuView(accessibilityService, items)
 
-    // This function is called when the menu is opened
-    fun open() {
-        menuView.open()
-    }
-
-    // This function is called when the menu is closed
-    fun close() {
-        menuView.close()
-    }
 }
diff --git a/app/src/main/java/com/enaboapps/switchify/service/menu/menus/SwipeMenu.kt b/app/src/main/java/com/enaboapps/switchify/service/menu/menus/SwipeMenu.kt
@@ -7,7 +7,7 @@ import com.enaboapps.switchify.service.menu.MenuManager
 import com.enaboapps.switchify.service.menu.MenuView
 
 class SwipeMenu(accessibilityService: SwitchifyAccessibilityService) {
-    private var items: List<MenuItem> = listOf(
+    private val items: List<MenuItem> = listOf(
         MenuItem("Swipe Up", {
             GestureManager.getInstance().performSwipe(GestureManager.SwipeDirection.UP)
         }),
@@ -28,15 +28,6 @@ class SwipeMenu(accessibilityService: SwitchifyAccessibilityService) {
         })
     )
 
-    val menuView = MenuView(accessibilityService, items.toMutableList())
-
-    // This function is called when the menu is opened
-    fun open() {
-        menuView.open()
-    }
-
-    // This function is called when the menu is closed
-    fun close() {
-        menuView.close()
-    }
+    val menuView = MenuView(accessibilityService, items)
+
 }
diff --git a/app/src/main/java/com/enaboapps/switchify/service/menu/menus/SystemControlMenu.kt b/app/src/main/java/com/enaboapps/switchify/service/menu/menus/SystemControlMenu.kt
@@ -7,7 +7,7 @@ import com.enaboapps.switchify.service.menu.MenuView
 
 class SystemControlMenu(accessibilityService: AccessibilityService) {
 
-    private var items: List<MenuItem> = listOf(
+    private val items: List<MenuItem> = listOf(
         MenuItem("Back", {
             // Perform the back action
             accessibilityService.performGlobalAction(AccessibilityService.GLOBAL_ACTION_BACK)
@@ -36,16 +36,6 @@ class SystemControlMenu(accessibilityService: AccessibilityService) {
         })
     )
 
-    val menuView = MenuView(accessibilityService, items.toMutableList())
-
-    // This function is called when the menu is opened
-    fun open() {
-        menuView.open()
-    }
-
-    // This function is called when the menu is closed
-    fun close() {
-        menuView.close()
-    }
+    val menuView = MenuView(accessibilityService, items)
 
 }