diff --git a/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt b/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt new file mode 100644 index 0000000..b497135 --- /dev/null +++ b/app/src/main/kotlin/jackall/moncalc/Contract/MainServiceContract.kt @@ -0,0 +1,9 @@ +package jackall.moncalc.Contract + +/** + * Created by matsumoto_k on 2017/11/01. + */ +interface MainServiceContract { + fun showMoveView() + fun showRegistView() +} \ 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 629601f..737aae0 100644 --- a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt +++ b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt @@ -11,6 +11,7 @@ import android.support.v4.app.NotificationCompat import android.view.* import jackall.moncalc.Const +import jackall.moncalc.Contract.MainServiceContract import jackall.moncalc.R import jackall.moncalc.common.PreferenceKeys import jackall.moncalc.common.PreferenceNames @@ -21,7 +22,7 @@ /** * Created by matsumoto_k on 2017/11/01. */ -class MainService : Service() { +class MainService : Service(), MainServiceContract { val mySharedPref by lazy { MySharedPref(this, PreferenceNames.CONFIG) } val moveOverlayView: ViewGroup by lazy { LayoutInflater.from(this).inflate(R.layout.move_overlay, null) as ViewGroup } @@ -102,12 +103,12 @@ PixelFormat.TRANSLUCENT) } - registBinding.registViewModel = OverlayRegistViewModel() + registBinding.registViewModel = OverlayRegistViewModel(this as MainServiceContract) registViewParams?.gravity = Gravity.TOP } - private fun showMoveView() { + override fun showMoveView() { moveViewParams?.x = mySharedPref.getValue(PreferenceKeys.VIEWX, Int::class.java, 0) as Int moveViewParams?.y = mySharedPref.getValue(PreferenceKeys.VIEWY, Int::class.java, 0) as Int @@ -118,7 +119,7 @@ windowManager.addView(moveOverlayView, moveViewParams) } - private fun showRegistView() { + override fun showRegistView() { if (moveOverlayView.isShown) { windowManager.removeView(moveOverlayView) } @@ -171,4 +172,6 @@ override fun onBind(intent: Intent?): IBinder? { return null } + + } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt index 24b0041..135c9f8 100644 --- a/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt +++ b/app/src/main/kotlin/jackall/moncalc/viewmodel/OverlayRegistViewModel.kt @@ -2,12 +2,13 @@ import android.databinding.BaseObservable import android.view.View +import jackall.moncalc.Contract.MainServiceContract /** * Created by matsumoto_k on 2017/11/01. */ -class OverlayRegistViewModel : BaseObservable() { +class OverlayRegistViewModel(val mainServiceContract: MainServiceContract) : BaseObservable() { fun onClickMin(view: View) { - println("onClickMin") + mainServiceContract.showMoveView() } } \ No newline at end of file