fenix/Simple-Voice-Recorder
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Voice-Recorder.git synced 2025-02-24 23:47:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

updating some code style, no functionality changes

Browse Source
This commit is contained in:
tibbi 2020-04-17 22:44:54 +02:00
parent b393cda6ee
commit c5f507944c
5 changed files with 43 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
View File

@ -1,6 +1,7 @@
package com.simplemobiletools.voicerecorder.adapters
import android.provider.MediaStore
import android.provider.MediaStore.Audio.Media
import android.view.Menu
import android.view.View
import android.view.ViewGroup
@ -21,10 +22,10 @@ import kotlinx.android.synthetic.main.item_recording.view.*
import java.io.File
import java.util.*
class RecordingsAdapter(
activity: SimpleActivity, var recordings: ArrayList<Recording>, val refreshListener: RefreshRecordingsListener,
recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit
) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
class RecordingsAdapter(activity: SimpleActivity, var recordings: ArrayList<Recording>, val refreshListener: RefreshRecordingsListener,
recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit)
: MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
var currRecordingId = 0
init {
@ -124,8 +125,8 @@ class RecordingsAdapter(
if (isQPlus()) {
recordingsToRemove.forEach {
val uri = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
val selection = "${MediaStore.Audio.Media._ID} = ?"
val uri = Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
val selection = "${Media._ID} = ?"
val selectionArgs = arrayOf(it.id.toString())
activity.contentResolver.delete(uri, selection, selectionArgs)
}

6
app/src/main/kotlin/com/simplemobiletools/voicerecorder/dialogs/RenameRecordingDialog.kt
View File

@ -1,7 +1,7 @@
package com.simplemobiletools.voicerecorder.dialogs
import android.content.ContentValues
import android.provider.MediaStore
import android.provider.MediaStore.Audio.Media
import androidx.appcompat.app.AlertDialog
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.*
@ -59,8 +59,8 @@ class RenameRecordingDialog(val activity: BaseSimpleActivity, val recording: Rec
val newDisplayName = "${newTitle.removeSuffix(".$oldExtension")}.$oldExtension"
val values = ContentValues().apply {
put(MediaStore.Audio.Media.TITLE, newTitle.substringAfterLast('.'))
put(MediaStore.Audio.Media.DISPLAY_NAME, newDisplayName)
put(Media.TITLE, newTitle.substringAfterLast('.'))
put(Media.DISPLAY_NAME, newDisplayName)
}
activity.contentResolver.update(getAudioFileContentUri(recording.id.toLong()), values, null, null)

60
app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
View File

@ -2,7 +2,6 @@ package com.simplemobiletools.voicerecorder.fragments
import android.annotation.SuppressLint
import android.content.Context
import android.database.Cursor
import android.graphics.drawable.Drawable
import android.media.AudioManager
import android.media.MediaMetadataRetriever
@ -11,6 +10,7 @@ import android.os.Handler
import android.os.Looper
import android.os.PowerManager
import android.provider.MediaStore
import android.provider.MediaStore.Audio.Media
import android.util.AttributeSet
import android.widget.SeekBar
import com.simplemobiletools.commons.extensions.*
@ -165,47 +165,37 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
private fun getMediaStoreRecordings(): ArrayList<Recording> {
val recordings = ArrayList<Recording>()
val uri = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
val uri = Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
val projection = arrayOf(
MediaStore.Audio.Media._ID,
MediaStore.Audio.Media.DISPLAY_NAME,
MediaStore.Audio.Media.DATE_ADDED,
MediaStore.Audio.Media.DURATION,
MediaStore.Audio.Media.SIZE
Media._ID,
Media.DISPLAY_NAME,
Media.DATE_ADDED,
Media.DURATION,
Media.SIZE
)
val selection = "${MediaStore.Audio.Media.OWNER_PACKAGE_NAME} = ?"
val selection = "${Media.OWNER_PACKAGE_NAME} = ?"
val selectionArgs = arrayOf(context.packageName)
val sorting = "${MediaStore.Audio.Media.DATE_ADDED} DESC"
val sortOrder = "${Media.DATE_ADDED} DESC"
var cursor: Cursor? = null
try {
cursor = context.contentResolver.query(uri, projection, selection, selectionArgs, sorting)
if (cursor?.moveToFirst() == true) {
do {
val id = cursor.getIntValue(MediaStore.Audio.Media._ID)
val title = cursor.getStringValue(MediaStore.Audio.Media.DISPLAY_NAME)
val path = ""
val timestamp = cursor.getIntValue(MediaStore.Audio.Media.DATE_ADDED)
var duration = cursor.getLongValue(MediaStore.Audio.Media.DURATION) / 1000
var size = cursor.getIntValue(MediaStore.Audio.Media.SIZE)
context.queryCursor(uri, projection, selection, selectionArgs, sortOrder, true) { cursor ->
val id = cursor.getIntValue(Media._ID)
val title = cursor.getStringValue(Media.DISPLAY_NAME)
val path = ""
val timestamp = cursor.getIntValue(Media.DATE_ADDED)
var duration = cursor.getLongValue(Media.DURATION) / 1000
var size = cursor.getIntValue(Media.SIZE)
if (duration == 0L) {
duration = getDurationFromUri(id.toLong())
}
if (size == 0) {
size = getSizeFromUri(id.toLong())
}
val recording = Recording(id, title, "", timestamp, duration.toInt(), size)
recordings.add(recording)
} while (cursor.moveToNext())
if (duration == 0L) {
duration = getDurationFromUri(id.toLong())
}
} catch (e: Exception) {
context.showErrorToast(e)
} finally {
cursor?.close()
if (size == 0) {
size = getSizeFromUri(id.toLong())
}
val recording = Recording(id, title, "", timestamp, duration.toInt(), size)
recordings.add(recording)
}
return recordings

5
app/src/main/kotlin/com/simplemobiletools/voicerecorder/helpers/Constants.kt
View File

@ -4,6 +4,7 @@ import android.annotation.SuppressLint
import android.content.ContentUris
import android.net.Uri
import android.provider.MediaStore
import android.provider.MediaStore.Audio.Media
import com.simplemobiletools.commons.helpers.isQPlus
const val RECORDER_RUNNING_NOTIF_ID = 10000
@ -19,9 +20,9 @@ const val SAVE_RECORDINGS = "save_recordings"
@SuppressLint("InlinedApi")
fun getAudioFileContentUri(id: Long): Uri {
val baseUri = if (isQPlus()) {
MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
} else {
MediaStore.Audio.Media.EXTERNAL_CONTENT_URI
Media.EXTERNAL_CONTENT_URI
}
return ContentUris.withAppendedId(baseUri, id)

9
app/src/main/kotlin/com/simplemobiletools/voicerecorder/services/RecorderService.kt
View File

@ -11,6 +11,7 @@ import android.media.MediaScannerConnection
import android.os.Build
import android.os.IBinder
import android.provider.MediaStore
import android.provider.MediaStore.Audio.Media
import android.widget.Toast
import androidx.core.app.NotificationCompat
import com.simplemobiletools.commons.extensions.*
@ -147,13 +148,13 @@ class RecorderService : Service() {
@SuppressLint("InlinedApi")
private fun addFileInNewMediaStore() {
val audioCollection = MediaStore.Audio.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
val audioCollection = Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY)
val storeFilename = currFilePath.getFilenameFromPath()
val newSongDetails = ContentValues().apply {
put(MediaStore.Audio.Media.DISPLAY_NAME, storeFilename)
put(MediaStore.Audio.Media.TITLE, storeFilename)
put(MediaStore.Audio.Media.MIME_TYPE, storeFilename.getMimeType())
put(Media.DISPLAY_NAME, storeFilename)
put(Media.TITLE, storeFilename)
put(Media.MIME_TYPE, storeFilename.getMimeType())
}
val newUri = contentResolver.insert(audioCollection, newSongDetails)