diff --git a/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt b/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt index b497135..e3cea4c 100644 --- a/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt +++ b/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt @@ -6,4 +6,5 @@ interface MainServiceContract { fun showMoveView() fun showRegistView() + fun finish() } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt index 9ebb4cb..ab1807b 100644 --- a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt +++ b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt @@ -174,12 +174,16 @@ if (moveOverlayView.isShown) { windowManager.removeView(moveOverlayView) } - if (moveOverlayView.isShown) { - windowManager.removeView(moveOverlayView) + if (registBinding.root.isShown) { + windowManager.removeView(registBinding.root) } registBinding.registViewModel?.realmInstanceClose() } + override fun finish() { + stopSelf() + } + override fun onBind(intent: Intent?): IBinder? { return null } diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt index 7af0378..5abeedd 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt @@ -16,6 +16,10 @@ mainServiceContract.showMoveView() } + fun onClickFinish(view: View) { + mainServiceContract.finish() + } + fun realmInstanceClose() { templeRealmHelper.close() fruitRealmHelper.close() diff --git a/app/src/main/res/layout/regist_overlay.xml b/app/src/main/res/layout/regist_overlay.xml index b864156..f3d1a1d 100644 --- a/app/src/main/res/layout/regist_overlay.xml +++ b/app/src/main/res/layout/regist_overlay.xml @@ -34,5 +34,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/regist_btn" /> +