hardcoresushi/DroidFS
2
2
Fork 3
Code Issues 12 Pull Requests 1 Releases 24 Activity

Update dependencies

Browse Source
This commit is contained in:
Matéo Duparc 2021-12-20 14:44:58 +01:00
parent 57e93f0b49
commit 8b4adfbe21
Signed by: hardcoresushi
GPG Key ID: 007F84120107191E
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/build.gradle
View File

@ -58,26 +58,26 @@ dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"]) implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation 'androidx.core:core-ktx:1.7.0' implementation 'androidx.core:core-ktx:1.7.0'
implementation "androidx.appcompat:appcompat:1.3.1" implementation "androidx.appcompat:appcompat:1.4.0"
implementation "androidx.constraintlayout:constraintlayout:2.1.1" implementation "androidx.constraintlayout:constraintlayout:2.1.2"
implementation "androidx.sqlite:sqlite-ktx:2.1.0" implementation "androidx.sqlite:sqlite-ktx:2.2.0"
implementation "androidx.preference:preference-ktx:1.1.1" implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.4.0'
implementation "com.github.bumptech.glide:glide:4.12.0" implementation "com.github.bumptech.glide:glide:4.12.0"
implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.biometric:biometric:1.1.0"
def exoplayer_version = "2.16.0" def exoplayer_version = "2.16.1"
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version" implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version" implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
implementation "androidx.concurrent:concurrent-futures:1.1.0" implementation "androidx.concurrent:concurrent-futures:1.1.0"
def camerax_v1 = "1.1.0-alpha10" def camerax_v1 = "1.1.0-alpha12"
implementation "androidx.camera:camera-camera2:$camerax_v1" implementation "androidx.camera:camera-camera2:$camerax_v1"
implementation "androidx.camera:camera-lifecycle:$camerax_v1" implementation "androidx.camera:camera-lifecycle:$camerax_v1"
def camerax_v2 = "1.0.0-alpha30" def camerax_v2 = "1.0.0-alpha32"
implementation "androidx.camera:camera-view:$camerax_v2" implementation "androidx.camera:camera-view:$camerax_v2"
implementation "androidx.camera:camera-extensions:$camerax_v2" implementation "androidx.camera:camera-extensions:$camerax_v2"
} }

2
app/libgocryptfs

@ -1 +1 @@
Subproject commit 19731536027d0b64c19742846bf8dda6920110ba Subproject commit b232bb782605eb0c6b23aef5f7ea56fd5bd3b7fd

11
app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
View File

@ -110,15 +110,14 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
ProcessCameraProvider.getInstance(this).apply { ProcessCameraProvider.getInstance(this).apply {
addListener({ addListener({
cameraProvider = get() cameraProvider = get()
setupCamera() ExtensionsManager.getInstanceAsync(this@CameraActivity, cameraProvider).apply {
}, executor)
}
ExtensionsManager.getInstance(this).apply {
addListener({ addListener({
extensionsManager = get() extensionsManager = get()
setupCamera() setupCamera()
}, executor) }, executor)
} }
}, executor)
}
binding.imageCaptureMode.setOnClickListener { binding.imageCaptureMode.setOnClickListener {
val currentIndex = if (captureMode == ImageCapture.CAPTURE_MODE_MAXIMIZE_QUALITY) { val currentIndex = if (captureMode == ImageCapture.CAPTURE_MODE_MAXIMIZE_QUALITY) {
@ -318,8 +317,8 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
}.build() }.build()
cameraSelector = if (isBackCamera){ CameraSelector.DEFAULT_BACK_CAMERA } else { CameraSelector.DEFAULT_FRONT_CAMERA } cameraSelector = if (isBackCamera){ CameraSelector.DEFAULT_BACK_CAMERA } else { CameraSelector.DEFAULT_FRONT_CAMERA }
if (extensionsManager.isExtensionAvailable(cameraProvider, cameraSelector, ExtensionMode.HDR)) { if (extensionsManager.isExtensionAvailable(cameraSelector, ExtensionMode.HDR)) {
cameraSelector = extensionsManager.getExtensionEnabledCameraSelector(cameraProvider, cameraSelector, ExtensionMode.HDR) cameraSelector = extensionsManager.getExtensionEnabledCameraSelector(cameraSelector, ExtensionMode.HDR)
} }
cameraProvider.unbindAll() cameraProvider.unbindAll()