diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/activity/MainActivity.kt b/app/src/main/kotlin/jackall/overlaymulticounter/activity/MainActivity.kt index ef499bf..6c55a96 100644 --- a/app/src/main/kotlin/jackall/overlaymulticounter/activity/MainActivity.kt +++ b/app/src/main/kotlin/jackall/overlaymulticounter/activity/MainActivity.kt @@ -94,4 +94,8 @@ val intent = Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:jackall.overlaymulticounter")) startActivityForResult(intent, 0) } + + override fun finish() { + super.finish() + } } diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/contract/MainContract.kt b/app/src/main/kotlin/jackall/overlaymulticounter/contract/MainContract.kt index ba3d588..a29e8d2 100644 --- a/app/src/main/kotlin/jackall/overlaymulticounter/contract/MainContract.kt +++ b/app/src/main/kotlin/jackall/overlaymulticounter/contract/MainContract.kt @@ -7,4 +7,5 @@ fun openSetting() fun startService() fun stopService() + fun finish() } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt index 436f8b1..b2fecfe 100644 --- a/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt +++ b/app/src/main/kotlin/jackall/overlaymulticounter/viewmodel/MainViewModel.kt @@ -1,15 +1,11 @@ package jackall.overlaymulticounter.viewmodel -import android.app.Activity import android.app.AlertDialog import android.arch.lifecycle.LifecycleObserver import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModelProvider import android.content.DialogInterface -import android.content.Intent import android.databinding.BindingAdapter -import android.net.Uri -import android.provider.Settings import android.support.v7.widget.DividerItemDecoration import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView @@ -22,7 +18,6 @@ import jackall.overlaymulticounter.contract.CounterContract import jackall.overlaymulticounter.contract.MainContract import jackall.overlaymulticounter.db.CounterRealmHelper -import jackall.overlaymulticounter.service.MainService import jackall.overlaymulticounter.utils.AdUtil import jackall.overlaymulticounter.utils.RuntimePermissionUtil import jackall.overlaymulticounter.utils.ServiceUtil @@ -76,7 +71,7 @@ } fun onClickClose(view: View) { - (view.context as Activity).finish() + contract.finish() } fun onClickAdd(view: View) {