fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-02-03 16:47:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve preview alignment

Browse Source 
- center the PreviewView between the top action icons and the bottom mode switcher view for 4:3, 3:2 (video mode - SD) and 1:1 resolutions, when not full screen
This commit is contained in:
darthpaul 2022-11-25 07:52:10 +00:00
parent c901a3f88e
commit 47bc591035
5 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/kotlin/com/simplemobiletools/camera/activities/MainActivity.kt
View File

@ -11,6 +11,7 @@ import android.os.Bundle
import android.provider.MediaStore
import android.view.*
import android.widget.LinearLayout
import androidx.constraintlayout.widget.ConstraintSet
import androidx.core.content.ContextCompat
import androidx.core.view.*
import androidx.transition.*
@ -318,7 +319,9 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
initInPhotoMode = isInPhotoMode,
)
mFocusCircleView = FocusCircleView(this)
mFocusCircleView = FocusCircleView(this).apply {
id = View.generateViewId()
}
view_holder.addView(mFocusCircleView)
setupPreviewImage(true)
@ -752,6 +755,19 @@ class MainActivity : SimpleActivity(), PhotoProcessor.MediaSavedListener, Camera
button.iconTint = ColorStateList(states, iconColors)
}
override fun adjustPreviewView(requiresCentering: Boolean) {
val constraintSet = ConstraintSet()
constraintSet.clone(view_holder)
if (requiresCentering) {
constraintSet.connect(preview_view.id, ConstraintSet.TOP, top_options.id, ConstraintSet.BOTTOM)
constraintSet.connect(preview_view.id, ConstraintSet.BOTTOM, camera_mode_tab.id, ConstraintSet.TOP)
} else {
constraintSet.connect(preview_view.id, ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP)
constraintSet.connect(preview_view.id, ConstraintSet.BOTTOM, ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM)
}
constraintSet.applyTo(view_holder)
}
override fun mediaSaved(path: String) {
rescanPaths(arrayListOf(path)) {
setupPreviewImage(true)

2
app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
View File

@ -162,6 +162,8 @@ class CameraXPreview(
MySize(selectedQuality.width, selectedQuality.height)
}
listener.adjustPreviewView(resolution.requiresCentering())
val isFullSize = resolution.isFullScreen
previewView.scaleType = if (isFullSize) ScaleType.FILL_CENTER else ScaleType.FIT_CENTER
val rotation = previewView.display.rotation

2
app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreviewListener.kt
View File

@ -29,6 +29,6 @@ interface CameraXPreviewListener {
isFrontCamera: Boolean,
onSelect: (index: Int, changed: Boolean) -> Unit,
)
fun showFlashOptions(photoCapture: Boolean)
fun adjustPreviewView(requiresCentering: Boolean)
}

4
app/src/main/kotlin/com/simplemobiletools/camera/models/MySize.kt
View File

@ -17,6 +17,10 @@ data class MySize(val width: Int, val height: Int, val isFullScreen: Boolean = f
val megaPixels: String = String.format("%.1f", (width * height.toFloat()) / ONE_MEGA_PIXEL)
fun requiresCentering(): Boolean {
return !isFullScreen && (isFourToThree() || isThreeToTwo() || isSquare())
}
fun isSixteenToNine() = ratio == 16 / 9f
private fun isFiveToThree() = ratio == 5 / 3f

4
app/src/main/res/layout/activity_main.xml
View File

@ -11,7 +11,9 @@
<androidx.camera.view.PreviewView
android:id="@+id/preview_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/shutter_animation"