From 51d2e5077efb461e69cbc84263e4584671e61a1c Mon Sep 17 00:00:00 2001 From: Henrik Klev Date: Wed, 18 Sep 2024 10:10:39 +0200 Subject: [PATCH] Can now shut down the ECR on Device application --- app/src/main/java/com/pax/ecr/app/AdminAction.kt | 1 + app/src/main/java/com/pax/ecr/app/MainActivity.kt | 4 ++++ .../main/java/com/pax/ecr/app/ui/screen/common/AdminMenu.kt | 5 +++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/pax/ecr/app/AdminAction.kt b/app/src/main/java/com/pax/ecr/app/AdminAction.kt index fc2bc8d..20bd9c2 100644 --- a/app/src/main/java/com/pax/ecr/app/AdminAction.kt +++ b/app/src/main/java/com/pax/ecr/app/AdminAction.kt @@ -8,4 +8,5 @@ enum class AdminAction { OPEN_CONFIG_MENU, TEMPORARY_SHOW, MODE_SELECTOR, + SHUTDOWN, } diff --git a/app/src/main/java/com/pax/ecr/app/MainActivity.kt b/app/src/main/java/com/pax/ecr/app/MainActivity.kt index a8319ee..25e7df0 100644 --- a/app/src/main/java/com/pax/ecr/app/MainActivity.kt +++ b/app/src/main/java/com/pax/ecr/app/MainActivity.kt @@ -177,6 +177,10 @@ class MainActivity : ComponentActivity() { AdminAction.MODE_SELECTOR -> { selectedMode = null } + + AdminAction.SHUTDOWN -> { + this.finishAndRemoveTask() + } } } diff --git a/app/src/main/java/com/pax/ecr/app/ui/screen/common/AdminMenu.kt b/app/src/main/java/com/pax/ecr/app/ui/screen/common/AdminMenu.kt index 6b35f4e..08deaf4 100644 --- a/app/src/main/java/com/pax/ecr/app/ui/screen/common/AdminMenu.kt +++ b/app/src/main/java/com/pax/ecr/app/ui/screen/common/AdminMenu.kt @@ -48,10 +48,11 @@ fun AdminMenu( modifier = Modifier.padding(vertical = 24.dp), ) { AdminMenuButton("Admin Menu") { actionHandler(AdminAction.OPEN_ADMIN_MENU) } - AdminMenuButton("Show payment app") { actionHandler(AdminAction.MOVE_TO_FRONT) } - AdminMenuButton("Temporarily show payment app") { actionHandler(AdminAction.TEMPORARY_SHOW) } AdminMenuButton("Configuration") { actionHandler(AdminAction.OPEN_CONFIG_MENU) } AdminMenuButton("Go to mode selector") { actionHandler(AdminAction.MODE_SELECTOR) } + AdminMenuButton("Show payment app") { actionHandler(AdminAction.MOVE_TO_FRONT) } + AdminMenuButton("Shutdown ECR on Device") { actionHandler(AdminAction.SHUTDOWN) } + AdminMenuButton("Temporarily show payment app") { actionHandler(AdminAction.TEMPORARY_SHOW) } } } }