Skip to content

Commit 981f1c4

Browse files
committed
Revert "set preview view aspect ratio correctly"
This reverts commit 09aa331.
1 parent 0ca3ca2 commit 981f1c4

File tree

3 files changed

+2
-27
lines changed

3 files changed

+2
-27
lines changed

app/src/main/java/app/grapheneos/camera/CamConfig.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ import androidx.camera.video.VideoCapture
3737
import androidx.camera.view.PreviewView
3838
import androidx.core.content.ContextCompat
3939
import app.grapheneos.camera.analyzer.QRAnalyzer
40-
import app.grapheneos.camera.ktx.markAs16by9Layout
41-
import app.grapheneos.camera.ktx.markAs4by3Layout
4240
import app.grapheneos.camera.ui.activities.CaptureActivity
4341
import app.grapheneos.camera.ui.activities.MainActivity
4442
import app.grapheneos.camera.ui.activities.MoreSettings
@@ -1164,16 +1162,7 @@ class CamConfig(private val mActivity: MainActivity) {
11641162

11651163
// Focus camera on touch/tap
11661164
mActivity.previewView.setOnTouchListener(mActivity)
1167-
mActivity.previewView.apply {
1168-
when (aspectRatio) {
1169-
AspectRatio.RATIO_16_9 -> {
1170-
markAs16by9Layout()
1171-
}
1172-
AspectRatio.RATIO_4_3 -> {
1173-
markAs4by3Layout()
1174-
}
1175-
}
1176-
}
1165+
11771166
if (isInPhotoMode) {
11781167
mActivity.sensorNotifier?.forceUpdateGyro()
11791168
} else {

app/src/main/java/app/grapheneos/camera/ktx/PreviewView.kt

Lines changed: 0 additions & 14 deletions
This file was deleted.

app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
android:id="@+id/preview"
2929
android:layout_width="0dp"
3030
android:layout_height="0dp"
31-
tools:layout_constraintDimensionRatio="H,9:16"
31+
app:layout_constraintDimensionRatio="H,9:16"
3232
app:layout_constraintTop_toTopOf="parent"
3333
app:layout_constraintStart_toStartOf="parent"
3434
app:layout_constraintEnd_toEndOf="parent"/>

0 commit comments

Comments
 (0)