From b59ef1a74617ca8b4d42741fc6a56903e3080153 Mon Sep 17 00:00:00 2001 From: OxygenCobalt Date: Thu, 26 May 2022 10:03:41 -0600 Subject: [PATCH] info: update architecture Update architecture to reflect the new changes made in 2.3.0. --- .../main/java/org/oxycblt/auxio/AuxioApp.kt | 10 +- .../org/oxycblt/auxio/image/Components.kt | 14 +- ...ctory.kt => CrossfadeTransitionFactory.kt} | 2 +- .../auxio/playback/state/RepeatMode.kt | 5 +- .../java/org/oxycblt/auxio/util/LogUtil.kt | 19 +-- app/src/main/res/values-de/strings.xml | 1 + build.gradle | 2 +- info/ARCHITECTURE.md | 156 ++++++++++-------- 8 files changed, 107 insertions(+), 102 deletions(-) rename app/src/main/java/org/oxycblt/auxio/image/{CrossfadeFactory.kt => CrossfadeTransitionFactory.kt} (96%) diff --git a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt index a28e0d47a..5b54fd4ca 100644 --- a/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt +++ b/app/src/main/java/org/oxycblt/auxio/AuxioApp.kt @@ -21,9 +21,9 @@ import android.app.Application import coil.ImageLoader import coil.ImageLoaderFactory import coil.request.CachePolicy -import org.oxycblt.auxio.image.AlbumArtFetcher +import org.oxycblt.auxio.image.AlbumCoverFetcher import org.oxycblt.auxio.image.ArtistImageFetcher -import org.oxycblt.auxio.image.CrossfadeFactory +import org.oxycblt.auxio.image.CrossfadeTransitionFactory import org.oxycblt.auxio.image.GenreImageFetcher import org.oxycblt.auxio.image.MusicKeyer import org.oxycblt.auxio.settings.SettingsManager @@ -41,13 +41,13 @@ class AuxioApp : Application(), ImageLoaderFactory { override fun newImageLoader(): ImageLoader { return ImageLoader.Builder(applicationContext) .components { - add(AlbumArtFetcher.SongFactory()) - add(AlbumArtFetcher.AlbumFactory()) + add(AlbumCoverFetcher.SongFactory()) + add(AlbumCoverFetcher.AlbumFactory()) add(ArtistImageFetcher.Factory()) add(GenreImageFetcher.Factory()) add(MusicKeyer()) } - .transitionFactory(CrossfadeFactory()) + .transitionFactory(CrossfadeTransitionFactory()) .diskCachePolicy(CachePolicy.DISABLED) // Not downloading anything, so no disk-caching .build() } diff --git a/app/src/main/java/org/oxycblt/auxio/image/Components.kt b/app/src/main/java/org/oxycblt/auxio/image/Components.kt index 0184a203e..5dc8c2326 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/Components.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/Components.kt @@ -50,10 +50,10 @@ class MusicKeyer : Keyer { } /** - * Fetcher that returns the album art for a given [Album] or [Song], depending on the factory used. + * Fetcher that returns the album cover for a given [Album] or [Song], depending on the factory used. * @author OxygenCobalt */ -class AlbumArtFetcher private constructor(private val context: Context, private val album: Album) : +class AlbumCoverFetcher private constructor(private val context: Context, private val album: Album) : BaseFetcher() { override suspend fun fetch(): FetchResult? { return fetchArt(context, album)?.let { stream -> @@ -66,13 +66,13 @@ class AlbumArtFetcher private constructor(private val context: Context, private class SongFactory : Fetcher.Factory { override fun create(data: Song, options: Options, imageLoader: ImageLoader): Fetcher { - return AlbumArtFetcher(options.context, data.album) + return AlbumCoverFetcher(options.context, data.album) } } class AlbumFactory : Fetcher.Factory { override fun create(data: Album, options: Options, imageLoader: ImageLoader) = - AlbumArtFetcher(options.context, data) + AlbumCoverFetcher(options.context, data) } } @@ -133,11 +133,11 @@ private inline fun Collection.mapAtMost( val out = mutableListOf() for (item in this) { - if (out.size >= until) { + if (out.size < until) { + transform(item)?.let(out::add) + } else { break } - - transform(item)?.let(out::add) } return out diff --git a/app/src/main/java/org/oxycblt/auxio/image/CrossfadeFactory.kt b/app/src/main/java/org/oxycblt/auxio/image/CrossfadeTransitionFactory.kt similarity index 96% rename from app/src/main/java/org/oxycblt/auxio/image/CrossfadeFactory.kt rename to app/src/main/java/org/oxycblt/auxio/image/CrossfadeTransitionFactory.kt index 6ba95cf93..7d15697d6 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CrossfadeFactory.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CrossfadeTransitionFactory.kt @@ -30,7 +30,7 @@ import coil.transition.TransitionTarget * Like they used to. * @author Coil Team */ -class CrossfadeFactory : Transition.Factory { +class CrossfadeTransitionFactory : Transition.Factory { override fun create(target: TransitionTarget, result: ImageResult): Transition { // Don't animate if the request was fulfilled by the memory cache. if (result is SuccessResult && result.dataSource == DataSource.MEMORY_CACHE) { diff --git a/app/src/main/java/org/oxycblt/auxio/playback/state/RepeatMode.kt b/app/src/main/java/org/oxycblt/auxio/playback/state/RepeatMode.kt index 5ac7adcf2..d5277a13f 100644 --- a/app/src/main/java/org/oxycblt/auxio/playback/state/RepeatMode.kt +++ b/app/src/main/java/org/oxycblt/auxio/playback/state/RepeatMode.kt @@ -29,7 +29,7 @@ enum class RepeatMode { ALL, TRACK; - /** Increment the LoopMode, e.g from [NONE] to [ALL] */ + /** Increment the mode, e.g from [NONE] to [ALL] */ fun increment(): RepeatMode { return when (this) { NONE -> ALL @@ -47,8 +47,7 @@ enum class RepeatMode { } /** - * Convert the LoopMode to an int constant that is saved in PlaybackStateDatabase - * @return The int constant for this mode + * The integer code representing this particular mode. */ val intCode: Int get() = diff --git a/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt b/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt index cdf805eb2..424fa3b1f 100644 --- a/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt +++ b/app/src/main/java/org/oxycblt/auxio/util/LogUtil.kt @@ -27,9 +27,7 @@ import org.oxycblt.auxio.BuildConfig * Shortcut method for logging a non-string [obj] to debug. Should only be used for debug * preferably. */ -fun Any.logD(obj: Any) { - logD(obj.toString()) -} +fun Any.logD(obj: Any?) = logD("$obj") /** * Shortcut method for logging [msg] to the debug console. Handles debug builds and anonymous @@ -38,19 +36,15 @@ fun Any.logD(obj: Any) { fun Any.logD(msg: String) { if (BuildConfig.DEBUG) { basedCopyleftNotice() - Log.d(name, msg) + Log.d(autoTag, msg) } } /** Shortcut method for logging [msg] as a warning to the console. Handles anonymous objects */ -fun Any.logW(msg: String) { - Log.w(name, msg) -} +fun Any.logW(msg: String) = Log.w(autoTag, msg) /** Shortcut method for logging [msg] as an error to the console. Handles anonymous objects */ -fun Any.logE(msg: String) { - Log.e(name, msg) -} +fun Any.logE(msg: String) = Log.e(autoTag, msg) /** * Logs an error in production while still throwing it in debug mode. This is useful for @@ -65,10 +59,9 @@ fun Throwable.logTraceOrThrow() { } /** - * Get a non-nullable name, used so that logs will always show up by Auxio - * @return The name of the object, otherwise "Anonymous Object" + * Automatically creates a tag that identifies the object currently logging. */ -private val Any.name: String +private val Any.autoTag: String get() = "Auxio.${this::class.simpleName ?: "Anonymous Object"}" /** diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8c18e2e8e..9361a7b1f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -76,6 +76,7 @@ Kopfhörer automatische Wiedergabe Beginne die Wiedergabe immer, wenn Kopfhörer verbunden sind (funktioniert nicht auf allen Geräten) ReplayGain + ReplayGain prälautverstärkung Während Musikwiedergabe, Die Prälautverstärkung trifft zu dem aktuellem Abgleich Abgleich mit Metadaten Abgleich ohne Metadaten diff --git a/build.gradle b/build.gradle index 526b48e17..f5b1b6ebe 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:7.2.0" + classpath 'com.android.tools.build:gradle:7.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version" classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0" diff --git a/info/ARCHITECTURE.md b/info/ARCHITECTURE.md index f275ebf4f..036785d28 100644 --- a/info/ARCHITECTURE.md +++ b/info/ARCHITECTURE.md @@ -9,28 +9,31 @@ Auxio's package structure is strictly feature-oriented. For example, playback co and detail code is exclusively in the `detail` package. Sub-packages can be related to the code it contains, such as `detail.recycler` for the detail UI adapters, or they can be related to a sub-feature, like `playback.queue` for the queue UI. +The outliers here are `.ui` and `.util`, which are generic utility or component packages. + A full run-down of Auxio's current package structure as of the latest version is shown below. ``` org.oxycblt.auxio # Main UIs -├──.accent # Color Scheme UI + Systems -├──.coil # Image loading components ├──.detail # Album/Artist/Genre detail UIs │ └──.recycler # RecyclerView components for detail UIs ├──.home # Home UI │ ├──.fastscroll # Fast scroller UI │ ├──.list # Home item lists │ └──.tabs # Home tab customization +├──.image # Image loading components ├──.music # Music data and loading │ └──.excluded # Excluded Directories UI + Systems ├──.playback # Playback UI + Systems │ ├──.queue # Queue UI +│ ├──.replaygain # ReplayGain System + UIs │ ├──.state # Playback state backend │ └──.system # System-side playback [Services, ExoPlayer] ├──.search # Search UI ├──.settings # Settings UI + Systems │ └──.pref # Int preference add-on ├──.ui # Shared views and models +│ └──.accent # Color Scheme UI + Systems ├──.util # Shared utilities └──.widgets # AppWidgets ``` @@ -73,8 +76,8 @@ often takes the form of `MutableLiveData` or `LiveData`, which can be observed. - Shared Objects: These are the fundamental building blocks of Auxio, and exist at the process level. These are usually retrieved using `getInstance` or a similar function. Shared Objects should be avoided in UIs, as their volatility can cause problems. Its better to use a ViewModel and their exposed data instead. -- Utilities: These are largely found in the `.util` and `.coil` packages, taking the form of standalone or extension -functions that can be used anywhere. +- Utilities: These are largely found in the `.util` package, taking the form of standalone or extension functions +that can be used anywhere. Ideally, UIs should only be talking to ViewModels, ViewModels should only be talking to the Shared Objects, and Shared Objects should only be talking to other shared objects. All objects can use the utility functions where appropriate. @@ -85,13 +88,14 @@ Auxio represents data in multiple ways. `Item` is the base class for most music and UI data in Auxio, with a single ID field meant to mark it as unique. It has the following implementations: -- `Music` is a `Item` that represents music. It adds a `name` field that represents the raw name of the music (from `MediaStore`). -- `MusicParent` is a type of `Music` that contains children. It adds a `resolveName` field that converts the raw `MediaStore` name -to a name that can be used in UIs. -- `Header` corresponds to a simple header. The Detail UIs have a derivative called `SortHeader` that also adds a sorting button. +- `Music` is a `Item` that represents music. It adds a `name` field that represents the raw name of the music (from `MediaStore`), +and a `resolveName` method meant to resolve the name in context of the UI. +- `MusicParent` is a type of `Music` that contains children. +- `Header` corresponds to a simple header with a title and no interaction functionality. There are also the detail-specific +`DiscHeader` and `SortHeader`, however these are largely unrelated to `Header`. Other data types represent a specific UI configuration or state: -- Sealed classes like `Sort` contain data with them that can be modified. +- Sealed classes like `Sort` contain an ascending state that can be modified immutably. - Enums like `DisplayMode` and `RepeatMode` only contain static data, such as a string resource. Things to keep in mind while working with music data: @@ -107,10 +111,11 @@ objects. a song, as it will always show collaborator information first before defaulting to the album artist. #### Music Access -All music on a system is asynchronously loaded into the shared object `MusicStore`. Because of this, **`MusicStore` may not be available at all times**. +All music on a system is asynchronously loaded into the shared object `MusicStore`. More specifically, it is accessible within +the `Library` construct. By the nature of music loading, **`Library` may not be available at all times.** -- ViewModels should try to await or gracefully exit the called method if `MusicStore` is not available -- In the case that a ViewModel needs a `MusicStore` instance to function, an instance can be required. This should be done sparingly. +- ViewModels should try to await or gracefully exit the called method if `Library` is not available +- In the case that a ViewModel needs a `Library` instance to function, it can be asserted with `requireNotNull`. This should be done sparingly. - Other shared objects that rely on `MusicStore` [like `PlaybackStateManager`] will no-op if music is not available. If the loading status needs to be shown in a UI, `MusicViewModel` can be used to observe the current music loader response. @@ -120,17 +125,16 @@ Auxio's playback system is somewhat unorthodox, as it avoids much of the android The diagram below highlights the overall structure and connections: ``` - [Requests update from] - ┌─────────────────────────────────────────────────────────────────────────────────┐ - │ │ - ┌──────────────────── PlaybackService ──────────────────── WidgetController ──────────────────── WidgetProvider ┘ - │ │ [Contains] [Controls] -PlaybackStateManager [Communicates with] │ - │ │ [Contains] - │ │ - │ ├ Notification - │ ├ MediaSession - │ └ Player + ┌──────────────────── PlaybackService ────────────────┐ + │ │ │ +PlaybackStateManager [Communicates with] │ │ + │ │ [Contains] │ + │ │ │ + │ ├ WidgetComponent ┤ + │ ├ NotificationComponent ┤ + │ ├ MediaSessionComponent ┤ + │ └ Player ┘ + │ │ └──────────────────── PlaybackViewModel ───────────────────── UIs [Communicates With] @@ -141,14 +145,13 @@ PlaybackStateManager [Communicates with] │ is also prone to memory leaks if not cleared when done. `PlaybackViewModel` should be used instead, as it exposes stable data and safe functions that UIs can use to interact with the playback state. -`PlaybackService`'s job is to use the playback state to manage the ExoPlayer instance, the notification, the widget, and also modify the state depending on -system events, such as when a button is pressed on a headset. It should **never** be bound to, mostly because there is no need given that -`PlaybackViewModel` exposes the same data in a much safer fashion. +`PlaybackService`'s job is to use the playback state to manage the ExoPlayer instance, the notification, the media session, the widget, and +also modify the state depending on system events, such as when a button is pressed on a headset. It should **never** be bound to, mostly because +there is no need given that `PlaybackViewModel` exposes the same data in a much safer fashion. #### Data Integers -Integer representations of data/UI elements are used heavily in Auxio, primarily for efficiency. -To prevent any strange bugs, all integer representations must be unique. To see a table of all current integers, see the `C` class within -the project. +Integer representations of data/UI elements are used heavily in Auxio, primarily for efficiency. To prevent any strange bugs, all integer +representations must be unique. To see a table of all current integers, see the `C` class within the project. Some datatypes [like `Tab` and `Sort`] have even more fine-grained integer representations for other data. More information can be found in the documentation for those datatypes. @@ -159,24 +162,6 @@ the documentation for those datatypes. This is the root package and contains the application instance and the landing UIs. This should be kept sparse with most other code being placed into a package. -#### `.accent` -This package is responsible for Auxio's color schemes, internally known as accents due to legacy code. -It contains an object that represents the attributes of an accent, but this should be avoided in favor of -resolving color attributes directly, such as `colorPrimary`. This package also contains the UIs for picking -an accent. - -#### `.coil` -[Coil](https://github.com/coil-kt/coil) is the image loader used by Auxio. All image loading is done through these four functions/binding adapters: - -- `app:albumArt`: Binding Adapter that will load the cover art for a song or album -- `app:artistImage`: Binding Adapter that will load the artist image -- `app:genreImage`: Binding Adapter that will load the genre image -- `loadBitmap`: Function that will take a song and return a bitmap, this should not be used in anything UI related, that is what the binding adapters above are for. - -This should be enough to cover most use cases in Auxio. - -Internally, multiple fetchers are provided to transform `Music` instances into images. All of these fetchers inherit `BaseFetcher`, which implements -the necessary methods for loading album artwork and creating the mosaics shown in artist/genre images. #### `.detail` Contains all the detail UIs for some data types in Auxio. All detail user interfaces share the same base layout (A Single RecyclerView) and @@ -190,13 +175,6 @@ Each adapter instance also handles the highlighting of the currently playing ite `DetailViewModel` acts as the holder for the currently displaying items, along with having the `navToItem` LiveData that coordinates menu/playback navigation [Such as when a user presses "Go to artist"] -#### `.excluded` -This package is responsible for the excluded directory system. It contains the database of excluded directories and the dialog that appears when -editing them. - -**Note:** Certain naming in this package might not line up with the current name of the package. This is because updating those names would break -compatibility with previous versions of Auxio. - #### `.home` This package contains the components for the "home" UI in Auxio, or the UI that the user first sees when they open the app. @@ -205,19 +183,35 @@ This package contains the components for the "home" UI in Auxio, or the UI that - The `list` package contains the individual fragments for each list of music. These are all placed in the top-level ViewPager instance. - The `tabs` package contains the data representation of an individual library tab and the UIs for editing them. +#### `.image` +[Coil](https://github.com/coil-kt/coil) is the image loader used by Auxio. This package contains the components Auxio leverages to load images +in a stable manner. Usually, you do not need to import this package elsewhere, but there are some important components: + +- `BitmapProvider`, which allows external components (Such as in PlaybackService) to load a `Bitmap` in a way not prone to race conditions. +This should not be used for UIs. +- `BaseFetcher`, which is effectively Auxio's image loading routine. Most changes to image loading should be done there, and not it's +sub-classes like `AlbumArtFetcher`. + #### `.music` -This package contains all `BaseModel` implementations and the music loading implementation. This also includes `Header`/`ActionHeader`, as those -data objects have to inherit `BaseModel` so that they can be placed alongside `Music` instances in `RecyclerView` instances. +This package contains all `Music` implementations, the music loading implementation, and the excluded directory system. + +Key classes in this package include: +- `MusicStore`, which is the primary access point for music data. +- `Indexer`, which implements all of the `MediaStore` hacks to create a good metadata indexer for Auxio. #### `.playback` This module not only contains the playback system described above, but also multiple other components: -- `queue` contains the Queue UI and it's fancy item transitions -- `state` contains the core playback state and persistence system -- `system` contains the system-facing playback system +- `queue` contains the Queue UI and it's fancy item UIs. +- `state` contains the core playback state and persistence system. +- `replaygain` contains the ReplayGain implementation and the UIs related to it. Auxio's ReplayGain implementation is +somewhat different compared to other apps, as it leverages ExoPlayer's metadata and audio processing systems to not only +parse ReplayGain +- `system` contains the system-facing playback system, i.e `PlaybackService` -The most important part of this module is `PlaybackLayout`, which is a custom `ViewGroup` that implements the playback bar and it's ability to -slide up into the full playback view. `MainFragment` controls this `ViewGroup`. +The base package contains the user-facing UIs representing the playback state, specifically the playback bar and the +playback panel that it expands into. Note that while the playback UI does rely on `BottomSheetLayout`, the layout is +designed to be at least somewhat re-usable, so it is in the generic `.ui` class. #### `.search` Package for Auxio's search functionality, `SearchViewHolder` handles the data results and filtering while `SearchFragment`/`SearchAdapter` handles the @@ -225,27 +219,45 @@ display of the results and user input. #### `.settings` The settings system is primarily based off of `SettingsManager`, a wrapper around `SharedPreferences`. This allows settings to be read/written in a -much simpler/safer manner and without a context being needed. The Settings UI is largely contained in `SettingsListFragment`, while the `pref` -sub-package contains `IntListPreference`, which allows Auxio's integer representations to be used with the preference UI. The about dialog -also resides in this package. +much simpler/safer manner and without a context being needed. The Settings UI is largely contained in `SettingsListFragment`, which is a standard +`PreferenceFragment` implementation wrapped by the more general `SettingsFragment`. + +Internally, the settings package also leverages a couple custom preference implementations, notably `IntListPreference`, which enables +a normal choice preference to be backed by the integer representations that Auxio uses. #### `.ui` Shared views and view configuration models. This contains: -- Customized views such as `EdgeAppBarLayout` and `EdgeRecyclerView`, which add some extra functionality not provided by default +- Customized views such as `EdgeAppBarLayout`, `StyledImageView`, and others, which provide extra styling and behavior +not provided by default. - Configuration models like `DisplayMode` and `Sort`, which are used in many places but aren't tied to a specific feature. -- `newMenu` and `ActionMenu`, which automates menu creation for most data types +- `newMenu` and `ActionMenu`, which automates menu creation for most data types. +- The `RecyclerView` adapter framework described previously. +- The view-binding super classes described previously. +- `BottomSheetLayout`, a highly important layout that underpins Auxio's UI flow. +- Standard `ViewHolder` implementations that can be used for common datatypes. #### `.util` Shared utilities. This is primarily for QoL when developing Auxio. Documentation is provided on each method. +Utilities are separated into a few groups: +- Context utilties are extensions of `Context` and generally act as shortcuts for that class. +- Framework utilities extend a variety of view implementations to add new behavior or shortcuts. +- Primitive utilities operate on basic datatypes and are mostly shortcuts. +- Log utilities are a more light-weight logging framework that Auxio leverages instead of +bloated and over-engineered libraries like Timber. + #### `.widgets` This package contains Auxio's AppWidget implementation, which deviates from other AppWidget implementations by packing multiple -different layouts into a single widget and then switching between them depending on the widget size. +different layouts into a single widget and then switching between them depending on the widget size. Note that since `RemoteViews` +and the AppWidget API in general is incredibly outdated and limited, this package deviates from much of Auxio's normal UI +conventions. -When `WidgetProvider` creates a layout, it first turns the `PlaybackStateManager` instance into a `WidgetState`, which is -an immutable version of the playback state that negates some of the problems with using a shared object here. It then picks -a layout [e.g "Form"] depending on its current dimensions and applies the `WidgetState` object to that. +The playback service owns `WidgetComponent`, which listens to `PlaybackStateManager` for updates. During an update, it reloads +all song metadata and playback state into a `WidgetState`, which is an immutable version of the playback state that negates some +of the problems with using a volatile shared object. -**Note:** The AppWidget implementation violates UI conventions by directly interfacing with coil and `PlaybackStateManager`. -This is required due to `RemoteView` limitations. +`WidgetProvider` is the widget "implementation" exposed in the manifest. When `WidgetComponent` updates it, the class will create +a series of layouts [e.g "Forms"] for a variety of "size buckets" that would adequately contain the widget. This is then used as +the widget views, either with the native responsive behavior on Android 12 and above, or with the responsive behavior backported +to older devices.