Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/main/java/app/grapheneos/camera/CamConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1215,6 +1215,17 @@ class CamConfig(private val mActivity: MainActivity) {
previewBuilder.setPreviewStabilizationEnabled(false)
}

// Adapt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Adapt
val shouldMirror = lensFacing == CameraSelector.LENS_FACING_FRONT &&
((isVideoMode && saveVideoAsPreviewed) || (isInPhotoMode && saveImageAsPreviewed))
previewBuilder.setMirrorMode(
if (shouldMirror) MirrorMode.MIRROR_MODE_ON
else MirrorMode.MIRROR_MODE_OFF
)

if ((lensFacing == CameraSelector.LENS_FACING_FRONT) && (isVideoMode && saveVideoAsPreviewed) || (isInPhotoMode && saveImageAsPreviewed)) {
previewBuilder.setMirrorMode(
MirrorMode.MIRROR_MODE_ON
)
} else {
previewBuilder.setMirrorMode(
MirrorMode.MIRROR_MODE_OFF
)
}

preview = previewBuilder.build().also {
useCaseGroupBuilder.addUseCase(it)
it.setSurfaceProvider(mActivity.previewView.surfaceProvider)
Expand Down
18 changes: 9 additions & 9 deletions app/src/main/res/layout/more_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:id="@+id/gyroscope_setting_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/save_image_as_previewed"
android:contentDescription="@string/fix_inversion_for_photos"
android:paddingStart="4dp"
android:paddingEnd="8dp"
android:src="@drawable/straighten" />
Expand Down Expand Up @@ -257,7 +257,7 @@
android:id="@+id/save_image_as_preview_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/save_image_as_previewed"
android:contentDescription="@string/fix_inversion_for_photos"
android:paddingStart="4dp"
android:paddingEnd="8dp"
android:src="@drawable/selfie_preview" />
Expand All @@ -275,7 +275,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:paddingBottom="2dp"
android:text="@string/save_image_as_previewed"
android:text="@string/fix_inversion_for_photos"
android:textColor="?android:textColorPrimary"
android:textSize="16sp" />

Expand All @@ -284,7 +284,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:text="@string/save_as_image_preview_desc"
android:text="@string/fix_inversion_for_photos_desc"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />

Expand Down Expand Up @@ -399,7 +399,7 @@
android:id="@+id/remove_exif_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/save_image_as_previewed"
android:contentDescription="@string/fix_inversion_for_photos"
android:paddingStart="4dp"
android:paddingEnd="8dp"
android:src="@drawable/info_adaptable" />
Expand Down Expand Up @@ -473,7 +473,7 @@
android:id="@+id/save_video_as_preview_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/save_video_as_previewed"
android:contentDescription="@string/fix_inversion_for_videos"
android:paddingStart="4dp"
android:paddingEnd="8dp"
android:src="@drawable/selfie_preview" />
Expand All @@ -491,7 +491,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:paddingBottom="2dp"
android:text="@string/save_video_as_previewed"
android:text="@string/fix_inversion_for_videos"
android:textColor="?android:textColorPrimary"
android:textSize="16sp" />

Expand All @@ -500,7 +500,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="10dp"
android:text="@string/save_as_video_preview_desc"
android:text="@string/fix_inversion_for_videos_desc"
android:textSize="14sp"
tools:ignore="RtlSymmetry" />

Expand Down Expand Up @@ -547,7 +547,7 @@
android:id="@+id/storage_location_icon"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/save_image_as_previewed"
android:contentDescription="@string/fix_inversion_for_photos"
android:paddingStart="4dp"
android:paddingEnd="8dp"
android:src="@drawable/storage" />
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@

<string name="general">General</string>

<string name="save_image_as_previewed">Save image as previewed</string>
<string name="save_as_image_preview_desc">Save output image as visible on preview (fixes inversion in front camera)</string>
<string name="fix_inversion_for_photos">Fix front camera inversion</string>
<string name="fix_inversion_for_photos_desc">Fixes inversion while taking a photo via the front camera</string>

<string name="save_video_as_previewed">Save video as previewed</string>
<string name="save_as_video_preview_desc">Save output video as visible on preview (fixes inversion in front camera)</string>
<string name="fix_inversion_for_videos">Fix front camera inversion</string>
<string name="fix_inversion_for_videos_desc">Fixes inversion while recording a video via the front camera</string>

<string name="gyroscope_suggestions">Gyroscope Suggestions</string>
<string name="gyroscope_setting_desc">Occasionally get visual suggestions for straight/well-angled images</string>
Expand Down