Skip to content

Commit b8e8958

Browse files
committed
🚨 A few detekt fixes
1 parent 30f4db6 commit b8e8958

File tree

14 files changed

+8
-14
lines changed

14 files changed

+8
-14
lines changed

app/src/main/java/co/stonephone/stonecamera/StoneCameraViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,4 +458,4 @@ class StoneCameraViewModelFactory(
458458
}
459459
throw IllegalArgumentException("Unknown ViewModel class")
460460
}
461-
}
461+
}

app/src/main/java/co/stonephone/stonecamera/plugins/AspectRatio.kt renamed to app/src/main/java/co/stonephone/stonecamera/plugins/AspectRatioPlugin.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package co.stonephone.stonecamera.plugins
22

3-
import android.app.Application
43
import android.util.Size
54
import androidx.camera.core.AspectRatio
65
import androidx.camera.core.ImageCapture
@@ -14,7 +13,6 @@ import androidx.compose.material3.MaterialTheme
1413
import androidx.compose.material3.Text
1514
import androidx.compose.ui.Modifier
1615
import androidx.compose.ui.graphics.Color
17-
import androidx.compose.ui.platform.LocalContext
1816
import androidx.compose.ui.text.font.FontWeight
1917
import androidx.compose.ui.unit.dp
2018
import co.stonephone.stonecamera.MyApplication
@@ -91,10 +89,13 @@ class AspectRatioPlugin : IPlugin {
9189
targetSize: Size?, // e.g. 3000×3000 for 1:1
9290
ratio: Float? // e.g. 1.0f for 1:1, 1.333...f for 4:3, etc.
9391
): ResolutionSelector {
92+
val sixteenByNine = 16f / 9f
93+
val fourByThree = 4f / 3f
94+
val wiggleRoom = 0.01f
9495
val aspectRatioConst = when {
9596
ratio == null -> null // “FULL” or unknown
96-
kotlin.math.abs(ratio - (4f / 3f)) < 0.01f -> AspectRatio.RATIO_4_3
97-
kotlin.math.abs(ratio - (16f / 9f)) < 0.01f -> AspectRatio.RATIO_16_9
97+
kotlin.math.abs(ratio - (fourByThree)) < wiggleRoom -> AspectRatio.RATIO_4_3
98+
kotlin.math.abs(ratio - (sixteenByNine)) < wiggleRoom -> AspectRatio.RATIO_16_9
9899
else -> null // e.g. 1:1 or any custom ratio
99100
}
100101

app/src/main/java/co/stonephone/stonecamera/plugins/Debug.kt renamed to app/src/main/java/co/stonephone/stonecamera/plugins/DebugPlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import androidx.compose.ui.graphics.Color
1717
import androidx.compose.ui.unit.dp
1818
import co.stonephone.stonecamera.StoneCameraViewModel
1919
import co.stonephone.stonecamera.utils.calculateImageCoverageRegion
20-
import co.stonephone.stonecamera.utils.selectCameraForStepZoomLevel
2120

2221
class DebugPlugin : IPlugin {
2322
override val id: String = "debugPlugin"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

app/src/main/java/co/stonephone/stonecamera/plugins/ShutterFlash.kt renamed to app/src/main/java/co/stonephone/stonecamera/plugins/ShutterFlashPlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package co.stonephone.stonecamera.plugins
22

33
import android.annotation.SuppressLint
4-
import androidx.camera.core.ImageCapture
54
import androidx.compose.animation.AnimatedVisibility
65
import androidx.compose.animation.fadeIn
76
import androidx.compose.animation.fadeOut

app/src/main/java/co/stonephone/stonecamera/plugins/TapToFocus.kt renamed to app/src/main/java/co/stonephone/stonecamera/plugins/TapToFocusPlugin.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package co.stonephone.stonecamera.plugins
22

33
import android.annotation.SuppressLint
4-
import android.graphics.Rect
54
import android.view.MotionEvent
65
import androidx.compose.runtime.Composable
76
import androidx.compose.runtime.remember
87
import androidx.compose.ui.platform.LocalContext
9-
import co.stonephone.stonecamera.MyApplication
108
import co.stonephone.stonecamera.StoneCameraViewModel
119
import co.stonephone.stonecamera.ui.FocusReticle
12-
import co.stonephone.stonecamera.utils.calculateImageCoverageRegion
1310

1411
class TapToFocusPlugin : IPlugin {
1512
override val id: String = "tapToFocusPlugin"
File renamed without changes.

0 commit comments

Comments
 (0)