Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

music: rename filesystem back into storage

Browse source 
Rename the filesystem module into storage.

Forgot about the MediaStore utils I had in there. The original name was
more correct.
This commit is contained in:
Alexander Capehart 2023-01-04 09:45:24 -07:00
parent d55dfbc849
commit 1b44eeae15
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
13 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/oxycblt/auxio/detail/Detail.kt
View file

@ -20,7 +20,7 @@ package org.oxycblt.auxio.detail
import androidx.annotation.StringRes import androidx.annotation.StringRes
import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.Item
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.music.filesystem.MimeType import org.oxycblt.auxio.music.storage.MimeType
/** /**
* A header variation that displays a button to open a sort menu. * A header variation that displays a button to open a sort menu.

2
app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
View file

@ -39,7 +39,7 @@ import org.oxycblt.auxio.music.Music
import org.oxycblt.auxio.music.MusicStore import org.oxycblt.auxio.music.MusicStore
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.music.Sort import org.oxycblt.auxio.music.Sort
import org.oxycblt.auxio.music.filesystem.MimeType import org.oxycblt.auxio.music.storage.MimeType
import org.oxycblt.auxio.settings.Settings import org.oxycblt.auxio.settings.Settings
import org.oxycblt.auxio.util.* import org.oxycblt.auxio.util.*

2
app/src/main/java/org/oxycblt/auxio/music/Music.kt
View file

@ -30,7 +30,7 @@ import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize import kotlinx.parcelize.Parcelize
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.list.Item import org.oxycblt.auxio.list.Item
import org.oxycblt.auxio.music.filesystem.* import org.oxycblt.auxio.music.storage.*
import org.oxycblt.auxio.music.parsing.parseId3GenreNames import org.oxycblt.auxio.music.parsing.parseId3GenreNames
import org.oxycblt.auxio.music.parsing.parseMultiValue import org.oxycblt.auxio.music.parsing.parseMultiValue
import org.oxycblt.auxio.settings.Settings import org.oxycblt.auxio.settings.Settings

4
app/src/main/java/org/oxycblt/auxio/music/MusicStore.kt
View file

@ -20,8 +20,8 @@ package org.oxycblt.auxio.music
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.provider.OpenableColumns import android.provider.OpenableColumns
import org.oxycblt.auxio.music.filesystem.contentResolverSafe import org.oxycblt.auxio.music.storage.contentResolverSafe
import org.oxycblt.auxio.music.filesystem.useQuery import org.oxycblt.auxio.music.storage.useQuery
/** /**
* A repository granting access to the music library.. * A repository granting access to the music library..

14
app/src/main/java/org/oxycblt/auxio/music/extractor/MediaStoreExtractor.kt
View file

@ -29,13 +29,13 @@ import androidx.core.database.getStringOrNull
import java.io.File import java.io.File
import org.oxycblt.auxio.music.Date import org.oxycblt.auxio.music.Date
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.music.filesystem.Directory import org.oxycblt.auxio.music.storage.Directory
import org.oxycblt.auxio.music.filesystem.contentResolverSafe import org.oxycblt.auxio.music.storage.contentResolverSafe
import org.oxycblt.auxio.music.filesystem.directoryCompat import org.oxycblt.auxio.music.storage.directoryCompat
import org.oxycblt.auxio.music.filesystem.mediaStoreVolumeNameCompat import org.oxycblt.auxio.music.storage.mediaStoreVolumeNameCompat
import org.oxycblt.auxio.music.filesystem.safeQuery import org.oxycblt.auxio.music.storage.safeQuery
import org.oxycblt.auxio.music.filesystem.storageVolumesCompat import org.oxycblt.auxio.music.storage.storageVolumesCompat
import org.oxycblt.auxio.music.filesystem.useQuery import org.oxycblt.auxio.music.storage.useQuery
import org.oxycblt.auxio.music.parsing.parseId3v2Position import org.oxycblt.auxio.music.parsing.parseId3v2Position
import org.oxycblt.auxio.settings.Settings import org.oxycblt.auxio.settings.Settings
import org.oxycblt.auxio.util.getSystemServiceCompat import org.oxycblt.auxio.util.getSystemServiceCompat

2
app/src/main/java/org/oxycblt/auxio/music/extractor/MetadataExtractor.kt
View file

@ -23,7 +23,7 @@ import com.google.android.exoplayer2.MediaItem
import com.google.android.exoplayer2.MetadataRetriever import com.google.android.exoplayer2.MetadataRetriever
import org.oxycblt.auxio.music.Date import org.oxycblt.auxio.music.Date
import org.oxycblt.auxio.music.Song import org.oxycblt.auxio.music.Song
import org.oxycblt.auxio.music.filesystem.toAudioUri import org.oxycblt.auxio.music.storage.toAudioUri
import org.oxycblt.auxio.music.parsing.parseId3v2Position import org.oxycblt.auxio.music.parsing.parseId3v2Position
import org.oxycblt.auxio.util.logD import org.oxycblt.auxio.util.logD
import org.oxycblt.auxio.util.logW import org.oxycblt.auxio.util.logW

2
app/src/main/java/org/oxycblt/auxio/music/filesystem/DirectoryAdapter.kt → app/src/main/java/org/oxycblt/auxio/music/storage/DirectoryAdapter.kt
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.filesystem package org.oxycblt.auxio.music.storage
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

2
app/src/main/java/org/oxycblt/auxio/music/filesystem/Filesystem.kt → app/src/main/java/org/oxycblt/auxio/music/storage/Filesystem.kt
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.filesystem package org.oxycblt.auxio.music.storage
import android.content.Context import android.content.Context
import android.media.MediaFormat import android.media.MediaFormat

2
app/src/main/java/org/oxycblt/auxio/music/filesystem/MusicDirsDialog.kt → app/src/main/java/org/oxycblt/auxio/music/storage/MusicDirsDialog.kt
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.filesystem package org.oxycblt.auxio.music.storage
import android.content.ActivityNotFoundException import android.content.ActivityNotFoundException
import android.net.Uri import android.net.Uri

2
app/src/main/java/org/oxycblt/auxio/music/filesystem/FilesystemUtil.kt → app/src/main/java/org/oxycblt/auxio/music/storage/StorageUtil.kt
View file

@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
package org.oxycblt.auxio.music.filesystem package org.oxycblt.auxio.music.storage
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.ContentResolver import android.content.ContentResolver

2
app/src/main/java/org/oxycblt/auxio/music/system/IndexerService.kt
View file

@ -34,7 +34,7 @@ import kotlinx.coroutines.launch
import org.oxycblt.auxio.BuildConfig import org.oxycblt.auxio.BuildConfig
import org.oxycblt.auxio.R import org.oxycblt.auxio.R
import org.oxycblt.auxio.music.MusicStore import org.oxycblt.auxio.music.MusicStore
import org.oxycblt.auxio.music.filesystem.contentResolverSafe import org.oxycblt.auxio.music.storage.contentResolverSafe
import org.oxycblt.auxio.playback.state.PlaybackStateManager import org.oxycblt.auxio.playback.state.PlaybackStateManager
import org.oxycblt.auxio.service.ForegroundManager import org.oxycblt.auxio.service.ForegroundManager
import org.oxycblt.auxio.settings.Settings import org.oxycblt.auxio.settings.Settings

4
app/src/main/java/org/oxycblt/auxio/settings/Settings.kt
View file

@ -31,8 +31,8 @@ import org.oxycblt.auxio.home.tabs.Tab
import org.oxycblt.auxio.image.CoverMode import org.oxycblt.auxio.image.CoverMode
import org.oxycblt.auxio.music.MusicMode import org.oxycblt.auxio.music.MusicMode
import org.oxycblt.auxio.music.Sort import org.oxycblt.auxio.music.Sort
import org.oxycblt.auxio.music.filesystem.Directory import org.oxycblt.auxio.music.storage.Directory
import org.oxycblt.auxio.music.filesystem.MusicDirectories import org.oxycblt.auxio.music.storage.MusicDirectories
import org.oxycblt.auxio.playback.ActionMode import org.oxycblt.auxio.playback.ActionMode
import org.oxycblt.auxio.playback.replaygain.ReplayGainMode import org.oxycblt.auxio.playback.replaygain.ReplayGainMode
import org.oxycblt.auxio.playback.replaygain.ReplayGainPreAmp import org.oxycblt.auxio.playback.replaygain.ReplayGainPreAmp

2
app/src/main/res/navigation/nav_main.xml
View file

@ -106,7 +106,7 @@
tools:layout="@layout/dialog_pre_amp" /> tools:layout="@layout/dialog_pre_amp" />
<dialog <dialog
android:id="@+id/music_dirs_dialog" android:id="@+id/music_dirs_dialog"
android:name="org.oxycblt.auxio.music.filesystem.MusicDirsDialog" android:name="org.oxycblt.auxio.music.storage.MusicDirsDialog"
android:label="music_dirs_dialog" android:label="music_dirs_dialog"
tools:layout="@layout/dialog_music_dirs" /> tools:layout="@layout/dialog_music_dirs" />
<dialog <dialog