diff --git a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt
index ad79a60..4f5c828 100644
--- a/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt
+++ b/app/src/main/kotlin/jackall/moncalc/activity/MainActivity.kt
@@ -1,13 +1,42 @@
package jackall.moncalc.activity
+import android.app.ActivityManager
+import android.content.Context
+import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import jackall.moncalc.R
+import jackall.moncalc.service.MainService
+import kotlinx.android.synthetic.main.activity_main.*
+
class MainActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
+
+ // TODO:レイアウトを決めてdatbinding,viewModelProvidersを有効にする
+ val intent = Intent(this, MainService::class.java)
+
+ start_service_btn.setOnClickListener {
+ if (!isMainServiceRunning())
+ startService(intent)
+ }
+
+ stop_service_btn.setOnClickListener {
+ if (isMainServiceRunning())
+ stopService(intent)
+ }
+ }
+
+ private fun isMainServiceRunning(): Boolean {
+ val manager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+ for (serviceInfo in manager.getRunningServices(Integer.MAX_VALUE)) {
+ if (MainService::class.java.getName() == serviceInfo.service.className) {
+ return true
+ }
+ }
+ return false
}
}
diff --git a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt
index 737aae0..05d248d 100644
--- a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt
+++ b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt
@@ -169,9 +169,17 @@
}
}
+ override fun onDestroy() {
+ super.onDestroy()
+ if (moveOverlayView.isShown) {
+ windowManager.removeView(moveOverlayView)
+ }
+ if (moveOverlayView.isShown) {
+ windowManager.removeView(moveOverlayView)
+ }
+ }
+
override fun onBind(intent: Intent?): IBinder? {
return null
}
-
-
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 334fc21..345feec 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,13 +6,24 @@
android:layout_height="match_parent"
tools:context="jackall.moncalc.activity.MainActivity">
-
+
+