Skip to content

Commit 627324b

Browse files
committed
Make video picker UI functional
1 parent 5f8d376 commit 627324b

1 file changed

Lines changed: 19 additions & 11 deletions

File tree

app/src/main/java/app/grapheneos/camera/ui/activities/VideoCaptureActivity.kt

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,19 @@ class VideoCaptureActivity : CaptureActivity() {
3333

3434
captureButton.setImageResource(R.drawable.recording)
3535

36+
thirdCircle.setOnClickListener {
37+
if (isPreviewShown) {
38+
val i = Intent(
39+
this@VideoCaptureActivity,
40+
VideoPlayer::class.java
41+
)
42+
i.putExtra("videoUri", savedUri)
43+
startActivity(i)
44+
} else {
45+
videoPicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.VideoOnly))
46+
}
47+
}
48+
3649
captureButton.setOnClickListener OnClickListener@{
3750
if (videoCapturer.isRecording) {
3851
videoCapturer.stopRecording()
@@ -41,18 +54,9 @@ class VideoCaptureActivity : CaptureActivity() {
4154
}
4255
}
4356

44-
playPreview.setOnClickListener {
45-
val i = Intent(
46-
this@VideoCaptureActivity,
47-
VideoPlayer::class.java
48-
)
49-
i.putExtra("videoUri", savedUri)
50-
startActivity(i)
51-
}
52-
5357
imagePreview.visibility = View.GONE
5458
whiteOptionCircle.visibility = View.GONE
55-
playPreview.visibility = View.VISIBLE
59+
// playPreview.visibility = View.VISIBLE
5660

5761
confirmButton.setOnClickListener {
5862
confirmCapturedVideo()
@@ -74,6 +78,9 @@ class VideoCaptureActivity : CaptureActivity() {
7478
override fun showPreview() {
7579
super.showPreview()
7680
thirdOption.visibility = View.VISIBLE
81+
selectImageIcon.visibility = View.GONE
82+
playPreview.visibility = View.VISIBLE
83+
thirdCircle.setImageResource(R.drawable.option_circle)
7784
}
7885

7986
private fun confirmCapturedVideo() {
@@ -103,6 +110,7 @@ class VideoCaptureActivity : CaptureActivity() {
103110

104111
override fun hidePreview() {
105112
super.hidePreview()
106-
thirdOption.visibility = View.INVISIBLE
113+
selectImageIcon.visibility = View.VISIBLE
114+
playPreview.visibility = View.GONE
107115
}
108116
}

0 commit comments

Comments
 (0)