Merge pull request #36 from FourthDing/main

UmerCodez · web-flow · commit 43178038a383 · 2025-11-30T18:38:07.000+05:00
Angle snapping in control pad editor
diff --git a/app/src/androidTest/java/com/github/umer0586/droidpad/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/github/umer0586/droidpad/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.github.umer0586.droidpad
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
diff --git a/app/src/main/java/com/github/umer0586/droidpad/ui/screens/controlpadbuilderscreen/ControlPadBuilderScreen.kt b/app/src/main/java/com/github/umer0586/droidpad/ui/screens/controlpadbuilderscreen/ControlPadBuilderScreen.kt
diff --git a/app/src/main/java/com/github/umer0586/droidpad/ui/screens/controlpadbuilderscreen/ControlPadBuilderScreenViewModel.kt b/app/src/main/java/com/github/umer0586/droidpad/ui/screens/controlpadbuilderscreen/ControlPadBuilderScreenViewModel.kt
@@ -42,6 +42,7 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+import kotlin.math.roundToInt
 
 
 data class ControlPadBuilderScreenState(
@@ -50,8 +51,10 @@ data class ControlPadBuilderScreenState(
     val showItemEditor: Boolean = false,
     val itemToBeEdited: ControlPadItem? = null,
     val transformableStatesMap: SnapshotStateMap<Long, TransformableState> = SnapshotStateMap(),
-    val isModified: Boolean = false
-)
+    val isModified: Boolean = false,
+    val useAngleSnap: Boolean = false,
+    val angleSnapDivision:Int = 36,
+    )
 
 sealed interface ControlPadBuilderScreenEvent {
     data object OnAddItemClick : ControlPadBuilderScreenEvent
@@ -65,6 +68,8 @@ sealed interface ControlPadBuilderScreenEvent {
     data object OnBackPress: ControlPadBuilderScreenEvent
     data class OnResolutionReported(val controlPad: ControlPad, val builderScreenResolution: Resolution, val tempOpen : Boolean = false) : ControlPadBuilderScreenEvent
     data object OnTempOpenCompleted : ControlPadBuilderScreenEvent
+    data object OnUseAngleSnapChange: ControlPadBuilderScreenEvent
+    data class OnAngleSnapChange(val newValue:Float) : ControlPadBuilderScreenEvent
 
 }
 
@@ -91,6 +96,13 @@ class ControlPadBuilderScreenViewModel @Inject constructor(
         Log.d(tag,"onCleared() ${hashCode()}")
     }
 
+    private fun snappedRotation(input: Float): Float {
+        return input.div(360)
+            .times(_uiState.value.angleSnapDivision)// Scale the input into [-angleSnapDivision,angleSnapDivision]
+            .roundToInt()// Snap!
+            .times(360).toFloat()
+            .div(_uiState.value.angleSnapDivision)// Scale back to normal and convert
+    }
     fun loadControlPadItemsFor(controlPad: ControlPad){
         _uiState.update {
             it.copy(isModified = false)
@@ -101,6 +113,8 @@ class ControlPadBuilderScreenViewModel @Inject constructor(
                 Log.d(tag, items.toString())
                 _uiState.value.controlPadItems.clear()
                 items.forEach { item ->
+                    var temporalRotation: Float =item.rotation// I have little understanding on kotlin, thanks closure isolation
+
                     uiState.value.controlPadItems.add(item)
                     uiState.value.transformableStatesMap[item.id] =
                         TransformableState { zoomChange, offsetChange, rotationChange ->
@@ -110,15 +124,29 @@ class ControlPadBuilderScreenViewModel @Inject constructor(
                             val controlPadItem = uiState.value.controlPadItems[index]
 
                             val newScale = controlPadItem.scale * zoomChange
-                            val newRotation = controlPadItem.rotation + rotationChange
-                            val newOffset = controlPadItem.offset + offsetChange.rotateBy(newRotation) * newScale
+
+                            val newRotation = if(controlPadItem.itemType == ItemType.JOYSTICK || controlPadItem.itemType == ItemType.STEERING_WHEEL) 0f
+                                else if (_uiState.value.useAngleSnap){ temporalRotation + rotationChange }
+                                else{ controlPadItem.rotation + rotationChange }
+
+                            temporalRotation = newRotation
+                            
+                            val snappedNewRotation = snappedRotation(newRotation)
+
+                            val newOffset = controlPadItem.offset + offsetChange.rotateBy(
+                                if (rotationChange == 0f) controlPadItem.rotation
+                                else if (_uiState.value.useAngleSnap) snappedNewRotation
+                                else newRotation
+                            ) * newScale
 
                             uiState.value.controlPadItems[index] =
                                 controlPadItem.copy(
                                     offsetX = newOffset.x,
                                     offsetY = newOffset.y,
                                     // Joystick and steering wheel should not be rotatable
-                                    rotation = if(controlPadItem.itemType == ItemType.JOYSTICK || controlPadItem.itemType == ItemType.STEERING_WHEEL) 0f else newRotation,
+                                    rotation = if (rotationChange == 0f) controlPadItem.rotation
+                                            else if (_uiState.value.useAngleSnap) snappedNewRotation
+                                            else newRotation,
                                     scale = newScale.coerceIn(minScale,maxScale)
                                 )
 
@@ -198,29 +226,41 @@ class ControlPadBuilderScreenViewModel @Inject constructor(
                     properties = event.properties
                 )
                 viewModelScope.launch {
+                    var temporalRotation: Float =newItem.rotation
                     controlPadItemRepository.save(newItem).also { newId ->
                         controlPadItemRepository.getById(newId).also { newItem ->
 
                             uiState.value.controlPadItems.add(newItem!!)
 
-
                             uiState.value.transformableStatesMap[newItem.id] =
                                 TransformableState { zoomChange, offsetChange, rotationChange ->
-
                                     val index = uiState.value.controlPadItems.indexOfFirst { it.id == newItem.id }
-
                                     val controlPadItem = uiState.value.controlPadItems[index]
 
                                     val newScale = controlPadItem.scale * zoomChange
-                                    val newRotation = controlPadItem.rotation + rotationChange
-                                    val newOffset = controlPadItem.offset + offsetChange.rotateBy(newRotation) * newScale
+
+                                    val newRotation = if(controlPadItem.itemType == ItemType.JOYSTICK || controlPadItem.itemType == ItemType.STEERING_WHEEL) 0f
+                                    else if (_uiState.value.useAngleSnap){ temporalRotation + rotationChange }
+                                    else{ controlPadItem.rotation + rotationChange }
+
+                                    temporalRotation = newRotation
+
+                                    val snappedNewRotation = snappedRotation(newRotation)
+
+                                    val newOffset = controlPadItem.offset + offsetChange.rotateBy(
+                                        if (rotationChange == 0f) controlPadItem.rotation
+                                        else if (_uiState.value.useAngleSnap) snappedNewRotation
+                                        else newRotation
+                                    ) * newScale
 
                                     uiState.value.controlPadItems[index] =
                                         controlPadItem.copy(
                                             offsetX = newOffset.x,
                                             offsetY = newOffset.y,
                                             // Joystick and steering wheel should not be rotatable
-                                            rotation = if(controlPadItem.itemType == ItemType.JOYSTICK || controlPadItem.itemType == ItemType.STEERING_WHEEL) 0f else newRotation,
+                                            rotation = if (rotationChange == 0f) controlPadItem.rotation
+                                            else if (_uiState.value.useAngleSnap) snappedNewRotation
+                                            else newRotation,
                                             scale = newScale.coerceIn(minScale,maxScale)
                                         )
 
@@ -260,6 +300,18 @@ class ControlPadBuilderScreenViewModel @Inject constructor(
 
             }
 
+            is ControlPadBuilderScreenEvent.OnUseAngleSnapChange ->{
+                _uiState.update {
+                    it.copy(useAngleSnap = !it.useAngleSnap)
+                }
+            }
+            is ControlPadBuilderScreenEvent.OnAngleSnapChange -> {
+                _uiState.update {
+                    it.copy(angleSnapDivision = event.newValue.toInt())
+                }
+            }
+
+
             ControlPadBuilderScreenEvent.OnBackPress -> {}
             ControlPadBuilderScreenEvent.OnTempOpenCompleted -> {}
         }
diff --git a/app/src/test/java/com/github/umer0586/droidpad/MigrationTest.kt b/app/src/test/java/com/github/umer0586/droidpad/MigrationTest.kt
@@ -14,7 +14,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import kotlin.jvm.Throws
 
 @RunWith(RobolectricTestRunner::class)
 class MigrationTest {
diff --git a/app/src/test/java/com/github/umer0586/droidpad/connectiontests/WebsocketConnectionTest.kt b/app/src/test/java/com/github/umer0586/droidpad/connectiontests/WebsocketConnectionTest.kt
@@ -3,8 +3,8 @@ package com.github.umer0586.droidpad.connectiontests
 import app.cash.turbine.test
 import com.github.umer0586.droidpad.MainDispatcherRule
 import com.github.umer0586.droidpad.data.connection.ConnectionState
-import com.github.umer0586.droidpad.data.connectionconfig.WebsocketConfig
 import com.github.umer0586.droidpad.data.connection.WebsocketConnection
+import com.github.umer0586.droidpad.data.connectionconfig.WebsocketConfig
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.runTest
@@ -17,7 +17,6 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
-import java.lang.Exception
 import java.net.InetSocketAddress
 
 @Ignore("This Tests times out with 'gradlew test' but works fine when run manually")
diff --git a/app/src/test/java/com/github/umer0586/droidpad/daotests/ConnectionConfigDaoTest.kt b/app/src/test/java/com/github/umer0586/droidpad/daotests/ConnectionConfigDaoTest.kt
@@ -2,8 +2,8 @@ package com.github.umer0586.droidpad.daotests
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
-import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.MainDispatcherRule
+import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.data.database.dao.ConnectionConfigurationDao
 import com.github.umer0586.droidpad.data.database.dao.ControlPadDao
 import com.github.umer0586.droidpad.data.database.entities.ConnectionConfig
diff --git a/app/src/test/java/com/github/umer0586/droidpad/daotests/ControlPadDaoTest.kt b/app/src/test/java/com/github/umer0586/droidpad/daotests/ControlPadDaoTest.kt
@@ -2,8 +2,8 @@ package com.github.umer0586.droidpad.daotests
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
-import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.MainDispatcherRule
+import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.data.database.dao.ControlPadDao
 import com.github.umer0586.droidpad.data.database.dao.ControlPadItemDao
 import com.github.umer0586.droidpad.data.database.entities.ControlPad
diff --git a/app/src/test/java/com/github/umer0586/droidpad/daotests/ControlPadItemDaoTest.kt b/app/src/test/java/com/github/umer0586/droidpad/daotests/ControlPadItemDaoTest.kt
@@ -2,15 +2,14 @@ package com.github.umer0586.droidpad.daotests
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
-import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.MainDispatcherRule
+import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.data.database.dao.ControlPadDao
 import com.github.umer0586.droidpad.data.database.dao.ControlPadItemDao
 import com.github.umer0586.droidpad.data.database.entities.ControlPad
 import com.github.umer0586.droidpad.data.database.entities.ControlPadItem
 import com.github.umer0586.droidpad.data.database.entities.ItemType
 import com.github.umer0586.droidpad.data.database.entities.Orientation
-
 import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Assert.assertEquals
diff --git a/app/src/test/java/com/github/umer0586/droidpad/repositorytests/ControlPadRepositoryImpTest.kt b/app/src/test/java/com/github/umer0586/droidpad/repositorytests/ControlPadRepositoryImpTest.kt
@@ -2,8 +2,8 @@ package com.github.umer0586.droidpad.repositorytests
 
 import androidx.room.Room
 import androidx.test.core.app.ApplicationProvider
-import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.MainDispatcherRule
+import com.github.umer0586.droidpad.data.database.AppDatabase
 import com.github.umer0586.droidpad.data.database.entities.ControlPad
 import com.github.umer0586.droidpad.data.database.entities.ControlPadItem
 import com.github.umer0586.droidpad.data.database.entities.ItemType
diff --git a/app/src/test/java/com/github/umer0586/droidpad/uitests/ItemEditorTest.kt b/app/src/test/java/com/github/umer0586/droidpad/uitests/ItemEditorTest.kt
@@ -7,11 +7,11 @@ import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextReplacement
-import com.github.umer0586.droidpad.data.database.entities.ControlPadItem
-import com.github.umer0586.droidpad.data.database.entities.ItemType
 import com.github.umer0586.droidpad.data.ButtonProperties
 import com.github.umer0586.droidpad.data.LabelProperties
 import com.github.umer0586.droidpad.data.SliderProperties
+import com.github.umer0586.droidpad.data.database.entities.ControlPadItem
+import com.github.umer0586.droidpad.data.database.entities.ItemType
 import com.github.umer0586.droidpad.ui.components.propertieseditor.ItemPropertiesEditorSheet
 import org.junit.Assert.assertEquals
 import org.junit.Assert.fail
