Skip to content

Commit bd05e5f

Browse files
empratyushthestinger
authored andcommitted
add activity to handle system Qr tile intent
1 parent be7bd24 commit bd05e5f

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,11 @@
188188
android:showWhenLocked="true"
189189
android:exported="false"/>
190190

191+
<activity
192+
android:name=".ui.activities.QrTile"
193+
android:exported="true"
194+
android:excludeFromRecents="true"/>
195+
191196
</application>
192197

193198
</manifest>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import app.grapheneos.camera.ktx.markAs4by3Layout
4242
import app.grapheneos.camera.ui.activities.CaptureActivity
4343
import app.grapheneos.camera.ui.activities.MainActivity
4444
import app.grapheneos.camera.ui.activities.MoreSettings
45+
import app.grapheneos.camera.ui.activities.QrTile
4546
import app.grapheneos.camera.ui.activities.SecureActivity
4647
import app.grapheneos.camera.ui.activities.SecureMainActivity
4748
import app.grapheneos.camera.ui.activities.VideoCaptureActivity
@@ -271,6 +272,7 @@ class CamConfig(private val mActivity: MainActivity) {
271272
}
272273
}
273274

275+
private val defaultMode = if (mActivity is QrTile) CameraMode.QR_SCAN else DEFAULT_CAMERA_MODE
274276
private var currentMode: CameraMode = DEFAULT_CAMERA_MODE
275277

276278
var aspectRatio: Int
@@ -1272,7 +1274,7 @@ class CamConfig(private val mActivity: MainActivity) {
12721274
}
12731275
tab.tag = mode
12741276

1275-
tabLayout.addTab(tab, mode == DEFAULT_CAMERA_MODE)
1277+
tabLayout.addTab(tab, mode == defaultMode)
12761278
}
12771279
}
12781280
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package app.grapheneos.camera.ui.activities
2+
3+
import android.os.Bundle
4+
import app.grapheneos.camera.CameraMode
5+
6+
class QrTile : MainActivity() {
7+
8+
override fun onCreate(savedInstanceState: Bundle?) {
9+
super.onCreate(savedInstanceState)
10+
camConfig.switchMode(CameraMode.QR_SCAN)
11+
}
12+
}

0 commit comments

Comments
 (0)