diff --git a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt index e74d903..629601f 100644 --- a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt +++ b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt @@ -3,6 +3,7 @@ import android.app.Service import android.content.Context import android.content.Intent +import android.databinding.DataBindingUtil import android.graphics.PixelFormat import android.graphics.Point import android.os.Build @@ -13,7 +14,9 @@ import jackall.moncalc.R import jackall.moncalc.common.PreferenceKeys import jackall.moncalc.common.PreferenceNames +import jackall.moncalc.databinding.RegistOverlayBinding import jackall.moncalc.utils.MySharedPref +import jackall.moncalc.viewmodel.OverlayRegistViewModel /** * Created by matsumoto_k on 2017/11/01. @@ -22,7 +25,9 @@ val mySharedPref by lazy { MySharedPref(this, PreferenceNames.CONFIG) } val moveOverlayView: ViewGroup by lazy { LayoutInflater.from(this).inflate(R.layout.move_overlay, null) as ViewGroup } - val registOverlayView: ViewGroup by lazy { LayoutInflater.from(this).inflate(R.layout.regist_overlay, null) as ViewGroup } + val registBinding by lazy { + DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.regist_overlay, null, false) + } val windowManager: WindowManager by lazy { applicationContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager } var moveViewParams: WindowManager.LayoutParams? = null var registViewParams: WindowManager.LayoutParams? = null @@ -97,6 +102,8 @@ PixelFormat.TRANSLUCENT) } + registBinding.registViewModel = OverlayRegistViewModel() + registViewParams?.gravity = Gravity.TOP } @@ -104,8 +111,8 @@ moveViewParams?.x = mySharedPref.getValue(PreferenceKeys.VIEWX, Int::class.java, 0) as Int moveViewParams?.y = mySharedPref.getValue(PreferenceKeys.VIEWY, Int::class.java, 0) as Int - if (registOverlayView.isShown) { - windowManager.removeView(registOverlayView) + if (registBinding.root.isShown) { + windowManager.removeView(registBinding.root) } windowManager.addView(moveOverlayView, moveViewParams) @@ -116,7 +123,7 @@ windowManager.removeView(moveOverlayView) } - windowManager.addView(registOverlayView, registViewParams) + windowManager.addView(registBinding.root, registViewParams) } private fun setMoveViewClickListener(): View.() -> Unit {