@@ -25,11 +25,11 @@ import androidx.camera.core.CameraSelector
25
25
import androidx.camera.core.ImageAnalysis
26
26
import androidx.camera.core.ImageCapture
27
27
import androidx.camera.core.Preview
28
+ import androidx.camera.core.TorchState
29
+ import androidx.camera.core.UseCaseGroup
28
30
import androidx.camera.core.resolutionselector.AspectRatioStrategy
29
31
import androidx.camera.core.resolutionselector.ResolutionSelector
30
32
import androidx.camera.core.resolutionselector.ResolutionStrategy
31
- import androidx.camera.core.TorchState
32
- import androidx.camera.core.UseCaseGroup
33
33
import androidx.camera.extensions.ExtensionMode
34
34
import androidx.camera.extensions.ExtensionsManager
35
35
import androidx.camera.lifecycle.ProcessCameraProvider
@@ -44,7 +44,6 @@ import app.grapheneos.camera.ktx.markAs4by3Layout
44
44
import app.grapheneos.camera.ui.activities.CaptureActivity
45
45
import app.grapheneos.camera.ui.activities.MainActivity
46
46
import app.grapheneos.camera.ui.activities.MoreSettings
47
- import app.grapheneos.camera.ui.activities.QrTile
48
47
import app.grapheneos.camera.ui.activities.SecureActivity
49
48
import app.grapheneos.camera.ui.activities.SecureMainActivity
50
49
import app.grapheneos.camera.ui.activities.VideoCaptureActivity
@@ -274,7 +273,6 @@ class CamConfig(private val mActivity: MainActivity) {
274
273
}
275
274
}
276
275
277
- private val defaultMode = if (mActivity is QrTile ) CameraMode .QR_SCAN else DEFAULT_CAMERA_MODE
278
276
private var currentMode: CameraMode = DEFAULT_CAMERA_MODE
279
277
280
278
var aspectRatio: Int
@@ -1266,6 +1264,10 @@ class CamConfig(private val mActivity: MainActivity) {
1266
1264
1267
1265
@SuppressLint(" ClickableViewAccessibility" )
1268
1266
private fun loadTabs () {
1267
+ if (! mActivity.shouldShowCameraModeTabs()) {
1268
+ return
1269
+ }
1270
+
1269
1271
val tabLayout = mActivity.tabLayout
1270
1272
val availableModes = availableModes()
1271
1273
@@ -1289,7 +1291,7 @@ class CamConfig(private val mActivity: MainActivity) {
1289
1291
}
1290
1292
tab.tag = mode
1291
1293
1292
- tabLayout.addTab(tab, mode == defaultMode )
1294
+ tabLayout.addTab(tab, mode == DEFAULT_CAMERA_MODE )
1293
1295
}
1294
1296
}
1295
1297
}
0 commit comments