mirror of
https://github.com/Myzel394/Alibi.git
synced 2025-06-18 23:05:26 +02:00
fix: Small improvements
This commit is contained in:
parent
298ce13369
commit
3cbf822b88
@ -26,7 +26,6 @@
|
|||||||
|
|
||||||
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
|
<uses-permission android:name="android.permission.USE_BIOMETRIC" />
|
||||||
|
|
||||||
<!-- Todo: Check android permissions -->
|
|
||||||
<!-- Starting with Android 29, apps don't need to request the READ_EXTERNAL_STORAGE permission
|
<!-- Starting with Android 29, apps don't need to request the READ_EXTERNAL_STORAGE permission
|
||||||
for files in their own MediaStore -->
|
for files in their own MediaStore -->
|
||||||
<uses-permission
|
<uses-permission
|
||||||
|
@ -32,8 +32,7 @@ class AudioBatchesFolder(
|
|||||||
override val ffmpegParameters = FFMPEG_PARAMETERS
|
override val ffmpegParameters = FFMPEG_PARAMETERS
|
||||||
override val scopedMediaContentUri: Uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
|
override val scopedMediaContentUri: Uri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
|
||||||
override val legacyMediaFolder = File(
|
override val legacyMediaFolder = File(
|
||||||
// TODO: Add support for `DIRECTORY_RECORDINGS`
|
Environment.getExternalStoragePublicDirectory(BASE_LEGACY_STORAGE_FOLDER),
|
||||||
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM),
|
|
||||||
MEDIA_RECORDINGS_SUBFOLDER,
|
MEDIA_RECORDINGS_SUBFOLDER,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -73,7 +72,7 @@ class AudioBatchesFolder(
|
|||||||
)!!
|
)!!
|
||||||
} else {
|
} else {
|
||||||
val path = arrayOf(
|
val path = arrayOf(
|
||||||
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM),
|
Environment.getExternalStoragePublicDirectory(BASE_LEGACY_STORAGE_FOLDER),
|
||||||
MEDIA_SUBFOLDER_NAME,
|
MEDIA_SUBFOLDER_NAME,
|
||||||
getName(date, extension)
|
getName(date, extension)
|
||||||
).joinToString("/")
|
).joinToString("/")
|
||||||
@ -145,6 +144,7 @@ class AudioBatchesFolder(
|
|||||||
else -> viaCustomFolder(context, DocumentFile.fromTreeUri(context, Uri.parse(folder))!!)
|
else -> viaCustomFolder(context, DocumentFile.fromTreeUri(context, Uri.parse(folder))!!)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val BASE_LEGACY_STORAGE_FOLDER = Environment.DIRECTORY_PODCASTS
|
||||||
val MEDIA_RECORDINGS_SUBFOLDER = MEDIA_SUBFOLDER_NAME + "/audio_recordings"
|
val MEDIA_RECORDINGS_SUBFOLDER = MEDIA_SUBFOLDER_NAME + "/audio_recordings"
|
||||||
val BASE_SCOPED_STORAGE_RELATIVE_PATH =
|
val BASE_SCOPED_STORAGE_RELATIVE_PATH =
|
||||||
(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
|
(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
|
||||||
|
@ -289,11 +289,14 @@ abstract class BatchesFolder(
|
|||||||
extension = extension,
|
extension = extension,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// TODO: Smoother transition from start to status
|
||||||
concatenationFunction(
|
concatenationFunction(
|
||||||
filePaths,
|
filePaths,
|
||||||
outputFile,
|
outputFile,
|
||||||
parameter
|
parameter
|
||||||
) { time ->
|
) { time ->
|
||||||
|
// The progressbar for the conversion is calculated based on the
|
||||||
|
// current time of the conversion and the total time of the batches.
|
||||||
if (fullTime != null) {
|
if (fullTime != null) {
|
||||||
onProgress(time / fullTime!!)
|
onProgress(time / fullTime!!)
|
||||||
} else {
|
} else {
|
||||||
|
@ -32,7 +32,7 @@ class VideoBatchesFolder(
|
|||||||
override val ffmpegParameters = FFMPEG_PARAMETERS
|
override val ffmpegParameters = FFMPEG_PARAMETERS
|
||||||
override val scopedMediaContentUri: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
|
override val scopedMediaContentUri: Uri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI
|
||||||
override val legacyMediaFolder = File(
|
override val legacyMediaFolder = File(
|
||||||
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM),
|
Environment.getExternalStoragePublicDirectory(BASE_LEGACY_STORAGE_FOLDER),
|
||||||
MEDIA_RECORDINGS_SUBFOLDER,
|
MEDIA_RECORDINGS_SUBFOLDER,
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -59,7 +59,7 @@ class VideoBatchesFolder(
|
|||||||
val mediaUri = getOrCreateMediaFile(
|
val mediaUri = getOrCreateMediaFile(
|
||||||
name = getName(date, extension),
|
name = getName(date, extension),
|
||||||
mimeType = "video/$extension",
|
mimeType = "video/$extension",
|
||||||
relativePath = Environment.DIRECTORY_DCIM + "/" + MEDIA_SUBFOLDER_NAME,
|
relativePath = BASE_SCOPED_STORAGE_RELATIVE_PATH + "/" + MEDIA_SUBFOLDER_NAME,
|
||||||
)
|
)
|
||||||
|
|
||||||
return FFmpegKitConfig.getSafParameterForWrite(
|
return FFmpegKitConfig.getSafParameterForWrite(
|
||||||
@ -68,7 +68,7 @@ class VideoBatchesFolder(
|
|||||||
)!!
|
)!!
|
||||||
} else {
|
} else {
|
||||||
val path = arrayOf(
|
val path = arrayOf(
|
||||||
Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM),
|
Environment.getExternalStoragePublicDirectory(BASE_LEGACY_STORAGE_FOLDER),
|
||||||
MEDIA_SUBFOLDER_NAME,
|
MEDIA_SUBFOLDER_NAME,
|
||||||
getName(date, extension)
|
getName(date, extension)
|
||||||
).joinToString("/")
|
).joinToString("/")
|
||||||
@ -143,9 +143,11 @@ class VideoBatchesFolder(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val BASE_LEGACY_STORAGE_FOLDER = Environment.DIRECTORY_DCIM
|
||||||
val MEDIA_RECORDINGS_SUBFOLDER = MEDIA_SUBFOLDER_NAME + "/video_recordings"
|
val MEDIA_RECORDINGS_SUBFOLDER = MEDIA_SUBFOLDER_NAME + "/video_recordings"
|
||||||
|
val BASE_SCOPED_STORAGE_RELATIVE_PATH = Environment.DIRECTORY_DCIM
|
||||||
val SCOPED_STORAGE_RELATIVE_PATH =
|
val SCOPED_STORAGE_RELATIVE_PATH =
|
||||||
Environment.DIRECTORY_DCIM + "/" + MEDIA_RECORDINGS_SUBFOLDER
|
BASE_SCOPED_STORAGE_RELATIVE_PATH + "/" + MEDIA_RECORDINGS_SUBFOLDER
|
||||||
|
|
||||||
// Parameters to be passed in descending order
|
// Parameters to be passed in descending order
|
||||||
// Those parameters first try to concatenate without re-encoding
|
// Those parameters first try to concatenate without re-encoding
|
||||||
|
@ -17,8 +17,6 @@ val MEDIA_RECORDINGS_PREFIX = "alibi-recording-"
|
|||||||
val RECORDER_MEDIA_SELECTED_VALUE = "_'media"
|
val RECORDER_MEDIA_SELECTED_VALUE = "_'media"
|
||||||
val RECORDER_INTERNAL_SELECTED_VALUE = "_'internal"
|
val RECORDER_INTERNAL_SELECTED_VALUE = "_'internal"
|
||||||
|
|
||||||
// TODO: Check API 24
|
|
||||||
|
|
||||||
// You are not allowed to change the constants below.
|
// You are not allowed to change the constants below.
|
||||||
// If you do so, you will be blocked on GitHub.
|
// If you do so, you will be blocked on GitHub.
|
||||||
const val REPO_URL = "https://github.com/Myzel394/Alibi"
|
const val REPO_URL = "https://github.com/Myzel394/Alibi"
|
||||||
|
@ -324,7 +324,6 @@ fun RecorderEventsHandler(
|
|||||||
progress = processingProgress,
|
progress = processingProgress,
|
||||||
)
|
)
|
||||||
|
|
||||||
// TODO: Add thread for concatenation
|
|
||||||
if (showRecorderError)
|
if (showRecorderError)
|
||||||
RecorderErrorDialog(
|
RecorderErrorDialog(
|
||||||
onClose = {
|
onClose = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user