Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Don't play shutter sound if phone is on silent #2435

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: Don't play shutter sound if phone is on silent #2435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion package/android/src/main/java/com/mrousavy/camera/CameraView+TakePhoto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import android.graphics.BitmapFactory
import android.graphics.ImageFormat
import android.graphics.Matrix
import android.hardware.camera2.*
import android.media.AudioManager
import android.util.Log
import com.facebook.react.bridge.Arguments
import com.facebook.react.bridge.ReadableMap
Expand All @@ -32,7 +33,12 @@ suspend fun CameraView.takePhoto(optionsMap: ReadableMap): WritableMap {
val flash = options["flash"] as? String ?: "off"
val enableAutoRedEyeReduction = options["enableAutoRedEyeReduction"] == true
val enableAutoStabilization = options["enableAutoStabilization"] == true
val enableShutterSound = options["enableShutterSound"] as? Boolean ?: true
var enableShutterSound = options["enableShutterSound"] as? Boolean ?: true

val canPlaySound = audioManager.ringerMode == AudioManager.RINGER_MODE_NORMAL
if (!canPlaySound) {
enableShutterSound = false
}

val flashMode = Flash.fromUnionValue(flash)
val qualityPrioritizationMode = QualityPrioritization.fromUnionValue(qualityPrioritization)
Expand Down
2 changes: 2 additions & 0 deletions package/android/src/main/java/com/mrousavy/camera/CameraView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.mrousavy.camera
import android.annotation.SuppressLint
import android.content.Context
import android.hardware.camera2.CameraManager
import android.media.AudioManager
import android.util.Log
import android.view.ScaleGestureDetector
import android.widget.FrameLayout
Expand Down Expand Up @@ -89,6 +90,7 @@ class CameraView(context: Context) :
// private properties
private var isMounted = false
internal val cameraManager = context.getSystemService(Context.CAMERA_SERVICE) as CameraManager
internal val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager

// session
internal val cameraSession: CameraSession
Expand Down
5 changes: 4 additions & 1 deletion package/android/src/main/java/com/mrousavy/camera/core/CameraSession.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import android.hardware.camera2.CaptureRequest
import android.hardware.camera2.CaptureResult
import android.hardware.camera2.TotalCaptureResult
import android.hardware.camera2.params.MeteringRectangle
import android.media.AudioManager
import android.media.Image
import android.media.ImageReader
import android.os.Build
Expand Down Expand Up @@ -55,7 +56,9 @@ import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock

class CameraSession(private val context: Context, private val cameraManager: CameraManager, private val callback: CameraSessionCallback) :
class CameraSession(private val context: Context,
private val cameraManager: CameraManager,
private val callback: CameraSessionCallback) :
CameraManager.AvailabilityCallback(),
Closeable,
CoroutineScope {
Expand Down
Loading