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: 8 additions & 3 deletions app/src/main/java/app/grapheneos/camera/CamConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,12 @@ class CamConfig(private val mActivity: MainActivity) {
} else {
View.VISIBLE
}
mActivity.muteToggle.visibility =
Copy link

Choose a reason for hiding this comment

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

consider one liner
e.g.
mActivity.muteToggle.visibility = if (includeAudio) View.VISIBLE else View.GONE

if (includeAudio) {
View.VISIBLE
} else {
View.GONE
}

val videoCaptureBuilder = VideoCapture.Builder(
Recorder.Builder()
Expand Down Expand Up @@ -1426,8 +1432,6 @@ class CamConfig(private val mActivity: MainActivity) {

mActivity.captureButton.setBackgroundResource(android.R.color.transparent)
mActivity.captureButton.setImageResource(R.drawable.torch_off_button)

mActivity.micOffIcon.visibility = View.GONE
} else {
mActivity.qrOverlay.visibility = View.INVISIBLE
mActivity.thirdOption.visibility = View.VISIBLE
Expand All @@ -1442,10 +1446,11 @@ class CamConfig(private val mActivity: MainActivity) {
mActivity.captureButton.setImageResource(R.drawable.recording)
} else {
mActivity.captureButton.setImageResource(R.drawable.camera_shutter)
mActivity.micOffIcon.visibility = View.GONE
}
}

mActivity.micOffIcon.visibility = View.GONE
mActivity.muteToggle.visibility = View.GONE
mActivity.cbText.visibility = if (isQRMode || isVideoMode || mActivity.timerDuration == 0) {
View.INVISIBLE
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class VideoCapturer(private val mActivity: MainActivity) {
val pendingRecording = recordingCtx.pendingRecording

if (includeAudio) {
pendingRecording.withAudioEnabled()
pendingRecording.withAudioEnabled(isMuted)
}

beforeRecordingStarts()
Expand Down Expand Up @@ -315,14 +315,6 @@ class VideoCapturer(private val mActivity: MainActivity) {
mActivity.timerView.visibility = View.VISIBLE

mActivity.settingsDialog.includeAudioToggle.isEnabled = false

if (camConfig.includeAudio) {
isMuted = false
mActivity.muteToggle.setImageResource(R.drawable.mic_on)
mActivity.muteToggle.setBackgroundColor(mActivity.getColor(R.color.red))
mActivity.muteToggle.tooltipText = mActivity.getString(R.string.tap_to_mute_audio)
mActivity.muteToggle.visibility = View.VISIBLE
}
}

private fun afterRecordingStops() {
Expand Down Expand Up @@ -375,22 +367,19 @@ class VideoCapturer(private val mActivity: MainActivity) {
// mActivity.micOffIcon.visibility = View.VISIBLE

mActivity.settingsDialog.includeAudioToggle.isEnabled = true
mActivity.muteToggle.visibility = View.GONE

isRecording = false

mActivity.forceUpdateOrientationSensor()
}

fun muteRecording() {
if (!isRecording) return
check(camConfig.includeAudio)
isMuted = true
recording?.mute(true)
}

fun unmuteRecording() {
if (!isRecording) return
check(camConfig.includeAudio)
isMuted = false
recording?.mute(false)
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/app/grapheneos/camera/ui/SettingsDialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,11 @@ class SettingsDialog(val mActivity: MainActivity, themedContext: Context) :
} else {
View.VISIBLE
}
mActivity.muteToggle.visibility = if (includeAudioToggle.isChecked) {
View.VISIBLE
} else {
View.GONE
}

camConfig.includeAudio = includeAudioToggle.isChecked
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class VideoCaptureActivity : CaptureActivity() {
override fun showPreview() {
super.showPreview()
thirdOption.visibility = View.VISIBLE
muteToggle.visibility = View.GONE
}

private fun confirmVideo() {
Expand Down