Rename EditPageScreen to CropScreen

2026-05-07 17:00:24 +02:00
parent c43e4e73ad
commit f234d50a2a
12 changed files with 41 additions and 41 deletions
--- a/app/src/main/java/org/fairscan/app/MainActivity.kt
+++ b/app/src/main/java/org/fairscan/app/MainActivity.kt
@@ -55,7 +55,7 @@ import org.fairscan.app.ui.Navigation
 import org.fairscan.app.ui.Screen
 import org.fairscan.app.ui.components.rememberCameraPermissionState
 import org.fairscan.app.ui.screens.document.DocumentScreen
-import org.fairscan.app.ui.screens.edit.EditPageScreen
+import org.fairscan.app.ui.screens.crop.CropScreen
 import org.fairscan.app.ui.screens.LibrariesScreen
 import org.fairscan.app.ui.screens.about.AboutEvent
 import org.fairscan.app.ui.screens.about.AboutScreen
@@ -180,7 +180,7 @@ class MainActivity : ComponentActivity() {
                        )
                    }
                    is Screen.Main.EditImage -> {
-                        EditPageScreen(
+                        CropScreen(
                            pageId = documentUiState.currentPage?.key?.pageId ?: "",
                            initState = cropInitialState,
                            navigation = navigation,
--- a/app/src/main/java/org/fairscan/app/MainViewModel.kt
+++ b/app/src/main/java/org/fairscan/app/MainViewModel.kt
@@ -44,7 +44,7 @@ import org.fairscan.app.ui.NavigationState
 import org.fairscan.app.ui.Screen
 import org.fairscan.app.ui.screens.document.CurrentPageUiState
 import org.fairscan.app.ui.screens.document.DocumentUiState
-import org.fairscan.app.ui.screens.edit.CropInitState
+import org.fairscan.app.ui.screens.crop.CropInitState
 import org.fairscan.app.ui.state.DocumentUiModel
 import org.fairscan.app.ui.state.PageThumbnail
 import org.fairscan.imageprocessing.ColorMode
--- a/app/src/main/java/org/fairscan/app/ui/screens/edit/EditPageScreen.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/edit/EditPageScreen.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import android.annotation.SuppressLint
 import android.content.res.Configuration
@@ -64,13 +64,13 @@ import org.fairscan.imageprocessing.Quad
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
@OptIn(ExperimentalMaterial3Api::class)
@Composable
-fun EditPageScreen(
+fun CropScreen(
    pageId: String,
    initState: CropInitState,
    navigation: Navigation,
    onUpdatePageQuad: (Quad) -> Unit,
 ) {
-    val state = remember(pageId) { EditPageScreenState() }
+    val state = remember(pageId) { CropScreenState() }
    val quadHandler = remember { QuadEditingHandler() }

    if (initState is CropInitState.Ready && initState.pageId == pageId && state.bitmap == null) {
@@ -145,7 +145,7 @@ private fun ActionButtons(

@Composable
 private fun DragQuadOverlay(
-    state: EditPageScreenState,
+    state: CropScreenState,
    quadHandler: QuadEditingHandler,
    bmp: Bitmap
 ) {
@@ -154,7 +154,7 @@ private fun DragQuadOverlay(
    val containerSize = state.containerSize!!
    val displaySize = QuadCoordinateUtils.calculateDisplaySize(bmp.width, bmp.height, containerSize)
    val liftWiggleThresholdPx = with(LocalDensity.current) {
-        EditPageScreenState.LIFT_WIGGLE_MAX_DISTANCE.toPx()
+        CropScreenState.LIFT_WIGGLE_MAX_DISTANCE.toPx()
    }

    QuadOverlay(
@@ -238,7 +238,7 @@ private fun DragQuadOverlay(
 }

@Composable
-private fun DragMagnifyingGlass(state: EditPageScreenState) {
+private fun DragMagnifyingGlass(state: CropScreenState) {
    // showLoupe becomes true immediately on touch-down and stays true for
    // one additional second after the finger is lifted.
    val showLoupe = remember { mutableStateOf(false) }
@@ -314,7 +314,7 @@ fun EditPageScreenPreview() {
            BitmapFactory.decodeStream(input)
        }
        val quad = Quad(Point(.1, .1), Point(.9, .1), Point(.9, .9), Point(.1, .9))
-        EditPageScreen(
+        CropScreen(
            pageId = "123",
            initState = CropInitState.Ready("123",dummyImage, quad),
            navigation = dummyNavigation(),
--- a/app/src/main/java/org/fairscan/app/ui/screens/edit/EditPageScreenState.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/edit/EditPageScreenState.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import android.graphics.Bitmap
 import androidx.compose.runtime.getValue
@@ -34,7 +34,7 @@ sealed interface CropInitState {
    ) : CropInitState
 }

-class EditPageScreenState {
+class CropScreenState {
    companion object {
        val LIFT_WIGGLE_MAX_DISTANCE = 8.dp
        const val LIFT_WIGGLE_WINDOW_MS = 70L
--- a/app/src/main/java/org/fairscan/app/ui/screens/crop/MagnifyingGlass.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/crop/MagnifyingGlass.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import android.graphics.Bitmap
 import androidx.compose.foundation.Canvas
--- a/app/src/main/java/org/fairscan/app/ui/screens/crop/QuadCoordinateUtils.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/crop/QuadCoordinateUtils.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.IntSize
--- a/app/src/main/java/org/fairscan/app/ui/screens/crop/QuadEditingHandler.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/crop/QuadEditingHandler.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.IntSize
--- a/app/src/main/java/org/fairscan/app/ui/screens/crop/QuadOverlay.kt
+++ b/app/src/main/java/org/fairscan/app/ui/screens/crop/QuadOverlay.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.layout.fillMaxSize
--- a/app/src/test/java/org/fairscan/app/ui/screens/crop/EditPageScreenStateTest.kt
+++ b/app/src/test/java/org/fairscan/app/ui/screens/crop/EditPageScreenStateTest.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.ui.geometry.Offset
 import org.assertj.core.api.Assertions.assertThat
@@ -42,7 +42,7 @@ class EditPageScreenStateTest {

    @Test
    fun initialState_hasCorrectDefaults() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        assertThat(state.bitmap).isNull()
        assertThat(state.containerSize).isNull()
@@ -57,7 +57,7 @@ class EditPageScreenStateTest {

    @Test
    fun quadUpdates_workCorrectly() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        state.updateQuad(testQuad)
        assertThat(state.editableQuad).isEqualTo(testQuad)
@@ -68,7 +68,7 @@ class EditPageScreenStateTest {

    @Test
    fun cornerDragging_managesStateCorrectly() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        // Corner drag starts correctly
        for (i in 0 until 4) {
@@ -91,7 +91,7 @@ class EditPageScreenStateTest {

    @Test
    fun fullDragCycle_preservesQuadAfterDragEnds() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        assertThat(state.isDragging()).isFalse()
        state.startCornerDrag(1)
@@ -108,7 +108,7 @@ class EditPageScreenStateTest {

    @Test
    fun onTouchDown_setsIsTouchingAndDragPosition() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        val pos = Offset(100f, 200f)

        state.onTouchDown(pos)
@@ -120,7 +120,7 @@ class EditPageScreenStateTest {

    @Test
    fun onTouchDown_withCornerIndex_storesCornerIndex() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        state.onTouchDown(Offset(50f, 50f), cornerIndex = 2)

@@ -131,7 +131,7 @@ class EditPageScreenStateTest {
    @Test
    fun onTouchDown_withEdgeIndex_storesEdgeIndex() {
        // Edge index no longer exists; onTouchDown with no corner index leaves touchDownCornerIndex as -1.
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        state.onTouchDown(Offset(50f, 50f))

@@ -141,7 +141,7 @@ class EditPageScreenStateTest {

    @Test
    fun onTouchDown_overwritesPreviousTouchDown() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.onTouchDown(Offset(10f, 10f), cornerIndex = 0)

        state.onTouchDown(Offset(50f, 50f), cornerIndex = 3)
@@ -154,7 +154,7 @@ class EditPageScreenStateTest {

    @Test
    fun onTouchUp_clearsIsTouchingAndTouchDownIndices() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.onTouchDown(Offset(100f, 200f), cornerIndex = 1)

        state.onTouchUp()
@@ -165,7 +165,7 @@ class EditPageScreenStateTest {

    @Test
    fun onTouchUp_preservesDragPosition() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        val pos = Offset(100f, 200f)
        state.onTouchDown(pos, cornerIndex = 1)

@@ -177,7 +177,7 @@ class EditPageScreenStateTest {

    @Test
    fun onTouchUp_whenNotTouching_isIdempotent() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        state.onTouchUp()

@@ -189,7 +189,7 @@ class EditPageScreenStateTest {

    @Test
    fun endDrag_preservesDragPosition() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.setInitialQuad(testQuad)
        val pos = Offset(100f, 200f)
        state.onTouchDown(pos, cornerIndex = 0)
@@ -205,7 +205,7 @@ class EditPageScreenStateTest {

    @Test
    fun endDrag_doesNotResetTouchDownIndices() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.setInitialQuad(testQuad)
        state.onTouchDown(Offset(100f, 200f), cornerIndex = 2)
        state.startCornerDrag(2)
@@ -218,7 +218,7 @@ class EditPageScreenStateTest {

    @Test
    fun rollbackLastDragStepIfLikelyLiftWiggle_revertsRecentSmallStep() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.updateQuad(testQuad)
        state.startCornerDrag(0)

@@ -232,7 +232,7 @@ class EditPageScreenStateTest {

    @Test
    fun rollbackLastDragStepIfLikelyLiftWiggle_keepsLargeStep() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.updateQuad(testQuad)
        state.startCornerDrag(0)

@@ -246,7 +246,7 @@ class EditPageScreenStateTest {

    @Test
    fun rollbackLastDragStepIfLikelyLiftWiggle_keepsOldSmallStep() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.updateQuad(testQuad)
        state.startCornerDrag(0)

@@ -260,7 +260,7 @@ class EditPageScreenStateTest {

    @Test
    fun endDrag_clearsLastDragStepTracking() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.updateQuad(testQuad)
        state.startCornerDrag(0)

@@ -277,7 +277,7 @@ class EditPageScreenStateTest {

    @Test
    fun tapCycle_leavesStateConsistent() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        val pos = Offset(100f, 200f)

        state.onTouchDown(pos, cornerIndex = 3)
@@ -294,7 +294,7 @@ class EditPageScreenStateTest {

    @Test
    fun dragCycle_corner_leavesStateConsistent() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.setInitialQuad(testQuad)
        val pos = Offset(100f, 200f)

@@ -321,7 +321,7 @@ class EditPageScreenStateTest {
    fun dragCycle_edge_leavesStateConsistent() {
        // Edge dragging is no longer supported; this test verifies that a touch
        // without a valid corner index simply does not trigger a drag.
-        val state = EditPageScreenState()
+        val state = CropScreenState()
        state.setInitialQuad(testQuad)
        val pos = Offset(150f, 80f)

@@ -339,7 +339,7 @@ class EditPageScreenStateTest {

    @Test
    fun consecutiveTaps_eachSetsCorrectTouchDownIndex() {
-        val state = EditPageScreenState()
+        val state = CropScreenState()

        state.onTouchDown(Offset(10f, 10f), cornerIndex = 0)
        assertThat(state.touchDownCornerIndex).isEqualTo(0)
--- a/app/src/test/java/org/fairscan/app/ui/screens/crop/MagnifyingGlassTest.kt
+++ b/app/src/test/java/org/fairscan/app/ui/screens/crop/MagnifyingGlassTest.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.ui.geometry.Offset
 import org.assertj.core.api.Assertions.assertThat
--- a/app/src/test/java/org/fairscan/app/ui/screens/crop/QuadCoordinateUtilsTest.kt
+++ b/app/src/test/java/org/fairscan/app/ui/screens/crop/QuadCoordinateUtilsTest.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.IntSize
--- a/app/src/test/java/org/fairscan/app/ui/screens/crop/QuadEditingHandlerTest.kt
+++ b/app/src/test/java/org/fairscan/app/ui/screens/crop/QuadEditingHandlerTest.kt
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-package org.fairscan.app.ui.screens.edit
+package org.fairscan.app.ui.screens.crop

 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.unit.IntSize