Finish Basic Touchpad on Android

android/app/src/main/java/com/metallic/chiaki/lib/Chiaki.kt

@@ -165,7 +165,7 @@ data class ControllerState constructor(
 	var leftY: Short = 0,
 	var rightX: Short = 0,
 	var rightY: Short = 0,
-	private var touchIdNext: UByte = 100U,
+	private var touchIdNext: UByte = 0U,
 	var touches: Array<ControllerTouch> = arrayOf(ControllerTouch(), ControllerTouch()),
 	var gyroX: Float = 0.0f,
 	var gyroY: Float = 0.0f,
@@ -280,7 +280,8 @@ data class ControllerState constructor(
 			.find { it.id < 0 }
 			?.also {
 				it.id = touchIdNext.toByte()
-				Log.d("TouchId", "touch id next: $touchIdNext")
+				it.x = x
+				it.y = y
 				touchIdNext = ((touchIdNext + 1U) and 0x7fU).toUByte()
 			}?.id?.toUByte()
 

android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt

@@ -22,6 +22,7 @@ import com.metallic.chiaki.databinding.ActivityStreamBinding
 import com.metallic.chiaki.lib.ConnectInfo
 import com.metallic.chiaki.lib.ConnectVideoProfile
 import com.metallic.chiaki.session.*
+import com.metallic.chiaki.touchcontrols.DefaultTouchControlsFragment
 import com.metallic.chiaki.touchcontrols.TouchControlsFragment
 import com.metallic.chiaki.touchcontrols.TouchpadOnlyFragment
 import io.reactivex.disposables.CompositeDisposable
@@ -120,20 +121,14 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
 	override fun onAttachFragment(fragment: Fragment)
 	{
 		super.onAttachFragment(fragment)
-		when(fragment)
+		if(fragment is TouchControlsFragment)
 		{
-			is TouchControlsFragment ->
-			{
-				fragment.controllerState
-					.subscribe { viewModel.input.touchControllerState = it }
-					.addTo(controlsDisposable)
-				fragment.onScreenControlsEnabled = viewModel.onScreenControlsEnabled
-			}
-			is TouchpadOnlyFragment ->
-			{
-				fragment.controllerStateCallback = { viewModel.input.touchControllerState = it }
+			fragment.controllerState
+				.subscribe { viewModel.input.touchControllerState = it }
+				.addTo(controlsDisposable)
+			fragment.onScreenControlsEnabled = viewModel.onScreenControlsEnabled
+			if(fragment is TouchpadOnlyFragment)
 				fragment.touchpadOnlyEnabled = viewModel.touchpadOnlyEnabled
-			}
 		}
 	}
 

android/app/src/main/java/com/metallic/chiaki/touchcontrols/TouchControlsFragment.kt

@@ -12,14 +12,14 @@ import androidx.lifecycle.Observer
 import com.metallic.chiaki.databinding.FragmentControlsBinding
 import com.metallic.chiaki.lib.ControllerState
 import io.reactivex.Observable
-import io.reactivex.Observable.combineLatest
+import io.reactivex.rxkotlin.Observables.combineLatest
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 
-class TouchControlsFragment : Fragment()
+abstract class TouchControlsFragment : Fragment()
 {
-	private var ownControllerState = ControllerState()
-		private set(value)
+	protected var ownControllerState = ControllerState()
+		set(value)
 		{
 			val diff = field != value
 			field = value
@@ -27,17 +27,20 @@ class TouchControlsFragment : Fragment()
 				ownControllerStateSubject.onNext(ownControllerState)
 		}
 
-	private val ownControllerStateSubject: Subject<ControllerState>
+	protected val ownControllerStateSubject: Subject<ControllerState>
 			= BehaviorSubject.create<ControllerState>().also { it.onNext(ownControllerState) }
 
 	// to delay attaching to the touchpadView until it's available
-	private val controllerStateProxy: Subject<Observable<ControllerState>>
-		= BehaviorSubject.create<Observable<ControllerState>>().also { it.onNext(ownControllerStateSubject) }
+	protected val controllerStateProxy: Subject<Observable<ControllerState>>
+			= BehaviorSubject.create<Observable<ControllerState>>().also { it.onNext(ownControllerStateSubject) }
 	val controllerState: Observable<ControllerState> get() =
 		controllerStateProxy.flatMap { it }
 
 	var onScreenControlsEnabled: LiveData<Boolean>? = null
+}
 
+class DefaultTouchControlsFragment : TouchControlsFragment()
+{
 	private var _binding: FragmentControlsBinding? = null
 	private val binding get() = _binding!!
 

android/app/src/main/java/com/metallic/chiaki/touchcontrols/TouchpadOnlyFragment.kt

@@ -6,26 +6,14 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.fragment.app.Fragment
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
-import com.metallic.chiaki.R
-import com.metallic.chiaki.databinding.FragmentControlsBinding
 import com.metallic.chiaki.databinding.FragmentTouchpadOnlyBinding
 import com.metallic.chiaki.lib.ControllerState
+import io.reactivex.rxkotlin.Observables.combineLatest
 
-class TouchpadOnlyFragment : Fragment()
+class TouchpadOnlyFragment : TouchControlsFragment()
 {
-	private var controllerState = ControllerState()
-		private set(value)
-		{
-			val diff = field != value
-			field = value
-			if(diff)
-				controllerStateCallback?.let { it(value) }
-		}
-
-	var controllerStateCallback: ((ControllerState) -> Unit)? = null
 	var touchpadOnlyEnabled: LiveData<Boolean>? = null
 
 	private var _binding: FragmentTouchpadOnlyBinding? = null
@@ -34,6 +22,9 @@ class TouchpadOnlyFragment : Fragment()
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View =
 		FragmentTouchpadOnlyBinding.inflate(inflater, container, false).let {
 			_binding = it
+			controllerStateProxy.onNext(
+				combineLatest(ownControllerStateSubject, binding.touchpadView.controllerState) { a, b -> a or b }
+			)
 			it.root
 		}
 
@@ -49,13 +40,12 @@ class TouchpadOnlyFragment : Fragment()
 	}
 
 	private fun buttonStateChanged(buttonMask: UInt) = { pressed: Boolean ->
-		controllerState = controllerState.copy().apply {
+		ownControllerState = ownControllerState.copy().apply {
 			buttons =
 				if(pressed)
 					buttons or buttonMask
 				else
 					buttons and buttonMask.inv()
-
 		}
 	}
 }

android/app/src/main/java/com/metallic/chiaki/touchcontrols/TouchpadView.kt

@@ -86,6 +86,7 @@ class TouchpadView @JvmOverloads constructor(
 
 	private fun triggerStateChanged()
 	{
+		invalidate()
 		stateSubject.onNext(state)
 	}
 }

android/app/src/main/res/layout/activity_stream.xml

@@ -28,7 +28,7 @@
 
     <fragment
         android:id="@+id/controlsFragment"
-        android:name="com.metallic.chiaki.touchcontrols.TouchControlsFragment"
+        android:name="com.metallic.chiaki.touchcontrols.DefaultTouchControlsFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 

android/app/src/main/res/layout/fragment_touchpad_only.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,9 +15,9 @@
 
     <com.metallic.chiaki.touchcontrols.ButtonView
         android:id="@+id/touchpadButtonView"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginEnd="32dp"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:padding="8dp"
         app:drawableIdle="@drawable/control_button_touchpad"
@@ -24,4 +25,17 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <com.metallic.chiaki.touchcontrols.TouchpadView
+        android:id="@+id/touchpadView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:drawable="@drawable/control_touchpad"
+        app:layout_constraintDimensionRatio="1920:942"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_marginLeft="80dp"
+        android:layout_marginRight="80dp"/>
+
 </androidx.constraintlayout.widget.ConstraintLayout>