Release/v1.1.0 (#47)

* bump version for 1.1.0

* add changelog for 1.1.0

.bundle/config

@@ -1,2 +0,0 @@
-BUNDLE_PATH: "vendor/bundle"
-BUNDLE_FORCE_RUBY_PLATFORM: 1

.eslintrc.js

@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  ignorePatterns: ['submodules/**', 'ndk/**'],
+  ignorePatterns: ['submodules/**'],
   extends: '@react-native-community',
   rules: {
     '@typescript-eslint/no-unused-vars': ['warn'],

.github/FUNDING.yml

@@ -1 +0,0 @@
-ko_fi: austinried

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. Pixel 4]
- - OS: [e.g. Android 12]
- - Subtracks version [e.g. 1.2.0]
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/release.yml

@@ -1,17 +0,0 @@
-changelog:
-  exclude:
-    labels:
-      - ignore-for-release
-      - dependencies
-    authors:
-      - weblate
-  categories:
-    - title: New
-      labels:
-        - enhancement
-    - title: Fixed
-      labels:
-        - bug
-    - title: Other Changes
-      labels:
-        - "*"

.github/workflows/build-release-debugsign.yml

@@ -4,27 +4,18 @@ on:
   push:
     paths-ignore:
       - assets/**
-      - .vscode/**
-      - .eslintrc.js
-      - .prettierrc.js
-      - BUILDING.md
       - README.md
       - LICENSE
     branches:
-      - main
+      - master
       - release/*
   pull_request:
     paths-ignore:
       - assets/**
-      - .vscode/**
-      - android/app/src/main/assets/custom/i18n/**
-      - .eslintrc.js
-      - .prettierrc.js
-      - BUILDING.md
       - README.md
       - LICENSE
     branches:
-      - main
+      - master
 
 jobs:
   build:
@@ -33,29 +24,21 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-
       - run: |
           rm submodules/ExoPlayer/gradle/wrapper/gradle-wrapper.jar
-
-      - uses: gradle/wrapper-validation-action@v1
-
       - uses: actions/setup-node@v2
         with:
           node-version: '14'
           cache: 'yarn'
-
       - run: |
-          yarn install --network-concurrency 1
-
+          yarn install
       - run: |
           yarn lint --max-warnings 0
-
       - run: |
           yarn license
-
       - run: |
-          yarn prepare-build
-
+          scripts/prepare-exoplayer-ffmpeg.sh
+      - uses: gradle/wrapper-validation-action@v1
       - uses: gradle/gradle-build-action@v1
         with:
           distributions-cache-enabled: true
@@ -63,14 +46,11 @@ jobs:
           configuration-cache-enabled: true
           build-root-directory: android
           arguments: assembleRelease -PsignReleaseWithDebug=true
-
       - run: |
           mkdir bin
-
       - run: >
           mv android/app/build/outputs/apk/release/app-release.apk
           bin/subtracks-${GITHUB_SHA}.apk
-
       - uses: actions/upload-artifact@v2
         with:
           name: subtracks-testing

.github/workflows/build-release.yml

@@ -12,36 +12,27 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
-
       - run: |
           rm submodules/ExoPlayer/gradle/wrapper/gradle-wrapper.jar
-
-      - uses: gradle/wrapper-validation-action@v1
-
       - uses: actions/setup-node@v2
         with:
           node-version: '14'
           cache: 'yarn'
-
       - name: Get subtracks version
         run: |
           echo "SUBTRACKS_VERSION=$(node -e "console.log(require('./package.json').version);")" >> $GITHUB_ENV
-
       - run: |
-          yarn install --network-concurrency 1
-
+          yarn install
       - run: |
           yarn license
-
       - run: |
-          yarn prepare-build
-
+          scripts/prepare-exoplayer-ffmpeg.sh
+      - uses: gradle/wrapper-validation-action@v1
       - name: Retrieve keystore file
         env:
           SUBTRACKS_KEYSTORE_BASE64: ${{ secrets.SUBTRACKS_KEYSTORE_BASE64 }}
         run: |
           echo "$SUBTRACKS_KEYSTORE_BASE64" | base64 --decode > android/app/subtracks.keystore
-
       - name: Build release APK
         env:
           SUBTRACKS_UPLOAD_KEY_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_KEY_PASSWORD }}
@@ -53,14 +44,11 @@ jobs:
           -PSUBTRACKS_UPLOAD_KEY_ALIAS=subtracks
           -PSUBTRACKS_UPLOAD_KEY_PASSWORD="$SUBTRACKS_UPLOAD_KEY_PASSWORD"
           -PSUBTRACKS_UPLOAD_STORE_PASSWORD="$SUBTRACKS_UPLOAD_STORE_PASSWORD"
-
       - run: |
           mkdir bin
-
       - run: >
           mv android/app/build/outputs/apk/release/app-release.apk
           bin/subtracks-${SUBTRACKS_VERSION}.apk
-
       - name: Build release AAB
         env:
           SUBTRACKS_UPLOAD_KEY_PASSWORD: ${{ secrets.SUBTRACKS_UPLOAD_KEY_PASSWORD }}
@@ -72,11 +60,9 @@ jobs:
           -PSUBTRACKS_UPLOAD_KEY_ALIAS=subtracks
           -PSUBTRACKS_UPLOAD_KEY_PASSWORD="$SUBTRACKS_UPLOAD_KEY_PASSWORD"
           -PSUBTRACKS_UPLOAD_STORE_PASSWORD="$SUBTRACKS_UPLOAD_STORE_PASSWORD"
-
       - run: >
           mv android/app/build/outputs/bundle/release/app-release.aab
           bin/subtracks-${SUBTRACKS_VERSION}.aab
-
       - uses: actions/upload-artifact@v2
         with:
           name: subtracks-release

.gitignore

@@ -28,7 +28,6 @@ build/
 .gradle
 local.properties
 *.iml
-*.hprof
 
 # node.js
 #

.nvmrc

@@ -1 +0,0 @@
-14

.prettierrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   bracketSpacing: true,
-  singleQuote: true,
   jsxBracketSameLine: true,
+  singleQuote: true,
   trailingComma: 'all',
   arrowParens: 'avoid',
   printWidth: 120,

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "typescript.tsdk": "node_modules/typescript/lib"
-}

BUILDING.md

@@ -1,59 +0,0 @@
-# Building from source
-Instructions are provided here for Linux, specifically Ubuntu 20.04, but other operating systems should be fine as long as the requirements are met.
-
-## Requirements
-### Base
-- git
-- wget
-- unzip
-- node.js (14.x)
-- yarn (1.x)
-
-### React Native
-Subtracks is a React Native application, which means you need to make sure you are set up for that.  Follow the guide here to set up your development environment (React Native CLI, not Expo): 
-
-https://reactnative.dev/docs/environment-setup
-
-When setting up your environment, make sure to install the following dependency versions:
-- Node 14
-- Java JDK 11 (tested with openjdk-11-jdk)
-
-### ExoPlayer
-We also need the requirements to build ExoPlayer's ffmpeg extension for Android, which should be covered by:
-- build-essential (make, etc.)
-
-More information on building ffmpeg can be found here (this is what the `prepare-build` script does):
-
-https://github.com/google/ExoPlayer/tree/r2.11.4/extensions/ffmpeg
-
-## Building
-Clone the repository, making sure to recurse submodules, and change into the directory:
-```sh
-git clone --recursive https://github.com/austinried/subtracks.git
-cd subtracks
-```
-
-Install the yarn packages and prepare the ExoPlayer ffmpeg extension by running the yarn script:
-```sh
-yarn install
-yarn prepare-build
-```
-
-### Debug
-In a separate terminal start Metro, which will be an ongoing process that serves javascript bundles to the build:
-```sh
-yarn start
-```
-
-Run the android debug build script, which will start the build and also start your default emulator and push the build to it (or push the build to a running emulator/already connected device):
-```sh
-yarn android
-```
-
-### Release
-Similar to the debug build, except we don't need to run Metro first:
-```sh
-yarn android:release
-```
-
-The generated APK will be written to `android/app/build/outputs/apk/release/app-release.apk`

README.md

@@ -3,8 +3,6 @@
 # 
 Subtracks is an Android open source music streaming app for [Subsonic-API-compatible](http://www.subsonic.org/pages/api.jsp) servers ([Subsonic](http://www.subsonic.org/pages/index.jsp), [Navidrome](https://www.navidrome.org/), [Airsonic](https://airsonic.github.io/), and more).  It's designed to give you clean and convenient access to your music in the style of modern media players.
 
-[![Translation status](https://hosted.weblate.org/widgets/subtracks/-/subtracks/svg-badge.svg)](https://hosted.weblate.org/engage/subtracks/) ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/austinried/subtracks/build-release-debugsign/main) ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/austinried/subtracks?label=github) ![F-Droid](https://img.shields.io/f-droid/v/com.subtracks)
-
 # Screenshots
 <p float="left">
   <img src="metadata/en-US/images/phoneScreenshots/01_home.png" alt="home" width="200"/>
@@ -44,13 +42,3 @@ Subtracks is an Android open source music streaming app for [Subsonic-API-compat
 - Multi-select actions
 - Performance & animation improvements
 - More shuffle play modes
-
-# Building
-See [Building from source](BUILDING.md).
-
-# Translations
-Want to see Subtracks in your language? Visit the project on [Weblate](https://hosted.weblate.org/engage/subtracks/) to help!
-
-<a href="https://hosted.weblate.org/engage/subtracks/">
-<img src="https://hosted.weblate.org/widgets/subtracks/-/subtracks/multi-auto.svg" alt="Translation status" />
-</a>

android/app/build.gradle

@@ -134,8 +134,8 @@ android {
         applicationId "com.subtracks"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 9
-        versionName '1.3.0'
+        versionCode 4
+        versionName '1.1.0'
     }
     splits {
         abi {

android/app/proguard-rules.pro

@@ -10,7 +10,3 @@
 # Add any project specific keep options here:
 
 -keep class com.facebook.react.turbomodule.** { *; }
-
-# react-native-reanimated
-# https://github.com/software-mansion/react-native-reanimated/pull/2725
--keep class com.swmansion.** {*;}

android/app/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission tools:node="remove" android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <uses-permission tools:node="remove" android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
   <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="false" android:theme="@style/AppTheme" android:usesCleartextTraffic="true" android:networkSecurityConfig="@xml/network_security_config">
     <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustPan">
       <intent-filter>

android/app/src/main/assets/custom/i18n/ca.json

@@ -1,152 +0,0 @@
-{
-    "resources": {
-        "album": {
-            "lists": {
-                "newest": "Afegit recentment",
-                "sort": "Ordenar els àlbums",
-                "random": "Aleatori",
-                "byGenre": "Per gènere",
-                "alphabeticalByName": "Pel nom",
-                "alphabeticalByArtist": "Per artista",
-                "byYear": "Per any",
-                "frequent": "Escoltat freqüentment",
-                "recent": "Reproduït recentment",
-                "starred": "Favorits"
-            },
-            "actions": {
-                "play": "Reproduir l'àlbum",
-                "view": "Veure l'àlbum"
-            },
-            "name": "Àlbum",
-            "name_plural": "Àlbums"
-        },
-        "artist": {
-            "lists": {
-                "sort": "Ordenar els artistes",
-                "starred": "Preferits",
-                "alphabeticalByName": "Pel nom",
-                "random": "Aleatori"
-            },
-            "name": "Artista",
-            "name_plural": "Artistes",
-            "actions": {
-                "view": "Veure l'artista"
-            }
-        },
-        "queue": {
-            "name": "Cua",
-            "name_plural": "Cues"
-        },
-        "song": {
-            "name": "Cançó",
-            "name_plural": "Cançons",
-            "lists": {
-                "artistTopSongs": "Millors cançons"
-            }
-        },
-        "playlist": {
-            "actions": {
-                "play": "Reproduir la llista de reproducció"
-            },
-            "name": "Playlist",
-            "name_plural": "Playlists"
-        }
-    },
-    "context": {
-        "actions": {
-            "unstar": "Eliminar dels preferits",
-            "star": "Afegir als favorits"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "Inici",
-            "search": "Cercar",
-            "library": "Biblioteca",
-            "settings": "Paràmetres"
-        }
-    },
-    "messages": {
-        "nothingHere": "Aquí no hi ha res…"
-    },
-    "settings": {
-        "servers": {
-            "fields": {
-                "username": "Nom d’usuari",
-                "password": "Contrasenya",
-                "address": "Adreça"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "Forçar la contrasenya de text sense format",
-                    "descriptionOn": "Enviar la contrasenya en text sense format (llegat, assegura't que la teva connexió sigui segura!)",
-                    "descriptionOff": "Enviar la contrasenya com a fitxa + sal"
-                }
-            },
-            "actions": {
-                "add": "Afegir un servidor",
-                "testConnection": "Comprovar la connexió",
-                "save": "Desar",
-                "edit": "Editar el servidor",
-                "delete": "Esborrar"
-            },
-            "messages": {
-                "connectionOk": "Connexió a {{address}} OK!",
-                "connectionFailed": "La connexió a {{address}} ha fallat, comprova la configuració o el servidor"
-            },
-            "name": "Servidors"
-        },
-        "network": {
-            "name": "Xarxa",
-            "values": {
-                "seconds": "{{value}} segons",
-                "kbps": "{{value}}kbit/s",
-                "unlimitedKbps": "Il·limitat"
-            },
-            "options": {
-                "maxBuffer": {
-                    "title": "Temps màxim de buffer"
-                },
-                "maxBitrateWifi": {
-                    "title": "Taxa de bits màxima (Wi-Fi)"
-                },
-                "maxBitrateMobile": {
-                    "title": "Taxa de bits màxima (mòbil)"
-                },
-                "minBuffer": {
-                    "title": "Temps mínim de buffer"
-                }
-            }
-        },
-        "music": {
-            "options": {
-                "scrobble": {
-                    "title": "Capturar la lectura",
-                    "descriptionOn": "Capturar l'historial de reproduccions",
-                    "descriptionOff": "No capturar l'historial de reproducció"
-                }
-            },
-            "name": "Música"
-        },
-        "reset": {
-            "name": "Reinicialitzar",
-            "actions": {
-                "clearImageCache": "Esborrar la memòria cau d'imatges"
-            }
-        },
-        "about": {
-            "name": "Quant a",
-            "version": "versió {{version}}",
-            "actions": {
-                "projectHomepage": "Pàgina d'inici del projecte",
-                "licenses": "Llicències"
-            }
-        }
-    },
-    "search": {
-        "nowPlayingContext": "Resultats de la cerca",
-        "inputPlaceholder": "Cercar",
-        "moreResults": "Més…",
-        "headerTitle": "Cercar: {{query}}"
-    }
-}

android/app/src/main/assets/custom/i18n/da.json

@@ -1,92 +0,0 @@
-{
-    "resources": {
-        "album": {
-            "lists": {
-                "byGenre": "Efter genre",
-                "alphabeticalByName": "Efter navn",
-                "alphabeticalByArtist": "Efter kunstner",
-                "byYear": "Efter år",
-                "sort": "Sortér albums"
-            },
-            "actions": {
-                "play": "Afspil album",
-                "view": "Se album"
-            }
-        },
-        "artist": {
-            "name": "Kunstner",
-            "name_plural": "Kunstnere",
-            "lists": {
-                "sort": "Sortér kunstnere",
-                "alphabeticalByName": "Efter navn"
-            },
-            "actions": {
-                "view": "Se kunstnere"
-            }
-        },
-        "song": {
-            "lists": {
-                "artistTopSongs": "Top sange"
-            },
-            "name": "Sang",
-            "name_plural": "Sange"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "library": "Bibliotek",
-            "search": "Søg",
-            "settings": "Indstillinger"
-        }
-    },
-    "search": {
-        "inputPlaceholder": "Søg",
-        "headerTitle": "Søg: {{query}}",
-        "nowPlayingContext": "Søgeresultater",
-        "moreResults": "Mere…"
-    },
-    "settings": {
-        "servers": {
-            "name": "Servere",
-            "fields": {
-                "address": "Adresse",
-                "username": "Brugernavn",
-                "password": "Adgangskode"
-            },
-            "actions": {
-                "add": "Tilføj server",
-                "edit": "Redigér server",
-                "testConnection": "Test forbindelse",
-                "delete": "Slet",
-                "save": "Gem"
-            },
-            "messages": {
-                "connectionOk": "Forbindelse til {{address}} OK!"
-            }
-        },
-        "network": {
-            "name": "Netværk",
-            "values": {
-                "kbps": "{{value}}kbps",
-                "unlimitedKbps": "Ubegrænset",
-                "seconds": "{{value}} sekunder"
-            }
-        },
-        "music": {
-            "name": "Musik"
-        },
-        "reset": {
-            "name": "Nulstil",
-            "actions": {
-                "clearImageCache": "Ryd billede cache"
-            }
-        },
-        "about": {
-            "name": "Omkring",
-            "version": "version {{version}}",
-            "actions": {
-                "licenses": "Licenser"
-            }
-        }
-    }
-}

android/app/src/main/assets/custom/i18n/de.json

@@ -1,152 +0,0 @@
-{
-    "resources": {
-        "song": {
-            "lists": {
-                "artistTopSongs": "Top Lieder"
-            },
-            "name": "Lied",
-            "name_plural": "Lieder"
-        },
-        "album": {
-            "name": "Album",
-            "name_plural": "Alben",
-            "lists": {
-                "sort": "Alben sortieren",
-                "random": "Zufällig",
-                "frequent": "Häufig abgespielt",
-                "recent": "Kürzlich abgespielt",
-                "starred": "Favoriten",
-                "byYear": "Nach Jahr",
-                "byGenre": "Nach Genre",
-                "alphabeticalByName": "Nach Name",
-                "newest": "Kürzlich hinzugefügt",
-                "alphabeticalByArtist": "Nach Interpreten"
-            },
-            "actions": {
-                "play": "Album abspielen",
-                "view": "Album anzeigen"
-            }
-        },
-        "artist": {
-            "name": "Interpret",
-            "name_plural": "Interpreten",
-            "lists": {
-                "sort": "Interpreten sortieren",
-                "random": "Zufällig",
-                "alphabeticalByName": "Nach Name",
-                "starred": "Favoriten"
-            },
-            "actions": {
-                "view": "Interpret anzeigen"
-            }
-        },
-        "playlist": {
-            "name": "Wiedergabeliste",
-            "name_plural": "Wiedergabelisten",
-            "actions": {
-                "play": "Wiedergabeliste abspielen"
-            }
-        },
-        "queue": {
-            "name": "Warteschlange",
-            "name_plural": "Warteschlangen"
-        }
-    },
-    "context": {
-        "actions": {
-            "star": "Markieren",
-            "unstar": "Markierung entfernen"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "Startseite",
-            "library": "Bibliothek",
-            "search": "Suche",
-            "settings": "Einstellungen"
-        }
-    },
-    "search": {
-        "inputPlaceholder": "Suche",
-        "headerTitle": "Suche: {{query}}",
-        "nowPlayingContext": "Suchergebnis",
-        "moreResults": "Mehr…"
-    },
-    "settings": {
-        "servers": {
-            "fields": {
-                "address": "Adresse",
-                "password": "Passwort",
-                "username": "Nutzername"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "Erzwinge Klartextpasswort",
-                    "descriptionOn": "Passwort als Klartext senden (Veraltet, stellen Sie sicher, dass Ihre Verbindung sicher ist!)",
-                    "descriptionOff": "Sende Passwort als Token + Salt"
-                }
-            },
-            "actions": {
-                "add": "Server hinzufügen",
-                "edit": "Server bearbeiten",
-                "testConnection": "Verbindung testen",
-                "delete": "Löschen",
-                "save": "Speichern"
-            },
-            "messages": {
-                "connectionOk": "Verbindung zu {{address}} ist OK!",
-                "connectionFailed": "Verbindung zu {{address}} fehlgeschlagen, überprüfe Einstellungen oder Server"
-            },
-            "name": "Server"
-        },
-        "network": {
-            "name": "Netzwerk",
-            "values": {
-                "kbps": "{{value}}kbps",
-                "unlimitedKbps": "Unbegrenzt",
-                "seconds": "{{value}} Sekunden"
-            },
-            "options": {
-                "maxBitrateWifi": {
-                    "title": "Maximale Bitrate (WLAN)"
-                },
-                "maxBuffer": {
-                    "title": "Maxilmale Pufferzeit"
-                },
-                "minBuffer": {
-                    "title": "Minimale Pufferzeit"
-                },
-                "maxBitrateMobile": {
-                    "title": "Maximale Bitrate (Mobil)"
-                }
-            }
-        },
-        "music": {
-            "name": "Musik",
-            "options": {
-                "scrobble": {
-                    "descriptionOn": "Scrobble Wiedergabeverlauf",
-                    "descriptionOff": "Kein Scrobble für Wiedergabeverlauf",
-                    "title": "Scrobble Wiedergabe"
-                }
-            }
-        },
-        "reset": {
-            "name": "Zurücksetzen",
-            "actions": {
-                "clearImageCache": "Bildzwischenspeicher löschen"
-            }
-        },
-        "about": {
-            "name": "Über",
-            "actions": {
-                "projectHomepage": "Projektseite",
-                "licenses": "Lizenzen"
-            },
-            "version": "Version {{version}}"
-        }
-    },
-    "messages": {
-        "nothingHere": "Hier ist nichts…"
-    }
-}

android/app/src/main/assets/custom/i18n/en.json

@@ -1,152 +0,0 @@
-{
-    "resources": {
-        "song": {
-            "name": "Song",
-            "name_plural": "Songs",
-            "lists": {
-                "artistTopSongs": "Top Songs"
-            }
-        },
-        "album": {
-            "name": "Album",
-            "name_plural": "Albums",
-            "lists": {
-                "sort": "Sort Albums",
-                "random": "Random",
-                "newest": "Recently Added",
-                "frequent": "Frequently Played",
-                "recent": "Recently Played",
-                "starred": "Starred",
-                "alphabeticalByName": "By Name",
-                "alphabeticalByArtist": "By Artist",
-                "byYear": "By Year",
-                "byGenre": "By Genre"
-            },
-            "actions": {
-                "play": "Play Album",
-                "view": "View Album"
-            }
-        },
-        "artist": {
-            "name": "Artist",
-            "name_plural": "Artists",
-            "lists": {
-                "sort": "Sort Artists",
-                "random": "Random",
-                "starred": "Starred",
-                "alphabeticalByName": "By Name"
-            },
-            "actions": {
-                "view": "View Artist"
-            }
-        },
-        "playlist": {
-            "name": "Playlist",
-            "name_plural": "Playlists",
-            "actions": {
-                "play": "Play Playlist"
-            }
-        },
-        "queue": {
-            "name": "Queue",
-            "name_plural": "Queues"
-        }
-    },
-    "context": {
-        "actions": {
-            "star": "Star",
-            "unstar": "Unstar"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "Home",
-            "library": "Library",
-            "search": "Search",
-            "settings": "Settings"
-        }
-    },
-    "messages": {
-        "nothingHere": "Nothing here…"
-    },
-    "search": {
-        "inputPlaceholder": "Search",
-        "headerTitle": "Search: {{query}}",
-        "moreResults": "More…",
-        "nowPlayingContext": "Search Results"
-    },
-    "settings": {
-        "servers": {
-            "name": "Servers",
-            "fields": {
-                "address": "Address",
-                "username": "Username",
-                "password": "Password"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "Force plaintext password",
-                    "descriptionOn": "Send password in plaintext (legacy, make sure your connection is secure!)",
-                    "descriptionOff": "Send password as token + salt"
-                }
-            },
-            "actions": {
-                "add": "Add Server",
-                "edit": "Edit Server",
-                "testConnection": "Test Connection",
-                "delete": "Delete",
-                "save": "Save"
-            },
-            "messages": {
-                "connectionOk": "Connection to {{address}} OK!",
-                "connectionFailed": "Connection to {{address}} failed, check settings or server"
-            }
-        },
-        "network": {
-            "name": "Network",
-            "values": {
-                "kbps": "{{value}}kbps",
-                "unlimitedKbps": "Unlimited",
-                "seconds": "{{value}} seconds"
-            },
-            "options": {
-                "maxBitrateWifi": {
-                    "title": "Maximum bitrate (Wi-Fi)"
-                },
-                "maxBitrateMobile": {
-                    "title": "Maximum bitrate (mobile)"
-                },
-                "minBuffer": {
-                    "title": "Minimum buffer time"
-                },
-                "maxBuffer": {
-                    "title": "Maximum buffer time"
-                }
-            }
-        },
-        "music": {
-            "name": "Music",
-            "options": {
-                "scrobble": {
-                    "title": "Scrobble plays",
-                    "descriptionOn": "Scrobble play history",
-                    "descriptionOff": "Don't scrobble play history"
-                }
-            }
-        },
-        "reset": {
-            "name": "Reset",
-            "actions": {
-                "clearImageCache": "Clear Image Cache"
-            }
-        },
-        "about": {
-            "name": "About",
-            "version": "version {{version}}",
-            "actions": {
-                "projectHomepage": "Project Homepage",
-                "licenses": "Licenses"
-            }
-        }
-    }
-}

android/app/src/main/assets/custom/i18n/fr.json

@@ -1,152 +0,0 @@
-{
-    "resources": {
-        "album": {
-            "name": "Album",
-            "name_plural": "Albums",
-            "lists": {
-                "random": "Aléatoire",
-                "newest": "Récemment Ajouté",
-                "frequent": "Fréquemment Joué",
-                "recent": "Récemment Joué",
-                "alphabeticalByName": "Par Nom",
-                "byYear": "Par Année",
-                "alphabeticalByArtist": "Par Artiste",
-                "byGenre": "Par Genre",
-                "starred": "Favoris",
-                "sort": "Trier les albums"
-            },
-            "actions": {
-                "play": "Jouer l'album",
-                "view": "Voir l'album"
-            }
-        },
-        "song": {
-            "name": "Chanson",
-            "name_plural": "Chansons",
-            "lists": {
-                "artistTopSongs": "Meilleures Chansons"
-            }
-        },
-        "artist": {
-            "name": "Artiste",
-            "name_plural": "Artistes",
-            "lists": {
-                "random": "Aléatoire",
-                "starred": "Favoris",
-                "alphabeticalByName": "Par Nom",
-                "sort": "Trier les artistes"
-            },
-            "actions": {
-                "view": "Voir l'artiste"
-            }
-        },
-        "playlist": {
-            "actions": {
-                "play": "Lire la playlist"
-            },
-            "name": "Playlist",
-            "name_plural": "Playlists"
-        },
-        "queue": {
-            "name": "File d'attente",
-            "name_plural": "Files d'attente"
-        }
-    },
-    "settings": {
-        "network": {
-            "values": {
-                "seconds": "{{value}} secondes",
-                "unlimitedKbps": "Illimité",
-                "kbps": "{{value}}kbit/s"
-            },
-            "options": {
-                "maxBitrateWifi": {
-                    "title": "Débit binaire maximum (Wi-Fi)"
-                },
-                "maxBitrateMobile": {
-                    "title": "Débit binaire maximum (mobile)"
-                },
-                "maxBuffer": {
-                    "title": "Temps maximum en mémoire tampon"
-                },
-                "minBuffer": {
-                    "title": "Temps minimum en mémoire tampon"
-                }
-            },
-            "name": "Réseau"
-        },
-        "servers": {
-            "fields": {
-                "username": "Nom d'utilisateur",
-                "address": "Adresse",
-                "password": "Mot de passe"
-            },
-            "actions": {
-                "testConnection": "Tester la connexion",
-                "add": "Ajouter un serveur",
-                "delete": "Supprimer",
-                "save": "Sauvegarder",
-                "edit": "Modifier le serveur"
-            },
-            "name": "Serveurs",
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "Forcer le mot de passe en texte clair",
-                    "descriptionOn": "Envoyer le mot de passe en test clair (héritage, assurez-vous que la connexion est sécurisée !)",
-                    "descriptionOff": "Envoyer le mot de passe sous forme de jeton + salage"
-                }
-            },
-            "messages": {
-                "connectionOk": "Connexion à {{address}} OK !",
-                "connectionFailed": "Échec de la connexion à {{address}}, vérifiez les paramètres ou le serveur"
-            }
-        },
-        "music": {
-            "name": "Musique",
-            "options": {
-                "scrobble": {
-                    "descriptionOff": "Ne pas scrobbler l'historique de lecture",
-                    "descriptionOn": "Scrobbler l'historique de lecture",
-                    "title": "Scrobbler la lecture"
-                }
-            }
-        },
-        "about": {
-            "version": "version {{version}}",
-            "name": "À propos",
-            "actions": {
-                "licenses": "Licenses",
-                "projectHomepage": "Page d'accueil du projet"
-            }
-        },
-        "reset": {
-            "actions": {
-                "clearImageCache": "Vider le cache d'images"
-            },
-            "name": "Réinitialiser"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "library": "Bibliothèque",
-            "home": "Accueil",
-            "search": "Recherche",
-            "settings": "Paramètres"
-        }
-    },
-    "search": {
-        "headerTitle": "Recherche : {{query}}",
-        "inputPlaceholder": "Recherche",
-        "moreResults": "Plus…",
-        "nowPlayingContext": "Résultats de recherche"
-    },
-    "context": {
-        "actions": {
-            "star": "Mettre en favoris",
-            "unstar": "Enlever des favoris"
-        }
-    },
-    "messages": {
-        "nothingHere": "Rien ici…"
-    }
-}

android/app/src/main/assets/custom/i18n/it.json

@@ -1,152 +0,0 @@
-{
-    "resources": {
-        "artist": {
-            "name": "Artista",
-            "name_plural": "Artisti",
-            "actions": {
-                "view": "Vedi artista"
-            },
-            "lists": {
-                "random": "Casuale",
-                "starred": "Preferiti",
-                "sort": "Ordina artisti",
-                "alphabeticalByName": "Per nome"
-            }
-        },
-        "song": {
-            "lists": {
-                "artistTopSongs": "Brani più popolari"
-            },
-            "name": "Brano",
-            "name_plural": "Brani"
-        },
-        "album": {
-            "name": "Album",
-            "name_plural": "Album",
-            "lists": {
-                "random": "Casuale",
-                "newest": "Aggiunti di recente",
-                "recent": "Ascoltati di recente",
-                "alphabeticalByName": "Per nome",
-                "alphabeticalByArtist": "Per artista",
-                "byYear": "Per anno",
-                "byGenre": "Per genere",
-                "sort": "Ordina album",
-                "frequent": "Ascoltati frequentemente",
-                "starred": "Preferiti"
-            },
-            "actions": {
-                "play": "Riproduci album",
-                "view": "Vedi album"
-            }
-        },
-        "playlist": {
-            "name": "Playlist",
-            "name_plural": "Playlist",
-            "actions": {
-                "play": "Riproduci playlist"
-            }
-        },
-        "queue": {
-            "name": "Coda",
-            "name_plural": "Code"
-        }
-    },
-    "settings": {
-        "servers": {
-            "fields": {
-                "password": "Password",
-                "address": "Indirizzo",
-                "username": "Nome utente"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "Forza password in chiaro",
-                    "descriptionOn": "Invia password in chiaro (deprecato, assicurati che la tua connessione sia sicura!)",
-                    "descriptionOff": "Invia la password come token + salt"
-                }
-            },
-            "actions": {
-                "delete": "Rimuovi",
-                "edit": "Modifica server",
-                "add": "Aggiungi server",
-                "save": "Salva",
-                "testConnection": "Prova connessione"
-            },
-            "name": "Server",
-            "messages": {
-                "connectionOk": "Connesso a {{address}} con successo!",
-                "connectionFailed": "Connessione a {{address}} fallita, controlla le impostazioni o il server"
-            }
-        },
-        "network": {
-            "name": "Rete",
-            "values": {
-                "kbps": "{{value}}kbps",
-                "unlimitedKbps": "Illimitato",
-                "seconds": "{{value}} secondi"
-            },
-            "options": {
-                "maxBitrateWifi": {
-                    "title": "Bitrate massimo (Wi-Fi)"
-                },
-                "maxBitrateMobile": {
-                    "title": "Bitrate massimo (rete dati)"
-                },
-                "minBuffer": {
-                    "title": "Tempo di buffer minimo"
-                },
-                "maxBuffer": {
-                    "title": "Tempo di buffer massimo"
-                }
-            }
-        },
-        "music": {
-            "name": "Musica",
-            "options": {
-                "scrobble": {
-                    "title": "Scrobbling delle riproduzioni",
-                    "descriptionOn": "Scrobbling della cronologia di ascolto",
-                    "descriptionOff": "Non eseguire lo scrobbling della cronologia d'ascolto"
-                }
-            }
-        },
-        "reset": {
-            "name": "Reimposta",
-            "actions": {
-                "clearImageCache": "Pulisci la cache delle immagini"
-            }
-        },
-        "about": {
-            "name": "Informazioni",
-            "version": "versione {{version}}",
-            "actions": {
-                "projectHomepage": "Pagina principale del progetto",
-                "licenses": "Licenze"
-            }
-        }
-    },
-    "context": {
-        "actions": {
-            "star": "Aggiungi ai preferiti",
-            "unstar": "Rimuovi dai preferiti"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "Home",
-            "library": "Libreria",
-            "search": "Cerca",
-            "settings": "Impostazioni"
-        }
-    },
-    "messages": {
-        "nothingHere": "Non c'è niente qui…"
-    },
-    "search": {
-        "inputPlaceholder": "Ricerca",
-        "headerTitle": "Ricerca: {{query}}",
-        "moreResults": "Mostra di più…",
-        "nowPlayingContext": "Risultati della ricerca"
-    }
-}

android/app/src/main/assets/custom/i18n/ja.json

@@ -1,55 +0,0 @@
-{
-    "resources": {
-        "album": {
-            "lists": {
-                "random": "ランダムアルバム",
-                "frequent": "よく聴くアルバム",
-                "recent": "最近再生した",
-                "starred": "星付きアルバム"
-            },
-            "name": "アルバム"
-        },
-        "song": {
-            "name": "歌",
-            "lists": {
-                "artistTopSongs": "人気曲"
-            }
-        },
-        "artist": {
-            "name": "アーティスト"
-        },
-        "playlist": {
-            "name": "プレイリスト"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "ホーム",
-            "library": "ライブラリ",
-            "search": "検索",
-            "settings": "設定"
-        }
-    },
-    "search": {
-        "inputPlaceholder": "検索"
-    },
-    "settings": {
-        "servers": {
-            "name": "サーバ"
-        },
-        "network": {
-            "name": "ネット"
-        },
-        "music": {
-            "name": "音楽"
-        },
-        "reset": {
-            "name": "リセット"
-        },
-        "about": {
-            "actions": {
-                "projectHomepage": "ホームページ"
-            }
-        }
-    }
-}

android/app/src/main/assets/custom/i18n/nb-NO.json

@@ -1,152 +0,0 @@
-{
-    "resources": {
-        "artist": {
-            "name": "Artist",
-            "name_plural": "Artister",
-            "lists": {
-                "sort": "Sorter artister",
-                "random": "Tilfeldig",
-                "starred": "Stjernemerket",
-                "alphabeticalByName": "Etter navn"
-            },
-            "actions": {
-                "view": "Vis artist"
-            }
-        },
-        "playlist": {
-            "name": "Spilleliste",
-            "name_plural": "Spillelister",
-            "actions": {
-                "play": "Spill av spilleliste"
-            }
-        },
-        "song": {
-            "lists": {
-                "artistTopSongs": "Toppspor"
-            },
-            "name": "Spor",
-            "name_plural": "Spor"
-        },
-        "album": {
-            "name": "Album",
-            "name_plural": "Album",
-            "lists": {
-                "sort": "Sorter album",
-                "random": "Tilfeldig",
-                "newest": "Nylig tillagt",
-                "frequent": "Ofte spilt",
-                "recent": "Nylig spilt",
-                "starred": "Stjernemerket",
-                "alphabeticalByName": "Etter navn",
-                "alphabeticalByArtist": "Etter artist",
-                "byYear": "Etter år",
-                "byGenre": "Etter sjanger"
-            },
-            "actions": {
-                "play": "Spill album",
-                "view": "Vis album"
-            }
-        },
-        "queue": {
-            "name": "Kø",
-            "name_plural": "Køer"
-        }
-    },
-    "settings": {
-        "servers": {
-            "actions": {
-                "add": "Legg til tjener",
-                "testConnection": "Test tilkobling",
-                "delete": "Slett",
-                "save": "Lagre",
-                "edit": "Rediger tjener"
-            },
-            "messages": {
-                "connectionOk": "Tilkobling til {{address}} OK.",
-                "connectionFailed": "Tilkobling til {{address}} mislyktes. Sjekk innstillingene eller tjeneren."
-            },
-            "name": "Tjenere",
-            "fields": {
-                "address": "Adresse",
-                "username": "Brukernavn",
-                "password": "Passord"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "Påtving klartekstspassord",
-                    "descriptionOn": "Send passord i klartekst (Foreldet. Forsikre deg om at tilkoblingen er sikker.)",
-                    "descriptionOff": "Send passord som symbol + salt"
-                }
-            }
-        },
-        "network": {
-            "name": "Nettverk",
-            "values": {
-                "kbps": "{{value}} kbps",
-                "unlimitedKbps": "Ubegrenset",
-                "seconds": "{{value}} sekunder"
-            },
-            "options": {
-                "maxBitrateWifi": {
-                    "title": "Maksimal bitrate (Wi-Fi)"
-                },
-                "maxBitrateMobile": {
-                    "title": "Maksimal bitrate (mobil)"
-                },
-                "minBuffer": {
-                    "title": "Minimal mellomlagringstid"
-                },
-                "maxBuffer": {
-                    "title": "Maksimal mellomlagringstid"
-                }
-            }
-        },
-        "music": {
-            "name": "Musikk",
-            "options": {
-                "scrobble": {
-                    "title": "Sporinfodelingsavspillinger",
-                    "descriptionOn": "Sporinfodelings-avspillinghistorikk",
-                    "descriptionOff": "Ikke utfør sporinfodeling av avspillingshistorikk"
-                }
-            }
-        },
-        "reset": {
-            "name": "Tilbakestill",
-            "actions": {
-                "clearImageCache": "Tøm bildehurtiglager"
-            }
-        },
-        "about": {
-            "name": "Om",
-            "version": "versjon {{version}}",
-            "actions": {
-                "projectHomepage": "Prosjekthjemmeside",
-                "licenses": "Lisenser"
-            }
-        }
-    },
-    "context": {
-        "actions": {
-            "star": "Stjernemerk",
-            "unstar": "Fjern stjernemerking"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "Hjem",
-            "library": "Bibliotek",
-            "search": "Søk",
-            "settings": "Innstillinger"
-        }
-    },
-    "search": {
-        "inputPlaceholder": "Søk",
-        "headerTitle": "Søk: {{query}}",
-        "moreResults": "Mer …",
-        "nowPlayingContext": "Søkeresultater"
-    },
-    "messages": {
-        "nothingHere": "Ingenting her …"
-    }
-}

android/app/src/main/assets/custom/i18n/ru.json

@@ -1,157 +0,0 @@
-{
-    "settings": {
-        "servers": {
-            "actions": {
-                "delete": "Удалить",
-                "add": "Добавить сервер",
-                "edit": "Редактировать сервер",
-                "testConnection": "Проверить подключение",
-                "save": "Сохранить"
-            },
-            "name": "Серверы",
-            "fields": {
-                "address": "Адрес",
-                "username": "Имя пользователя",
-                "password": "Пароль"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "descriptionOn": "Отправить пароль в виде текста (устарело, убедитесь, что ваше соединение безопасно!)",
-                    "descriptionOff": "Отправить пароль в виде токена",
-                    "title": "Принудительный текстовый пароль"
-                }
-            },
-            "messages": {
-                "connectionOk": "Подключение к {{address}} установлено!",
-                "connectionFailed": "Не удалось подключиться к {{address}}, проверьте настройки или сервер"
-            }
-        },
-        "network": {
-            "name": "Сеть",
-            "values": {
-                "kbps": "{{value}} кбит/с",
-                "unlimitedKbps": "Без ограничений",
-                "seconds": "{{value}} секунд"
-            },
-            "options": {
-                "maxBitrateWifi": {
-                    "title": "Максимальный битрейт (Wi-Fi)"
-                },
-                "maxBitrateMobile": {
-                    "title": "Максимальный битрейт (мобильный интернет)"
-                },
-                "minBuffer": {
-                    "title": "Минимальное время буферизации"
-                },
-                "maxBuffer": {
-                    "title": "Максимальное время буферизации"
-                }
-            }
-        },
-        "music": {
-            "name": "Музыка",
-            "options": {
-                "scrobble": {
-                    "title": "Синхронизация воспроизведения",
-                    "descriptionOff": "Не синхронизировать историю воспроизведений",
-                    "descriptionOn": "Синхронизация истории воспроизведения"
-                }
-            }
-        },
-        "reset": {
-            "name": "Сброс",
-            "actions": {
-                "clearImageCache": "Очистить кэш изображения"
-            }
-        },
-        "about": {
-            "name": "О Subtracks",
-            "version": "версия {{version}}",
-            "actions": {
-                "projectHomepage": "Сайт проекта",
-                "licenses": "Лицензии"
-            }
-        }
-    },
-    "resources": {
-        "album": {
-            "name_0": "Альбом",
-            "name_1": "Альбома",
-            "name_2": "Альбомов",
-            "lists": {
-                "sort": "Сортировка альбомов",
-                "random": "Случайно",
-                "newest": "Недавно добавленные",
-                "frequent": "Часто проигрываемые",
-                "recent": "Недавно проигранные",
-                "starred": "Избранные",
-                "alphabeticalByName": "По имени",
-                "alphabeticalByArtist": "По исполнителю",
-                "byYear": "По году",
-                "byGenre": "По жанру"
-            },
-            "actions": {
-                "play": "Воспроизвести альбом",
-                "view": "Посмотреть альбом"
-            }
-        },
-        "song": {
-            "name_0": "Трек",
-            "name_1": "Трека",
-            "name_2": "Треков",
-            "lists": {
-                "artistTopSongs": "Лучшие треки"
-            }
-        },
-        "artist": {
-            "name_0": "Исполнитель",
-            "name_1": "Исполнителя",
-            "name_2": "Исполнителей",
-            "lists": {
-                "sort": "Сортировать исполнителей",
-                "random": "Случайно",
-                "starred": "Избранные",
-                "alphabeticalByName": "По имени"
-            },
-            "actions": {
-                "view": "Посмотреть исполнителя"
-            }
-        },
-        "playlist": {
-            "name_0": "Плейлист",
-            "name_1": "Плейлиста",
-            "name_2": "Плейлистов",
-            "actions": {
-                "play": "Воспроизвести плейлист"
-            }
-        },
-        "queue": {
-            "name_0": "Очередь",
-            "name_1": "Очереди",
-            "name_2": "Очередей"
-        }
-    },
-    "context": {
-        "actions": {
-            "star": "Избранное",
-            "unstar": "Убрать из избранного"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "library": "Библиотека",
-            "search": "Поиск",
-            "settings": "Настройки",
-            "home": "Главная"
-        }
-    },
-    "messages": {
-        "nothingHere": "Здесь ничего нет…"
-    },
-    "search": {
-        "inputPlaceholder": "Поиск",
-        "headerTitle": "Поиск: {{query}}",
-        "moreResults": "Больше…",
-        "nowPlayingContext": "Результаты поиска"
-    }
-}

android/app/src/main/assets/custom/i18n/zh-Hans.json

@@ -1,147 +0,0 @@
-{
-    "context": {
-        "actions": {
-            "unstar": "移除收藏",
-            "star": "收藏"
-        }
-    },
-    "settings": {
-        "servers": {
-            "name": "服务器",
-            "messages": {
-                "connectionFailed": "连接到 {{address}} 失败，检查设置或服务器",
-                "connectionOk": "连接到 {{address}} 正常！"
-            },
-            "options": {
-                "forcePlaintextPassword": {
-                    "title": "强制使用明文密码",
-                    "descriptionOn": "密码以明文发送（不推荐，注意链接安全！）",
-                    "descriptionOff": "密码以 token + salt 加密发送"
-                }
-            },
-            "actions": {
-                "add": "添加服务器",
-                "testConnection": "测试连接",
-                "save": "保存",
-                "edit": "编辑服务器",
-                "delete": "删除"
-            },
-            "fields": {
-                "password": "密码",
-                "username": "用户名",
-                "address": "地址"
-            }
-        },
-        "network": {
-            "name": "网络",
-            "values": {
-                "seconds": "{{value}} 秒",
-                "kbps": "{{value}}kbps",
-                "unlimitedKbps": "不限制"
-            },
-            "options": {
-                "maxBitrateMobile": {
-                    "title": "最大比特率 (3G/4G/5G)"
-                },
-                "minBuffer": {
-                    "title": "最小缓冲时间"
-                },
-                "maxBuffer": {
-                    "title": "最大缓冲时间"
-                },
-                "maxBitrateWifi": {
-                    "title": "最大比特率 (Wi-Fi)"
-                }
-            }
-        },
-        "music": {
-            "name": "音乐",
-            "options": {
-                "scrobble": {
-                    "title": "Scrobble模式",
-                    "descriptionOn": "Scrobble播放历史",
-                    "descriptionOff": "不记录scrobble历史"
-                }
-            }
-        },
-        "reset": {
-            "name": "重置",
-            "actions": {
-                "clearImageCache": "清除图片缓存"
-            }
-        },
-        "about": {
-            "name": "关于",
-            "version": "版本 {{version}}",
-            "actions": {
-                "projectHomepage": "项目地址",
-                "licenses": "许可"
-            }
-        }
-    },
-    "resources": {
-        "album": {
-            "actions": {
-                "view": "查看专辑",
-                "play": "播放专辑"
-            },
-            "name": "专辑",
-            "lists": {
-                "newest": "最近添加",
-                "frequent": "播放最多",
-                "alphabeticalByName": "根据名称",
-                "alphabeticalByArtist": "根据歌手",
-                "byYear": "根据年份",
-                "random": "随机",
-                "sort": "专辑排序",
-                "recent": "最近播放",
-                "byGenre": "根据类型",
-                "starred": "已收藏"
-            }
-        },
-        "playlist": {
-            "actions": {
-                "play": "全部播放"
-            },
-            "name": "播放列表"
-        },
-        "song": {
-            "name": "歌曲",
-            "lists": {
-                "artistTopSongs": "热门歌曲"
-            }
-        },
-        "artist": {
-            "name": "歌手",
-            "lists": {
-                "starred": "已收藏",
-                "sort": "歌手排序",
-                "random": "随机",
-                "alphabeticalByName": "根据名称"
-            },
-            "actions": {
-                "view": "查看歌手"
-            }
-        },
-        "queue": {
-            "name": "队列"
-        }
-    },
-    "navigation": {
-        "tabs": {
-            "home": "首页",
-            "library": "所有",
-            "search": "搜索",
-            "settings": "设置"
-        }
-    },
-    "search": {
-        "inputPlaceholder": "搜索",
-        "headerTitle": "搜索： {{query}}",
-        "moreResults": "更多…",
-        "nowPlayingContext": "搜索结果"
-    },
-    "messages": {
-        "nothingHere": "什么都没有…"
-    }
-}

android/app/src/main/java/com/subsonify/MainActivity.java

@@ -14,9 +14,6 @@ public class MainActivity extends ReactActivity {
     return "subtracks";
   }
 
-  // required by react-native-screens
-  // "This change is required to avoid crashes related to View state being not persisted consistently across Activity restarts."
-  // https://reactnavigation.org/docs/getting-started
   @Override
   protected void onCreate(Bundle savedInstanceState) {
       super.onCreate(null);

android/app/src/main/res/drawable/rn_edit_text_material.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
-       android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
-
-    <selector>
-        <!-- 
-          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
-          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
-          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
-
-          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-
-          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
-        -->
-        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
-        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
-    </selector>
-
-</inset>

android/app/src/main/res/values/styles.xml

@@ -3,7 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
+        <item name="android:textColor">#000000</item>
     </style>
 
 </resources>

android/build.gradle

@@ -2,25 +2,24 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "30.0.3"
         minSdkVersion = 21
         compileSdkVersion = 30
         targetSdkVersion = 30
-        ndkVersion = "21.4.7075529"
+        ndkVersion = "20.1.5948944"
 
         // react-native-async-storage next
         kotlinVersion = '1.4.21'
     }
     repositories {
         google()
-        mavenCentral()
-        // jcenter()
+        jcenter()
         maven {
             url 'https://plugins.gradle.org/m2/'
         }
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:4.1.0")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
 
@@ -46,24 +45,9 @@ allprojects {
             // Android JSC is installed from npm
             url("$rootDir/../node_modules/jsc-android/dist")
         }
-        mavenCentral {
-            // We don't want to fetch react-native from Maven Central as there are
-            // older versions over there.
-            content {
-                excludeGroup "com.facebook.react"
-            }
-        }
+
         google()
+        jcenter()
         maven { url 'https://www.jitpack.io' }
-        // remove jcenter once the following workarounds are no longer needed
-        jcenter() {
-            content {
-                // used by react-native-track-player, can remove once they use a newer exoplayer
-                includeGroup("com.linkedin.dexmaker")
-                // used by exoplayer
-                includeGroup("com.linkedin.dexmaker-mockito")
-                includeGroup("com.google.android.exoplayer")
-            }
-        }
     }
 }

android/gradle.properties

@@ -9,7 +9,7 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# Default value: -Xmx10248m -XX:MaxPermSize=256m
 org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 # When configured, Gradle will run in incubating parallel mode.
@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.99.0
+FLIPPER_VERSION=0.75.1
 
 # react-native-async-storage next
 AsyncStorage_useNextStorage=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/licenses.yml

@@ -4,18 +4,12 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://developer.android.com/jetpack/androidx
-- artifact: androidx.annotation:annotation-experimental:+
-  name: annotation-experimental
-  copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/annotation#1.1.0
 - artifact: androidx.annotation:annotation:+
   name: annotation
   copyrightHolder: Original Author
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/annotation#1.2.0
+  url: http://developer.android.com/tools/extras/support-library.html
 - artifact: androidx.appcompat:appcompat-resources:+
   name: appcompat-resources
   copyrightHolder: Original Author
@@ -46,12 +40,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: http://developer.android.com/tools/extras/support-library.html
-- artifact: androidx.autofill:autofill:+
-  name: autofill
-  copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/autofill#1.1.0
 - artifact: androidx.cardview:cardview:+
   name: cardview
   copyrightHolder: Original Author
@@ -70,12 +58,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://developer.android.com/jetpack/androidx
-- artifact: androidx.core:core-ktx:+
-  name: core-ktx
-  copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/core#1.6.0
 - artifact: androidx.core:core:+
   name: core
   copyrightHolder: Original Author
@@ -207,19 +189,19 @@
   copyrightHolder: Original Author
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/room#2.3.0
+  url: https://developer.android.com/topic/libraries/architecture/index.html
 - artifact: androidx.room:room-ktx:+
   name: room-ktx
   copyrightHolder: Original Author
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/room#2.3.0
+  url: https://developer.android.com/topic/libraries/architecture/index.html
 - artifact: androidx.room:room-runtime:+
   name: room-runtime
   copyrightHolder: Original Author
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://developer.android.com/jetpack/androidx/releases/room#2.3.0
+  url: https://developer.android.com/topic/libraries/architecture/index.html
 - artifact: androidx.savedstate:savedstate:+
   name: savedstate
   copyrightHolder: Original Author
@@ -319,104 +301,62 @@
 - artifact: com.facebook.fresco:drawee:+
   name: drawee
   copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:fbcore:+
   name: fbcore
   copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:fresco:+
   name: fresco
   copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:imagepipeline-base:+
   name: imagepipeline-base
   copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:imagepipeline-native:+
-  name: imagepipeline-native
-  copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:imagepipeline-okhttp3:+
   name: imagepipeline-okhttp3
   copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:imagepipeline:+
   name: imagepipeline
   copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:memory-type-ashmem:+
-  name: memory-type-ashmem
-  copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:memory-type-java:+
-  name: memory-type-java
-  copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:memory-type-native:+
-  name: memory-type-native
-  copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:middleware:+
-  name: middleware
-  copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:nativeimagefilters:+
   name: nativeimagefilters
   copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.fresco:nativeimagetranscoder:+
   name: nativeimagetranscoder
   copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:soloader:+
-  name: soloader
-  copyrightHolder: Original Author
-  license: MIT
-  licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
-  url: https://github.com/facebook/fresco
-- artifact: com.facebook.fresco:ui-common:+
-  name: ui-common
-  copyrightHolder: Original Author
-  license: MIT
+  license: MIT License
   licenseUrl: https://github.com/facebook/fresco/blob/master/LICENSE
   url: https://github.com/facebook/fresco
 - artifact: com.facebook.infer.annotation:infer-annotation:+
   name: infer-annotation
   copyrightHolder: Original Author
-  license: MIT license
+  license: BSD license
   licenseUrl: https://github.com/facebook/infer/blob/master/LICENSE
   url: http://fbinfer.com/
 - artifact: com.facebook.react:react-native:+
   name: react-native
   copyrightHolder: Original Author
   license: MIT License
-  licenseUrl: https://github.com/facebook/react-native/blob/HEAD/LICENSE
+  licenseUrl: https://github.com/facebook/react-native/blob/master/LICENSE
   url: https://github.com/facebook/react-native
 - artifact: com.facebook.soloader:annotation:+
   name: annotation
@@ -554,21 +494,21 @@
 - artifact: com.squareup.okhttp3:okhttp-urlconnection:+
   name: okhttp-urlconnection
   copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://square.github.io/okhttp/
+  license: Apache-2.0 License
+  licenseUrl: https://github.com/square/okhttp/blob/master/LICENSE.txt
+  url: https://github.com/square/okhttp
 - artifact: com.squareup.okhttp3:okhttp:+
   name: okhttp
   copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://square.github.io/okhttp/
+  license: Apache-2.0 License
+  licenseUrl: https://github.com/square/okhttp/blob/master/LICENSE.txt
+  url: https://github.com/square/okhttp
 - artifact: com.squareup.okio:okio:+
   name: okio
   copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/square/okio/
+  license: Apache-2.0 License
+  licenseUrl: https://github.com/square/okio/blob/master/LICENSE.txt
+  url: https://github.com/square/okio
 - artifact: javax.inject:javax.inject:+
   name: javax.inject
   copyrightHolder: Original Author
@@ -593,12 +533,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://github.com/raphw/byte-buddy
-- artifact: org.apache.commons:commons-lang3:+
-  name: commons-lang3
-  copyrightHolder: Original Author
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://commons.apache.org/lang/
 - artifact: org.checkerframework:checker-compat-qual:+
   name: checker-compat-qual
   copyrightHolder: Original Author
@@ -629,30 +563,12 @@
   license: The Apache License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://kotlinlang.org/
-- artifact: org.jetbrains.kotlin:kotlin-reflect:+
-  name: kotlin-reflect
-  copyrightHolder: Original Author
-  license: The Apache License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
 - artifact: org.jetbrains.kotlin:kotlin-stdlib-common:+
   name: kotlin-stdlib-common
   copyrightHolder: Original Author
   license: The Apache License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://kotlinlang.org/
-- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk7:+
-  name: kotlin-stdlib-jdk7
-  copyrightHolder: Original Author
-  license: The Apache License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
-- artifact: org.jetbrains.kotlin:kotlin-stdlib-jdk8:+
-  name: kotlin-stdlib-jdk8
-  copyrightHolder: Original Author
-  license: The Apache License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://kotlinlang.org/
 - artifact: org.jetbrains.kotlin:kotlin-stdlib:+
   name: kotlin-stdlib
   copyrightHolder: Original Author

app/App.tsx

@@ -2,30 +2,22 @@ import RootNavigator from '@app/navigation/RootNavigator'
 import SplashPage from '@app/screens/SplashPage'
 import colors from '@app/styles/colors'
 import React from 'react'
-import { StatusBar, StyleSheet, View } from 'react-native'
-import { MenuProvider } from 'react-native-popup-menu'
-import { QueryClientProvider } from 'react-query'
+import { StatusBar, View, StyleSheet } from 'react-native'
 import ProgressHook from './components/ProgressHook'
-import queryClient from './queryClient'
 import { useStore } from './state/store'
+import { selectTrackPlayer } from './state/trackplayer'
+import { MenuProvider } from 'react-native-popup-menu'
 
 const Debug = () => {
-  const currentTrackTitle = useStore(store => store.currentTrack?.title)
-  console.log('currentTrackTitle', currentTrackTitle)
+  const currentTrack = useStore(selectTrackPlayer.currentTrack)
+  console.log(currentTrack?.title)
   return <></>
 }
 
-const App = () => {
-  return (
-    <QueryClientProvider client={queryClient}>
+const App = () => (
   <MenuProvider backHandler={true}>
     <View style={styles.appContainer}>
-          <StatusBar
-            animated={true}
-            backgroundColor={'rgba(0, 0, 0, 0.3)'}
-            barStyle={'light-content'}
-            translucent={true}
-          />
+      <StatusBar animated={true} backgroundColor={'rgba(0, 0, 0, 0.3)'} barStyle={'light-content'} translucent={true} />
       <SplashPage>
         <ProgressHook />
         <Debug />
@@ -33,9 +25,7 @@ const App = () => {
       </SplashPage>
     </View>
   </MenuProvider>
-    </QueryClientProvider>
-  )
-}
+)
 
 const styles = StyleSheet.create({
   appContainer: {

app/components/BackgroundHeaderFlatList.tsx

@@ -37,7 +37,7 @@ function BackgroundHeaderFlatList<ItemT>(props: BackgroundHeaderFlatListProp<Ite
         </props.BackgroundComponent>
       }
       ListHeaderComponentStyle={[headerStyle]}
-      ListEmptyComponent={props.ListEmptyComponent || <NothingHere style={styles.nothing} />}
+      ListEmptyComponent={<NothingHere style={styles.nothing} />}
     />
   )
 }

app/components/Button.tsx

@@ -16,13 +16,7 @@ const Button: React.FC<{
       onPress={onPress}
       disabled={disabled}
       style={[styles.container, buttonStyle !== undefined ? styles[buttonStyle] : {}, style]}>
-      {title ? (
-        <Text style={styles.text} numberOfLines={2} adjustsFontSizeToFit={true}>
-          {title}
-        </Text>
-      ) : (
-        children
-      )}
+      {title ? <Text style={styles.text}>{title}</Text> : children}
     </PressableOpacity>
   )
 }
@@ -32,7 +26,6 @@ const styles = StyleSheet.create({
     backgroundColor: colors.accent,
     paddingHorizontal: 10,
     minHeight: 42,
-    maxHeight: 42,
     justifyContent: 'center',
     borderRadius: 1000,
   },
@@ -50,7 +43,6 @@ const styles = StyleSheet.create({
     fontFamily: font.bold,
     color: colors.text.primary,
     paddingHorizontal: 14,
-    textAlign: 'center',
   },
 })
 

app/components/ContextMenu.tsx

@@ -1,19 +1,20 @@
 import PressableOpacity from '@app/components/PressableOpacity'
-import { useStar } from '@app/hooks/query'
-import { StarrableItemType, Song, Artist, Album } from '@app/models/library'
+import { useStarred } from '@app/hooks/music'
+import { AlbumListItem, Artist, Song, StarrableItemType } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { NavigationProp, useNavigation } from '@react-navigation/native'
 import { ReactComponentLike } from 'prop-types'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
 import { ScrollView, StyleProp, StyleSheet, Text, View, ViewStyle } from 'react-native'
 import { Menu, MenuOption, MenuOptions, MenuTrigger, renderers } from 'react-native-popup-menu'
 import IconFA from 'react-native-vector-icons/FontAwesome'
 import IconFA5 from 'react-native-vector-icons/FontAwesome5'
+// import IconMat from 'react-native-vector-icons/MaterialIcons'
 import CoverArt from './CoverArt'
-import { Star } from './Star'
-import { withSuspenseMemo } from './withSuspense'
+import Star from './Star'
 
 const { SlideInMenu } = renderers
 
@@ -24,7 +25,6 @@ type ContextMenuProps = {
   triggerTouchableStyle?: StyleProp<ViewStyle>
   onPress?: () => any
   triggerOnLongPress?: boolean
-  disabled?: boolean
 }
 
 type InternalContextMenuProps = ContextMenuProps & {
@@ -42,7 +42,6 @@ const ContextMenu: React.FC<InternalContextMenuProps> = ({
   menuOptions,
   children,
   triggerOnLongPress,
-  disabled,
 }) => {
   menuStyle = menuStyle || { flex: 1 }
   triggerWrapperStyle = triggerWrapperStyle || { flex: 1 }
@@ -51,12 +50,11 @@ const ContextMenu: React.FC<InternalContextMenuProps> = ({
   return (
     <Menu renderer={SlideInMenu} style={menuStyle}>
       <MenuTrigger
-        disabled={disabled}
         triggerOnLongPress={triggerOnLongPress === undefined ? true : triggerOnLongPress}
         customStyles={{
           triggerOuterWrapper: triggerOuterWrapperStyle,
           triggerWrapper: triggerWrapperStyle,
-          triggerTouchable: { style: triggerTouchableStyle, disabled },
+          triggerTouchable: { style: triggerTouchableStyle },
           TriggerTouchableComponent: PressableOpacity,
         }}
         onAlternativeAction={onPress}>
@@ -108,9 +106,7 @@ const ContextMenuIconTextOption = React.memo<ContextMenuIconTextOptionProps>(
     return (
       <ContextMenuOption onSelect={onSelect}>
         <View style={styles.icon}>{Icon}</View>
-        <Text style={styles.optionText} numberOfLines={1} adjustsFontSizeToFit={true} minimumFontScale={0.6}>
-          {text}
-        </Text>
+        <Text style={styles.optionText}>{text}</Text>
       </ContextMenuOption>
     )
   },
@@ -119,50 +115,15 @@ const ContextMenuIconTextOption = React.memo<ContextMenuIconTextOptionProps>(
 const MenuHeader = React.memo<{
   coverArt?: string
   artistId?: string
-  albumId?: string
   title: string
   subtitle?: string
-}>(({ coverArt, artistId, albumId, title, subtitle }) => {
-  let CoverArtComponent = <></>
-  if (artistId) {
-    CoverArtComponent = (
-      <CoverArt
-        type="artist"
-        artistId={artistId}
-        style={styles.coverArt}
-        resizeMode="cover"
-        round={true}
-        size="thumbnail"
-        fadeDuration={0}
-      />
-    )
-  } else if (albumId) {
-    CoverArtComponent = (
-      <CoverArt
-        type="album"
-        albumId={albumId}
-        style={styles.coverArt}
-        resizeMode="cover"
-        size="thumbnail"
-        fadeDuration={0}
-      />
-    )
-  } else {
-    CoverArtComponent = (
-      <CoverArt
-        type="cover"
-        coverArt={coverArt}
-        style={styles.coverArt}
-        resizeMode="cover"
-        size="thumbnail"
-        fadeDuration={0}
-      />
-    )
-  }
-
-  return (
+}>(({ coverArt, artistId, title, subtitle }) => (
   <View style={styles.menuHeader}>
-      {CoverArtComponent}
+    {artistId ? (
+      <CoverArt type="artist" artistId={artistId} style={styles.coverArt} resizeMode={'cover'} round={true} />
+    ) : (
+      <CoverArt type="cover" coverArt={coverArt} style={styles.coverArt} resizeMode={'cover'} />
+    )}
     <View style={styles.menuHeaderText}>
       <Text numberOfLines={1} style={styles.menuTitle}>
         {title}
@@ -176,33 +137,30 @@ const MenuHeader = React.memo<{
       )}
     </View>
   </View>
-  )
-})
+))
 
-const OptionStar = withSuspenseMemo<{
+const OptionStar = React.memo<{
   id: string
   type: StarrableItemType
   additionalText?: string
 }>(({ id, type, additionalText: text }) => {
-  const { query, toggle } = useStar(id, type)
-  const { t } = useTranslation()
+  const starred = useStarred(id, type)
+  const setStarred = useStore(selectMusic.starItem)
 
   return (
     <ContextMenuIconTextOption
-      IconComponentRaw={<Star starred={!!query.data} size={26} />}
-      text={(query.data ? t('context.actions.unstar') : t('context.actions.star')) + (text ? ` ${text}` : '')}
-      onSelect={() => toggle.mutate()}
+      IconComponentRaw={<Star starred={starred} size={26} />}
+      text={(starred ? 'Unstar' : 'Star') + (text ? ` ${text}` : '')}
+      onSelect={() => setStarred(id, type, starred)}
     />
   )
 })
 
-const OptionViewArtist = withSuspenseMemo<{
+const OptionViewArtist = React.memo<{
   navigation: NavigationProp<any>
   artist?: string
   artistId?: string
 }>(({ navigation, artist, artistId }) => {
-  const { t } = useTranslation()
-
   if (!artist || !artistId) {
     return <></>
   }
@@ -212,19 +170,17 @@ const OptionViewArtist = withSuspenseMemo<{
       IconComponent={IconFA}
       name="microphone"
       size={26}
-      text={t('resources.artist.actions.view')}
+      text="View Artist"
       onSelect={() => navigation.navigate('artist', { id: artistId, title: artist })}
     />
   )
 })
 
-const OptionViewAlbum = withSuspenseMemo<{
+const OptionViewAlbum = React.memo<{
   navigation: NavigationProp<any>
   album?: string
   albumId?: string
 }>(({ navigation, album, albumId }) => {
-  const { t } = useTranslation()
-
   if (!album || !albumId) {
     return <></>
   }
@@ -234,7 +190,7 @@ const OptionViewAlbum = withSuspenseMemo<{
       IconComponent={IconFA5}
       name="compact-disc"
       size={26}
-      text={t('resources.album.actions.view')}
+      text="View Album"
       onSelect={() => navigation.navigate('album', { id: albumId, title: album })}
     />
   )
@@ -247,7 +203,7 @@ const OptionViewAlbum = withSuspenseMemo<{
 // ))
 
 export type AlbumContextPressableProps = ContextMenuProps & {
-  album: Album
+  album: AlbumListItem
 }
 
 export const AlbumContextPressable: React.FC<AlbumContextPressableProps> = props => {
@@ -281,7 +237,7 @@ export const SongContextPressable: React.FC<SongContextPressableProps> = props =
   return (
     <ContextMenu
       {...props}
-      menuHeader={<MenuHeader title={song.title} subtitle={song.artist} albumId={song.albumId} />}
+      menuHeader={<MenuHeader title={song.title} subtitle={song.artist} coverArt={song.coverArt} />}
       menuOptions={
         <>
           <OptionStar id={song.id} type={song.itemType} />
@@ -328,7 +284,7 @@ export const NowPlayingContextPressable: React.FC<NowPlayingContextPressableProp
   return (
     <ContextMenu
       {...props}
-      menuHeader={<MenuHeader title={song.title} subtitle={song.artist} albumId={song.albumId} />}
+      menuHeader={<MenuHeader title={song.title} subtitle={song.artist} coverArt={song.coverArt} />}
       menuOptions={
         <>
           <OptionStar id={song.id} type={song.itemType} />
@@ -348,8 +304,6 @@ const styles = StyleSheet.create({
   },
   optionsWrapper: {
     // marginBottom: 10,
-    paddingHorizontal: 20,
-    // backgroundColor: 'purple',
   },
   menuHeader: {
     paddingTop: 14,
@@ -380,11 +334,9 @@ const styles = StyleSheet.create({
   },
   option: {
     paddingVertical: 8,
-    // paddingHorizontal: 100,
+    paddingHorizontal: 20,
     flexDirection: 'row',
     alignItems: 'center',
-    // backgroundColor: 'blue',
-    overflow: 'hidden',
   },
   icon: {
     marginRight: 10,

app/components/CoverArt.tsx

@@ -1,5 +1,5 @@
-import { useQueryAlbumCoverArtPath, useQueryArtistArtPath, useQueryCoverArtPath } from '@app/hooks/query'
-import { CacheImageSize } from '@app/models/cache'
+import { useArtistArtFile, useCoverArtFile } from '@app/hooks/cache'
+import { CacheFile, CacheImageSize, CacheRequest } from '@app/models/cache'
 import colors from '@app/styles/colors'
 import React, { useState } from 'react'
 import {
@@ -18,8 +18,7 @@ type BaseProps = {
   imageStyle?: ImageStyle
   resizeMode?: ImageResizeMode
   round?: boolean
-  size: CacheImageSize
-  fadeDuration?: number
+  size?: CacheImageSize
 }
 
 type ArtistCoverArtProps = BaseProps & {
@@ -32,68 +31,50 @@ type CoverArtProps = BaseProps & {
   coverArt?: string
 }
 
-type AlbumIdProps = BaseProps & {
-  type: 'album'
-  albumId?: string
-}
-
-type ImageSourceProps = BaseProps & {
-  data?: string
-  isFetching: boolean
-  isExistingFetching: boolean
-}
-
-const ImageSource = React.memo<ImageSourceProps>(
-  ({ style, imageStyle, resizeMode, data, isFetching, isExistingFetching, fadeDuration }) => {
+const ImageSource = React.memo<{ cache?: { file?: CacheFile; request?: CacheRequest } } & BaseProps>(
+  ({ cache, style, imageStyle, resizeMode }) => {
     const [error, setError] = useState(false)
 
     let source: ImageSourcePropType
-    if (!error && data) {
-      source = { uri: `file://${data}` }
+    if (!error && cache?.file && !cache?.request?.promise) {
+      source = { uri: `file://${cache.file.path}`, cache: 'reload' }
     } else {
       source = require('@res/fallback.png')
     }
 
     return (
       <>
-        {isExistingFetching ? (
-          <View style={{ height: style?.height, width: style?.width }} />
-        ) : (
         <Image
           source={source}
-            fadeDuration={fadeDuration === undefined ? 250 : fadeDuration}
+          fadeDuration={150}
           resizeMode={resizeMode || 'contain'}
           style={[{ height: style?.height, width: style?.width }, imageStyle]}
           onError={() => setError(true)}
         />
-        )}
-        {isFetching && (
-          <ActivityIndicator animating={true} size="large" color={colors.accent} style={styles.indicator} />
-        )}
+        <ActivityIndicator
+          animating={!!cache?.request?.promise}
+          size="large"
+          color={colors.accent}
+          style={styles.indicator}
+        />
       </>
     )
   },
 )
 
 const ArtistImage = React.memo<ArtistCoverArtProps>(props => {
-  const { data, isFetching, isExistingFetching } = useQueryArtistArtPath(props.artistId, props.size)
+  const cache = useArtistArtFile(props.artistId, props.size)
 
-  return <ImageSource data={data} isFetching={isFetching} isExistingFetching={isExistingFetching} {...props} />
+  return <ImageSource cache={cache} {...props} imageStyle={{ ...styles.artistImage, ...props.imageStyle }} />
 })
 
 const CoverArtImage = React.memo<CoverArtProps>(props => {
-  const { data, isFetching, isExistingFetching } = useQueryCoverArtPath(props.coverArt, props.size)
+  const cache = useCoverArtFile(props.coverArt, props.size)
 
-  return <ImageSource data={data} isFetching={isFetching} isExistingFetching={isExistingFetching} {...props} />
+  return <ImageSource cache={cache} {...props} />
 })
 
-const AlbumIdIamge = React.memo<AlbumIdProps>(props => {
-  const { data, isFetching, isExistingFetching } = useQueryAlbumCoverArtPath(props.albumId, props.size)
-
-  return <ImageSource data={data} isFetching={isFetching} isExistingFetching={isExistingFetching} {...props} />
-})
-
-const CoverArt = React.memo<CoverArtProps | ArtistCoverArtProps | AlbumIdProps>(props => {
+const CoverArt = React.memo<CoverArtProps | ArtistCoverArtProps>(props => {
   const viewStyles = [props.style]
   if (props.round) {
     viewStyles.push(styles.round)
@@ -104,9 +85,6 @@ const CoverArt = React.memo<CoverArtProps | ArtistCoverArtProps | AlbumIdProps>(
     case 'artist':
       imageComponent = <ArtistImage {...(props as ArtistCoverArtProps)} />
       break
-    case 'album':
-      imageComponent = <AlbumIdIamge {...(props as AlbumIdProps)} />
-      break
     default:
       imageComponent = <CoverArtImage {...(props as CoverArtProps)} />
       break

app/components/FilterButton.tsx

@@ -1,13 +1,10 @@
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import React from 'react'
-import { Text, StyleSheet, View } from 'react-native'
-import { MenuOption, Menu, MenuTrigger, MenuOptions, renderers } from 'react-native-popup-menu'
+import { Text, StyleSheet } from 'react-native'
+import { MenuOption, Menu, MenuTrigger, MenuOptions } from 'react-native-popup-menu'
 import PressableOpacity from './PressableOpacity'
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
-import { ScrollView } from 'react-native-gesture-handler'
-
-const { SlideInMenu } = renderers
 
 export type OptionData = {
   value: string
@@ -20,14 +17,12 @@ const Option = React.memo<{
   selected?: boolean
 }>(({ text, value, selected }) => (
   <MenuOption style={styles.option} value={value}>
+    <Text style={styles.optionText}>{text}</Text>
     {selected ? (
-      <Icon name="checkbox-marked-circle" size={32} color={colors.accent} style={styles.icon} />
+      <Icon name="checkbox-marked-circle" size={26} color={colors.accent} />
     ) : (
-      <Icon name="checkbox-blank-circle-outline" size={32} color={colors.text.secondary} style={styles.icon} />
+      <Icon name="checkbox-blank-circle-outline" size={26} color={colors.text.secondary} />
     )}
-    <Text style={styles.optionText} numberOfLines={1} adjustsFontSizeToFit={true} minimumFontScale={0.6}>
-      {text}
-    </Text>
   </MenuOption>
 ))
 
@@ -35,10 +30,9 @@ const FilterButton = React.memo<{
   value?: string
   data: OptionData[]
   onSelect?: (selection: string) => void
-  title: string
-}>(({ value, data, onSelect, title }) => {
+}>(({ value, data, onSelect }) => {
   return (
-    <Menu onSelect={onSelect} renderer={SlideInMenu}>
+    <Menu onSelect={onSelect}>
       <MenuTrigger
         customStyles={{
           triggerOuterWrapper: styles.filterOuterWrapper,
@@ -46,23 +40,16 @@ const FilterButton = React.memo<{
           triggerTouchable: { style: styles.filter },
           TriggerTouchableComponent: PressableOpacity,
         }}>
-        <Icon name="filter-variant" color="white" size={30} />
+        <Icon name="filter-variant" color="white" size={30} style={styles.filterIcon} />
       </MenuTrigger>
       <MenuOptions
         customStyles={{
           optionsWrapper: styles.optionsWrapper,
           optionsContainer: styles.optionsContainer,
         }}>
-        <ScrollView style={styles.optionsScroll} overScrollMode="never">
-          <View style={styles.header}>
-            <Text style={styles.headerText} numberOfLines={2} ellipsizeMode="clip">
-              {title}
-            </Text>
-          </View>
         {data.map(o => (
           <Option key={o.value} text={o.text} value={o.value} selected={o.value === value} />
         ))}
-        </ScrollView>
       </MenuOptions>
     </Menu>
   )
@@ -84,45 +71,28 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     backgroundColor: colors.accent,
   },
-  optionsScroll: {
-    maxHeight: 260,
+  filterIcon: {
+    // top: 4,
   },
   optionsWrapper: {
-    overflow: 'hidden',
+    maxWidth: 145,
   },
   optionsContainer: {
-    backgroundColor: 'rgba(45, 45, 45, 0.95)',
-  },
-  header: {
-    paddingHorizontal: 20,
-    // paddingVertical: 10,
-    marginTop: 16,
-    marginBottom: 6,
-  },
-  headerText: {
-    fontFamily: font.bold,
-    fontSize: 20,
-    color: colors.text.primary,
+    backgroundColor: colors.gradient.high,
+    maxWidth: 145,
   },
   option: {
-    paddingVertical: 8,
-    paddingHorizontal: 20,
     flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'flex-start',
-  },
-  optionText: {
-    fontFamily: font.semiBold,
-    fontSize: 16,
-    color: colors.text.primary,
-  },
-  icon: {
-    marginRight: 14,
-    width: 32,
-    height: 32,
+    paddingHorizontal: 12,
+    paddingVertical: 8,
     justifyContent: 'center',
     alignItems: 'center',
-    // backgroundColor: 'red',
+  },
+  optionText: {
+    color: colors.text.primary,
+    fontFamily: font.semiBold,
+    fontSize: 16,
+    flex: 1,
   },
 })
 

app/components/GradientScrollView.tsx

@@ -4,7 +4,6 @@ import dimensions from '@app/styles/dimensions'
 import React, { ForwardedRef, PropsWithChildren } from 'react'
 import { ScrollView, ScrollViewProps, useWindowDimensions } from 'react-native'
 import Animated from 'react-native-reanimated'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 export type GradientScrollViewProps = PropsWithChildren<
   Animated.AnimateProps<ScrollViewProps> & {
@@ -14,9 +13,8 @@ export type GradientScrollViewProps = PropsWithChildren<
 
 const GradientScrollView = React.forwardRef<ScrollView, GradientScrollViewProps>((props, ref) => {
   const layout = useWindowDimensions()
-  const paddingTop = useSafeAreaInsets().top
 
-  const minHeight = layout.height - (dimensions.header + paddingTop + dimensions.bottom())
+  const minHeight = layout.height - (dimensions.top() + dimensions.bottom())
 
   return (
     <Animated.ScrollView

app/components/HeaderBar.tsx

@@ -1,18 +1,17 @@
-import { Album, Song } from '@app/models/library'
 import colors from '@app/styles/colors'
 import dimensions from '@app/styles/dimensions'
 import font from '@app/styles/font'
 import { useNavigation } from '@react-navigation/core'
-import { ReactComponentLike } from 'prop-types'
 import React, { useCallback } from 'react'
-import { StyleSheet, Text, View, ViewStyle } from 'react-native'
+import { View, StatusBar, Text, StyleSheet, ViewStyle } from 'react-native'
 import Animated from 'react-native-reanimated'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
-import IconMat from 'react-native-vector-icons/MaterialIcons'
-import { AlbumContextPressable, NowPlayingContextPressable } from './ContextMenu'
 import PressableOpacity from './PressableOpacity'
+import IconMat from 'react-native-vector-icons/MaterialIcons'
+import { ReactComponentLike } from 'prop-types'
+import { AlbumListItem, Song } from '@app/models/music'
+import { AlbumContextPressable, NowPlayingContextPressable } from './ContextMenu'
 
-export type HeaderContextItem = Song | Album
+export type HeaderContextItem = Song | AlbumListItem
 
 const More = React.memo<{ contextItem?: HeaderContextItem }>(({ contextItem }) => {
   const moreIcon = <IconMat name="more-vert" color="white" size={25} />
@@ -49,12 +48,11 @@ const More = React.memo<{ contextItem?: HeaderContextItem }>(({ contextItem }) =
 
 const HeaderBar = React.memo<{
   title?: string
-  headerStyle?: Animated.AnimateStyle<ViewStyle> | Animated.AnimateStyle<ViewStyle>[]
+  headerStyle?: Animated.AnimatedStyleProp<ViewStyle> | Animated.AnimatedStyleProp<ViewStyle>[]
   HeaderCenter?: ReactComponentLike
   contextItem?: HeaderContextItem
 }>(({ title, headerStyle, HeaderCenter, contextItem }) => {
   const navigation = useNavigation()
-  const top = useSafeAreaInsets().top
 
   const back = useCallback(() => {
     navigation.goBack()
@@ -63,7 +61,7 @@ const HeaderBar = React.memo<{
   const _headerStyle = Array.isArray(headerStyle) ? headerStyle : [headerStyle]
 
   return (
-    <Animated.View style={[styles.container, { paddingTop: top, height: dimensions.header + top }, ..._headerStyle]}>
+    <Animated.View style={[styles.container, ..._headerStyle]}>
       <PressableOpacity onPress={back} style={styles.icons}>
         <IconMat name="arrow-back" color="white" size={25} />
       </PressableOpacity>
@@ -83,6 +81,8 @@ const HeaderBar = React.memo<{
 
 const styles = StyleSheet.create({
   container: {
+    height: dimensions.top(),
+    paddingTop: StatusBar.currentHeight,
     backgroundColor: colors.gradient.high,
     width: '100%',
     flexDirection: 'row',

app/components/ImageGradientScrollView.tsx

@@ -3,13 +3,11 @@ import colors from '@app/styles/colors'
 import dimensions from '@app/styles/dimensions'
 import React from 'react'
 import { ScrollView, ScrollViewProps, useWindowDimensions } from 'react-native'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 const ImageGradientScrollView: React.FC<ScrollViewProps & ImageGradientBackgroundProps> = props => {
   const layout = useWindowDimensions()
-  const paddingTop = useSafeAreaInsets().top
 
-  const minHeight = layout.height - (dimensions.header + paddingTop + dimensions.bottom())
+  const minHeight = layout.height - (dimensions.top() + dimensions.bottom())
 
   return (
     <ScrollView

app/components/ListItem.tsx

@@ -1,5 +1,8 @@
+import { useStarred } from '@app/hooks/music'
 import { useIsPlaying } from '@app/hooks/trackplayer'
-import { Album, Artist, ListableItem, Song } from '@app/models/library'
+import { AlbumListItem, Artist, ListableItem, Song } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { useNavigation } from '@react-navigation/native'
@@ -10,8 +13,7 @@ import IconMat from 'react-native-vector-icons/MaterialIcons'
 import { AlbumContextPressable, ArtistContextPressable, SongContextPressable } from './ContextMenu'
 import CoverArt from './CoverArt'
 import PressableOpacity from './PressableOpacity'
-import { PressableStar } from './Star'
-import equal from 'fast-deep-equal/es6/react'
+import Star from './Star'
 
 const TitleTextSong = React.memo<{
   contextId?: string
@@ -54,9 +56,9 @@ const ListItem: React.FC<{
   listStyle?: 'big' | 'small'
   subtitle?: string
   style?: StyleProp<ViewStyle>
-  disabled?: boolean
-}> = ({ item, contextId, queueId, onPress, showArt, showStar, subtitle, listStyle, style, disabled }) => {
+}> = ({ item, contextId, queueId, onPress, showArt, showStar, subtitle, listStyle, style }) => {
   const navigation = useNavigation()
+  const starred = useStarred(item.id, item.itemType)
 
   showStar = showStar === undefined ? true : showStar
   listStyle = listStyle || 'small'
@@ -66,13 +68,13 @@ const ListItem: React.FC<{
   if (!onPress) {
     switch (item.itemType) {
       case 'album':
-        onPress = () => navigation.navigate('album', { id: item.id, title: item.name, album: item })
+        onPress = () => navigation.navigate('album', { id: item.id, title: item.name })
         break
       case 'artist':
         onPress = () => navigation.navigate('artist', { id: item.id, title: item.name })
         break
       case 'playlist':
-        onPress = () => navigation.navigate('playlist', { id: item.id, title: item.name, playlist: item })
+        onPress = () => navigation.navigate('playlist', { id: item.id, title: item.name })
         break
     }
   }
@@ -91,43 +93,35 @@ const ListItem: React.FC<{
 
   const itemPressable = useCallback(
     ({ children }) => (
-      <PressableOpacity onPress={onPress} style={styles.item} disabled={disabled}>
+      <PressableOpacity onPress={onPress} style={styles.item}>
         {children}
       </PressableOpacity>
     ),
-    [disabled, onPress],
+    [onPress],
   )
   const albumPressable = useCallback(
     ({ children }) => (
-      <AlbumContextPressable
-        album={item as Album}
-        onPress={onPress}
-        triggerWrapperStyle={styles.item}
-        disabled={disabled}>
+      <AlbumContextPressable album={item as AlbumListItem} onPress={onPress} triggerWrapperStyle={styles.item}>
         {children}
       </AlbumContextPressable>
     ),
-    [disabled, item, onPress],
+    [item, onPress],
   )
   const songPressable = useCallback(
     ({ children }) => (
-      <SongContextPressable song={item as Song} onPress={onPress} triggerWrapperStyle={styles.item} disabled={disabled}>
+      <SongContextPressable song={item as Song} onPress={onPress} triggerWrapperStyle={styles.item}>
         {children}
       </SongContextPressable>
     ),
-    [disabled, item, onPress],
+    [item, onPress],
   )
   const artistPressable = useCallback(
     ({ children }) => (
-      <ArtistContextPressable
-        artist={item as Artist}
-        onPress={onPress}
-        triggerWrapperStyle={styles.item}
-        disabled={disabled}>
+      <ArtistContextPressable artist={item as Artist} onPress={onPress} triggerWrapperStyle={styles.item}>
         {children}
       </ArtistContextPressable>
     ),
-    [disabled, item, onPress],
+    [item, onPress],
   )
 
   let PressableComponent = itemPressable
@@ -139,6 +133,13 @@ const ListItem: React.FC<{
     PressableComponent = artistPressable
   }
 
+  const starItem = useStore(selectMusic.starItem)
+  const toggleStarred = useCallback(() => {
+    if (item.itemType !== 'playlist') {
+      starItem(item.id, item.itemType, starred)
+    }
+  }, [item.id, item.itemType, starItem, starred])
+
   let title = <></>
   if (item.itemType === 'song' && queueId !== undefined) {
     title = <TitleTextSong contextId={contextId} queueId={queueId} title={item.title} />
@@ -150,24 +151,9 @@ const ListItem: React.FC<{
   const resizeMode = 'cover'
   let coverArt = <></>
   if (item.itemType === 'artist') {
-    coverArt = (
-      <CoverArt
-        type="artist"
-        artistId={item.id}
-        round={true}
-        style={artStyle}
-        resizeMode={resizeMode}
-        size="thumbnail"
-      />
-    )
-  } else if (item.itemType === 'song') {
-    coverArt = (
-      <CoverArt type="album" albumId={item.albumId} style={artStyle} resizeMode={resizeMode} size="thumbnail" />
-    )
+    coverArt = <CoverArt type="artist" artistId={item.id} round={true} style={artStyle} resizeMode={resizeMode} />
   } else {
-    coverArt = (
-      <CoverArt type="cover" coverArt={item.coverArt} style={artStyle} resizeMode={resizeMode} size="thumbnail" />
-    )
+    coverArt = <CoverArt type="cover" coverArt={item.coverArt} style={artStyle} resizeMode={resizeMode} />
   }
 
   return (
@@ -192,8 +178,10 @@ const ListItem: React.FC<{
         </View>
       </PressableComponent>
       <View style={styles.controls}>
-        {showStar && item.itemType !== 'playlist' && (
-          <PressableStar id={item.id} type={item.itemType} size={26} style={styles.controlItem} disabled={disabled} />
+        {showStar && (
+          <PressableOpacity onPress={toggleStarred} style={styles.controlItem}>
+            <Star size={26} starred={starred} />
+          </PressableOpacity>
         )}
       </View>
     </View>
@@ -271,4 +259,4 @@ const bigStyles = StyleSheet.create({
   },
 })
 
-export default React.memo(ListItem, equal)
+export default React.memo(ListItem)

app/components/ListPlayerControls.tsx

@@ -1,23 +1,23 @@
 import Button from '@app/components/Button'
-import { Song } from '@app/models/library'
+import { Song } from '@app/models/music'
+import { useStore } from '@app/state/store'
+import { QueueContextType, selectTrackPlayer } from '@app/state/trackplayer'
 import colors from '@app/styles/colors'
 import React, { useState } from 'react'
-import { useTranslation } from 'react-i18next'
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native'
 import Icon from 'react-native-vector-icons/Ionicons'
 import IconMat from 'react-native-vector-icons/MaterialIcons'
-import { withSuspenseMemo } from './withSuspense'
 
-const ListPlayerControls = withSuspenseMemo<{
+const ListPlayerControls = React.memo<{
   songs: Song[]
-  listType: 'album' | 'playlist'
+  typeName: string
+  queueName: string
+  queueContextType: QueueContextType
+  queueContextId: string
   style?: StyleProp<ViewStyle>
-  play: () => void
-  shuffle: () => void
-  disabled?: boolean
-}>(({ listType, style, play, shuffle, disabled }) => {
+}>(({ songs, typeName, queueName, queueContextType, queueContextId, style }) => {
   const [downloaded, setDownloaded] = useState(false)
-  const { t } = useTranslation()
+  const setQueue = useStore(selectTrackPlayer.setQueue)
 
   return (
     <View style={[styles.controls, style]}>
@@ -34,10 +34,13 @@ const ListPlayerControls = withSuspenseMemo<{
         </Button>
       </View>
       <View style={styles.controlsCenter}>
-        <Button title={t(`resources.${listType}.actions.play`)} disabled={disabled} onPress={play} />
+        <Button
+          title={`Play ${typeName}`}
+          onPress={() => setQueue(songs, queueName, queueContextType, queueContextId, undefined, false)}
+        />
       </View>
       <View style={styles.controlsSide}>
-        <Button disabled={disabled} onPress={shuffle}>
+        <Button onPress={() => setQueue(songs, queueName, queueContextType, queueContextId, undefined, true)}>
           <Icon name="shuffle" size={26} color="white" />
         </Button>
       </View>
@@ -58,7 +61,6 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'center',
     alignItems: 'center',
-    maxWidth: '65%',
   },
 })
 

app/components/NothingHere.tsx

@@ -1,25 +1,20 @@
 import font from '@app/styles/font'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
 import { Text, View, StyleSheet, ViewStyle } from 'react-native'
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
-import { withSuspenseMemo } from './withSuspense'
 
-const NothingHere = withSuspenseMemo<{
+const NothingHere = React.memo<{
   height?: number
   width?: number
   style?: ViewStyle
 }>(({ height, width, style }) => {
-  const { t } = useTranslation()
   height = height || 200
   width = width || 200
 
   return (
     <View style={[styles.container, { height, width }, style]}>
       <Icon name="music-rest-quarter" color={styles.text.color} size={width / 2} />
-      <Text style={[styles.text, { fontSize: width / 8 }]} numberOfLines={3}>
-        {t('messages.nothingHere')}
-      </Text>
+      <Text style={[styles.text, { fontSize: width / 8 }]}>Nothing here...</Text>
     </View>
   )
 })

app/components/NowPlayingBar.tsx

@@ -2,6 +2,7 @@ import CoverArt from '@app/components/CoverArt'
 import PressableOpacity from '@app/components/PressableOpacity'
 import { usePause, usePlay } from '@app/hooks/trackplayer'
 import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { useNavigation } from '@react-navigation/native'
@@ -11,8 +12,7 @@ import { State } from 'react-native-track-player'
 import IconFA5 from 'react-native-vector-icons/FontAwesome5'
 
 const ProgressBar = React.memo(() => {
-  const position = useStore(store => store.progress.position)
-  const duration = useStore(store => store.progress.duration)
+  const { position, duration } = useStore(selectTrackPlayer.progress)
 
   let progress = 0
   if (duration > 0) {
@@ -41,7 +41,7 @@ const progressStyles = StyleSheet.create({
 })
 
 const Controls = React.memo(() => {
-  const state = useStore(store => store.playerState)
+  const state = useStore(selectTrackPlayer.playerState)
   const play = usePlay()
   const pause = usePause()
 
@@ -78,30 +78,25 @@ const Controls = React.memo(() => {
 
 const NowPlayingBar = React.memo(() => {
   const navigation = useNavigation()
-  const currentTrackExists = useStore(store => !!store.currentTrack)
-  const albumId = useStore(store => store.currentTrack?.albumId)
-  const title = useStore(store => store.currentTrack?.title)
-  const artist = useStore(store => store.currentTrack?.artist)
+  const track = useStore(selectTrackPlayer.currentTrack)
 
-  const displayStyle: ViewStyle = { display: currentTrackExists ? 'flex' : 'none' }
+  const displayStyle: ViewStyle = { display: track ? 'flex' : 'none' }
 
   return (
     <Pressable onPress={() => navigation.navigate('now-playing')} style={[styles.container, displayStyle]}>
       <ProgressBar />
       <View style={styles.subContainer}>
         <CoverArt
-          type="album"
+          type="cover"
           style={{ height: styles.subContainer.height, width: styles.subContainer.height }}
-          albumId={albumId}
-          size="thumbnail"
-          fadeDuration={0}
+          coverArt={track?.coverArt}
         />
         <View style={styles.detailsContainer}>
           <Text numberOfLines={1} style={styles.detailsTitle}>
-            {title}
+            {track?.title}
           </Text>
           <Text numberOfLines={1} style={styles.detailsAlbum}>
-            {artist}
+            {track?.artist}
           </Text>
         </View>
         <Controls />

app/components/PressableOpacity.tsx

@@ -1,5 +1,5 @@
-import React, { useCallback, useState } from 'react'
-import { GestureResponderEvent, LayoutRectangle, Pressable, PressableProps, StyleSheet } from 'react-native'
+import React, { useCallback, useEffect, useState } from 'react'
+import { GestureResponderEvent, LayoutRectangle, Pressable, PressableProps, ViewStyle, StyleSheet } from 'react-native'
 
 type PressableOpacityProps = PressableProps & {
   ripple?: boolean
@@ -9,8 +9,13 @@ type PressableOpacityProps = PressableProps & {
 
 const PressableOpacity: React.FC<PressableOpacityProps> = props => {
   const [opacity, setOpacity] = useState(1)
+  const [disabledStyle, setDisabledStyle] = useState<ViewStyle>({})
   const [dimensions, setDimensions] = useState<LayoutRectangle | undefined>(undefined)
 
+  useEffect(() => {
+    props.disabled === true ? setDisabledStyle({ opacity: 0.3 }) : setDisabledStyle({})
+  }, [props.disabled])
+
   props = {
     ...props,
     unstable_pressDelay: props.unstable_pressDelay === undefined ? 60 : props.unstable_pressDelay,
@@ -50,8 +55,7 @@ const PressableOpacity: React.FC<PressableOpacityProps> = props => {
   return (
     <Pressable
       {...props}
-      // eslint-disable-next-line react-native/no-inline-styles
-      style={[styles.pressable, props.style as any, { opacity }, props.disabled ? { opacity: 0.3 } : {}]}
+      style={[styles.pressable, props.style as any, { opacity }, disabledStyle]}
       android_ripple={
         props.ripple
           ? {

app/components/ProgressHook.tsx

@@ -1,10 +1,11 @@
 import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
 import React, { useEffect } from 'react'
 import { State, useProgress } from 'react-native-track-player'
 
 const ProgressHook = () => {
-  const playerState = useStore(store => store.playerState)
-  const setProgress = useStore(store => store.setProgress)
+  const playerState = useStore(selectTrackPlayer.playerState)
+  const setProgress = useStore(selectTrackPlayer.setProgress)
   const progress = useProgress(250)
 
   useEffect(() => {

app/components/Star.tsx

@@ -1,11 +1,8 @@
-import { useStar } from '@app/hooks/query'
 import colors from '@app/styles/colors'
 import React from 'react'
-import { PressableStateCallbackType, StyleProp, ViewStyle } from 'react-native'
 import IconFA from 'react-native-vector-icons/FontAwesome'
-import PressableOpacity from './PressableOpacity'
 
-export const Star = React.memo<{
+const Star = React.memo<{
   starred: boolean
   size: number
 }>(({ starred, size }) => {
@@ -14,18 +11,4 @@ export const Star = React.memo<{
   )
 })
 
-export const PressableStar = React.memo<{
-  id: string
-  type: 'album' | 'artist' | 'song'
-  size: number
-  style?: StyleProp<ViewStyle> | ((state: PressableStateCallbackType) => StyleProp<ViewStyle>) | undefined
-  disabled?: boolean
-}>(({ id, type, size, style, disabled }) => {
-  const { query, toggle } = useStar(id, type)
-
-  return (
-    <PressableOpacity onPress={() => toggle.mutate()} style={style} disabled={disabled}>
-      <Star size={size} starred={!!query.data} />
-    </PressableOpacity>
-  )
-})
+export default Star

app/components/withSuspense.tsx

@@ -1,32 +0,0 @@
-import React, { ComponentType, FunctionComponent, Suspense, SuspenseProps } from 'react'
-
-export function withSuspense<P extends string | number | object>(
-  WrappedComponent: ComponentType<P>,
-  fallback: SuspenseProps['fallback'] = null,
-): FunctionComponent<P> {
-  function ComponentWithSuspense(props: P) {
-    return (
-      <Suspense fallback={fallback}>
-        <WrappedComponent {...props} />
-      </Suspense>
-    )
-  }
-
-  return ComponentWithSuspense
-}
-
-export function withSuspenseMemo<P extends string | number | object>(
-  WrappedComponent: ComponentType<P>,
-  fallback: SuspenseProps['fallback'] = null,
-  propsAreEqual?: Parameters<typeof React.memo>['1'],
-) {
-  function ComponentWithSuspense(props: P) {
-    return (
-      <Suspense fallback={fallback}>
-        <WrappedComponent {...props} />
-      </Suspense>
-    )
-  }
-
-  return React.memo(ComponentWithSuspense, propsAreEqual)
-}

app/hooks/cache.ts

@@ -0,0 +1,88 @@
+import { CacheImageSize, CacheItemTypeKey } from '@app/models/cache'
+import { ArtistInfo } from '@app/models/music'
+import { selectCache } from '@app/state/cache'
+import { selectMusic } from '@app/state/music'
+import { selectSettings } from '@app/state/settings'
+import { useStore, Store } from '@app/state/store'
+import { useCallback, useEffect } from 'react'
+
+const useFileRequest = (key: CacheItemTypeKey, id: string) => {
+  const file = useStore(
+    useCallback(
+      (store: Store) => {
+        const activeServerId = store.settings.activeServer
+        if (!activeServerId) {
+          return
+        }
+
+        return store.cacheFiles[activeServerId][key][id]
+      },
+      [key, id],
+    ),
+  )
+  const request = useStore(
+    useCallback(
+      (store: Store) => {
+        const activeServerId = store.settings.activeServer
+        if (!activeServerId) {
+          return
+        }
+
+        return store.cacheRequests[activeServerId][key][id]
+      },
+      [key, id],
+    ),
+  )
+
+  return { file, request }
+}
+
+export const useCoverArtFile = (coverArt = '-1', size: CacheImageSize = 'thumbnail') => {
+  const type: CacheItemTypeKey = size === 'original' ? 'coverArt' : 'coverArtThumb'
+  const { file, request } = useFileRequest(type, coverArt)
+  const client = useStore(selectSettings.client)
+  const cacheItem = useStore(selectCache.cacheItem)
+
+  useEffect(() => {
+    if (!file && client) {
+      cacheItem(type, coverArt, () =>
+        client.getCoverArtUri({
+          id: coverArt,
+          size: type === 'coverArtThumb' ? '256' : undefined,
+        }),
+      )
+    }
+    // intentionally leaving file out so it doesn't re-render if the request fails
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [cacheItem, client, coverArt, type])
+
+  return { file, request }
+}
+
+export const useArtistArtFile = (artistId: string, size: CacheImageSize = 'thumbnail') => {
+  const type: CacheItemTypeKey = size === 'original' ? 'artistArt' : 'artistArtThumb'
+  const fetchArtistInfo = useStore(selectMusic.fetchArtistInfo)
+  const { file, request } = useFileRequest(type, artistId)
+  const cacheItem = useStore(selectCache.cacheItem)
+
+  useEffect(() => {
+    if (!file) {
+      cacheItem(type, artistId, async () => {
+        let artistInfo: ArtistInfo | undefined
+        const cachedArtistInfo = useStore.getState().artistInfo[artistId]
+
+        if (cachedArtistInfo) {
+          artistInfo = cachedArtistInfo
+        } else {
+          artistInfo = await fetchArtistInfo(artistId)
+        }
+
+        return type === 'artistArtThumb' ? artistInfo?.smallImageUrl : artistInfo?.largeImageUrl
+      })
+    }
+    // intentionally leaving file out so it doesn't re-render if the request fails
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [artistId, cacheItem, fetchArtistInfo, type])
+
+  return { file, request }
+}

app/hooks/fetch.ts

@@ -1,315 +0,0 @@
-import { CacheItemTypeKey } from '@app/models/cache'
-import { Album, Playlist, Song } from '@app/models/library'
-import { mapAlbum, mapArtist, mapArtistInfo, mapPlaylist, mapSong } from '@app/models/map'
-import queryClient from '@app/queryClient'
-import { useStore } from '@app/state/store'
-import { SubsonicApiClient } from '@app/subsonic/api'
-import { GetAlbumList2TypeBase, Search3Params, StarParams } from '@app/subsonic/params'
-import { cacheDir } from '@app/util/fs'
-import { mapCollectionById } from '@app/util/state'
-import userAgent from '@app/util/userAgent'
-import cd from 'content-disposition'
-import mime from 'mime-types'
-import path from 'path'
-import ReactNativeBlobUtil, { FetchBlobResponse } from 'react-native-blob-util'
-import RNFS from 'react-native-fs'
-import qk from './queryKeys'
-
-export const useClient = () => {
-  const client = useStore(store => store.client)
-
-  return () => {
-    if (!client) {
-      throw new Error('no client!')
-    }
-
-    return client
-  }
-}
-
-function cacheStarredData<T extends { id: string; starred?: undefined | any }>(item: T) {
-  queryClient.setQueryData<boolean>(qk.starredItems(item.id), !!item.starred)
-}
-
-function cacheAlbumCoverArtData<T extends { id: string; coverArt?: string }>(item: T) {
-  queryClient.setQueryData<string | undefined>(qk.albumCoverArt(item.id), item.coverArt)
-}
-
-export const useFetchArtists = () => {
-  const client = useClient()
-
-  return async () => {
-    const res = await client().getArtists()
-
-    res.data.artists.forEach(cacheStarredData)
-
-    return mapCollectionById(res.data.artists, mapArtist)
-  }
-}
-
-export const useFetchArtist = () => {
-  const client = useClient()
-
-  return async (id: string) => {
-    const res = await client().getArtist({ id })
-
-    cacheStarredData(res.data.artist)
-    res.data.albums.forEach(cacheStarredData)
-
-    res.data.albums.forEach(cacheAlbumCoverArtData)
-
-    return {
-      artist: mapArtist(res.data.artist),
-      albums: res.data.albums.map(mapAlbum),
-    }
-  }
-}
-
-export const useFetchArtistInfo = () => {
-  const client = useClient()
-
-  return async (id: string) => {
-    const res = await client().getArtistInfo2({ id })
-    return mapArtistInfo(id, res.data.artistInfo)
-  }
-}
-
-export const useFetchArtistTopSongs = () => {
-  const client = useClient()
-
-  return async (artistName: string) => {
-    const res = await client().getTopSongs({ artist: artistName })
-
-    res.data.songs.forEach(cacheStarredData)
-
-    return res.data.songs.map(mapSong)
-  }
-}
-
-export const useFetchPlaylists = () => {
-  const client = useClient()
-
-  return async () => {
-    const res = await client().getPlaylists()
-    return mapCollectionById(res.data.playlists, mapPlaylist)
-  }
-}
-
-export const useFetchPlaylist = () => {
-  const client = useClient()
-
-  return async (id: string): Promise<{ playlist: Playlist; songs?: Song[] }> => {
-    const res = await client().getPlaylist({ id })
-
-    res.data.playlist.songs.forEach(cacheStarredData)
-
-    return {
-      playlist: mapPlaylist(res.data.playlist),
-      songs: res.data.playlist.songs.map(mapSong),
-    }
-  }
-}
-
-export async function fetchAlbum(id: string, client: SubsonicApiClient): Promise<{ album: Album; songs?: Song[] }> {
-  const res = await client.getAlbum({ id })
-
-  cacheStarredData(res.data.album)
-  res.data.songs.forEach(cacheStarredData)
-
-  cacheAlbumCoverArtData(res.data.album)
-
-  return {
-    album: mapAlbum(res.data.album),
-    songs: res.data.songs.map(mapSong),
-  }
-}
-
-export const useFetchAlbum = () => {
-  const client = useClient()
-  return async (id: string) => fetchAlbum(id, client())
-}
-
-export const useFetchAlbumList = () => {
-  const client = useClient()
-
-  return async (size: number, offset: number, type: GetAlbumList2TypeBase) => {
-    const res = await client().getAlbumList2({ size, offset, type })
-
-    res.data.albums.forEach(cacheStarredData)
-
-    res.data.albums.forEach(cacheAlbumCoverArtData)
-
-    return res.data.albums.map(mapAlbum)
-  }
-}
-
-export const useFetchSong = () => {
-  const client = useClient()
-
-  return async (id: string) => {
-    const res = await client().getSong({ id })
-
-    cacheStarredData(res.data.song)
-
-    return mapSong(res.data.song)
-  }
-}
-
-export const useFetchSearchResults = () => {
-  const client = useClient()
-
-  return async (params: Search3Params) => {
-    const res = await client().search3(params)
-
-    res.data.artists.forEach(cacheStarredData)
-    res.data.albums.forEach(cacheStarredData)
-    res.data.songs.forEach(cacheStarredData)
-
-    res.data.albums.forEach(cacheAlbumCoverArtData)
-
-    return {
-      artists: res.data.artists.map(mapArtist),
-      albums: res.data.albums.map(mapAlbum),
-      songs: res.data.songs.map(mapSong),
-    }
-  }
-}
-
-export const useFetchStar = () => {
-  const client = useClient()
-
-  return async (params: StarParams) => {
-    await client().star(params)
-    return
-  }
-}
-
-export const useFetchUnstar = () => {
-  const client = useClient()
-
-  return async (params: StarParams) => {
-    await client().unstar(params)
-    return
-  }
-}
-
-export type FetchExisingFileOptions = {
-  itemType: CacheItemTypeKey
-  itemId: string
-}
-
-export async function fetchExistingFile(
-  options: FetchExisingFileOptions,
-  serverId: string | undefined,
-): Promise<string | undefined> {
-  const { itemType, itemId } = options
-  const fileDir = cacheDir(serverId, itemType, itemId)
-
-  try {
-    const dir = await RNFS.readDir(fileDir)
-    console.log('existing file:', dir[0].path)
-    return dir[0].path
-  } catch {}
-}
-
-export const useFetchExistingFile = () => {
-  const serverId = useStore(store => store.settings.activeServerId)
-  return async (options: FetchExisingFileOptions) => fetchExistingFile(options, serverId)
-}
-
-function assertMimeType(expected?: string, actual?: string) {
-  expected = expected?.toLowerCase()
-  actual = actual?.toLowerCase()
-
-  if (!expected || expected === actual) {
-    return
-  }
-
-  if (!expected.includes(';')) {
-    actual = actual?.split(';')[0]
-  }
-
-  if (!expected.includes('/')) {
-    actual = actual?.split('/')[0]
-  }
-
-  if (expected !== actual) {
-    throw new Error(`Request does not satisfy expected content type. Expected: ${expected} Actual: ${actual}`)
-  }
-}
-
-export type FetchFileOptions = FetchExisingFileOptions & {
-  fromUrl: string
-  useCacheBuster?: boolean
-  expectedContentType?: string
-  progress?: (received: number, total: number) => void
-}
-
-export async function fetchFile(options: FetchFileOptions, serverId: string | undefined): Promise<string> {
-  let { itemType, itemId, fromUrl, useCacheBuster, expectedContentType, progress } = options
-  useCacheBuster = useCacheBuster === undefined ? true : useCacheBuster
-
-  const fileDir = cacheDir(serverId, itemType, itemId)
-  const filePathNoExt = path.join(fileDir, useCacheBuster ? useStore.getState().settings.cacheBuster : itemType)
-
-  try {
-    await RNFS.unlink(fileDir)
-  } catch {}
-
-  const headers = { 'User-Agent': userAgent }
-
-  // we send a HEAD first for two reasons:
-  // 1. to follow any redirects and get the actual URL (DownloadManager does not support redirects)
-  // 2. to obtain the mime-type up front so we can use it for the file extension/validation
-  const headRes = await fetch(fromUrl, { method: 'HEAD', headers })
-
-  if (headRes.status > 399) {
-    throw new Error(`HTTP status error ${headRes.status}. File: ${itemType} ID: ${itemId}`)
-  }
-
-  const contentType = headRes.headers.get('content-type') || undefined
-  assertMimeType(expectedContentType, contentType)
-
-  const contentDisposition = headRes.headers.get('content-disposition') || undefined
-  const filename = contentDisposition ? cd.parse(contentDisposition).parameters.filename : undefined
-
-  let extension: string | undefined
-  if (filename) {
-    extension = path.extname(filename) || undefined
-    if (extension) {
-      extension = extension.substring(1)
-    }
-  } else if (contentType) {
-    extension = mime.extension(contentType) || undefined
-  }
-
-  const config = ReactNativeBlobUtil.config({
-    addAndroidDownloads: {
-      useDownloadManager: true,
-      notification: false,
-      mime: contentType,
-      description: 'subtracks',
-      path: extension ? `${filePathNoExt}.${extension}` : filePathNoExt,
-    },
-  })
-
-  const fetchParams: Parameters<typeof config['fetch']> = ['GET', headRes.url, headers]
-
-  let res: FetchBlobResponse
-  if (progress) {
-    res = await config.fetch(...fetchParams).progress(progress)
-  } else {
-    res = await config.fetch(...fetchParams)
-  }
-
-  const downloadPath = res.path()
-  queryClient.setQueryData<string>(qk.existingFiles(itemType, itemId), downloadPath)
-
-  console.log('downloaded file:', downloadPath)
-  return downloadPath
-}
-
-export const useFetchFile = () => {
-  const serverId = useStore(store => store.settings.activeServerId)
-  return async (options: FetchFileOptions) => fetchFile(options, serverId)
-}

app/hooks/list.ts

@@ -0,0 +1,77 @@
+import { useState, useCallback } from 'react'
+import { useActiveServerRefresh } from './server'
+
+export const useFetchList = <T>(fetchList: () => Promise<T[]>) => {
+  const [list, setList] = useState<T[]>([])
+  const [refreshing, setRefreshing] = useState(false)
+
+  const refresh = useCallback(() => {
+    setRefreshing(true)
+
+    fetchList().then(items => {
+      setList(items)
+      setRefreshing(false)
+    })
+  }, [fetchList])
+
+  const reset = useCallback(() => {
+    setList([])
+    refresh()
+  }, [refresh])
+
+  useActiveServerRefresh(
+    useCallback(() => {
+      reset()
+    }, [reset]),
+  )
+
+  return { list, refreshing, refresh, reset }
+}
+
+export const useFetchPaginatedList = <T>(
+  fetchList: (size?: number, offset?: number) => Promise<T[]>,
+  pageSize: number,
+) => {
+  const [list, setList] = useState<T[]>([])
+  const [refreshing, setRefreshing] = useState(false)
+  const [offset, setOffset] = useState(0)
+
+  const refresh = useCallback(() => {
+    setOffset(0)
+    setRefreshing(true)
+
+    fetchList(pageSize, 0).then(firstPage => {
+      setList(firstPage)
+      setRefreshing(false)
+    })
+  }, [fetchList, pageSize])
+
+  const reset = useCallback(() => {
+    setList([])
+    refresh()
+  }, [refresh])
+
+  useActiveServerRefresh(
+    useCallback(() => {
+      reset()
+    }, [reset]),
+  )
+
+  const fetchNextPage = useCallback(() => {
+    const newOffset = offset + pageSize
+    setRefreshing(true)
+
+    fetchList(pageSize, newOffset).then(nextPage => {
+      setRefreshing(false)
+
+      if (nextPage.length === 0) {
+        return
+      }
+
+      setList([...list, ...nextPage])
+      setOffset(newOffset)
+    })
+  }, [offset, pageSize, fetchList, list])
+
+  return { list, refreshing, refresh, reset, fetchNextPage }
+}

app/hooks/music.ts

@@ -0,0 +1,62 @@
+import { selectMusic } from '@app/state/music'
+import { Store, useStore } from '@app/state/store'
+import { useCallback, useEffect } from 'react'
+
+export const useArtistInfo = (id: string) => {
+  const artistInfo = useStore(useCallback((state: Store) => state.artistInfo[id], [id]))
+  const fetchArtistInfo = useStore(selectMusic.fetchArtistInfo)
+
+  useEffect(() => {
+    if (!artistInfo) {
+      fetchArtistInfo(id)
+    }
+  }, [artistInfo, fetchArtistInfo, id])
+
+  return artistInfo
+}
+
+export const useAlbumWithSongs = (id: string) => {
+  const album = useStore(useCallback((state: Store) => state.albumsWithSongs[id], [id]))
+  const fetchAlbum = useStore(selectMusic.fetchAlbumWithSongs)
+
+  useEffect(() => {
+    if (!album) {
+      fetchAlbum(id)
+    }
+  }, [album, fetchAlbum, id])
+
+  return album
+}
+
+export const usePlaylistWithSongs = (id: string) => {
+  const playlist = useStore(useCallback((state: Store) => state.playlistsWithSongs[id], [id]))
+  const fetchPlaylist = useStore(selectMusic.fetchPlaylistWithSongs)
+
+  useEffect(() => {
+    if (!playlist) {
+      fetchPlaylist(id)
+    }
+  }, [fetchPlaylist, id, playlist])
+
+  return playlist
+}
+
+export const useStarred = (id: string, type: string) => {
+  return useStore(
+    useCallback(
+      (state: Store) => {
+        switch (type) {
+          case 'song':
+            return state.starredSongs[id]
+          case 'album':
+            return state.starredAlbums[id]
+          case 'artist':
+            return state.starredArtists[id]
+          default:
+            return false
+        }
+      },
+      [type, id],
+    ),
+  )
+}

app/hooks/query.ts

@@ -1,323 +0,0 @@
-import { CacheImageSize, CacheItemTypeKey } from '@app/models/cache'
-import { Album, Artist, Playlist, Song, StarrableItemType } from '@app/models/library'
-import { CollectionById } from '@app/models/state'
-import queryClient from '@app/queryClient'
-import { useStore } from '@app/state/store'
-import { GetAlbumList2TypeBase, Search3Params, StarParams } from '@app/subsonic/params'
-import _ from 'lodash'
-import { useInfiniteQuery, useMutation, useQueries, useQuery } from 'react-query'
-import {
-  useFetchAlbum,
-  useFetchAlbumList,
-  useFetchArtist,
-  useFetchArtistInfo,
-  useFetchArtists,
-  useFetchArtistTopSongs,
-  useFetchExistingFile,
-  useFetchFile,
-  useFetchPlaylist,
-  useFetchPlaylists,
-  useFetchSearchResults,
-  useFetchSong,
-  useFetchStar,
-  useFetchUnstar,
-} from './fetch'
-import qk from './queryKeys'
-
-export const useQueryArtists = () => useQuery(qk.artists, useFetchArtists())
-
-export const useQueryArtist = (id: string) => {
-  const fetchArtist = useFetchArtist()
-
-  return useQuery(qk.artist(id), () => fetchArtist(id), {
-    placeholderData: () => {
-      const artist = queryClient.getQueryData<CollectionById<Artist>>(qk.artists)?.byId[id]
-      if (artist) {
-        return { artist, albums: [] }
-      }
-    },
-  })
-}
-
-export const useQueryArtistInfo = (id: string) => {
-  const fetchArtistInfo = useFetchArtistInfo()
-  return useQuery(qk.artistInfo(id), () => fetchArtistInfo(id))
-}
-
-export const useQueryArtistTopSongs = (artistName?: string) => {
-  const fetchArtistTopSongs = useFetchArtistTopSongs()
-  const query = useQuery(qk.artistTopSongs(artistName || ''), () => fetchArtistTopSongs(artistName as string), {
-    enabled: !!artistName,
-    retry: false,
-    staleTime: Infinity,
-    cacheTime: Infinity,
-    notifyOnChangeProps: ['data', 'isError', 'isFetched', 'isSuccess', 'isFetching'],
-  })
-
-  const querySuccess = query.isFetched && query.isSuccess && query.data && query.data.length > 0
-
-  const fetchSearchResults = useFetchSearchResults()
-  const [artistCount, albumCount, songCount] = [0, 0, 300]
-  const backupQuery = useQuery(
-    qk.search(artistName || '', artistCount, albumCount, songCount),
-    () => fetchSearchResults({ query: artistName as string, artistCount, albumCount, songCount }),
-    {
-      select: data => {
-        const artistNameLower = artistName?.toLowerCase()
-        const songs = data.songs.filter(s => s.artist?.toLowerCase() === artistNameLower)
-
-        // sortBy is a stable sort, so that this doesn't change order arbitrarily and re-render
-        return _.sortBy(songs, [
-          s => -(s.playCount || 0),
-          s => -(s.averageRating || 0),
-          s => -(s.userRating || 0),
-        ]).slice(0, 50)
-      },
-      enabled: !!artistName && !query.isFetching && !querySuccess,
-      staleTime: Infinity,
-      cacheTime: Infinity,
-      notifyOnChangeProps: ['data', 'isError'],
-    },
-  )
-
-  return querySuccess ? query : backupQuery
-}
-
-export const useQueryPlaylists = () => useQuery(qk.playlists, useFetchPlaylists())
-
-export const useQueryPlaylist = (id: string, placeholderPlaylist?: Playlist) => {
-  const fetchPlaylist = useFetchPlaylist()
-
-  const query = useQuery(qk.playlist(id), () => fetchPlaylist(id), {
-    placeholderData: () => {
-      if (placeholderPlaylist) {
-        return { playlist: placeholderPlaylist }
-      }
-
-      const playlist = queryClient.getQueryData<CollectionById<Playlist>>(qk.playlists)?.byId[id]
-      if (playlist) {
-        return { playlist, songs: [] }
-      }
-    },
-  })
-
-  return query
-}
-
-export const useQueryAlbum = (id: string, placeholderAlbum?: Album) => {
-  const fetchAlbum = useFetchAlbum()
-
-  const query = useQuery(qk.album(id), () => fetchAlbum(id), {
-    placeholderData: (): { album: Album; songs?: Song[] } | undefined =>
-      placeholderAlbum ? { album: placeholderAlbum } : undefined,
-  })
-
-  return query
-}
-
-export const useQueryAlbumList = (type: GetAlbumList2TypeBase, size: number) => {
-  const fetchAlbumList = useFetchAlbumList()
-
-  return useInfiniteQuery(
-    qk.albumList(type, size),
-    async context => {
-      return await fetchAlbumList(size, context.pageParam || 0, type)
-    },
-    {
-      getNextPageParam: (lastPage, allPages) => {
-        if (lastPage.length === 0) {
-          return
-        }
-        return allPages.length * size
-      },
-      cacheTime: 0,
-    },
-  )
-}
-
-export const useQuerySearchResults = (params: Search3Params) => {
-  const fetchSearchResults = useFetchSearchResults()
-
-  const query = useInfiniteQuery(
-    qk.search(params.query, params.artistCount, params.albumCount, params.songCount),
-    async context => {
-      return await fetchSearchResults({
-        ...params,
-        artistOffset: context.pageParam?.artistOffset || 0,
-        albumOffset: context.pageParam?.albumOffset || 0,
-        songOffset: context.pageParam?.songOffset || 0,
-      })
-    },
-    {
-      getNextPageParam: (lastPage, allPages) => {
-        if (lastPage.albums.length + lastPage.artists.length + lastPage.songs.length === 0) {
-          return
-        }
-        return {
-          artistOffset: allPages.reduce((acc, val) => (acc += val.artists.length), 0),
-          albumOffset: allPages.reduce((acc, val) => (acc += val.albums.length), 0),
-          songOffset: allPages.reduce((acc, val) => (acc += val.songs.length), 0),
-        }
-      },
-      cacheTime: 1000 * 60,
-      enabled: !!params.query && params.query.length > 1,
-    },
-  )
-
-  return query
-}
-
-export const useQueryHomeLists = (types: GetAlbumList2TypeBase[], size: number) => {
-  const fetchAlbumList = useFetchAlbumList()
-
-  const listQueries = useQueries(
-    types.map(type => {
-      return {
-        queryKey: qk.albumList(type, size),
-        queryFn: async () => {
-          const albums = await fetchAlbumList(size, 0, type as GetAlbumList2TypeBase)
-          return { type, albums }
-        },
-      }
-    }),
-  )
-
-  return listQueries
-}
-
-export const useStar = (id: string, type: StarrableItemType) => {
-  const fetchStar = useFetchStar()
-  const fetchUnstar = useFetchUnstar()
-  const fetchSong = useFetchSong()
-  const fetchAlbum = useFetchAlbum()
-  const fetchArtist = useFetchArtist()
-
-  const query = useQuery(
-    qk.starredItems(id),
-    async () => {
-      switch (type) {
-        case 'album':
-          console.log('fetch album starred', id)
-          return !!(await fetchAlbum(id)).album.starred
-        case 'artist':
-          console.log('fetch artist starred', id)
-          return !!(await fetchArtist(id)).artist.starred
-        default:
-          console.log('fetch song starred', id)
-          return !!(await fetchSong(id)).starred
-      }
-    },
-    {
-      cacheTime: Infinity,
-      staleTime: Infinity,
-    },
-  )
-
-  const toggle = useMutation(
-    () => {
-      const params: StarParams = {
-        id: type === 'song' ? id : undefined,
-        albumId: type === 'album' ? id : undefined,
-        artistId: type === 'artist' ? id : undefined,
-      }
-      return !query.data ? fetchStar(params) : fetchUnstar(params)
-    },
-    {
-      onMutate: () => {
-        queryClient.setQueryData<boolean>(qk.starredItems(id), !query.data)
-      },
-      onSuccess: () => {
-        if (type === 'album') {
-          queryClient.invalidateQueries(qk.albumList('starred'))
-        }
-      },
-    },
-  )
-
-  return { query, toggle }
-}
-
-export const useQueryExistingFile = (itemType: CacheItemTypeKey, itemId: string) => {
-  const fetchExistingFile = useFetchExistingFile()
-
-  return useQuery(qk.existingFiles(itemType, itemId), () => fetchExistingFile({ itemType, itemId }), {
-    staleTime: Infinity,
-    cacheTime: Infinity,
-    notifyOnChangeProps: ['data', 'isFetched'],
-  })
-}
-
-export const useQueryCoverArtPath = (coverArt = '-1', size: CacheImageSize = 'thumbnail') => {
-  const fetchFile = useFetchFile()
-  const client = useStore(store => store.client)
-
-  const itemType: CacheItemTypeKey = size === 'original' ? 'coverArt' : 'coverArtThumb'
-  const existing = useQueryExistingFile(itemType, coverArt)
-
-  const query = useQuery(
-    qk.coverArt(coverArt, size),
-    async () => {
-      if (!client) {
-        return
-      }
-
-      const fromUrl = client.getCoverArtUri({ id: coverArt, size: itemType === 'coverArtThumb' ? '256' : undefined })
-      return await fetchFile({ itemType, itemId: coverArt, fromUrl, expectedContentType: 'image' })
-    },
-    {
-      enabled: existing.isFetched && !existing.data && !!client,
-      staleTime: Infinity,
-      cacheTime: Infinity,
-    },
-  )
-
-  return { ...query, data: existing.data || query.data, isExistingFetching: existing.isFetching }
-}
-
-export const useQueryArtistArtPath = (artistId: string, size: CacheImageSize = 'thumbnail') => {
-  const fetchFile = useFetchFile()
-  const client = useStore(store => store.client)
-  const { data: artistInfo } = useQueryArtistInfo(artistId)
-
-  const itemType: CacheItemTypeKey = size === 'original' ? 'artistArt' : 'artistArtThumb'
-  const existing = useQueryExistingFile(itemType, artistId)
-
-  const query = useQuery(
-    qk.artistArt(artistId, size),
-    async () => {
-      if (!client || !artistInfo?.smallImageUrl || !artistInfo?.largeImageUrl) {
-        return
-      }
-
-      const fromUrl = itemType === 'artistArtThumb' ? artistInfo.smallImageUrl : artistInfo.largeImageUrl
-      return await fetchFile({ itemType, itemId: artistId, fromUrl, expectedContentType: 'image' })
-    },
-    {
-      enabled:
-        existing.isFetched &&
-        !existing.data &&
-        !!client &&
-        (!!artistInfo?.smallImageUrl || !!artistInfo?.largeImageUrl),
-      staleTime: Infinity,
-      cacheTime: Infinity,
-    },
-  )
-
-  return { ...query, data: existing.data || query.data, isExistingFetching: existing.isFetching }
-}
-
-export const useQueryAlbumCoverArtPath = (albumId?: string, size: CacheImageSize = 'thumbnail') => {
-  const fetchAlbum = useFetchAlbum()
-
-  const query = useQuery(
-    qk.albumCoverArt(albumId || '-1'),
-    async () => (await fetchAlbum(albumId || '-1')).album.coverArt,
-    {
-      enabled: !!albumId,
-      staleTime: Infinity,
-      cacheTime: Infinity,
-    },
-  )
-
-  return useQueryCoverArtPath(query.data, size)
-}

app/hooks/queryKeys.ts

@@ -1,52 +0,0 @@
-import { CacheImageSize, CacheItemTypeKey } from '@app/models/cache'
-import { GetAlbumList2TypeBase } from '@app/subsonic/params'
-
-const qk = {
-  starredItems: (id: string) => ['starredItems', id],
-  albumCoverArt: (id: string) => ['albumCoverArt', id],
-
-  artists: 'artists',
-  artist: (id: string) => ['artist', id],
-  artistInfo: (id: string) => ['artistInfo', id],
-  artistTopSongs: (artistName: string) => ['artistTopSongs', artistName],
-
-  playlists: 'playlists',
-  playlist: (id: string) => ['playlist', id],
-
-  album: (id: string) => ['album', id],
-  albumList: (type: GetAlbumList2TypeBase, size?: number) => {
-    const key: (string | number)[] = ['albumList', type]
-    size !== undefined && key.push(size)
-    return key
-  },
-
-  search: (query: string, artistCount?: number, albumCount?: number, songCount?: number) => [
-    'search',
-    query,
-    artistCount,
-    albumCount,
-    songCount,
-  ],
-
-  coverArt: (coverArt?: string, size?: CacheImageSize) => {
-    const key: string[] = ['coverArt']
-    coverArt !== undefined && key.push(coverArt)
-    size !== undefined && key.push(size)
-    return key
-  },
-  artistArt: (artistId?: string, size?: CacheImageSize) => {
-    const key: string[] = ['artistArt']
-    artistId !== undefined && key.push(artistId)
-    size !== undefined && key.push(size)
-    return key
-  },
-
-  existingFiles: (type?: CacheItemTypeKey, itemId?: string) => {
-    const key: string[] = ['existingFiles']
-    type !== undefined && key.push(type)
-    itemId !== undefined && key.push(itemId)
-    return key
-  },
-}
-
-export default qk

app/hooks/server.ts

@@ -0,0 +1,29 @@
+import { useReset } from '@app/hooks/trackplayer'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
+import { useEffect } from 'react'
+
+export const useSwitchActiveServer = () => {
+  const activeServer = useStore(selectSettings.activeServer)
+  const setActiveServer = useStore(selectSettings.setActiveServer)
+  const resetPlayer = useReset()
+
+  return async (id: string) => {
+    if (id === activeServer?.id) {
+      return
+    }
+
+    await resetPlayer()
+    setActiveServer(id)
+  }
+}
+
+export const useActiveServerRefresh = (refresh: () => void) => {
+  const activeServer = useStore(selectSettings.activeServer)
+
+  useEffect(() => {
+    if (activeServer) {
+      refresh()
+    }
+  }, [activeServer, refresh])
+}

app/hooks/settings.ts

@@ -1,75 +0,0 @@
-import { useReset } from '@app/hooks/trackplayer'
-import { CacheItemTypeKey } from '@app/models/cache'
-import queryClient from '@app/queryClient'
-import { useStore, useStoreDeep } from '@app/state/store'
-import { cacheDir } from '@app/util/fs'
-import RNFS from 'react-native-fs'
-import qk from './queryKeys'
-
-export const useSwitchActiveServer = () => {
-  const activeServerId = useStore(store => store.settings.activeServerId)
-  const setActiveServer = useStore(store => store.setActiveServer)
-  const resetPlayer = useReset()
-
-  return async (id: string) => {
-    if (id === activeServerId) {
-      return
-    }
-
-    await queryClient.cancelQueries(undefined, { active: true })
-    await resetPlayer()
-    queryClient.removeQueries()
-    setActiveServer(id)
-  }
-}
-
-export const useFirstRun = () => {
-  return useStore(store => Object.keys(store.settings.servers).length === 0)
-}
-
-export const useResetImageCache = () => {
-  const serverIds = useStoreDeep(store => Object.keys(store.settings.servers))
-  const changeCacheBuster = useStore(store => store.changeCacheBuster)
-  const setDisableMusicTabs = useStore(store => store.setDisableMusicTabs)
-
-  return async () => {
-    setDisableMusicTabs(true)
-
-    try {
-      // disable/invalidate queries
-      await Promise.all([
-        queryClient.cancelQueries(qk.artistArt(), { active: true }),
-        queryClient.cancelQueries(qk.coverArt(), { active: true }),
-        queryClient.cancelQueries(qk.existingFiles(), { active: true }),
-        queryClient.invalidateQueries(qk.artistArt(), { refetchActive: false }),
-        queryClient.invalidateQueries(qk.coverArt(), { refetchActive: false }),
-        queryClient.invalidateQueries(qk.existingFiles(), { refetchActive: false }),
-      ])
-
-      // delete all images
-      const itemTypes: CacheItemTypeKey[] = ['artistArt', 'artistArtThumb', 'coverArt', 'coverArtThumb']
-      await Promise.all(
-        serverIds.flatMap(id =>
-          itemTypes.map(async type => {
-            const dir = cacheDir(id, type)
-            try {
-              await RNFS.unlink(dir)
-            } catch {}
-          }),
-        ),
-      )
-
-      // change cacheBuster
-      changeCacheBuster()
-    } finally {
-      setDisableMusicTabs(false)
-
-      // enable queries
-      await Promise.all([
-        queryClient.refetchQueries(qk.existingFiles(), { active: true }),
-        queryClient.refetchQueries(qk.artistArt(), { active: true }),
-        queryClient.refetchQueries(qk.coverArt(), { active: true }),
-      ])
-    }
-  }
-}

app/hooks/trackplayer.ts

@@ -1,12 +1,6 @@
-import { Song } from '@app/models/library'
-import { QueueContextType, TrackExt } from '@app/models/trackplayer'
-import queryClient from '@app/queryClient'
-import queueService from '@app/queueservice'
-import { useStore, useStoreDeep } from '@app/state/store'
-import { getQueue, SetQueueOptions, trackPlayerCommands } from '@app/state/trackplayer'
-import userAgent from '@app/util/userAgent'
+import { useStore } from '@app/state/store'
+import { getQueue, selectTrackPlayer, trackPlayerCommands } from '@app/state/trackplayer'
 import TrackPlayer from 'react-native-track-player'
-import qk from './queryKeys'
 
 export const usePlay = () => {
   return () => trackPlayerCommands.enqueue(() => TrackPlayer.play())
@@ -63,7 +57,7 @@ export const useSeekTo = () => {
 }
 
 export const useReset = (enqueue = true) => {
-  const resetStore = useStore(store => store.resetTrackPlayerState)
+  const resetStore = useStore(selectTrackPlayer.resetTrackPlayerState)
 
   const reset = async () => {
     await TrackPlayer.reset()
@@ -74,9 +68,9 @@ export const useReset = (enqueue = true) => {
 }
 
 export const useIsPlaying = (contextId: string | undefined, track: number) => {
-  const queueContextId = useStore(store => store.queueContextId)
-  const currentTrackIdx = useStore(store => store.currentTrackIdx)
-  const shuffleOrder = useStoreDeep(store => store.shuffleOrder)
+  const queueContextId = useStore(selectTrackPlayer.queueContextId)
+  const currentTrackIdx = useStore(selectTrackPlayer.currentTrackIdx)
+  const shuffleOrder = useStore(selectTrackPlayer.shuffleOrder)
 
   if (contextId === undefined) {
     return track === currentTrackIdx
@@ -89,51 +83,3 @@ export const useIsPlaying = (contextId: string | undefined, track: number) => {
 
   return contextId === queueContextId && track === currentTrackIdx
 }
-
-export function mapSongToTrackExt(song: Song): TrackExt {
-  return {
-    id: song.id,
-    title: song.title,
-    artist: song.artist || 'Unknown Artist',
-    album: song.album || 'Unknown Album',
-    url: useStore.getState().buildStreamUri(song.id),
-    artwork: require('@res/fallback.png'),
-    userAgent,
-    duration: song.duration,
-    artistId: song.artistId,
-    albumId: song.albumId,
-    track: song.track,
-    discNumber: song.discNumber,
-  }
-}
-
-export const useSetQueue = (type: QueueContextType, songs?: Song[]) => {
-  const _setQueue = useStore(store => store.setQueue)
-
-  const contextId = `${type}-${songs?.map(s => s.id).join('-')}`
-
-  const setQueue = async (options: SetQueueOptions) => {
-    if (!songs || songs.length === 0) {
-      return
-    }
-
-    const queue = songs.map(mapSongToTrackExt)
-    const first = queue[options.playTrack || 0]
-
-    if (!first.albumId) {
-      first.artwork = require('@res/fallback.png')
-    } else {
-      const albumCoverArt = queryClient.getQueryData<string>(qk.albumCoverArt(first.albumId))
-      const existingFile = queryClient.getQueryData<string>(qk.existingFiles('coverArtThumb', albumCoverArt))
-      const downloadFile = queryClient.getQueryData<string>(qk.coverArt(albumCoverArt, 'thumbnail'))
-      if (existingFile || downloadFile) {
-        first.artwork = `file://${existingFile || downloadFile}`
-      }
-    }
-
-    await _setQueue({ queue, type, contextId, ...options })
-    queueService.emit('set', { queue })
-  }
-
-  return { setQueue, contextId }
-}

app/i18n.ts

@@ -1,64 +0,0 @@
-import { BackendModule, LanguageDetectorAsyncModule } from 'i18next'
-import path from 'path'
-import RNFS from 'react-native-fs'
-import * as RNLocalize from 'react-native-localize'
-import _ from 'lodash'
-
-const I18N_ASSETS_DIR = path.join('custom', 'i18n')
-
-const cache: {
-  [language: string]: {
-    [key: string]: any
-  }
-} = {}
-
-async function loadTranslation(language: string) {
-  const text = await RNFS.readFileAssets(path.join(I18N_ASSETS_DIR, `${language}.json`), 'utf8')
-  return JSON.parse(text)
-}
-
-async function readTranslation(language: string, namespace: string) {
-  if (!cache[language]) {
-    cache[language] = await loadTranslation(language)
-  }
-
-  return namespace === 'translation' ? cache[language] : _.get(cache[language], namespace)
-}
-
-export const backend = {
-  type: 'backend',
-  init: () => {},
-  read: async (language, namespace, callback) => {
-    try {
-      callback(null, await readTranslation(language, namespace))
-    } catch (err) {
-      callback(err as any, null)
-    }
-  },
-} as BackendModule
-
-export const languageDetector = {
-  type: 'languageDetector',
-  async: true,
-  detect: async callback => {
-    try {
-      const languageTags = (await RNFS.readDirAssets(I18N_ASSETS_DIR))
-        .map(f => f.name)
-        .filter(n => n.endsWith('.json'))
-        .map(n => n.slice(0, -5))
-
-      console.log('translations available:', languageTags)
-      console.log(
-        'locales list:',
-        RNLocalize.getLocales().map(l => l.languageTag),
-      )
-      console.log('best language:', RNLocalize.findBestAvailableLanguage(languageTags)?.languageTag)
-
-      callback(RNLocalize.findBestAvailableLanguage(languageTags)?.languageTag)
-    } catch {
-      callback(undefined)
-    }
-  },
-  init: () => {},
-  cacheUserLanguage: () => {},
-} as LanguageDetectorAsyncModule

app/models/cache.ts

@@ -1,10 +1,11 @@
-import { Album, Playlist, Artist, Song } from './library'
+import { Album, PlaylistListItem, Artist, Song } from './music'
 
 export enum CacheItemType {
   coverArt = 'coverArt',
   coverArtThumb = 'coverArtThumb',
   artistArt = 'artistArt',
   artistArtThumb = 'artistArtThumb',
+  song = 'song',
 }
 
 export type CacheItemTypeKey = keyof typeof CacheItemType
@@ -26,7 +27,7 @@ export type DownloadedAlbum = Album & {
   songs: string[]
 }
 
-export type DownloadedPlaylist = Playlist & {
+export type DownloadedPlaylist = PlaylistListItem & {
   songs: string[]
 }
 

app/models/map.ts

@@ -1,84 +0,0 @@
-import {
-  AlbumID3Element,
-  ArtistID3Element,
-  ArtistInfo2Element,
-  ChildElement,
-  PlaylistElement,
-} from '@app/subsonic/elements'
-import { Album, Artist, ArtistInfo, Playlist, Song } from './library'
-import { TrackExt } from './trackplayer'
-
-export function mapArtist(artist: ArtistID3Element): Artist {
-  return {
-    itemType: 'artist',
-    id: artist.id,
-    name: artist.name,
-    starred: artist.starred?.getTime(),
-    coverArt: artist.coverArt,
-  }
-}
-
-export function mapArtistInfo(id: string, info: ArtistInfo2Element): ArtistInfo {
-  return {
-    id,
-    smallImageUrl: info.smallImageUrl,
-    largeImageUrl: info.largeImageUrl,
-  }
-}
-
-export function mapAlbum(album: AlbumID3Element): Album {
-  return {
-    itemType: 'album',
-    id: album.id,
-    name: album.name,
-    artist: album.artist,
-    artistId: album.artistId,
-    starred: album.starred?.getTime(),
-    coverArt: album.coverArt,
-    year: album.year,
-  }
-}
-
-export function mapPlaylist(playlist: PlaylistElement): Playlist {
-  return {
-    itemType: 'playlist',
-    id: playlist.id,
-    name: playlist.name,
-    comment: playlist.comment,
-    coverArt: playlist.coverArt,
-  }
-}
-
-export function mapSong(song: ChildElement): Song {
-  return {
-    itemType: 'song',
-    id: song.id,
-    album: song.album,
-    albumId: song.albumId,
-    artist: song.artist,
-    artistId: song.artistId,
-    title: song.title,
-    track: song.track,
-    discNumber: song.discNumber,
-    duration: song.duration,
-    starred: song.starred?.getTime(),
-    playCount: song.playCount,
-    averageRating: song.averageRating,
-    userRating: song.userRating,
-  }
-}
-
-export function mapTrackExtToSong(track: TrackExt): Song {
-  return {
-    itemType: 'song',
-    id: track.id,
-    title: track.title as string,
-    artist: track.artist,
-    album: track.album,
-    duration: track.duration,
-    artistId: track.artistId,
-    albumId: track.albumId,
-    track: track.track,
-    discNumber: track.discNumber,
-  }
-}

app/models/music.ts

@@ -2,28 +2,43 @@ export interface Artist {
   itemType: 'artist'
   id: string
   name: string
-  starred?: number
+  starred?: Date
   coverArt?: string
 }
 
-export interface ArtistInfo {
-  id: string
+export interface ArtistInfo extends Artist {
+  albums: Album[]
   smallImageUrl?: string
   largeImageUrl?: string
+  topSongs: Song[]
 }
 
-export interface Album {
+export interface AlbumListItem {
   itemType: 'album'
   id: string
   name: string
   artist?: string
   artistId?: string
-  starred?: number
+  starred?: Date
+  coverArt?: string
+}
+
+export interface Album extends AlbumListItem {
   coverArt?: string
   year?: number
 }
 
-export interface Playlist {
+export interface AlbumWithSongs extends Album {
+  songs: Song[]
+}
+
+export interface SearchResults {
+  artists: Artist[]
+  albums: AlbumListItem[]
+  songs: Song[]
+}
+
+export interface PlaylistListItem {
   itemType: 'playlist'
   id: string
   name: string
@@ -31,6 +46,10 @@ export interface Playlist {
   coverArt?: string
 }
 
+export interface PlaylistWithSongs extends PlaylistListItem {
+  songs: Song[]
+}
+
 export interface Song {
   itemType: 'song'
   id: string
@@ -42,23 +61,14 @@ export interface Song {
   track?: number
   discNumber?: number
   duration?: number
-  starred?: number
-  playCount?: number
-  userRating?: number
-  averageRating?: number
-}
+  starred?: Date
 
-export interface SearchResults {
-  artists: Artist[]
-  albums: Album[]
-  songs: Song[]
-}
-
-export type StarrableItemType = 'album' | 'song' | 'artist'
-
-export type ListableItem = Album | Song | Artist | Playlist
-
-export interface AlbumCoverArt {
-  albumId: string
+  streamUri: string
   coverArt?: string
 }
+
+export type ListableItem = Song | AlbumListItem | Artist | PlaylistListItem
+
+export type HomeLists = { [key: string]: AlbumListItem[] }
+
+export type StarrableItemType = 'song' | 'album' | 'artist'

app/models/settings.ts

@@ -30,3 +30,23 @@ export type ArtistFilterType = 'random' | 'starred' | 'alphabeticalByName'
 export interface ArtistFilterSettings {
   type: ArtistFilterType
 }
+
+export interface AppSettings {
+  servers: Server[]
+  screens: {
+    home: {
+      lists: string[]
+    }
+    library: {
+      albums: AlbumFilterSettings
+      artists: ArtistFilterSettings
+    }
+  }
+  activeServer?: string
+  scrobble: boolean
+  estimateContentLength: boolean
+  maxBitrateWifi: number
+  maxBitrateMobile: number
+  minBuffer: number
+  maxBuffer: number
+}

app/models/state.ts

@@ -1,19 +0,0 @@
-export interface ById<T> {
-  [id: string]: T
-}
-
-export type OneToMany = ById<string[]>
-
-export interface OrderedById<T> {
-  byId: ById<T>
-  allIds: string[]
-}
-
-export interface PaginatedList {
-  [offset: number]: string[]
-}
-
-export interface CollectionById<T extends { id: string }> {
-  byId: ById<T>
-  allIds: string[]
-}

app/models/trackplayer.ts

@@ -1,18 +0,0 @@
-import { Track } from 'react-native-track-player'
-
-export type TrackExt = Track & {
-  id: string
-  coverArt?: string
-  artistId?: string
-  albumId?: string
-  track?: number
-  discNumber?: number
-}
-
-export type Progress = {
-  position: number
-  duration: number
-  buffered: number
-}
-
-export type QueueContextType = 'album' | 'playlist' | 'song' | 'artist'

app/navigation/BottomTabBar.tsx

@@ -1,6 +1,7 @@
 import NowPlayingBar from '@app/components/NowPlayingBar'
 import PressableOpacity from '@app/components/PressableOpacity'
-import { useFirstRun } from '@app/hooks/settings'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import dimensions from '@app/styles/dimensions'
 import font from '@app/styles/font'
@@ -9,7 +10,7 @@ import { BottomTabBarProps } from '@react-navigation/bottom-tabs'
 import { BottomTabNavigationEventMap } from '@react-navigation/bottom-tabs/lib/typescript/src/types'
 import { NavigationHelpers, ParamListBase } from '@react-navigation/native'
 import React from 'react'
-import { Image, ImageStyle, StyleSheet, Text, View } from 'react-native'
+import { StyleSheet, Text, View, Image, ImageStyle } from 'react-native'
 
 const BottomTabButton = React.memo<{
   routeKey: string
@@ -18,11 +19,10 @@ const BottomTabButton = React.memo<{
   isFocused: boolean
   icon: OutlineFillIcon
   navigation: NavigationHelpers<ParamListBase, BottomTabNavigationEventMap>
-  disabled?: boolean
-}>(({ routeKey, label, name, isFocused, icon, navigation, disabled }) => {
-  const firstRun = useFirstRun()
+}>(({ routeKey, label, name, isFocused, icon, navigation }) => {
+  const firstRun = useStore(selectSettings.firstRun)
 
-  disabled = !!disabled || (firstRun && name !== 'settings')
+  const disabled = firstRun && name !== 'settings'
 
   const onPress = () => {
     const event = navigation.emit({
@@ -48,9 +48,7 @@ const BottomTabButton = React.memo<{
   return (
     <PressableOpacity onPress={onPress} style={styles.button} disabled={disabled}>
       <Image source={imgSource} style={imgStyle} fadeDuration={0} />
-      <Text style={textStyle} numberOfLines={1} ellipsizeMode="clip">
-        {label}
-      </Text>
+      <Text style={textStyle}>{label}</Text>
     </PressableOpacity>
   )
 })
@@ -68,13 +66,6 @@ const BottomTabBar: React.FC<BottomTabBarProps> = ({ state, descriptors, navigat
             ? options.title
             : route.name
 
-        let iconKey = route.name
-        let disabled = false
-        if (route.name.endsWith('-disabled')) {
-          iconKey = route.name.split('-')[0]
-          disabled = true
-        }
-
         return (
           <BottomTabButton
             key={route.key}
@@ -82,9 +73,8 @@ const BottomTabBar: React.FC<BottomTabBarProps> = ({ state, descriptors, navigat
             label={label}
             name={route.name}
             isFocused={state.index === index}
-            icon={bottomTabIcons[iconKey]}
+            icon={bottomTabIcons[route.name]}
             navigation={navigation}
-            disabled={disabled}
           />
         )
       })}
@@ -103,7 +93,6 @@ const styles = StyleSheet.create({
   },
   button: {
     alignItems: 'center',
-    flexGrow: 1,
     flex: 1,
     height: '100%',
   },

app/navigation/BottomTabNavigator.tsx

@@ -1,6 +1,3 @@
-import { withSuspense } from '@app/components/withSuspense'
-import { useFirstRun } from '@app/hooks/settings'
-import { Album, Playlist } from '@app/models/library'
 import BottomTabBar from '@app/navigation/BottomTabBar'
 import LibraryTopTabNavigator from '@app/navigation/LibraryTopTabNavigator'
 import ArtistView from '@app/screens/ArtistView'
@@ -11,21 +8,21 @@ import ServerView from '@app/screens/ServerView'
 import SettingsView from '@app/screens/Settings'
 import SongListView from '@app/screens/SongListView'
 import WebViewScreen from '@app/screens/WebViewScreen'
+import { selectSettings } from '@app/state/settings'
 import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { BottomTabNavigationProp, createBottomTabNavigator } from '@react-navigation/bottom-tabs'
 import { RouteProp, StackActions } from '@react-navigation/native'
 import React, { useEffect } from 'react'
-import { useTranslation } from 'react-i18next'
 import { StyleSheet } from 'react-native'
 import { createNativeStackNavigator, NativeStackNavigationProp } from 'react-native-screens/native-stack'
 
 type TabStackParamList = {
   main: undefined
-  album: { id: string; title: string; album?: Album }
+  album: { id: string; title: string }
   artist: { id: string; title: string }
-  playlist: { id: string; title: string; playlist?: Playlist }
+  playlist: { id: string; title: string }
   results: { query: string; type: 'album' | 'song' | 'artist' }
 }
 
@@ -36,7 +33,9 @@ type AlbumScreenProps = {
   navigation: AlbumScreenNavigationProp
 }
 
-const AlbumScreen: React.FC<AlbumScreenProps> = ({ route }) => <SongListView {...route.params} type="album" />
+const AlbumScreen: React.FC<AlbumScreenProps> = ({ route }) => (
+  <SongListView id={route.params.id} title={route.params.title} type="album" />
+)
 
 type ArtistScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'artist'>
 type ArtistScreenRouteProp = RouteProp<TabStackParamList, 'artist'>
@@ -45,7 +44,9 @@ type ArtistScreenProps = {
   navigation: ArtistScreenNavigationProp
 }
 
-const ArtistScreen: React.FC<ArtistScreenProps> = ({ route }) => <ArtistView {...route.params} />
+const ArtistScreen: React.FC<ArtistScreenProps> = ({ route }) => (
+  <ArtistView id={route.params.id} title={route.params.title} />
+)
 
 type PlaylistScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'playlist'>
 type PlaylistScreenRouteProp = RouteProp<TabStackParamList, 'playlist'>
@@ -54,7 +55,9 @@ type PlaylistScreenProps = {
   navigation: PlaylistScreenNavigationProp
 }
 
-const PlaylistScreen: React.FC<PlaylistScreenProps> = ({ route }) => <SongListView {...route.params} type="playlist" />
+const PlaylistScreen: React.FC<PlaylistScreenProps> = ({ route }) => (
+  <SongListView id={route.params.id} title={route.params.title} type="playlist" />
+)
 
 type ResultsScreenNavigationProp = NativeStackNavigationProp<TabStackParamList, 'results'>
 type ResultsScreenRouteProp = RouteProp<TabStackParamList, 'results'>
@@ -63,7 +66,9 @@ type ResultsScreenProps = {
   navigation: ResultsScreenNavigationProp
 }
 
-const ResultsScreen: React.FC<ResultsScreenProps> = ({ route }) => <SearchResultsView {...route.params} />
+const ResultsScreen: React.FC<ResultsScreenProps> = ({ route }) => (
+  <SearchResultsView query={route.params.query} type={route.params.type} />
+)
 
 const styles = StyleSheet.create({
   stackheaderStyle: {
@@ -117,8 +122,8 @@ const SearchTab = createTabStackNavigator(Search)
 
 type SettingsStackParamList = {
   main: undefined
-  server?: { id?: string; title?: string }
-  web: { uri: string; title?: string }
+  server?: { id?: string }
+  web: { uri: string }
 }
 
 type ServerScreenNavigationProp = NativeStackNavigationProp<SettingsStackParamList, 'server'>
@@ -127,9 +132,7 @@ type ServerScreenProps = {
   route: ServerScreenRouteProp
   navigation: ServerScreenNavigationProp
 }
-const ServerScreen: React.FC<ServerScreenProps> = ({ route }) => (
-  <ServerView id={route.params?.id} title={route.params?.title} />
-)
+const ServerScreen: React.FC<ServerScreenProps> = ({ route }) => <ServerView id={route.params?.id} />
 
 type WebScreenNavigationProp = NativeStackNavigationProp<SettingsStackParamList, 'web'>
 type WebScreenRouteProp = RouteProp<SettingsStackParamList, 'web'>
@@ -137,9 +140,7 @@ type WebScreenProps = {
   route: WebScreenRouteProp
   navigation: WebScreenNavigationProp
 }
-const WebScreen: React.FC<WebScreenProps> = ({ route }) => (
-  <WebViewScreen uri={route.params.uri} title={route.params.title} />
-)
+const WebScreen: React.FC<WebScreenProps> = ({ route }) => <WebViewScreen uri={route.params.uri} />
 
 const SettingsStack = createNativeStackNavigator()
 
@@ -151,6 +152,7 @@ const SettingsTab = () => {
         name="server"
         component={ServerScreen}
         options={{
+          title: 'Edit Server',
           headerStyle: styles.stackheaderStyle,
           headerHideShadow: true,
           headerTintColor: 'white',
@@ -161,6 +163,7 @@ const SettingsTab = () => {
         name="web"
         component={WebScreen}
         options={{
+          title: 'Web View',
           headerStyle: styles.stackheaderStyle,
           headerHideShadow: true,
           headerTintColor: 'white',
@@ -173,37 +176,17 @@ const SettingsTab = () => {
 
 const Tab = createBottomTabNavigator()
 
-const BottomTabNavigator = withSuspense(() => {
-  const { t } = useTranslation()
-  const firstRun = useFirstRun()
-  const disableMusicTabs = useStore(store => store.disableMusicTabs)
+const BottomTabNavigator = () => {
+  const firstRun = useStore(selectSettings.firstRun)
 
   return (
     <Tab.Navigator tabBar={BottomTabBar} initialRouteName={firstRun ? 'settings' : 'home'}>
-      {disableMusicTabs ? (
-        <>
-          <Tab.Screen name="home-disabled" children={() => null} options={{ tabBarLabel: t('navigation.tabs.home') }} />
-          <Tab.Screen
-            name="library-disabled"
-            children={() => null}
-            options={{ tabBarLabel: t('navigation.tabs.library') }}
-          />
-          <Tab.Screen
-            name="search-disabled"
-            children={() => null}
-            options={{ tabBarLabel: t('navigation.tabs.search') }}
-          />
-        </>
-      ) : (
-        <>
-          <Tab.Screen name="home" component={HomeTab} options={{ tabBarLabel: t('navigation.tabs.home') }} />
-          <Tab.Screen name="library" component={LibraryTab} options={{ tabBarLabel: t('navigation.tabs.library') }} />
-          <Tab.Screen name="search" component={SearchTab} options={{ tabBarLabel: t('navigation.tabs.search') }} />
-        </>
-      )}
-      <Tab.Screen name="settings" component={SettingsTab} options={{ tabBarLabel: t('navigation.tabs.settings') }} />
+      <Tab.Screen name="home" component={HomeTab} options={{ tabBarLabel: 'Home' }} />
+      <Tab.Screen name="library" component={LibraryTab} options={{ tabBarLabel: 'Library' }} />
+      <Tab.Screen name="search" component={SearchTab} options={{ tabBarLabel: 'Search' }} />
+      <Tab.Screen name="settings" component={SettingsTab} options={{ tabBarLabel: 'Settings' }} />
     </Tab.Navigator>
   )
-})
+}
 
 export default BottomTabNavigator

app/navigation/LibraryTopTabNavigator.tsx

@@ -1,4 +1,3 @@
-import { withSuspense } from '@app/components/withSuspense'
 import AlbumsTab from '@app/screens/LibraryAlbums'
 import ArtistsTab from '@app/screens/LibraryArtists'
 import PlaylistsTab from '@app/screens/LibraryPlaylists'
@@ -7,46 +6,28 @@ import dimensions from '@app/styles/dimensions'
 import font from '@app/styles/font'
 import { createMaterialTopTabNavigator } from '@react-navigation/material-top-tabs'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { StyleSheet } from 'react-native'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { StatusBar, StyleSheet } from 'react-native'
 
 const Tab = createMaterialTopTabNavigator()
 
-const LibraryTopTabNavigator = withSuspense(() => {
-  const { t } = useTranslation()
-  const marginTop = useSafeAreaInsets().top
-
-  return (
+const LibraryTopTabNavigator = () => (
   <Tab.Navigator
     tabBarOptions={{
-        style: [styles.tabBar, { marginTop }],
+      style: styles.tabBar,
       labelStyle: styles.tablabelStyle,
       indicatorStyle: styles.tabindicatorStyle,
     }}
     initialRouteName="albums">
-      <Tab.Screen
-        name="albums"
-        component={AlbumsTab}
-        options={{ tabBarLabel: t('resources.album.name', { count: 2 }) }}
-      />
-      <Tab.Screen
-        name="artists"
-        component={ArtistsTab}
-        options={{ tabBarLabel: t('resources.artist.name', { count: 2 }) }}
-      />
-      <Tab.Screen
-        name="playlists"
-        component={PlaylistsTab}
-        options={{ tabBarLabel: t('resources.playlist.name', { count: 2 }) }}
-      />
+    <Tab.Screen name="albums" component={AlbumsTab} options={{ tabBarLabel: 'Albums' }} />
+    <Tab.Screen name="artists" component={ArtistsTab} options={{ tabBarLabel: 'Artists' }} />
+    <Tab.Screen name="playlists" component={PlaylistsTab} options={{ tabBarLabel: 'Playlists' }} />
   </Tab.Navigator>
-  )
-})
+)
 
 const styles = StyleSheet.create({
   tabBar: {
     height: dimensions.header,
+    marginTop: StatusBar.currentHeight,
     backgroundColor: colors.gradient.high,
     elevation: 0,
     justifyContent: 'center',

app/navigation/RootNavigator.tsx

@@ -1,4 +1,3 @@
-import { withSuspense } from '@app/components/withSuspense'
 import BottomTabNavigator from '@app/navigation/BottomTabNavigator'
 import NowPlayingQueue from '@app/screens/NowPlayingQueue'
 import NowPlayingView from '@app/screens/NowPlayingView'
@@ -6,22 +5,18 @@ import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { DarkTheme, NavigationContainer } from '@react-navigation/native'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
 import { createNativeStackNavigator } from 'react-native-screens/native-stack'
 
 const NowPlayingStack = createNativeStackNavigator()
 
-const NowPlayingNavigator = withSuspense(() => {
-  const { t } = useTranslation()
-
-  return (
+const NowPlayingNavigator = () => (
   <NowPlayingStack.Navigator>
     <NowPlayingStack.Screen name="main" component={NowPlayingView} options={{ headerShown: false }} />
     <NowPlayingStack.Screen
       name="queue"
       component={NowPlayingQueue}
       options={{
-          title: t('resources.queue.name', { count: 1 }),
+        title: 'Queue',
         headerStyle: {
           backgroundColor: colors.gradient.high,
         },
@@ -35,8 +30,7 @@ const NowPlayingNavigator = withSuspense(() => {
       }}
     />
   </NowPlayingStack.Navigator>
-  )
-})
+)
 
 const RootStack = createNativeStackNavigator()
 

app/playbackservice.ts

@@ -1,14 +1,8 @@
-import { getCurrentTrack, getPlayerState, trackPlayerCommands } from '@app/state/trackplayer'
-import NetInfo, { NetInfoStateType } from '@react-native-community/netinfo'
-import _ from 'lodash'
-import { unstable_batchedUpdates } from 'react-native'
+import { getCurrentTrack, getPlayerState, TrackExt, trackPlayerCommands } from '@app/state/trackplayer'
 import TrackPlayer, { Event, State } from 'react-native-track-player'
-import { fetchAlbum, FetchExisingFileOptions, fetchExistingFile, fetchFile, FetchFileOptions } from './hooks/fetch'
-import qk from './hooks/queryKeys'
-import queryClient from './queryClient'
-import queueService from './queueservice'
 import { useStore } from './state/store'
-import { ReturnedPromiseResolvedType } from './util/types'
+import { unstable_batchedUpdates } from 'react-native'
+import NetInfo, { NetInfoStateType } from '@react-native-community/netinfo'
 
 const reset = () => {
   unstable_batchedUpdates(() => {
@@ -34,97 +28,23 @@ const setNetState = (netState: 'mobile' | 'wifi') => {
   })
 }
 
-const rebuildQueue = (forcePlay?: boolean) => {
+const rebuildQueue = () => {
   unstable_batchedUpdates(() => {
-    useStore.getState().rebuildQueue(forcePlay)
+    useStore.getState().rebuildQueue(useStore.getState().playerState === State.Playing)
   })
 }
 
-const updateQueue = () => {
-  unstable_batchedUpdates(() => {
-    useStore.getState().updateQueue()
-  })
-}
-
-const setDuckPaused = (duckPaused: boolean) => {
-  unstable_batchedUpdates(() => {
-    useStore.getState().setDuckPaused(duckPaused)
-  })
-}
-
-const setQueryDataAlbum = (queryKey: any, data: ReturnedPromiseResolvedType<typeof fetchAlbum>) => {
-  unstable_batchedUpdates(() => {
-    queryClient.setQueryData(queryKey, data)
-  })
-}
-
-const setQueryDataExistingFiles = (queryKey: any, data: ReturnedPromiseResolvedType<typeof fetchExistingFile>) => {
-  unstable_batchedUpdates(() => {
-    queryClient.setQueryData(queryKey, data)
-  })
-}
-
-const setQueryDataCoverArt = (queryKey: any, data: ReturnedPromiseResolvedType<typeof fetchFile>) => {
-  unstable_batchedUpdates(() => {
-    queryClient.setQueryData(queryKey, data)
-  })
-}
-
-function getClient() {
-  const client = useStore.getState().client
-  if (!client) {
-    throw new Error('no client!')
-  }
-
-  return client
-}
-
-async function getAlbum(id: string) {
-  try {
-    const res = await fetchAlbum(id, getClient())
-    setQueryDataAlbum(qk.album(id), res)
-    return res
-  } catch {}
-}
-
-async function getCoverArtThumbExisting(coverArt: string) {
-  const serverId = useStore.getState().settings.activeServerId
-  const options: FetchExisingFileOptions = { itemType: 'coverArtThumb', itemId: coverArt }
-
-  try {
-    const res = await fetchExistingFile(options, serverId)
-    setQueryDataExistingFiles(qk.existingFiles(options.itemType, options.itemId), res)
-    return res
-  } catch {}
-}
-
-async function getCoverArtThumb(coverArt: string) {
-  const serverId = useStore.getState().settings.activeServerId
-  const fromUrl = getClient().getCoverArtUri({ id: coverArt, size: '256' })
-  const options: FetchFileOptions = {
-    itemType: 'coverArtThumb',
-    itemId: coverArt,
-    fromUrl,
-    expectedContentType: 'image',
-  }
-
-  try {
-    const res = await fetchFile(options, serverId)
-    setQueryDataCoverArt(qk.coverArt(coverArt, 'thumbnail'), res)
-    return res
-  } catch {}
-}
-
 let serviceCreated = false
 
 const createService = async () => {
   useStore.subscribe(
-    state => state.currentTrack?.id,
-    (currentTrackId?: string) => {
-      if (currentTrackId) {
-        useStore.getState().scrobbleTrack(currentTrackId)
+    (currentTrack?: TrackExt) => {
+      if (currentTrack) {
+        useStore.getState().scrobbleTrack(currentTrack.id)
       }
     },
+    state => state.currentTrack,
+    (prev, next) => prev?.id === next?.id,
   )
 
   NetInfo.fetch().then(state => {
@@ -161,14 +81,9 @@ const createService = async () => {
     }
 
     if (data.paused) {
-      let state = useStore.getState().playerState
-      if (state === State.Playing || state === State.Buffering || state === State.Connecting) {
       trackPlayerCommands.enqueue(TrackPlayer.pause)
-        setDuckPaused(true)
-      }
-    } else if (useStore.getState().duckPaused) {
+    } else {
       trackPlayerCommands.enqueue(TrackPlayer.play)
-      setDuckPaused(false)
     }
   })
 
@@ -214,81 +129,9 @@ const createService = async () => {
 
     // fix for ExoPlayer aborting playback while esimating content length
     if (code === 'playback-source' && message.includes('416')) {
-      rebuildQueue(true)
+      rebuildQueue()
     }
   })
-
-  queueService.addListener('set', async ({ queue }) => {
-    const contextId = useStore.getState().queueContextId
-    const throwIfQueueChanged = () => {
-      if (contextId !== useStore.getState().queueContextId) {
-        throw 'queue-changed'
-      }
-    }
-
-    const albumIds = _.uniq(queue.map(s => s.albumId)).filter((id): id is string => id !== undefined)
-
-    const albumIdImagePath: { [albumId: string]: string | undefined } = {}
-    for (const albumId of albumIds) {
-      let coverArt = queryClient.getQueryData<string>(qk.albumCoverArt(albumId))
-      if (!coverArt) {
-        throwIfQueueChanged()
-        console.log('no cached coverArt for album', albumId, 'getting album...')
-        coverArt = (await getAlbum(albumId))?.album.coverArt
-        if (!coverArt) {
-          continue
-        }
-      }
-
-      let imagePath =
-        queryClient.getQueryData<string>(qk.existingFiles('coverArtThumb', coverArt)) ||
-        queryClient.getQueryData<string>(qk.coverArt(coverArt, 'thumbnail'))
-      if (!imagePath) {
-        throwIfQueueChanged()
-        console.log('no cached image for', coverArt, 'getting file...')
-        imagePath = (await getCoverArtThumbExisting(coverArt)) || (await getCoverArtThumb(coverArt))
-        if (!imagePath) {
-          continue
-        }
-      }
-
-      albumIdImagePath[albumId] = imagePath
-    }
-
-    for (let i = 0; i < queue.length; i++) {
-      const track = queue[i]
-      if (typeof track.artwork === 'string') {
-        continue
-      }
-
-      if (!track.albumId) {
-        continue
-      }
-
-      let imagePath = albumIdImagePath[track.albumId]
-      if (!imagePath) {
-        continue
-      }
-
-      try {
-        throwIfQueueChanged()
-
-        let trackIdx = i
-        const shuffleOrder = useStore.getState().shuffleOrder
-        if (shuffleOrder) {
-          trackIdx = shuffleOrder.indexOf(i)
-        }
-
-        await TrackPlayer.updateMetadataForTrack(trackIdx, { ...track, artwork: `file://${imagePath}` })
-      } catch {
-        break
-      }
-    }
-
-    await trackPlayerCommands.enqueue(async () => {
-      updateQueue()
-    })
-  })
 }
 
 module.exports = async function () {

app/queryClient.ts

@@ -1,5 +0,0 @@
-import { QueryClient } from 'react-query'
-
-const client = new QueryClient()
-
-export default client

app/queueservice.ts

@@ -1,18 +0,0 @@
-/* eslint-disable no-dupe-class-members */
-import { EmitterSubscription, NativeEventEmitter } from 'react-native'
-import { TrackExt } from './models/trackplayer'
-
-class QueueService extends NativeEventEmitter {
-  addListener(eventType: 'set', listener: (event: { queue: TrackExt[] }) => void): EmitterSubscription
-  addListener(eventType: string, listener: (event: any) => void, context?: Object): EmitterSubscription {
-    return super.addListener(eventType, listener, context)
-  }
-
-  emit(eventType: 'set', event: { queue: TrackExt[] }): void
-  emit(eventType: string, ...params: any[]): void {
-    super.emit(eventType, ...params)
-  }
-}
-
-const queueService = new QueueService()
-export default queueService

app/screens/ArtistView.tsx

@@ -5,18 +5,16 @@ import GradientScrollView from '@app/components/GradientScrollView'
 import Header from '@app/components/Header'
 import HeaderBar from '@app/components/HeaderBar'
 import ListItem from '@app/components/ListItem'
-import { withSuspenseMemo } from '@app/components/withSuspense'
-import { useQueryArtist, useQueryArtistTopSongs } from '@app/hooks/query'
-import { useSetQueue } from '@app/hooks/trackplayer'
-import { Album, Song } from '@app/models/library'
+import { useArtistInfo } from '@app/hooks/music'
+import { Album, Song } from '@app/models/music'
+import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
 import colors from '@app/styles/colors'
 import dimensions from '@app/styles/dimensions'
 import font from '@app/styles/font'
 import { useLayout } from '@react-native-community/hooks'
 import { useNavigation } from '@react-navigation/native'
-import equal from 'fast-deep-equal/es6/react'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
 import { ActivityIndicator, StyleSheet, Text, View } from 'react-native'
 import { useAnimatedScrollHandler, useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
 
@@ -34,72 +32,40 @@ const AlbumItem = React.memo<{
   return (
     <AlbumContextPressable
       album={album}
-      onPress={() => navigation.navigate('album', { id: album.id, title: album.name, album })}
+      onPress={() => navigation.navigate('album', { id: album.id, title: album.name })}
       menuStyle={[styles.albumItem, { width }]}
       triggerOuterWrapperStyle={{ width }}>
-      <CoverArt type="cover" coverArt={album.coverArt} style={{ height, width }} resizeMode="cover" size="thumbnail" />
+      <CoverArt type="cover" coverArt={album.coverArt} style={{ height, width }} resizeMode={'cover'} />
       <Text style={styles.albumTitle}>{album.name}</Text>
       <Text style={styles.albumYear}> {album.year ? album.year : ''}</Text>
     </AlbumContextPressable>
   )
-}, equal)
+})
 
-const TopSongs = withSuspenseMemo<{
+const TopSongs = React.memo<{
   songs: Song[]
   name: string
-}>(
-  ({ songs, name }) => {
-    const { setQueue, contextId } = useSetQueue('artist', songs)
-    const { t } = useTranslation()
+  artistId: string
+}>(({ songs, name, artistId }) => {
+  const setQueue = useStore(selectTrackPlayer.setQueue)
 
   return (
     <>
-        <Header>{t('resources.song.lists.artistTopSongs')}</Header>
-        {songs.slice(0, 5).map((s, i) => (
+      <Header>Top Songs</Header>
+      {songs.map((s, i) => (
         <ListItem
           key={i}
           item={s}
-            contextId={contextId}
+          contextId={artistId}
           queueId={i}
           showArt={true}
           subtitle={s.album}
-            onPress={() => setQueue({ title: name, playTrack: i })}
+          onPress={() => setQueue(songs, name, 'artist', artistId, i)}
         />
       ))}
     </>
   )
-  },
-  null,
-  equal,
-)
-
-const ArtistAlbums = withSuspenseMemo<{
-  albums: Album[]
-}>(
-  ({ albums }) => {
-    const albumsLayout = useLayout()
-    const { t } = useTranslation()
-
-    const sortedAlbums = [...albums]
-      .sort((a, b) => a.name.localeCompare(b.name))
-      .sort((a, b) => (b.year || 0) - (a.year || 0))
-
-    const albumSize = albumsLayout.width / 2 - styles.contentContainer.paddingHorizontal / 2
-
-    return (
-      <>
-        <Header>{t('resources.album.name', { count: 2 })}</Header>
-        <View style={styles.albums} onLayout={albumsLayout.onLayout}>
-          {sortedAlbums.map(a => (
-            <AlbumItem key={a.id} album={a} height={albumSize} width={albumSize} />
-          ))}
-        </View>
-      </>
-    )
-  },
-  null,
-  equal,
-)
+})
 
 const ArtistViewFallback = React.memo(() => (
   <GradientBackground style={styles.fallback}>
@@ -108,9 +74,8 @@ const ArtistViewFallback = React.memo(() => (
 ))
 
 const ArtistView = React.memo<{ id: string; title: string }>(({ id, title }) => {
-  const { data: artistData } = useQueryArtist(id)
-  const { data: topSongs, isError } = useQueryArtistTopSongs(artistData?.artist?.name)
-
+  const artist = useArtistInfo(id)
+  const albumsLayout = useLayout()
   const coverLayout = useLayout()
   const headerOpacity = useSharedValue(0)
 
@@ -126,11 +91,15 @@ const ArtistView = React.memo<{ id: string; title: string }>(({ id, title }) =>
     }
   })
 
-  if (!artistData) {
+  const albumSize = albumsLayout.width / 2 - styles.contentContainer.paddingHorizontal / 2
+
+  if (!artist) {
     return <ArtistViewFallback />
   }
 
-  const { artist, albums } = artistData
+  const _albums = [...artist.albums]
+    .sort((a, b) => a.name.localeCompare(b.name))
+    .sort((a, b) => (b.year || 0) - (a.year || 0))
 
   return (
     <View style={styles.container}>
@@ -141,23 +110,22 @@ const ArtistView = React.memo<{ id: string; title: string }>(({ id, title }) =>
         style={styles.scroll}
         contentContainerStyle={styles.scrollContent}
         onScroll={onScroll}>
-        <CoverArt type="artist" size="original" artistId={artist.id} style={styles.artistCover} resizeMode="cover" />
+        <CoverArt type="artist" size="original" artistId={artist.id} style={styles.artistCover} resizeMode={'cover'} />
         <View style={styles.titleContainer}>
           <Text style={styles.title}>{artist.name}</Text>
         </View>
         <View style={styles.contentContainer}>
-          {(topSongs || isError) && artist ? (
-            topSongs && topSongs.length > 0 ? (
-              <>
-                <TopSongs songs={topSongs} name={artist.name} />
-                <ArtistAlbums albums={albums} />
-              </>
+          {artist.topSongs.length > 0 ? (
+            <TopSongs songs={artist.topSongs} name={artist.name} artistId={artist.id} />
           ) : (
-              <ArtistAlbums albums={albums} />
-            )
-          ) : (
-            <ActivityIndicator size="large" color={colors.accent} style={styles.loading} />
+            <></>
           )}
+          <Header>Albums</Header>
+          <View style={styles.albums} onLayout={albumsLayout.onLayout}>
+            {_albums.map(a => (
+              <AlbumItem key={a.id} album={a} height={albumSize} width={albumSize} />
+            ))}
+          </View>
         </View>
       </GradientScrollView>
     </View>
@@ -232,9 +200,6 @@ const styles = StyleSheet.create({
     fontFamily: font.regular,
     textAlign: 'center',
   },
-  loading: {
-    marginTop: 30,
-  },
 })
 
 export default ArtistView

app/screens/Home.tsx

@@ -3,22 +3,27 @@ import CoverArt from '@app/components/CoverArt'
 import GradientScrollView from '@app/components/GradientScrollView'
 import Header from '@app/components/Header'
 import NothingHere from '@app/components/NothingHere'
-import { withSuspenseMemo } from '@app/components/withSuspense'
-import { useQueryHomeLists } from '@app/hooks/query'
-import { Album } from '@app/models/library'
-import { useStoreDeep } from '@app/state/store'
+import { useActiveServerRefresh } from '@app/hooks/server'
+import { AlbumListItem } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
-import { GetAlbumList2TypeBase } from '@app/subsonic/params'
+import { GetAlbumListType } from '@app/subsonic/params'
 import { useNavigation } from '@react-navigation/native'
-import equal from 'fast-deep-equal/es6/react'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { RefreshControl, ScrollView, StyleSheet, Text, View } from 'react-native'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import React, { useCallback } from 'react'
+import { RefreshControl, ScrollView, StatusBar, StyleSheet, Text, View } from 'react-native'
+
+const titles: { [key in GetAlbumListType]?: string } = {
+  recent: 'Recently Played',
+  random: 'Random Albums',
+  frequent: 'Frequently Played',
+  starred: 'Starred Albums',
+}
 
 const AlbumItem = React.memo<{
-  album: Album
+  album: AlbumListItem
 }>(({ album }) => {
   const navigation = useNavigation()
 
@@ -26,13 +31,12 @@ const AlbumItem = React.memo<{
     <AlbumContextPressable
       album={album}
       triggerWrapperStyle={styles.item}
-      onPress={() => navigation.navigate('album', { id: album.id, title: album.name, album })}>
+      onPress={() => navigation.navigate('album', { id: album.id, title: album.name })}>
       <CoverArt
         type="cover"
         coverArt={album.coverArt}
         style={{ height: styles.item.width, width: styles.item.width }}
-        resizeMode="cover"
-        size="thumbnail"
+        resizeMode={'cover'}
       />
       <Text style={styles.title} numberOfLines={1}>
         {album.name}
@@ -42,18 +46,12 @@ const AlbumItem = React.memo<{
       </Text>
     </AlbumContextPressable>
   )
-}, equal)
-
-const CategoryHeader = withSuspenseMemo<{ type: string }>(({ type }) => {
-  const { t } = useTranslation()
-  console.log('type', type, t(`resources.album.lists.${type}`))
-  return <Header style={styles.header}>{t(`resources.album.lists.${type}`)}</Header>
 })
 
 const Category = React.memo<{
-  type: string
-  albums: Album[]
-}>(({ type, albums }) => {
+  name?: string
+  data: AlbumListItem[]
+}>(({ name, data }) => {
   const Albums = () => (
     <ScrollView
       horizontal={true}
@@ -61,8 +59,8 @@ const Category = React.memo<{
       overScrollMode={'never'}
       style={styles.artScroll}
       contentContainerStyle={styles.artScrollContent}>
-      {albums.map(a => (
-        <AlbumItem key={a.id} album={a} />
+      {data.map(album => (
+        <AlbumItem key={album.id} album={album} />
       ))}
     </ScrollView>
   )
@@ -75,34 +73,42 @@ const Category = React.memo<{
 
   return (
     <View style={styles.category}>
-      <CategoryHeader type={type} />
-      {albums.length > 0 ? <Albums /> : <Nothing />}
+      <Header style={styles.header}>{name}</Header>
+      {data.length > 0 ? <Albums /> : <Nothing />}
     </View>
   )
-}, equal)
+})
 
 const Home = () => {
-  const types = useStoreDeep(store => store.settings.screens.home.listTypes)
-  const listQueries = useQueryHomeLists(types as GetAlbumList2TypeBase[], 20)
-  const paddingTop = useSafeAreaInsets().top
+  const types = useStore(selectSettings.homeLists)
+  const lists = useStore(selectMusic.homeLists)
+  const updating = useStore(selectMusic.homeListsUpdating)
+  const update = useStore(selectMusic.fetchHomeLists)
+  const clear = useStore(selectMusic.clearHomeLists)
+
+  useActiveServerRefresh(
+    useCallback(() => {
+      clear()
+      update()
+    }, [clear, update]),
+  )
 
   return (
     <GradientScrollView
       style={styles.scroll}
-      contentContainerStyle={{ paddingTop }}
+      contentContainerStyle={styles.scrollContentContainer}
       refreshControl={
         <RefreshControl
-          refreshing={listQueries.some(q => q.isLoading)}
-          onRefresh={() => listQueries.forEach(q => q.refetch())}
+          refreshing={updating}
+          onRefresh={update}
           colors={[colors.accent, colors.accentLow]}
-          progressViewOffset={paddingTop}
+          progressViewOffset={StatusBar.currentHeight}
         />
       }>
       <View style={styles.content}>
-        {types.map(type => {
-          const query = listQueries.find(list => list.data?.type === type)
-          return <Category key={type} type={type} albums={query?.data?.albums || []} />
-        })}
+        {types.map(type => (
+          <Category key={type} name={titles[type as GetAlbumListType]} data={type in lists ? lists[type] : []} />
+        ))}
       </View>
     </GradientScrollView>
   )
@@ -112,6 +118,9 @@ const styles = StyleSheet.create({
   scroll: {
     flex: 1,
   },
+  scrollContentContainer: {
+    paddingTop: StatusBar.currentHeight,
+  },
   content: {
     paddingBottom: 20,
   },

app/screens/LibraryAlbums.tsx

@@ -1,44 +1,33 @@
 import { AlbumContextPressable } from '@app/components/ContextMenu'
 import CoverArt from '@app/components/CoverArt'
-import FilterButton from '@app/components/FilterButton'
+import FilterButton, { OptionData } from '@app/components/FilterButton'
 import GradientFlatList from '@app/components/GradientFlatList'
-import { withSuspenseMemo } from '@app/components/withSuspense'
-import { useQueryAlbumList } from '@app/hooks/query'
-import { Album } from '@app/models/library'
-import { useStore, useStoreDeep } from '@app/state/store'
+import { useFetchPaginatedList } from '@app/hooks/list'
+import { Album, AlbumListItem } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
-import { GetAlbumList2TypeBase } from '@app/subsonic/params'
+import { GetAlbumList2Type } from '@app/subsonic/params'
 import { useNavigation } from '@react-navigation/native'
-import equal from 'fast-deep-equal/es6/react'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
+import React, { useEffect } from 'react'
 import { StyleSheet, Text, useWindowDimensions, View } from 'react-native'
 
 const AlbumItem = React.memo<{
-  album: Album
+  album: AlbumListItem
   size: number
   height: number
 }>(({ album, size, height }) => {
   const navigation = useNavigation()
 
-  if (!album) {
-    return <></>
-  }
-
   return (
     <AlbumContextPressable
       album={album}
       menuStyle={[styles.itemMenu, { width: size }]}
       triggerWrapperStyle={[styles.itemWrapper, { height }]}
-      onPress={() => navigation.navigate('album', { id: album.id, title: album.name, album })}>
-      <CoverArt
-        type="cover"
-        coverArt={album.coverArt}
-        style={{ height: size, width: size }}
-        resizeMode="cover"
-        size="thumbnail"
-      />
+      onPress={() => navigation.navigate('album', { id: album.id, title: album.name })}>
+      <CoverArt type="cover" coverArt={album.coverArt} style={{ height: size, width: size }} resizeMode={'cover'} />
       <View style={styles.itemDetails}>
         <Text style={styles.title} numberOfLines={1}>
           {album.name}
@@ -49,64 +38,62 @@ const AlbumItem = React.memo<{
       </View>
     </AlbumContextPressable>
   )
-}, equal)
+})
 
 const AlbumListRenderItem: React.FC<{
   item: { album: Album; size: number; height: number }
 }> = ({ item }) => <AlbumItem album={item.album} size={item.size} height={item.height} />
 
-const filterValues: GetAlbumList2TypeBase[] = [
-  'alphabeticalByName', //
-  'alphabeticalByArtist',
-  'newest',
-  'frequent',
-  'recent',
-  'starred',
-  'random',
+const filterOptions: OptionData[] = [
+  { text: 'By Name', value: 'alphabeticalByName' },
+  { text: 'By Artist', value: 'alphabeticalByArtist' },
+  { text: 'Newest', value: 'newest' },
+  { text: 'Frequent', value: 'frequent' },
+  { text: 'Recent', value: 'recent' },
+  { text: 'Starred', value: 'starred' },
+  { text: 'Random', value: 'random' },
+  // { text: 'By Year...', value: 'byYear' },
+  // { text: 'By Genre...', value: 'byGenre' },
 ]
 
-const AlbumFilterButton = withSuspenseMemo(() => {
-  const { t } = useTranslation()
-  const filterType = useStoreDeep(store => store.settings.screens.library.albumsFilter.type)
-  const setFilterType = useStore(store => store.setLibraryAlbumFilterType)
-
-  return (
-    <FilterButton
-      data={filterValues.map(value => ({ value, text: t(`resources.album.lists.${value}`) }))}
-      value={filterType}
-      onSelect={selection => {
-        setFilterType(selection as GetAlbumList2TypeBase)
-      }}
-      title={t('resources.album.lists.sort')}
-    />
-  )
-})
-
 const AlbumsList = () => {
-  const filterType = useStoreDeep(store => store.settings.screens.library.albumsFilter.type)
-  const { isLoading, data, fetchNextPage, refetch } = useQueryAlbumList(filterType as GetAlbumList2TypeBase, 300)
+  const fetchAlbums = useStore(selectMusic.fetchAlbums)
+  const { list, refreshing, refresh, reset, fetchNextPage } = useFetchPaginatedList(fetchAlbums, 300)
+  const filter = useStore(selectSettings.libraryAlbumFilter)
+  const setFilter = useStore(selectSettings.setLibraryAlbumFilter)
 
   const layout = useWindowDimensions()
 
   const size = layout.width / 3 - styles.itemWrapper.marginHorizontal * 2
   const height = size + 36
 
+  useEffect(() => reset(), [reset, filter])
+
   return (
     <View style={styles.container}>
       <GradientFlatList
-        data={data ? data.pages.flatMap(albums => albums.map(album => ({ album, size, height }))) : []}
+        data={list.map(album => ({ album, size, height }))}
         renderItem={AlbumListRenderItem}
         keyExtractor={item => item.album.id}
         numColumns={3}
         removeClippedSubviews={true}
-        refreshing={isLoading}
-        onRefresh={refetch}
+        refreshing={refreshing}
+        onRefresh={refresh}
         overScrollMode="never"
-        onEndReached={() => fetchNextPage()}
+        onEndReached={fetchNextPage}
         onEndReachedThreshold={6}
         windowSize={5}
       />
-      <AlbumFilterButton />
+      <FilterButton
+        data={filterOptions}
+        value={filter.type}
+        onSelect={selection => {
+          setFilter({
+            ...filter,
+            type: selection as GetAlbumList2Type,
+          })
+        }}
+      />
     </View>
   )
 }

app/screens/LibraryArtists.tsx

@@ -1,68 +1,45 @@
-import FilterButton from '@app/components/FilterButton'
+import FilterButton, { OptionData } from '@app/components/FilterButton'
 import GradientFlatList from '@app/components/GradientFlatList'
 import ListItem from '@app/components/ListItem'
-import { withSuspenseMemo } from '@app/components/withSuspense'
-import { useQueryArtists } from '@app/hooks/query'
-import { Artist } from '@app/models/library'
+import { useFetchList } from '@app/hooks/list'
+import { Artist } from '@app/models/music'
 import { ArtistFilterType } from '@app/models/settings'
-import { useStore, useStoreDeep } from '@app/state/store'
+import { selectMusic } from '@app/state/music'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
 import React, { useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
 import { StyleSheet, View } from 'react-native'
 
 const ArtistRenderItem: React.FC<{ item: Artist }> = ({ item }) => (
   <ListItem item={item} showArt={true} showStar={false} listStyle="big" style={styles.listItem} />
 )
 
-const filterValues: ArtistFilterType[] = [
-  'alphabeticalByName', //
-  'starred',
-  'random',
+const filterOptions: OptionData[] = [
+  { text: 'By Name', value: 'alphabeticalByName' },
+  { text: 'Starred', value: 'starred' },
+  { text: 'Random', value: 'random' },
 ]
 
-const ArtistFilterButton = withSuspenseMemo(() => {
-  const { t } = useTranslation()
-  const filterType = useStoreDeep(store => store.settings.screens.library.artistsFilter.type)
-  const setFilterType = useStore(store => store.setLibraryArtistFilterType)
-
-  return (
-    <FilterButton
-      data={filterValues.map(value => ({ value, text: t(`resources.artist.lists.${value}`) }))}
-      value={filterType}
-      onSelect={selection => setFilterType(selection as ArtistFilterType)}
-      title={t('resources.artist.lists.sort')}
-    />
-  )
-})
-
 const ArtistsList = () => {
-  const filterType = useStore(store => store.settings.screens.library.artistsFilter.type)
-
-  const { isLoading, data, refetch } = useQueryArtists()
+  const fetchArtists = useStore(selectMusic.fetchArtists)
+  const { list, refreshing, refresh } = useFetchList(fetchArtists)
+  const filter = useStore(selectSettings.libraryArtistFilter)
+  const setFilter = useStore(selectSettings.setLibraryArtistFiler)
   const [sortedList, setSortedList] = useState<Artist[]>([])
 
   useEffect(() => {
-    if (!data) {
-      setSortedList([])
-      return
-    }
-
-    const list = Object.values(data.byId)
-    switch (filterType) {
+    switch (filter.type) {
       case 'random':
         setSortedList([...list].sort(() => Math.random() - 0.5))
         break
       case 'starred':
         setSortedList([...list].filter(a => a.starred))
         break
-      case 'alphabeticalByName':
-        setSortedList(data.allIds.map(id => data.byId[id]))
-        break
       default:
         setSortedList([...list])
         break
     }
-  }, [filterType, data])
+  }, [list, filter])
 
   return (
     <View style={styles.container}>
@@ -70,13 +47,22 @@ const ArtistsList = () => {
         data={sortedList}
         renderItem={ArtistRenderItem}
         keyExtractor={item => item.id}
-        onRefresh={refetch}
-        refreshing={isLoading}
+        onRefresh={refresh}
+        refreshing={refreshing}
         overScrollMode="never"
         windowSize={3}
         contentMarginTop={6}
       />
-      <ArtistFilterButton />
+      <FilterButton
+        data={filterOptions}
+        value={filter.type}
+        onSelect={selection => {
+          setFilter({
+            ...filter,
+            type: selection as ArtistFilterType,
+          })
+        }}
+      />
     </View>
   )
 }

app/screens/LibraryPlaylists.tsx

@@ -1,25 +1,27 @@
 import GradientFlatList from '@app/components/GradientFlatList'
 import ListItem from '@app/components/ListItem'
-import { useQueryPlaylists } from '@app/hooks/query'
-import { Playlist } from '@app/models/library'
-import { mapById } from '@app/util/state'
+import { useFetchList } from '@app/hooks/list'
+import { PlaylistListItem } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { useStore } from '@app/state/store'
 import React from 'react'
 import { StyleSheet } from 'react-native'
 
-const PlaylistRenderItem: React.FC<{ item: Playlist }> = ({ item }) => (
+const PlaylistRenderItem: React.FC<{ item: PlaylistListItem }> = ({ item }) => (
   <ListItem item={item} showArt={true} showStar={false} listStyle="big" style={styles.listItem} />
 )
 
 const PlaylistsList = () => {
-  const { isLoading, data, refetch } = useQueryPlaylists()
+  const fetchPlaylists = useStore(selectMusic.fetchPlaylists)
+  const { list, refreshing, refresh } = useFetchList(fetchPlaylists)
 
   return (
     <GradientFlatList
-      data={data ? mapById(data?.byId, data?.allIds) : []}
+      data={list}
       renderItem={PlaylistRenderItem}
       keyExtractor={item => item.id}
-      onRefresh={refetch}
-      refreshing={isLoading}
+      onRefresh={refresh}
+      refreshing={refreshing}
       overScrollMode="never"
       windowSize={5}
       contentMarginTop={6}

app/screens/NowPlayingQueue.tsx

@@ -2,9 +2,10 @@ import GradientFlatList from '@app/components/GradientFlatList'
 import ListItem from '@app/components/ListItem'
 import NowPlayingBar from '@app/components/NowPlayingBar'
 import { useSkipTo } from '@app/hooks/trackplayer'
-import { Song } from '@app/models/library'
-import { mapTrackExtToSong } from '@app/models/map'
-import { useStoreDeep } from '@app/state/store'
+import { Song } from '@app/models/music'
+import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
+import { selectTrackPlayerMap } from '@app/state/trackplayermap'
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
 
@@ -26,7 +27,8 @@ const SongRenderItem: React.FC<{
 )
 
 const NowPlayingQueue = React.memo<{}>(() => {
-  const queue = useStoreDeep(store => store.queue)
+  const queue = useStore(selectTrackPlayer.queue)
+  const mapTrackExtToSong = useStore(selectTrackPlayerMap.mapTrackExtToSong)
   const skipTo = useSkipTo()
 
   return (

app/screens/NowPlayingView.tsx

@@ -2,19 +2,19 @@ import CoverArt from '@app/components/CoverArt'
 import HeaderBar from '@app/components/HeaderBar'
 import ImageGradientBackground from '@app/components/ImageGradientBackground'
 import PressableOpacity from '@app/components/PressableOpacity'
-import { PressableStar } from '@app/components/Star'
-import { withSuspenseMemo } from '@app/components/withSuspense'
+import Star from '@app/components/Star'
+import { useStarred } from '@app/hooks/music'
 import { useNext, usePause, usePlay, usePrevious, useSeekTo } from '@app/hooks/trackplayer'
-import { mapTrackExtToSong } from '@app/models/map'
-import { TrackExt } from '@app/models/trackplayer'
-import { useStore, useStoreDeep } from '@app/state/store'
+import { selectMusic } from '@app/state/music'
+import { useStore } from '@app/state/store'
+import { QueueContextType, selectTrackPlayer, TrackExt } from '@app/state/trackplayer'
+import { selectTrackPlayerMap } from '@app/state/trackplayermap'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import formatDuration from '@app/util/formatDuration'
 import Slider from '@react-native-community/slider'
 import { useNavigation } from '@react-navigation/native'
 import React, { useCallback, useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
 import { ActivityIndicator, StyleSheet, Text, TextStyle, View } from 'react-native'
 import { NativeStackScreenProps } from 'react-native-screens/native-stack'
 import { RepeatMode, State } from 'react-native-track-player'
@@ -23,29 +23,33 @@ import IconFA5 from 'react-native-vector-icons/FontAwesome5'
 import Icon from 'react-native-vector-icons/Ionicons'
 import IconMatCom from 'react-native-vector-icons/MaterialCommunityIcons'
 
-const NowPlayingHeader = withSuspenseMemo<{
+function getContextName(type?: QueueContextType) {
+  switch (type) {
+    case 'album':
+      return 'Album'
+    case 'artist':
+      return 'Top Songs'
+    case 'playlist':
+      return 'Playlist'
+    case 'song':
+      return 'Search Results'
+    default:
+      return undefined
+  }
+}
+
+const NowPlayingHeader = React.memo<{
   track?: TrackExt
 }>(({ track }) => {
-  const queueName = useStore(store => store.queueName)
-  const queueContextType = useStore(store => store.queueContextType)
-  const { t } = useTranslation()
-
-  console.log(t('resources.album.name', { count: 1 }))
+  const queueName = useStore(selectTrackPlayer.queueName)
+  const queueContextType = useStore(selectTrackPlayer.queueContextType)
+  const mapTrackExtToSong = useStore(selectTrackPlayerMap.mapTrackExtToSong)
 
   if (!track) {
     return <></>
   }
 
-  let contextName: string
-  if (queueContextType === 'album') {
-    contextName = t('resources.album.name', { count: 1 })
-  } else if (queueContextType === 'artist') {
-    contextName = t('resources.song.lists.artistTopSongs')
-  } else if (queueContextType === 'playlist') {
-    contextName = t('resources.playlist.name', { count: 1 })
-  } else if (queueContextType === 'song') {
-    contextName = t('search.nowPlayingContext')
-  }
+  let contextName = getContextName(queueContextType)
 
   return (
     <HeaderBar
@@ -90,11 +94,11 @@ const headerStyles = StyleSheet.create({
 })
 
 const SongCoverArt = () => {
-  const albumId = useStore(store => store.currentTrack?.albumId)
+  const track = useStore(selectTrackPlayer.currentTrack)
 
   return (
     <View style={coverArtStyles.container}>
-      <CoverArt type="album" size="original" albumId={albumId} style={coverArtStyles.image} />
+      <CoverArt type="cover" size="original" coverArt={track?.coverArt} style={coverArtStyles.image} />
     </View>
   )
 }
@@ -113,22 +117,26 @@ const coverArtStyles = StyleSheet.create({
 })
 
 const SongInfo = () => {
-  const id = useStore(store => store.currentTrack?.id)
-  const artist = useStore(store => store.currentTrack?.artist)
-  const title = useStore(store => store.currentTrack?.title)
+  const track = useStore(selectTrackPlayer.currentTrack)
+  const id = track?.id || '-1'
+  const type = 'song'
+  const starred = useStarred(id, type)
+  const setStarred = useStore(selectMusic.starItem)
 
   return (
     <View style={infoStyles.container}>
       <View style={infoStyles.details}>
         <Text numberOfLines={1} style={infoStyles.title}>
-          {title}
+          {track?.title}
         </Text>
         <Text numberOfLines={1} style={infoStyles.artist}>
-          {artist}
+          {track?.artist}
         </Text>
       </View>
       <View style={infoStyles.controls}>
-        <PressableStar id={id || '-1'} type={'song'} size={32} />
+        <PressableOpacity onPress={() => setStarred(id, type, starred)}>
+          <Star size={32} starred={starred} />
+        </PressableOpacity>
       </View>
     </View>
   )
@@ -162,8 +170,7 @@ const infoStyles = StyleSheet.create({
 })
 
 const SeekBar = () => {
-  const position = useStore(store => store.progress.position)
-  const duration = useStore(store => store.progress.duration)
+  const { position, duration } = useStore(selectTrackPlayer.progress)
   const seekTo = useSeekTo()
   const [value, setValue] = useState(0)
   const [sliding, setSliding] = useState(false)
@@ -255,15 +262,15 @@ const seekStyles = StyleSheet.create({
 })
 
 const PlayerControls = () => {
-  const state = useStore(store => store.playerState)
+  const state = useStore(selectTrackPlayer.playerState)
   const play = usePlay()
   const pause = usePause()
   const next = useNext()
   const previous = usePrevious()
-  const shuffled = useStore(store => !!store.shuffleOrder)
-  const toggleShuffle = useStore(store => store.toggleShuffle)
-  const repeatMode = useStore(store => store.repeatMode)
-  const toggleRepeat = useStore(store => store.toggleRepeatMode)
+  const shuffled = useStore(selectTrackPlayer.shuffled)
+  const toggleShuffle = useStore(selectTrackPlayer.toggleShuffle)
+  const repeatMode = useStore(selectTrackPlayer.repeatMode)
+  const toggleRepeat = useStore(selectTrackPlayer.toggleRepeatMode)
   const navigation = useNavigation()
 
   let playPauseIcon: string
@@ -385,7 +392,7 @@ type RootStackParamList = {
 type NowPlayingProps = NativeStackScreenProps<RootStackParamList, 'main'>
 
 const NowPlayingView: React.FC<NowPlayingProps> = ({ navigation }) => {
-  const track = useStoreDeep(store => store.currentTrack)
+  const track = useStore(selectTrackPlayer.currentTrack)
 
   useEffect(() => {
     if (!track) {
@@ -397,7 +404,7 @@ const NowPlayingView: React.FC<NowPlayingProps> = ({ navigation }) => {
 
   return (
     <View style={styles.container}>
-      <ImageGradientBackground imagePath={imagePath} height={'100%'} />
+      <ImageGradientBackground imagePath={imagePath} />
       <NowPlayingHeader track={track} />
       <View style={styles.content}>
         <SongCoverArt />

app/screens/Search.tsx

@@ -4,51 +4,47 @@ import Header from '@app/components/Header'
 import ListItem from '@app/components/ListItem'
 import NothingHere from '@app/components/NothingHere'
 import TextInput from '@app/components/TextInput'
-import { withSuspense, withSuspenseMemo } from '@app/components/withSuspense'
-import { useQuerySearchResults } from '@app/hooks/query'
-import { useSetQueue } from '@app/hooks/trackplayer'
-import { Album, Artist, SearchResults, Song } from '@app/models/library'
+import { useActiveServerRefresh } from '@app/hooks/server'
+import { ListableItem, SearchResults, Song } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { useFocusEffect, useNavigation } from '@react-navigation/native'
-import equal from 'fast-deep-equal/es6/react'
-import _ from 'lodash'
+import debounce from 'lodash.debounce'
 import React, { useCallback, useMemo, useRef, useState } from 'react'
-import { useTranslation } from 'react-i18next'
 import {
   ActivityIndicator,
   InteractionManager,
   ScrollView,
+  StatusBar,
   StyleSheet,
   TextInput as ReactTextInput,
   View,
 } from 'react-native'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 const SongItem = React.memo<{ item: Song }>(({ item }) => {
-  const { setQueue, contextId } = useSetQueue('song', [item])
+  const setQueue = useStore(selectTrackPlayer.setQueue)
 
   return (
     <ListItem
       item={item}
-      contextId={contextId}
+      contextId={item.id}
       queueId={0}
       showArt={true}
       showStar={false}
-      onPress={() => setQueue({ title: item.title, playTrack: 0 })}
+      onPress={() => setQueue([item], item.title, 'song', item.id, 0)}
     />
   )
-}, equal)
+})
 
-const ResultsCategory = withSuspenseMemo<{
+const ResultsCategory = React.memo<{
   name: string
   query: string
-  items: (Artist | Album | Song)[]
-  type: 'artist' | 'album' | 'song'
-}>(
-  ({ name, query, type, items }) => {
+  items: ListableItem[]
+}>(({ name, query, items }) => {
   const navigation = useNavigation()
-    const { t } = useTranslation()
 
   if (items.length === 0) {
     return <></>
@@ -58,15 +54,15 @@ const ResultsCategory = withSuspenseMemo<{
     <>
       <Header>{name}</Header>
       {items.map(a =>
-          type === 'song' ? (
-            <SongItem key={a.id} item={a as Song} />
+        a.itemType === 'song' ? (
+          <SongItem key={a.id} item={a} />
         ) : (
           <ListItem key={a.id} item={a} showArt={true} showStar={false} />
         ),
       )}
       {items.length === 5 && (
         <Button
-            title={t('search.moreResults')}
+          title="More..."
           buttonStyle="hollow"
           style={styles.more}
           onPress={() => navigation.navigate('results', { query, type: items[0].itemType })}
@@ -74,120 +70,101 @@ const ResultsCategory = withSuspenseMemo<{
       )}
     </>
   )
-  },
-  null,
-  equal,
-)
+})
 
-const Results = withSuspenseMemo<{
+const Results = React.memo<{
   results: SearchResults
   query: string
-}>(
-  ({ results, query }) => {
-    const { t } = useTranslation()
-
+}>(({ results, query }) => {
   return (
     <>
-        <ResultsCategory
-          name={t('resources.artist.name', { count: 2 })}
-          query={query}
-          type={'artist'}
-          items={results.artists}
-        />
-        <ResultsCategory
-          name={t('resources.album.name', { count: 2 })}
-          query={query}
-          type={'album'}
-          items={results.albums}
-        />
-        <ResultsCategory
-          name={t('resources.song.name', { count: 2 })}
-          query={query}
-          type={'song'}
-          items={results.songs}
-        />
+      <ResultsCategory name="Artists" query={query} items={results.artists} />
+      <ResultsCategory name="Albums" query={query} items={results.albums} />
+      <ResultsCategory name="Songs" query={query} items={results.songs} />
     </>
   )
-  },
-  null,
-  equal,
-)
-
-const Search = withSuspense(() => {
-  const [query, setQuery] = useState('')
-  const { data, isLoading } = useQuerySearchResults({ query, albumCount: 5, artistCount: 5, songCount: 5 })
-  const { t } = useTranslation()
+})
 
+const Search = () => {
+  const fetchSearchResults = useStore(selectMusic.fetchSearchResults)
+  const [results, setResults] = useState<SearchResults>({ artists: [], albums: [], songs: [] })
+  const [refreshing, setRefreshing] = useState(false)
   const [text, setText] = useState('')
   const searchBarRef = useRef<ReactTextInput>(null)
   const scrollRef = useRef<ScrollView>(null)
-  const paddingTop = useSafeAreaInsets().top
 
   useFocusEffect(
     useCallback(() => {
       const task = InteractionManager.runAfterInteractions(() => {
         setTimeout(() => {
-          if (text) {
-            return
-          }
           setText('')
-          setQuery('')
+          setResults({ artists: [], albums: [], songs: [] })
           searchBarRef.current?.focus()
           scrollRef.current?.scrollTo({ y: 0, animated: true })
         }, 50)
       })
       return () => task.cancel()
-    }, [text]),
+    }, [searchBarRef, scrollRef]),
   )
 
-  const debouncedSetQuery = useMemo(
+  useActiveServerRefresh(
+    useCallback(() => {
+      setText('')
+      setResults({ artists: [], albums: [], songs: [] })
+    }, []),
+  )
+
+  const debouncedonUpdateSearch = useMemo(
     () =>
-      _.debounce((value: string) => {
-        setQuery(value)
+      debounce(async (query: string) => {
+        setRefreshing(true)
+        setResults(await fetchSearchResults(query))
+        setRefreshing(false)
       }, 400),
-    [],
+    [fetchSearchResults],
   )
 
   const onChangeText = useCallback(
     (value: string) => {
       setText(value)
-      debouncedSetQuery(value)
+      debouncedonUpdateSearch(value)
     },
-    [setText, debouncedSetQuery],
+    [setText, debouncedonUpdateSearch],
   )
 
-  const resultsCount =
-    (data ? data.pages.reduce((acc, val) => (acc += val.artists.length), 0) : 0) +
-    (data ? data.pages.reduce((acc, val) => (acc += val.albums.length), 0) : 0) +
-    (data ? data.pages.reduce((acc, val) => (acc += val.songs.length), 0) : 0)
+  const resultsCount = results.albums.length + results.artists.length + results.songs.length
 
   return (
-    <GradientScrollView ref={scrollRef} style={styles.scroll} contentContainerStyle={{ paddingTop }}>
+    <GradientScrollView ref={scrollRef} style={styles.scroll} contentContainerStyle={styles.scrollContentContainer}>
       <View style={styles.content}>
         <View style={styles.inputBar}>
           <TextInput
             ref={searchBarRef}
             style={styles.textInput}
-            placeholder={t('search.inputPlaceholder')}
+            placeholder="Search"
             value={text}
             onChangeText={onChangeText}
           />
-          <ActivityIndicator animating={isLoading} size="small" color={colors.text.secondary} style={styles.activity} />
+          <ActivityIndicator
+            animating={refreshing}
+            size="small"
+            color={colors.text.secondary}
+            style={styles.activity}
+          />
         </View>
-        {data !== undefined && resultsCount > 0 ? (
-          <Results results={data.pages[0]} query={text} />
-        ) : (
-          <NothingHere style={styles.noResults} />
-        )}
+        {resultsCount > 0 ? <Results results={results} query={text} /> : <NothingHere style={styles.noResults} />}
       </View>
     </GradientScrollView>
   )
-})
+}
 
 const styles = StyleSheet.create({
   scroll: {
     flex: 1,
   },
+  scrollContentContainer: {
+    paddingTop: StatusBar.currentHeight,
+  },
   content: {
     paddingHorizontal: 20,
     paddingBottom: 20,

app/screens/SearchResultsView.tsx

@@ -1,35 +1,24 @@
 import GradientFlatList from '@app/components/GradientFlatList'
 import ListItem from '@app/components/ListItem'
-import { withSuspense } from '@app/components/withSuspense'
-import { useQuerySearchResults } from '@app/hooks/query'
-import { useSetQueue } from '@app/hooks/trackplayer'
-import { Album, Artist, Song } from '@app/models/library'
-import { Search3Params } from '@app/subsonic/params'
+import { useFetchPaginatedList } from '@app/hooks/list'
+import { AlbumListItem, Artist, Song } from '@app/models/music'
+import { selectMusic } from '@app/state/music'
+import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
 import { useNavigation } from '@react-navigation/native'
-import React, { useEffect } from 'react'
-import { useTranslation } from 'react-i18next'
+import React, { useCallback, useEffect } from 'react'
 import { StyleSheet } from 'react-native'
 
-type SearchListItemType = Album | Song | Artist
+type SearchListItemType = AlbumListItem | Song | Artist
 
-const SongResultsListItem: React.FC<{ item: Song }> = ({ item }) => {
-  const { setQueue, contextId } = useSetQueue('song', [item])
+const ResultsListItem: React.FC<{ item: SearchListItemType }> = ({ item }) => {
+  const setQueue = useStore(selectTrackPlayer.setQueue)
 
-  return (
-    <ListItem
-      item={item}
-      contextId={contextId}
-      queueId={0}
-      showArt={true}
-      showStar={false}
-      listStyle="small"
-      onPress={() => setQueue({ title: item.title, playTrack: 0 })}
-      style={styles.listItem}
-    />
-  )
-}
+  let onPress
+  if (item.itemType === 'song') {
+    onPress = () => setQueue([item], item.title, 'song', item.id, 0)
+  }
 
-const OtherResultsListItem: React.FC<{ item: SearchListItemType }> = ({ item }) => {
   return (
     <ListItem
       item={item}
@@ -38,73 +27,63 @@ const OtherResultsListItem: React.FC<{ item: SearchListItemType }> = ({ item })
       showArt={true}
       showStar={false}
       listStyle="small"
+      onPress={onPress}
       style={styles.listItem}
     />
   )
 }
 
-const ResultsListItem: React.FC<{ item: SearchListItemType }> = ({ item }) => {
-  if (item.itemType === 'song') {
-    return <SongResultsListItem item={item} />
-  } else {
-    return <OtherResultsListItem item={item} />
-  }
-}
-
 const SearchResultsRenderItem: React.FC<{ item: SearchListItemType }> = ({ item }) => <ResultsListItem item={item} />
 
-const SearchResultsView = withSuspense<{
+const SearchResultsView: React.FC<{
   query: string
   type: 'album' | 'artist' | 'song'
-}>(({ query, type }) => {
+}> = ({ query, type }) => {
   const navigation = useNavigation()
-  const { t } = useTranslation()
-
-  const size = 100
-  const params: Search3Params = { query }
-
-  if (type === 'album') {
-    params.albumCount = size
-  } else if (type === 'artist') {
-    params.artistCount = size
-  } else {
-    params.songCount = size
-  }
-
-  const { data, isLoading, refetch, fetchNextPage } = useQuerySearchResults(params)
-
-  const items: (Artist | Album | Song)[] = []
-  if (type === 'album') {
-    data && items.push(...data.pages.flatMap(p => p.albums))
-  } else if (type === 'artist') {
-    data && items.push(...data.pages.flatMap(p => p.artists))
-  } else {
-    data && items.push(...data.pages.flatMap(p => p.songs))
+  const fetchSearchResults = useStore(selectMusic.fetchSearchResults)
+  const { list, refreshing, refresh, fetchNextPage } = useFetchPaginatedList<SearchListItemType>(
+    useCallback(
+      (size, offset) =>
+        fetchSearchResults(query, type, size, offset).then(results => {
+          switch (type) {
+            case 'album':
+              return results.albums
+            case 'artist':
+              return results.artists
+            case 'song':
+              return results.songs
+            default:
+              return []
           }
+        }),
+      [fetchSearchResults, query, type],
+    ),
+    100,
+  )
 
   useEffect(() => {
     navigation.setOptions({
-      title: t('search.headerTitle', { query }),
+      title: `Search: "${query}"`,
     })
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
   return (
     <GradientFlatList
-      data={items}
+      data={list}
       renderItem={SearchResultsRenderItem}
       keyExtractor={(item, i) => i.toString()}
-      onRefresh={refetch}
-      refreshing={isLoading}
+      onRefresh={refresh}
+      refreshing={refreshing}
       overScrollMode="never"
-      onEndReached={() => fetchNextPage}
+      onEndReached={fetchNextPage}
       removeClippedSubviews={true}
       onEndReachedThreshold={2}
       contentMarginTop={6}
       windowSize={5}
     />
   )
-})
+}
 
 const styles = StyleSheet.create({
   listItem: {

app/screens/ServerView.tsx

@@ -1,34 +1,31 @@
 import Button from '@app/components/Button'
 import GradientScrollView from '@app/components/GradientScrollView'
-import SettingsSwitch from '@app/components/SettingsSwitch'
-import { withSuspense } from '@app/components/withSuspense'
 import { Server } from '@app/models/settings'
-import { useStore, useStoreDeep } from '@app/state/store'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import toast from '@app/util/toast'
 import { useNavigation } from '@react-navigation/native'
 import md5 from 'md5'
-import React, { useCallback, useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
+import React, { useCallback, useState } from 'react'
 import { StyleSheet, Text, TextInput, View, ViewStyle } from 'react-native'
-import uuid from 'react-native-uuid'
+import { v4 as uuidv4 } from 'uuid'
+import SettingsSwitch from '@app/components/SettingsSwitch'
 
 const PASSWORD_PLACEHOLDER = 'PASSWORD_PLACEHOLDER'
 
-const ServerView = withSuspense<{
+const ServerView: React.FC<{
   id?: string
-  title?: string
-}>(({ id, title }) => {
-  const { t } = useTranslation()
+}> = ({ id }) => {
   const navigation = useNavigation()
-  const activeServerId = useStore(store => store.settings.activeServerId)
-  const servers = useStoreDeep(store => store.settings.servers)
-  const addServer = useStore(store => store.addServer)
-  const updateServer = useStore(store => store.updateServer)
-  const removeServer = useStore(store => store.removeServer)
-  const server = id ? servers[id] : undefined
-  const pingServer = useStore(store => store.pingServer)
+  const activeServer = useStore(selectSettings.activeServer)
+  const servers = useStore(selectSettings.servers)
+  const addServer = useStore(selectSettings.addServer)
+  const updateServer = useStore(selectSettings.updateServer)
+  const removeServer = useStore(selectSettings.removeServer)
+  const server = id ? servers.find(s => s.id === id) : undefined
+  const pingServer = useStore(selectSettings.pingServer)
 
   const [address, setAddress] = useState(server?.address || '')
   const [username, setUsername] = useState(server?.username || '')
@@ -39,18 +36,16 @@ const ServerView = withSuspense<{
   )
 
   const [testing, setTesting] = useState(false)
-
-  useEffect(() => {
-    navigation.setOptions({ title })
-  }, [navigation, title])
+  const [removing, setRemoving] = useState(false)
+  const [saving, setSaving] = useState(false)
 
   const validate = useCallback(() => {
     return !!address && !!username && !!password
   }, [address, username, password])
 
   const canRemove = useCallback(() => {
-    return id && Object.keys(servers).length > 1 && activeServerId !== id
-  }, [id, servers, activeServerId])
+    return id && servers.length > 1 && activeServer?.id !== id
+  }, [id, servers, activeServer])
 
   const exit = useCallback(() => {
     if (navigation.canGoBack()) {
@@ -63,7 +58,7 @@ const ServerView = withSuspense<{
   const createServer = useCallback<() => Server>(() => {
     if (usePlainPassword) {
       return {
-        id: server?.id || '',
+        id: server?.id || uuidv4(),
         usePlainPassword,
         plainPassword: password,
         address,
@@ -78,12 +73,12 @@ const ServerView = withSuspense<{
       salt = server.salt
       token = server.token
     } else {
-      salt = uuid.v4() as string
+      salt = uuidv4()
       token = md5(password + salt)
     }
 
     return {
-      id: server?.id || '',
+      id: server?.id || uuidv4(),
       address,
       username,
       usePlainPassword,
@@ -97,15 +92,22 @@ const ServerView = withSuspense<{
       return
     }
 
+    setSaving(true)
     const update = createServer()
 
+    const waitForSave = async () => {
+      try {
         if (id) {
           updateServer(update)
         } else {
-      addServer(update)
+          await addServer(update)
         }
-
         exit()
+      } catch (err) {
+        setSaving(false)
+      }
+    }
+    waitForSave()
   }, [addServer, createServer, exit, id, updateServer, validate])
 
   const remove = useCallback(() => {
@@ -113,8 +115,16 @@ const ServerView = withSuspense<{
       return
     }
 
-    removeServer(id as string)
+    setRemoving(true)
+    const waitForRemove = async () => {
+      try {
+        await removeServer(id as string)
         exit()
+      } catch (err) {
+        setRemoving(false)
+      }
+    }
+    waitForRemove()
   }, [canRemove, exit, id, removeServer])
 
   const togglePlainPassword = useCallback(
@@ -142,20 +152,19 @@ const ServerView = withSuspense<{
 
     const ping = async () => {
       const res = await pingServer(potential)
-      toast(
-        t(`settings.servers.messages.${res ? 'connectionOk' : 'connectionFailed'}`, {
-          address: potential.address,
-          interpolation: { escapeValue: false },
-        }),
-      )
+      if (res) {
+        toast(`Connection to ${potential.address} OK!`)
+      } else {
+        toast(`Connection to ${potential.address} failed, check settings or server`)
+      }
       setTesting(false)
     }
     ping()
-  }, [createServer, pingServer, t])
+  }, [createServer, pingServer])
 
   const disableControls = useCallback(() => {
-    return !validate() || testing
-  }, [validate, testing])
+    return !validate() || testing || removing || saving
+  }, [validate, testing, removing, saving])
 
   const formatAddress = useCallback(() => {
     let addressFormatted = address.trim()
@@ -176,54 +185,48 @@ const ServerView = withSuspense<{
   }
 
   return (
-    <GradientScrollView style={styles.scroll}>
+    <GradientScrollView style={styles.scroll} contentContainerStyle={styles.scrollContentContainer}>
       <View style={styles.content}>
-        <Text style={styles.inputTitle}>{t('settings.servers.fields.address')}</Text>
+        <Text style={styles.inputTitle}>Address</Text>
         <TextInput
           style={styles.input}
           placeholderTextColor="grey"
           selectionColor={colors.text.secondary}
           textContentType="URL"
           placeholder="http://demo.navidrome.org"
-          autoCorrect={false}
-          autoCapitalize="none"
           value={address}
           onChangeText={setAddress}
           onBlur={formatAddress}
         />
-        <Text style={styles.inputTitle}>{t('settings.servers.fields.username')}</Text>
+        <Text style={styles.inputTitle}>Username</Text>
         <TextInput
           style={styles.input}
           placeholderTextColor="grey"
           selectionColor={colors.text.secondary}
           textContentType="username"
-          autoComplete="username"
-          importantForAutofill="yes"
-          autoCapitalize="none"
+          autoCompleteType="username"
           placeholder="demo"
           value={username}
           onChangeText={setUsername}
         />
-        <Text style={styles.inputTitle}>{t('settings.servers.fields.password')}</Text>
+        <Text style={styles.inputTitle}>Password</Text>
         <TextInput
           style={styles.input}
           placeholderTextColor="grey"
           selectionColor={colors.text.secondary}
           textContentType="password"
-          autoComplete="password"
-          autoCapitalize="none"
-          importantForAutofill="yes"
+          autoCompleteType="password"
           secureTextEntry={true}
           placeholder="demo"
           value={password}
           onChangeText={setPassword}
         />
         <SettingsSwitch
-          title={t('settings.servers.options.forcePlaintextPassword.title')}
+          title="Force plain text password"
           subtitle={
             usePlainPassword
-              ? t('settings.servers.options.forcePlaintextPassword.descriptionOn')
-              : t('settings.servers.options.forcePlaintextPassword.descriptionOff')
+              ? 'Send password in plain text (legacy, make sure your connection is secure!)'
+              : 'Send password as token + salt'
           }
           value={usePlainPassword}
           setValue={togglePlainPassword}
@@ -231,31 +234,29 @@ const ServerView = withSuspense<{
         <Button
           disabled={disableControls()}
           style={styles.button}
-          title={t('settings.servers.actions.testConnection')}
+          title="Test Connection"
           buttonStyle="hollow"
           onPress={test}
         />
         <Button
           disabled={disableControls()}
           style={[styles.button, styles.delete, deleteStyle]}
-          title={t('settings.servers.actions.delete')}
+          title="Delete"
           onPress={remove}
         />
-        <Button
-          disabled={disableControls()}
-          style={styles.button}
-          title={t('settings.servers.actions.save')}
-          onPress={save}
-        />
+        <Button disabled={disableControls()} style={styles.button} title="Save" onPress={save} />
       </View>
     </GradientScrollView>
   )
-})
+}
 
 const styles = StyleSheet.create({
   scroll: {
     flex: 1,
   },
+  scrollContentContainer: {
+    // paddingTop: StatusBar.currentHeight,
+  },
   content: {
     paddingHorizontal: 20,
   },

app/screens/Settings.tsx

@@ -5,28 +5,26 @@ import PressableOpacity from '@app/components/PressableOpacity'
 import SettingsItem from '@app/components/SettingsItem'
 import SettingsSwitch from '@app/components/SettingsSwitch'
 import TextInput from '@app/components/TextInput'
-import { withSuspenseMemo } from '@app/components/withSuspense'
-import { useResetImageCache, useSwitchActiveServer } from '@app/hooks/settings'
+import { useSwitchActiveServer } from '@app/hooks/server'
 import { Server } from '@app/models/settings'
-import { useStore, useStoreDeep } from '@app/state/store'
+import { selectCache } from '@app/state/cache'
+import { selectSettings } from '@app/state/settings'
+import { useStore } from '@app/state/store'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
 import { useNavigation } from '@react-navigation/core'
 import React, { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { KeyboardTypeOptions, Linking, Modal, Pressable, StyleSheet, Text, View } from 'react-native'
+import { KeyboardTypeOptions, Linking, Modal, Pressable, StatusBar, StyleSheet, Text, View } from 'react-native'
 import { ScrollView } from 'react-native-gesture-handler'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import Icon from 'react-native-vector-icons/MaterialCommunityIcons'
 import { version } from '../../package.json'
 
-const ServerItem = withSuspenseMemo<{
+const ServerItem = React.memo<{
   server: Server
 }>(({ server }) => {
-  const activeServerId = useStore(store => store.settings.activeServerId)
+  const activeServer = useStore(selectSettings.activeServer)
   const switchActiveServer = useSwitchActiveServer()
   const navigation = useNavigation()
-  const { t } = useTranslation()
 
   const setActive = useCallback(() => {
     switchActiveServer(server.id)
@@ -36,9 +34,9 @@ const ServerItem = withSuspenseMemo<{
     <SettingsItem
       title={server.address}
       subtitle={server.username}
-      onPress={() => navigation.navigate('server', { id: server.id, title: t('settings.servers.actions.edit') })}>
+      onPress={() => navigation.navigate('server', { id: server.id })}>
       <PressableOpacity style={styles.serverActive} onPress={setActive}>
-        {activeServerId === server.id ? (
+        {activeServer && activeServer.id === server.id ? (
           <Icon name="checkbox-marked-circle" size={30} color={colors.accent} />
         ) : (
           <Icon name="checkbox-blank-circle-outline" size={30} color={colors.text.secondary} />
@@ -76,27 +74,25 @@ const ModalChoice = React.memo<{
   )
 })
 
-const BitrateModal = withSuspenseMemo<{
+function bitrateString(bitrate: number): string {
+  return bitrate === 0 ? 'Unlimited' : `${bitrate}kbps`
+}
+
+const BitrateModal = React.memo<{
   title: string
   bitrate: number
   setBitrate: (bitrate: number) => void
 }>(({ title, bitrate, setBitrate }) => {
-  const { t } = useTranslation()
   const [visible, setVisible] = useState(false)
 
   const toggleModal = useCallback(() => setVisible(!visible), [visible])
 
-  const bitrateText = useCallback(
-    (value: number) =>
-      value === 0 ? t('settings.network.values.unlimitedKbps') : t('settings.network.values.kbps', { value }),
-    [t],
-  )
-
   const BitrateChoice: React.FC<{ value: number }> = useCallback(
     ({ value }) => {
+      const text = bitrateString(value)
       return (
         <ModalChoice
-          text={bitrateText(value)}
+          text={text}
           value={value}
           setValue={setBitrate}
           closeModal={toggleModal}
@@ -104,12 +100,12 @@ const BitrateModal = withSuspenseMemo<{
         />
       )
     },
-    [bitrate, toggleModal, setBitrate, bitrateText],
+    [bitrate, toggleModal, setBitrate],
   )
 
   return (
     <>
-      <SettingsItem title={title} subtitle={bitrateText(bitrate)} onPress={toggleModal} />
+      <SettingsItem title={title} subtitle={bitrateString(bitrate)} onPress={toggleModal} />
       <Modal animationType="fade" transparent={true} visible={visible} onRequestClose={toggleModal}>
         <Pressable style={styles.modalBackdrop} onPress={toggleModal}>
           <View style={styles.centeredView}>
@@ -140,9 +136,9 @@ const SettingsTextModal = React.memo<{
   title: string
   value: string
   setValue: (text: string) => void
-  subtitle: (value: string) => string
+  getUnit?: (text: string) => string
   keyboardType?: KeyboardTypeOptions
-}>(({ title, value, setValue, subtitle, keyboardType }) => {
+}>(({ title, value, setValue, getUnit, keyboardType }) => {
   const [visible, setVisible] = useState(false)
   const [inputText, setInputText] = useState(value)
 
@@ -153,9 +149,16 @@ const SettingsTextModal = React.memo<{
     toggleModal()
   }, [inputText, setValue, toggleModal])
 
+  const getSubtitle = useCallback(() => {
+    if (!getUnit) {
+      return value
+    }
+    return value + ' ' + getUnit(value)
+  }, [getUnit, value])
+
   return (
     <>
-      <SettingsItem title={title} subtitle={subtitle(value)} onPress={toggleModal} />
+      <SettingsItem title={title} subtitle={getSubtitle()} onPress={toggleModal} />
       <Modal animationType="fade" transparent={true} visible={visible} onRequestClose={toggleModal}>
         <Pressable style={styles.modalBackdrop} onPress={toggleModal}>
           <View style={styles.centeredView}>
@@ -181,117 +184,124 @@ const SettingsTextModal = React.memo<{
   )
 })
 
-const SettingsContent = withSuspenseMemo(() => {
-  const { t } = useTranslation()
+function secondsUnit(seconds: string): string {
+  const numberValue = parseFloat(seconds)
+  if (Math.abs(numberValue) !== 1) {
+    return 'seconds'
+  }
+  return 'second'
+}
 
-  const servers = useStoreDeep(store => store.settings.servers)
-  const scrobble = useStore(store => store.settings.scrobble)
-  const setScrobble = useStore(store => store.setScrobble)
+const SettingsContent = React.memo(() => {
+  const servers = useStore(selectSettings.servers)
+  const scrobble = useStore(selectSettings.scrobble)
+  const setScrobble = useStore(selectSettings.setScrobble)
 
-  const maxBitrateWifi = useStore(store => store.settings.maxBitrateWifi)
-  const setMaxBitrateWifi = useStore(store => store.setMaxBitrateWifi)
+  // doesn't seem to ever be a case where we want this off
+  // will remove later if there isn't a use case for disabling
+  // const estimateContentLength = useStore(selectSettings.estimateContentLength)
+  // const setEstimateContentLength = useStore(selectSettings.setEstimateContentLength)
 
-  const maxBitrateMobile = useStore(store => store.settings.maxBitrateMobile)
-  const setMaxBitrateMobile = useStore(store => store.setMaxBitrateMobile)
+  const maxBitrateWifi = useStore(selectSettings.maxBitrateWifi)
+  const setMaxBitrateWifi = useStore(selectSettings.setMaxBitrateWifi)
 
-  const minBuffer = useStore(store => store.settings.minBuffer)
-  const setMinBuffer = useStore(store => store.setMinBuffer)
-  const maxBuffer = useStore(store => store.settings.maxBuffer)
-  const setMaxBuffer = useStore(store => store.setMaxBuffer)
+  const maxBitrateMobile = useStore(selectSettings.maxBitrateMobile)
+  const setMaxBitrateMobile = useStore(selectSettings.setMaxBitrateMobile)
 
+  const minBuffer = useStore(selectSettings.minBuffer)
+  const setMinBuffer = useStore(selectSettings.setMinBuffer)
+  const maxBuffer = useStore(selectSettings.maxBuffer)
+  const setMaxBuffer = useStore(selectSettings.setMaxBuffer)
+
+  const clearImageCache = useStore(selectCache.clearImageCache)
   const [clearing, setClearing] = useState(false)
-  const resetImageCache = useResetImageCache()
 
   const navigation = useNavigation()
 
-  const clear = useCallback(async () => {
+  const clear = useCallback(() => {
     setClearing(true)
-    await resetImageCache()
+
+    const waitForClear = async () => {
+      try {
+        await clearImageCache()
+      } catch (err) {
+        console.log(err)
+      } finally {
         setClearing(false)
-  }, [resetImageCache])
+      }
+    }
+    waitForClear()
+  }, [clearImageCache])
 
   const setMinBufferText = useCallback((text: string) => setMinBuffer(parseFloat(text)), [setMinBuffer])
   const setMaxBufferText = useCallback((text: string) => setMaxBuffer(parseFloat(text)), [setMaxBuffer])
 
-  const secondsText = useCallback((value: string) => t('settings.network.values.seconds', { value }), [t])
-
   return (
     <View style={styles.content}>
-      <Header>{t('settings.servers.name')}</Header>
-      {Object.values(servers).map(s => (
+      <Header>Servers</Header>
+      {servers.map(s => (
         <ServerItem key={s.id} server={s} />
       ))}
       <Button
         style={styles.button}
-        title={t('settings.servers.actions.add')}
-        onPress={() => navigation.navigate('server', { title: t('settings.servers.actions.add') })}
+        title="Add Server"
+        onPress={() => navigation.navigate('server')}
         buttonStyle="hollow"
       />
-      <Header style={styles.header}>{t('settings.network.name')}</Header>
-      <BitrateModal
-        title={t('settings.network.options.maxBitrateWifi.title')}
-        bitrate={maxBitrateWifi}
-        setBitrate={setMaxBitrateWifi}
-      />
-      <BitrateModal
-        title={t('settings.network.options.maxBitrateMobile.title')}
-        bitrate={maxBitrateMobile}
-        setBitrate={setMaxBitrateMobile}
-      />
+      <Header style={styles.header}>Network</Header>
+      <BitrateModal title="Maximum bitrate (Wi-Fi)" bitrate={maxBitrateWifi} setBitrate={setMaxBitrateWifi} />
+      <BitrateModal title="Maximum bitrate (mobile)" bitrate={maxBitrateMobile} setBitrate={setMaxBitrateMobile} />
+      {/* <SettingsSwitch
+        title="Estimate content length"
+        subtitle='Send the "estimateContentLength" flag when streaming. Helps fix issues with seeking when the server is transcoding songs.'
+        value={estimateContentLength}
+        setValue={setEstimateContentLength}
+      /> */}
       <SettingsTextModal
-        title={t('settings.network.options.minBuffer.title')}
+        title="Minimum buffer time"
         value={minBuffer.toString()}
         setValue={setMinBufferText}
-        subtitle={secondsText}
+        getUnit={secondsUnit}
         keyboardType="numeric"
       />
       <SettingsTextModal
-        title={t('settings.network.options.maxBuffer.title')}
+        title="Maximum buffer time"
         value={maxBuffer.toString()}
         setValue={setMaxBufferText}
-        subtitle={secondsText}
+        getUnit={secondsUnit}
         keyboardType="numeric"
       />
-      <Header style={styles.header}>{t('settings.music.name')}</Header>
+      <Header style={styles.header}>Music</Header>
       <SettingsSwitch
-        title={t('settings.music.options.scrobble.title')}
-        subtitle={
-          scrobble
-            ? t('settings.music.options.scrobble.descriptionOn')
-            : t('settings.music.options.scrobble.descriptionOff')
-        }
+        title="Scrobble plays"
+        subtitle={scrobble ? 'Scrobble play history' : "Don't scrobble play history"}
         value={scrobble}
         setValue={setScrobble}
       />
-      <Header style={styles.header}>{t('settings.reset.name')}</Header>
+      <Header style={styles.header}>Reset</Header>
       <Button
         disabled={clearing}
         style={styles.button}
-        title={t('settings.reset.actions.clearImageCache')}
+        title="Clear Image Cache"
         onPress={clear}
         buttonStyle="hollow"
       />
-      <Header style={styles.header}>{t('settings.about.name')}</Header>
+      <Header style={styles.header}>About</Header>
       <Text style={styles.text}>
-        <Text style={styles.bold}>Subtracks</Text> {t('settings.about.version', { version })}
+        <Text style={styles.bold}>Subtracks</Text> version {version}
       </Text>
       <Button
         disabled={clearing}
         style={styles.button}
-        title={t('settings.about.actions.projectHomepage')}
+        title="Project Homepage"
         onPress={() => Linking.openURL('https://github.com/austinried/subtracks')}
         buttonStyle="hollow"
       />
       <Button
         disabled={clearing}
         style={styles.button}
-        title={t('settings.about.actions.licenses')}
-        onPress={() =>
-          navigation.navigate('web', {
-            uri: 'file:///android_asset/licenses.html',
-            title: t('settings.about.actions.licenses'),
-          })
-        }
+        title="Licenses"
+        onPress={() => navigation.navigate('web', { uri: 'file:///android_asset/licenses.html' })}
         buttonStyle="hollow"
       />
     </View>
@@ -299,10 +309,8 @@ const SettingsContent = withSuspenseMemo(() => {
 })
 
 const Settings = () => {
-  const paddingTop = useSafeAreaInsets().top
-
   return (
-    <GradientScrollView style={styles.scroll} contentContainerStyle={{ paddingTop }}>
+    <GradientScrollView style={styles.scroll} contentContainerStyle={styles.scrollContentContainer}>
       <SettingsContent />
     </GradientScrollView>
   )
@@ -312,6 +320,9 @@ const styles = StyleSheet.create({
   scroll: {
     flex: 1,
   },
+  scrollContentContainer: {
+    paddingTop: StatusBar.currentHeight,
+  },
   content: {
     paddingHorizontal: 20,
     paddingBottom: 40,

app/screens/SongListView.tsx

@@ -4,13 +4,13 @@ import HeaderBar from '@app/components/HeaderBar'
 import ImageGradientFlatList from '@app/components/ImageGradientFlatList'
 import ListItem from '@app/components/ListItem'
 import ListPlayerControls from '@app/components/ListPlayerControls'
-import NothingHere from '@app/components/NothingHere'
-import { useQueryAlbum, useQueryCoverArtPath, useQueryPlaylist } from '@app/hooks/query'
-import { useSetQueue } from '@app/hooks/trackplayer'
-import { Album, Playlist, Song } from '@app/models/library'
+import { useCoverArtFile } from '@app/hooks/cache'
+import { useAlbumWithSongs, usePlaylistWithSongs } from '@app/hooks/music'
+import { AlbumWithSongs, PlaylistWithSongs, Song } from '@app/models/music'
+import { useStore } from '@app/state/store'
+import { selectTrackPlayer } from '@app/state/trackplayer'
 import colors from '@app/styles/colors'
 import font from '@app/styles/font'
-import equal from 'fast-deep-equal/es6/react'
 import React, { useState } from 'react'
 import { ActivityIndicator, StyleSheet, Text, View } from 'react-native'
 
@@ -30,7 +30,6 @@ const SongRenderItem: React.FC<{
     subtitle?: string
     onPress?: () => void
     showArt?: boolean
-    disabled?: boolean
   }
 }> = ({ item }) => (
   <ListItem
@@ -41,23 +40,28 @@ const SongRenderItem: React.FC<{
     onPress={item.onPress}
     showArt={item.showArt}
     style={styles.listItem}
-    disabled={item.disabled}
   />
 )
 
 const SongListDetails = React.memo<{
   title: string
   type: SongListType
-  songList?: Album | Playlist
-  songs?: Song[]
+  songList?: AlbumWithSongs | PlaylistWithSongs
   subtitle?: string
-}>(({ title, songList, songs, subtitle, type }) => {
-  const { data: coverArtPath } = useQueryCoverArtPath(songList?.coverArt, 'thumbnail')
+}>(({ title, songList, subtitle, type }) => {
+  const coverArtFile = useCoverArtFile(songList?.coverArt, 'thumbnail')
   const [headerColor, setHeaderColor] = useState<string | undefined>(undefined)
+  const setQueue = useStore(selectTrackPlayer.setQueue)
 
-  const _songs = [...(songs || [])]
+  if (!songList) {
+    return <SongListDetailsFallback />
+  }
+
+  const _songs = [...songList.songs]
+  let typeName = ''
 
   if (type === 'album') {
+    typeName = 'Album'
     if (_songs.some(s => s.track === undefined)) {
       _songs.sort((a, b) => a.title.localeCompare(b.title))
     } else {
@@ -67,18 +71,10 @@ const SongListDetails = React.memo<{
         return aVal - bVal
       })
     }
+  } else {
+    typeName = 'Playlist'
   }
 
-  const { setQueue, contextId } = useSetQueue(type, _songs)
-
-  if (!songList) {
-    return <SongListDetailsFallback />
-  }
-
-  const disabled = _songs.length === 0
-  const play = (track?: number, shuffle?: boolean) => () =>
-    setQueue({ title: songList.name, playTrack: track, shuffle })
-
   return (
     <View style={styles.container}>
       <HeaderBar
@@ -89,99 +85,74 @@ const SongListDetails = React.memo<{
       <ImageGradientFlatList
         data={_songs.map((s, i) => ({
           song: s,
-          contextId,
+          contextId: songList.id,
           queueId: i,
           subtitle: s.artist,
-          onPress: play(i),
+          onPress: () => setQueue(_songs, songList.name, type, songList.id, i),
           showArt: songList.itemType === 'playlist',
-          disabled: disabled,
         }))}
         renderItem={SongRenderItem}
         keyExtractor={(item, i) => i.toString()}
         backgroundProps={{
-          imagePath: coverArtPath,
+          imagePath: coverArtFile?.file?.path,
           style: styles.container,
           onGetColor: setHeaderColor,
         }}
         overScrollMode="never"
         windowSize={7}
         contentMarginTop={26}
-        ListEmptyComponent={
-          songs ? (
-            <NothingHere style={styles.nothing} />
-          ) : (
-            <ActivityIndicator size="large" color={colors.accent} style={styles.listLoading} />
-          )
-        }
         ListHeaderComponent={
           <View style={styles.content}>
             <CoverArt type="cover" size="original" coverArt={songList.coverArt} style={styles.cover} />
             <Text style={styles.title}>{songList.name}</Text>
             {subtitle ? <Text style={styles.subtitle}>{subtitle}</Text> : <></>}
+            {songList.songs.length > 0 && (
               <ListPlayerControls
                 style={styles.controls}
                 songs={_songs}
-              listType={type}
-              play={play(undefined, false)}
-              shuffle={play(undefined, true)}
-              disabled={disabled}
+                typeName={typeName}
+                queueName={songList.name}
+                queueContextId={songList.id}
+                queueContextType={type}
               />
+            )}
           </View>
         }
       />
     </View>
   )
-}, equal)
+})
 
 const PlaylistView = React.memo<{
   id: string
   title: string
-  playlist?: Playlist
-}>(({ id, title, playlist }) => {
-  const query = useQueryPlaylist(id, playlist)
-
-  return (
-    <SongListDetails
-      title={title}
-      songList={query.data?.playlist}
-      songs={query.data?.songs}
-      subtitle={query.data?.playlist?.comment}
-      type="playlist"
-    />
-  )
-}, equal)
+}>(({ id, title }) => {
+  const playlist = usePlaylistWithSongs(id)
+  return <SongListDetails title={title} songList={playlist} subtitle={playlist?.comment} type="playlist" />
+})
 
 const AlbumView = React.memo<{
   id: string
   title: string
-  album?: Album
-}>(({ id, title, album }) => {
-  const query = useQueryAlbum(id, album)
-
+}>(({ id, title }) => {
+  const album = useAlbumWithSongs(id)
   return (
     <SongListDetails
       title={title}
-      songList={query.data?.album}
-      songs={query.data?.songs}
-      subtitle={(query.data?.album?.artist || '') + (query.data?.album?.year ? ' • ' + query.data?.album?.year : '')}
+      songList={album}
+      subtitle={(album?.artist || '') + (album?.year ? ' • ' + album?.year : '')}
       type="album"
     />
   )
-}, equal)
+})
 
 const SongListView = React.memo<{
   id: string
   title: string
   type: SongListType
-  album?: Album
-  playlist?: Playlist
-}>(({ id, title, type, album, playlist }) => {
-  return type === 'album' ? (
-    <AlbumView id={id} title={title} album={album} />
-  ) : (
-    <PlaylistView id={id} title={title} playlist={playlist} />
-  )
-}, equal)
+}>(({ id, title, type }) => {
+  return type === 'album' ? <AlbumView id={id} title={title} /> : <PlaylistView id={id} title={title} />
+})
 
 const styles = StyleSheet.create({
   container: {
@@ -225,12 +196,6 @@ const styles = StyleSheet.create({
   listItem: {
     paddingHorizontal: 20,
   },
-  nothing: {
-    width: '100%',
-  },
-  listLoading: {
-    marginTop: 10,
-  },
 })
 
 export default SongListView

app/screens/SplashPage.tsx

@@ -45,7 +45,7 @@ const SplashPage: React.FC<{}> = ({ children }) => {
 
   const splash = (
     <Animated.View style={[styles.splashContainer, animatedStyles]} pointerEvents="none">
-      <GradientBackground style={styles.background} height="100%">
+      <GradientBackground style={styles.background}>
         <View style={styles.logoContainer}>
           <Image style={styles.image} source={require('@res/casette.png')} fadeDuration={0} />
           <Text style={styles.text}>subtracks</Text>

app/screens/WebViewScreen.tsx

@@ -1,17 +1,9 @@
-import { useNavigation } from '@react-navigation/native'
-import React, { useEffect } from 'react'
+import React from 'react'
 import { WebView } from 'react-native-webview'
 
 const WebViewScreen: React.FC<{
   uri: string
-  title?: string
-}> = ({ uri, title }) => {
-  const navigation = useNavigation()
-
-  useEffect(() => {
-    navigation.setOptions({ title })
-  }, [navigation, title])
-
+}> = ({ uri }) => {
   return <WebView source={{ uri }} />
 }
 

app/state/cache.ts

@@ -0,0 +1,293 @@
+import { CacheFile, CacheImageSize, CacheItemType, CacheItemTypeKey, CacheRequest } from '@app/models/cache'
+import { mkdir, rmdir } from '@app/util/fs'
+import PromiseQueue from '@app/util/PromiseQueue'
+import produce from 'immer'
+import RNFS from 'react-native-fs'
+import { GetState, SetState } from 'zustand'
+import { Store } from './store'
+
+const queues: Record<CacheItemTypeKey, PromiseQueue> = {
+  coverArt: new PromiseQueue(5),
+  coverArtThumb: new PromiseQueue(50),
+  artistArt: new PromiseQueue(5),
+  artistArtThumb: new PromiseQueue(50),
+  song: new PromiseQueue(1),
+}
+
+export type CacheDownload = CacheFile & CacheRequest
+
+export type CacheDirsByServer = Record<string, Record<CacheItemTypeKey, string>>
+export type CacheFilesByServer = Record<string, Record<CacheItemTypeKey, Record<string, CacheFile>>>
+export type CacheRequestsByServer = Record<string, Record<CacheItemTypeKey, Record<string, CacheRequest>>>
+
+// export type DownloadedItemsByServer = Record<
+//   string,
+//   {
+//     songs: { [songId: string]: DownloadedSong }
+//     albums: { [albumId: string]: DownloadedAlbum }
+//     artists: { [songId: string]: DownloadedArtist }
+//     playlists: { [playlistId: string]: DownloadedPlaylist }
+//   }
+// >
+
+export type CacheSlice = {
+  cacheItem: (
+    key: CacheItemTypeKey,
+    itemId: string,
+    url: string | (() => string | Promise<string | undefined>),
+  ) => Promise<void>
+
+  // cache: DownloadedItemsByServer
+  cacheDirs: CacheDirsByServer
+  cacheFiles: CacheFilesByServer
+  cacheRequests: CacheRequestsByServer
+
+  fetchCoverArtFilePath: (coverArt: string, size?: CacheImageSize) => Promise<string | undefined>
+
+  createCache: (serverId: string) => Promise<void>
+  prepareCache: (serverId: string) => void
+  pendingRemoval: Record<string, boolean>
+  removeCache: (serverId: string) => Promise<void>
+  clearImageCache: () => Promise<void>
+}
+
+export const selectCache = {
+  cacheItem: (store: CacheSlice) => store.cacheItem,
+  fetchCoverArtFilePath: (store: CacheSlice) => store.fetchCoverArtFilePath,
+  clearImageCache: (store: CacheSlice) => store.clearImageCache,
+}
+
+export const createCacheSlice = (set: SetState<Store>, get: GetState<Store>): CacheSlice => ({
+  // cache: {},
+  cacheDirs: {},
+  cacheFiles: {},
+  cacheRequests: {},
+
+  cacheItem: async (key, itemId, url) => {
+    const client = get().client
+    if (!client) {
+      return
+    }
+
+    const activeServerId = get().settings.activeServer
+    if (!activeServerId) {
+      return
+    }
+
+    if (get().pendingRemoval[activeServerId]) {
+      return
+    }
+
+    const inProgress = get().cacheRequests[activeServerId][key][itemId]
+    if (inProgress && inProgress.promise !== undefined) {
+      return await inProgress.promise
+    }
+
+    const existing = get().cacheFiles[activeServerId][key][itemId]
+    if (existing) {
+      return
+    }
+
+    const path = `${get().cacheDirs[activeServerId][key]}/${itemId}`
+
+    const promise = queues[key].enqueue(async () => {
+      const urlResult = typeof url === 'string' ? url : url()
+      const fromUrl = typeof urlResult === 'string' ? urlResult : await urlResult
+
+      try {
+        if (!fromUrl) {
+          throw new Error('cannot resolve url for cache request')
+        }
+
+        await RNFS.downloadFile({
+          fromUrl,
+          toFile: path,
+          // progressInterval: 100,
+          // progress: res => {
+          //   set(
+          //     produce<CacheSlice>(state => {
+          //       state.cacheRequests[activeServerId][key][itemId].progress = Math.max(
+          //         1,
+          //         res.bytesWritten / (res.contentLength || 1),
+          //       )
+          //     }),
+          //   )
+          // },
+        }).promise
+
+        set(
+          produce<CacheSlice>(state => {
+            state.cacheRequests[activeServerId][key][itemId].progress = 1
+            delete state.cacheRequests[activeServerId][key][itemId].promise
+          }),
+        )
+      } catch {
+        set(
+          produce<CacheSlice>(state => {
+            delete state.cacheFiles[activeServerId][key][itemId]
+            delete state.cacheRequests[activeServerId][key][itemId]
+          }),
+        )
+      }
+    })
+    set(
+      produce<Store>(state => {
+        state.cacheFiles[activeServerId][key][itemId] = {
+          path,
+          date: Date.now(),
+          permanent: false,
+        }
+        state.cacheRequests[activeServerId][key][itemId] = {
+          progress: 0,
+          promise,
+        }
+      }),
+    )
+    return await promise
+  },
+
+  fetchCoverArtFilePath: async (coverArt, size = 'thumbnail') => {
+    const client = get().client
+    if (!client) {
+      return
+    }
+
+    const activeServerId = get().settings.activeServer
+    if (!activeServerId) {
+      return
+    }
+
+    const key: CacheItemTypeKey = size === 'thumbnail' ? 'coverArtThumb' : 'coverArt'
+
+    const existing = get().cacheFiles[activeServerId][key][coverArt]
+    const inProgress = get().cacheRequests[activeServerId][key][coverArt]
+    if (existing && inProgress) {
+      if (inProgress.promise) {
+        await inProgress.promise
+      }
+      return `file://${existing.path}`
+    }
+
+    await get().cacheItem(key, coverArt, () =>
+      client.getCoverArtUri({
+        id: coverArt,
+        size: size === 'thumbnail' ? '256' : undefined,
+      }),
+    )
+
+    return `file://${get().cacheFiles[activeServerId][key][coverArt].path}`
+  },
+
+  createCache: async serverId => {
+    for (const type in CacheItemType) {
+      await mkdir(`${RNFS.DocumentDirectoryPath}/servers/${serverId}/${type}`)
+    }
+
+    set(
+      produce<CacheSlice>(state => {
+        state.cacheFiles[serverId] = {
+          song: {},
+          coverArt: {},
+          coverArtThumb: {},
+          artistArt: {},
+          artistArtThumb: {},
+        }
+      }),
+    )
+
+    get().prepareCache(serverId)
+  },
+
+  prepareCache: serverId => {
+    set(
+      produce<CacheSlice>(state => {
+        if (!state.cacheDirs[serverId]) {
+          state.cacheDirs[serverId] = {
+            song: `${RNFS.DocumentDirectoryPath}/servers/${serverId}/song`,
+            coverArt: `${RNFS.DocumentDirectoryPath}/servers/${serverId}/coverArt`,
+            coverArtThumb: `${RNFS.DocumentDirectoryPath}/servers/${serverId}/coverArtThumb`,
+            artistArt: `${RNFS.DocumentDirectoryPath}/servers/${serverId}/artistArt`,
+            artistArtThumb: `${RNFS.DocumentDirectoryPath}/servers/${serverId}/artistArtThumb`,
+          }
+        }
+        if (!state.cacheRequests[serverId]) {
+          state.cacheRequests[serverId] = {
+            song: {},
+            coverArt: {},
+            coverArtThumb: {},
+            artistArt: {},
+            artistArtThumb: {},
+          }
+        }
+      }),
+    )
+  },
+
+  pendingRemoval: {},
+
+  removeCache: async serverId => {
+    set(
+      produce<CacheSlice>(state => {
+        state.pendingRemoval[serverId] = true
+      }),
+    )
+
+    const cacheRequests = get().cacheRequests[serverId]
+    const pendingRequests: Promise<void>[] = []
+
+    for (const type in CacheItemType) {
+      const requests = Object.values(cacheRequests[type as CacheItemTypeKey])
+        .filter(r => r.promise !== undefined)
+        .map(r => r.promise) as Promise<void>[]
+      pendingRequests.push(...requests)
+    }
+
+    await Promise.all(pendingRequests)
+    await rmdir(`${RNFS.DocumentDirectoryPath}/servers/${serverId}`)
+
+    set(
+      produce<CacheSlice>(state => {
+        delete state.pendingRemoval[serverId]
+
+        if (state.cacheDirs[serverId]) {
+          delete state.cacheDirs[serverId]
+        }
+        if (state.cacheFiles[serverId]) {
+          delete state.cacheFiles[serverId]
+        }
+        if (state.cacheRequests[serverId]) {
+          delete state.cacheRequests[serverId]
+        }
+      }),
+    )
+  },
+
+  clearImageCache: async () => {
+    const cacheRequests = get().cacheRequests
+    for (const serverId in cacheRequests) {
+      const coverArtRequests = cacheRequests[serverId].coverArt
+      const artstArtRequests = cacheRequests[serverId].artistArt
+      const requests = [...Object.values(coverArtRequests), ...Object.values(artstArtRequests)]
+      const pendingRequests = [
+        ...(requests.filter(r => r.promise !== undefined).map(r => r.promise) as Promise<void>[]),
+      ]
+
+      await Promise.all(pendingRequests)
+
+      await rmdir(get().cacheDirs[serverId].coverArt)
+      await mkdir(get().cacheDirs[serverId].coverArt)
+
+      await rmdir(get().cacheDirs[serverId].artistArt)
+      await mkdir(get().cacheDirs[serverId].artistArt)
+
+      set(
+        produce<CacheSlice>(state => {
+          state.cacheFiles[serverId].coverArt = {}
+          state.cacheFiles[serverId].coverArtThumb = {}
+          state.cacheFiles[serverId].artistArt = {}
+          state.cacheFiles[serverId].artistArtThumb = {}
+        }),
+      )
+    }
+  },
+})

app/state/migrations.ts

@@ -1,69 +1,11 @@
-import { Server } from '@app/models/settings'
-import { ById } from '@app/models/state'
-import { newCacheBuster } from './settings'
-import RNFS from 'react-native-fs'
-
-const migrations: Array<(state: any) => Promise<any>> = [
-  // 1
-  async state => {
+const migrations: Array<(state: any) => any> = [
+  state => {
     for (let server of state.settings.servers) {
       server.usePlainPassword = false
     }
 
     return state
   },
-
-  // 2
-  async state => {
-    state.settings.servers = state.settings.servers.reduce((acc: ById<Server>, server: Server) => {
-      acc[server.id] = server
-      return acc
-    }, {} as ById<Server>)
-
-    state.settings.activeServerId = state.settings.activeServer
-    delete state.settings.activeServer
-
-    state.settings.screens.home.listTypes = [...state.settings.screens.home.lists]
-    delete state.settings.screens.home.lists
-
-    state.settings.screens.library.albumsFilter = { ...state.settings.screens.library.albums }
-    delete state.settings.screens.library.albums
-
-    state.settings.screens.library.artistsFilter = { ...state.settings.screens.library.artists }
-    delete state.settings.screens.library.artists
-
-    delete state.settings.estimateContentLength
-
-    return state
-  },
-
-  // 3
-  async state => {
-    state.settings.cacheBuster = newCacheBuster()
-
-    state.settings.servers = Object.values(state.settings.servers as Record<string, Server>).reduce(
-      (acc, server, i) => {
-        const newId = i.toString()
-
-        if (server.id === state.settings.activeServerId) {
-          state.settings.activeServerId = newId
-        }
-
-        server.id = newId
-        acc[newId] = server
-        return acc
-      },
-      {} as Record<string, Server>,
-    )
-
-    try {
-      await RNFS.unlink(`${RNFS.DocumentDirectoryPath}/servers`)
-    } catch (err) {
-      console.error(err)
-    }
-
-    return state
-  },
 ]
 
 export default migrations

app/state/music.ts

@@ -0,0 +1,471 @@
+import {
+  AlbumListItem,
+  AlbumWithSongs,
+  Artist,
+  ArtistInfo,
+  HomeLists,
+  PlaylistListItem,
+  PlaylistWithSongs,
+  SearchResults,
+  StarrableItemType,
+} from '@app/models/music'
+import { Store } from '@app/state/store'
+import { GetAlbumList2Params, GetAlbumList2TypeBase, Search3Params, StarParams } from '@app/subsonic/params'
+import produce from 'immer'
+import { GetState, SetState } from 'zustand'
+
+export type MusicSlice = {
+  //
+  // family-style state
+  //
+  artistInfo: { [id: string]: ArtistInfo }
+  fetchArtistInfo: (id: string) => Promise<ArtistInfo | undefined>
+
+  albumsWithSongs: { [id: string]: AlbumWithSongs }
+  fetchAlbumWithSongs: (id: string) => Promise<AlbumWithSongs | undefined>
+
+  playlistsWithSongs: { [id: string]: PlaylistWithSongs }
+  fetchPlaylistWithSongs: (id: string) => Promise<PlaylistWithSongs | undefined>
+
+  //
+  // lists-style state
+  //
+  fetchArtists: (size?: number, offset?: number) => Promise<Artist[]>
+  fetchPlaylists: () => Promise<PlaylistListItem[]>
+  fetchAlbums: () => Promise<AlbumListItem[]>
+  fetchSearchResults: (
+    query: string,
+    type?: 'album' | 'song' | 'artist',
+    size?: number,
+    offset?: number,
+  ) => Promise<SearchResults>
+
+  homeLists: HomeLists
+  homeListsUpdating: boolean
+  fetchHomeLists: () => Promise<void>
+  clearHomeLists: () => void
+
+  //
+  // actions, etc.
+  //
+  starredSongs: { [id: string]: boolean }
+  starredAlbums: { [id: string]: boolean }
+  starredArtists: { [id: string]: boolean }
+  starItem: (id: string, type: StarrableItemType, unstar?: boolean) => Promise<void>
+
+  albumIdCoverArt: { [id: string]: string | undefined }
+  albumIdCoverArtRequests: { [id: string]: Promise<void> }
+  fetchAlbumCoverArt: (id: string) => Promise<void>
+  getAlbumCoverArt: (id: string | undefined) => Promise<string | undefined>
+}
+
+export const selectMusic = {
+  fetchArtistInfo: (state: Store) => state.fetchArtistInfo,
+  fetchAlbumWithSongs: (state: Store) => state.fetchAlbumWithSongs,
+  fetchPlaylistWithSongs: (state: Store) => state.fetchPlaylistWithSongs,
+
+  fetchArtists: (store: MusicSlice) => store.fetchArtists,
+  fetchPlaylists: (store: MusicSlice) => store.fetchPlaylists,
+  fetchAlbums: (store: MusicSlice) => store.fetchAlbums,
+  fetchSearchResults: (store: MusicSlice) => store.fetchSearchResults,
+
+  homeLists: (store: MusicSlice) => store.homeLists,
+  homeListsUpdating: (store: MusicSlice) => store.homeListsUpdating,
+  fetchHomeLists: (store: MusicSlice) => store.fetchHomeLists,
+  clearHomeLists: (store: MusicSlice) => store.clearHomeLists,
+
+  starItem: (store: MusicSlice) => store.starItem,
+}
+
+function reduceStarred(
+  starredType: { [id: string]: boolean },
+  items: { id: string; starred?: Date | boolean }[],
+): { [id: string]: boolean } {
+  return {
+    ...starredType,
+    ...items.reduce((acc, val) => {
+      acc[val.id] = !!val.starred
+      return acc
+    }, {} as { [id: string]: boolean }),
+  }
+}
+
+export const createMusicSlice = (set: SetState<Store>, get: GetState<Store>): MusicSlice => ({
+  artistInfo: {},
+
+  fetchArtistInfo: async id => {
+    const client = get().client
+    if (!client) {
+      return undefined
+    }
+
+    try {
+      const [artistResponse, artistInfoResponse] = await Promise.all([
+        client.getArtist({ id }),
+        client.getArtistInfo2({ id }),
+      ])
+      const topSongsResponse = await client.getTopSongs({ artist: artistResponse.data.artist.name, count: 50 })
+      const artistInfo = await get().mapArtistInfo(
+        artistResponse.data,
+        artistInfoResponse.data.artistInfo,
+        topSongsResponse.data.songs,
+      )
+
+      set(
+        produce<MusicSlice>(state => {
+          state.artistInfo[id] = artistInfo
+
+          state.starredSongs = reduceStarred(state.starredSongs, artistInfo.topSongs)
+          state.starredArtists = reduceStarred(state.starredArtists, [artistInfo])
+          state.starredAlbums = reduceStarred(state.starredAlbums, artistInfo.albums)
+        }),
+      )
+      return artistInfo
+    } catch {
+      return undefined
+    }
+  },
+
+  albumsWithSongs: {},
+
+  fetchAlbumWithSongs: async id => {
+    const client = get().client
+    if (!client) {
+      return undefined
+    }
+
+    try {
+      const response = await client.getAlbum({ id })
+      const album = await get().mapAlbumID3WithSongstoAlbumWithSongs(response.data.album, response.data.songs)
+
+      set(
+        produce<MusicSlice>(state => {
+          state.albumsWithSongs[id] = album
+          state.starredSongs = reduceStarred(state.starredSongs, album.songs)
+          state.starredAlbums = reduceStarred(state.starredAlbums, [album])
+        }),
+      )
+      return album
+    } catch {
+      return undefined
+    }
+  },
+
+  playlistsWithSongs: {},
+
+  fetchPlaylistWithSongs: async id => {
+    const client = get().client
+    if (!client) {
+      return undefined
+    }
+
+    try {
+      const response = await client.getPlaylist({ id })
+      const playlist = await get().mapPlaylistWithSongs(response.data.playlist)
+
+      set(
+        produce<MusicSlice>(state => {
+          state.playlistsWithSongs[id] = playlist
+          state.starredSongs = reduceStarred(state.starredSongs, playlist.songs)
+        }),
+      )
+      return playlist
+    } catch {
+      return undefined
+    }
+  },
+
+  fetchArtists: async () => {
+    const client = get().client
+    if (!client) {
+      return []
+    }
+
+    try {
+      const response = await client.getArtists()
+      const artists = response.data.artists.map(get().mapArtistID3toArtist)
+
+      set(
+        produce<MusicSlice>(state => {
+          state.starredArtists = reduceStarred(state.starredArtists, artists)
+        }),
+      )
+
+      return artists
+    } catch {
+      return []
+    }
+  },
+
+  fetchPlaylists: async () => {
+    const client = get().client
+    if (!client) {
+      return []
+    }
+
+    try {
+      const response = await client.getPlaylists()
+      return response.data.playlists.map(get().mapPlaylistListItem)
+    } catch {
+      return []
+    }
+  },
+
+  fetchAlbums: async (size = 500, offset = 0) => {
+    const client = get().client
+    if (!client) {
+      return []
+    }
+
+    try {
+      const filter = get().settings.screens.library.albums
+
+      let params: GetAlbumList2Params
+      switch (filter.type) {
+        case 'byYear':
+          params = {
+            size,
+            offset,
+            type: filter.type,
+            fromYear: filter.fromYear,
+            toYear: filter.toYear,
+          }
+          break
+        case 'byGenre':
+          params = {
+            size,
+            offset,
+            type: filter.type,
+            genre: filter.genre,
+          }
+          break
+        default:
+          params = {
+            size,
+            offset,
+            type: filter.type,
+          }
+          break
+      }
+
+      const response = await client.getAlbumList2(params)
+      const albums = response.data.albums.map(get().mapAlbumID3toAlbumListItem)
+
+      set(
+        produce<MusicSlice>(state => {
+          state.starredAlbums = reduceStarred(state.starredAlbums, albums)
+        }),
+      )
+
+      return albums
+    } catch {
+      return []
+    }
+  },
+
+  fetchSearchResults: async (query, type, size, offset) => {
+    if (query.length < 2) {
+      return { artists: [], albums: [], songs: [] }
+    }
+
+    const client = get().client
+    if (!client) {
+      return { artists: [], albums: [], songs: [] }
+    }
+
+    try {
+      const params: Search3Params = { query }
+      if (type === 'album') {
+        params.albumCount = size
+        params.albumOffset = offset
+      } else if (type === 'artist') {
+        params.artistCount = size
+        params.artistOffset = offset
+      } else if (type === 'song') {
+        params.songCount = size
+        params.songOffset = offset
+      } else {
+        params.albumCount = 5
+        params.artistCount = 5
+        params.songCount = 5
+      }
+
+      const response = await client.search3(params)
+
+      const artists = response.data.artists.map(get().mapArtistID3toArtist)
+      const albums = response.data.albums.map(get().mapAlbumID3toAlbumListItem)
+      const songs = await get().mapChildrenToSongs(response.data.songs)
+
+      set(
+        produce<MusicSlice>(state => {
+          state.starredSongs = reduceStarred(state.starredSongs, songs)
+          state.starredArtists = reduceStarred(state.starredArtists, artists)
+          state.starredAlbums = reduceStarred(state.starredAlbums, albums)
+        }),
+      )
+
+      return { artists, albums, songs }
+    } catch {
+      return { artists: [], albums: [], songs: [] }
+    }
+  },
+
+  homeLists: {},
+  homeListsUpdating: false,
+
+  fetchHomeLists: async () => {
+    const client = get().client
+    if (!client) {
+      return
+    }
+
+    if (get().homeListsUpdating) {
+      return
+    }
+    set({ homeListsUpdating: true })
+
+    const types = get().settings.screens.home.lists
+
+    try {
+      const promises: Promise<any>[] = []
+      for (const type of types) {
+        promises.push(
+          client
+            .getAlbumList2({ type: type as GetAlbumList2TypeBase, size: 20 })
+            .then(response => {
+              const list = response.data.albums.map(get().mapAlbumID3toAlbumListItem)
+              set(
+                produce<MusicSlice>(state => {
+                  state.homeLists[type] = list
+                  state.starredAlbums = reduceStarred(state.starredAlbums, state.homeLists[type])
+                }),
+              )
+            })
+            .catch(() => {}),
+        )
+      }
+      await Promise.all(promises)
+    } finally {
+      set({ homeListsUpdating: false })
+    }
+  },
+
+  clearHomeLists: () => {
+    set({ homeLists: {} })
+  },
+
+  starredSongs: {},
+  starredAlbums: {},
+  starredArtists: {},
+
+  starItem: async (id, type, unstar = false) => {
+    const client = get().client
+    if (!client) {
+      return
+    }
+
+    let params: StarParams
+    let setStarred: (starred: boolean) => void
+
+    switch (type) {
+      case 'song':
+        params = { id }
+        setStarred = starred => {
+          set(
+            produce<MusicSlice>(state => {
+              state.starredSongs = reduceStarred(state.starredSongs, [{ id, starred }])
+            }),
+          )
+        }
+        break
+      case 'album':
+        params = { albumId: id }
+        setStarred = starred => {
+          set(
+            produce<MusicSlice>(state => {
+              state.starredAlbums = reduceStarred(state.starredAlbums, [{ id, starred }])
+            }),
+          )
+        }
+        break
+      case 'artist':
+        params = { artistId: id }
+        setStarred = starred => {
+          set(
+            produce<MusicSlice>(state => {
+              state.starredArtists = reduceStarred(state.starredArtists, [{ id, starred }])
+            }),
+          )
+        }
+        break
+      default:
+        return
+    }
+
+    try {
+      setStarred(!unstar)
+      if (unstar) {
+        await client.unstar(params)
+      } else {
+        await client.star(params)
+      }
+    } catch {
+      setStarred(unstar)
+    }
+  },
+
+  albumIdCoverArt: {},
+  albumIdCoverArtRequests: {},
+
+  fetchAlbumCoverArt: async id => {
+    const client = get().client
+    if (!client) {
+      return
+    }
+
+    const inProgress = get().albumIdCoverArtRequests[id]
+    if (inProgress !== undefined) {
+      return await inProgress
+    }
+
+    const promise = new Promise<void>(async resolve => {
+      try {
+        const response = await client.getAlbum({ id })
+        set(
+          produce<MusicSlice>(state => {
+            state.albumIdCoverArt[id] = response.data.album.coverArt
+          }),
+        )
+      } finally {
+        resolve()
+      }
+    }).then(() => {
+      set(
+        produce<MusicSlice>(state => {
+          delete state.albumIdCoverArtRequests[id]
+        }),
+      )
+    })
+    set(
+      produce<MusicSlice>(state => {
+        state.albumIdCoverArtRequests[id] = promise
+      }),
+    )
+
+    return await promise
+  },
+
+  getAlbumCoverArt: async id => {
+    if (!id) {
+      return
+    }
+
+    const existing = get().albumIdCoverArt[id]
+    if (existing) {
+      return existing
+    }
+
+    await get().fetchAlbumCoverArt(id)
+    return get().albumIdCoverArt[id]
+  },
+})

app/state/musicmap.ts

@@ -0,0 +1,142 @@
+import {
+  AlbumListItem,
+  AlbumWithSongs,
+  Artist,
+  ArtistInfo,
+  PlaylistListItem,
+  PlaylistWithSongs,
+  Song,
+} from '@app/models/music'
+import {
+  AlbumID3Element,
+  ArtistID3Element,
+  ArtistInfo2Element,
+  ChildElement,
+  PlaylistElement,
+  PlaylistWithSongsElement,
+} from '@app/subsonic/elements'
+import { GetArtistResponse } from '@app/subsonic/responses'
+import { GetState, SetState } from 'zustand'
+import { Store } from './store'
+
+export type MusicMapSlice = {
+  mapChildToSong: (child: ChildElement, coverArt?: string) => Promise<Song>
+  mapChildrenToSongs: (children: ChildElement[], coverArt?: string) => Promise<Song[]>
+  mapArtistID3toArtist: (artist: ArtistID3Element) => Artist
+  mapArtistInfo: (
+    artistResponse: GetArtistResponse,
+    info: ArtistInfo2Element,
+    topSongs: ChildElement[],
+  ) => Promise<ArtistInfo>
+  mapAlbumID3toAlbumListItem: (album: AlbumID3Element) => AlbumListItem
+  mapAlbumID3toAlbum: (album: AlbumID3Element) => AlbumListItem
+  mapAlbumID3WithSongstoAlbumWithSongs: (album: AlbumID3Element, songs: ChildElement[]) => Promise<AlbumWithSongs>
+  mapPlaylistListItem: (playlist: PlaylistElement) => PlaylistListItem
+  mapPlaylistWithSongs: (playlist: PlaylistWithSongsElement) => Promise<PlaylistWithSongs>
+}
+
+export const createMusicMapSlice = (set: SetState<Store>, get: GetState<Store>): MusicMapSlice => ({
+  mapChildToSong: async (child, coverArt) => {
+    return {
+      itemType: 'song',
+      id: child.id,
+      album: child.album,
+      albumId: child.albumId,
+      artist: child.artist,
+      artistId: child.artistId,
+      title: child.title,
+      track: child.track,
+      discNumber: child.discNumber,
+      duration: child.duration,
+      starred: child.starred,
+      coverArt: coverArt || (await get().getAlbumCoverArt(child.albumId)),
+      streamUri: get().buildStreamUri(child.id),
+    }
+  },
+
+  mapChildrenToSongs: async (children, coverArt) => {
+    const albumIds = children.reduce((acc, val) => {
+      if (val.albumId && !(val.albumId in acc)) {
+        acc[val.albumId] = get().getAlbumCoverArt(val.albumId)
+      }
+      return acc
+    }, {} as Record<string, Promise<string | undefined>>)
+
+    await Promise.all(Object.values(albumIds))
+
+    const songs: Song[] = []
+    for (const child of children) {
+      songs.push(await get().mapChildToSong(child, coverArt || (await get().getAlbumCoverArt(child.albumId))))
+    }
+    return songs
+  },
+
+  mapArtistID3toArtist: artist => {
+    return {
+      itemType: 'artist',
+      id: artist.id,
+      name: artist.name,
+      starred: artist.starred,
+      coverArt: artist.coverArt,
+    }
+  },
+
+  mapArtistInfo: async (artistResponse, info, topSongs) => {
+    const { artist, albums } = artistResponse
+
+    const mappedAlbums = albums.map(get().mapAlbumID3toAlbum)
+
+    return {
+      ...get().mapArtistID3toArtist(artist),
+      albums: mappedAlbums,
+      smallImageUrl: info.smallImageUrl,
+      largeImageUrl: info.largeImageUrl,
+      topSongs: (await get().mapChildrenToSongs(topSongs)).slice(0, 5),
+    }
+  },
+
+  mapAlbumID3toAlbumListItem: album => {
+    return {
+      itemType: 'album',
+      id: album.id,
+      name: album.name,
+      artist: album.artist,
+      artistId: album.artistId,
+      starred: album.starred,
+      coverArt: album.coverArt,
+    }
+  },
+
+  mapAlbumID3toAlbum: album => {
+    return {
+      ...get().mapAlbumID3toAlbumListItem(album),
+      coverArt: album.coverArt,
+      year: album.year,
+    }
+  },
+
+  mapAlbumID3WithSongstoAlbumWithSongs: async (album, songs) => {
+    return {
+      ...get().mapAlbumID3toAlbum(album),
+      songs: await get().mapChildrenToSongs(songs),
+    }
+  },
+
+  mapPlaylistListItem: playlist => {
+    return {
+      itemType: 'playlist',
+      id: playlist.id,
+      name: playlist.name,
+      comment: playlist.comment,
+      coverArt: playlist.coverArt,
+    }
+  },
+
+  mapPlaylistWithSongs: async playlist => {
+    return {
+      ...get().mapPlaylistListItem(playlist),
+      songs: await get().mapChildrenToSongs(playlist.songs),
+      coverArt: playlist.coverArt,
+    }
+  },
+})

app/state/settings.ts

@@ -1,44 +1,21 @@
-import { AlbumFilterSettings, ArtistFilterSettings, ArtistFilterType, Server } from '@app/models/settings'
-import { ById } from '@app/models/state'
-import { GetStore, SetStore } from '@app/state/store'
+import { AppSettings, ArtistFilterSettings, AlbumFilterSettings, Server } from '@app/models/settings'
+import { Store } from '@app/state/store'
 import { SubsonicApiClient } from '@app/subsonic/api'
-import { GetAlbumList2TypeBase } from '@app/subsonic/params'
-import uuid from 'react-native-uuid'
+import produce from 'immer'
+import { GetState, SetState } from 'zustand'
 
 export type SettingsSlice = {
-  settings: {
-    servers: ById<Server>
-    activeServerId?: string
-    screens: {
-      home: {
-        listTypes: string[]
-      }
-      library: {
-        albumsFilter: AlbumFilterSettings
-        artistsFilter: ArtistFilterSettings
-      }
-    }
-    scrobble: boolean
-    maxBitrateWifi: number
-    maxBitrateMobile: number
-    minBuffer: number
-    maxBuffer: number
-    cacheBuster: string
-  }
-
+  settings: AppSettings
   client?: SubsonicApiClient
 
-  disableMusicTabs: boolean
-  setDisableMusicTabs: (value: boolean) => void
-
-  changeCacheBuster: () => void
-
   setActiveServer: (id: string | undefined, force?: boolean) => Promise<void>
-  addServer: (server: Server) => void
-  removeServer: (id: string) => void
+  getActiveServer: () => Server | undefined
+  addServer: (server: Server) => Promise<void>
+  removeServer: (id: string) => Promise<void>
   updateServer: (server: Server) => void
 
   setScrobble: (scrobble: boolean) => void
+  setEstimateContentLength: (estimateContentLength: boolean) => void
   setMaxBitrateWifi: (maxBitrateWifi: number) => void
   setMaxBitrateMobile: (maxBitrateMobile: number) => void
   setMinBuffer: (minBuffer: number) => void
@@ -46,62 +23,84 @@ export type SettingsSlice = {
 
   pingServer: (server?: Server) => Promise<boolean>
 
-  setLibraryAlbumFilterType: (type: GetAlbumList2TypeBase) => void
-  setLibraryArtistFilterType: (type: ArtistFilterType) => void
+  setLibraryAlbumFilter: (filter: AlbumFilterSettings) => void
+  setLibraryArtistFiler: (filter: ArtistFilterSettings) => void
 }
 
-export function newCacheBuster(): string {
-  return (uuid.v4() as string).split('-')[0]
+export const selectSettings = {
+  client: (state: SettingsSlice) => state.client,
+
+  firstRun: (state: SettingsSlice) => state.settings.servers.length === 0,
+
+  activeServer: (state: SettingsSlice) => state.settings.servers.find(s => s.id === state.settings.activeServer),
+  setActiveServer: (state: SettingsSlice) => state.setActiveServer,
+
+  servers: (state: SettingsSlice) => state.settings.servers,
+  addServer: (state: SettingsSlice) => state.addServer,
+  removeServer: (state: SettingsSlice) => state.removeServer,
+  updateServer: (state: SettingsSlice) => state.updateServer,
+
+  homeLists: (state: SettingsSlice) => state.settings.screens.home.lists,
+
+  scrobble: (state: SettingsSlice) => state.settings.scrobble,
+  setScrobble: (state: SettingsSlice) => state.setScrobble,
+
+  estimateContentLength: (state: SettingsSlice) => state.settings.estimateContentLength,
+  setEstimateContentLength: (state: SettingsSlice) => state.setEstimateContentLength,
+
+  maxBitrateWifi: (state: SettingsSlice) => state.settings.maxBitrateWifi,
+  setMaxBitrateWifi: (state: SettingsSlice) => state.setMaxBitrateWifi,
+  maxBitrateMobile: (state: SettingsSlice) => state.settings.maxBitrateMobile,
+  setMaxBitrateMobile: (state: SettingsSlice) => state.setMaxBitrateMobile,
+
+  minBuffer: (state: SettingsSlice) => state.settings.minBuffer,
+  setMinBuffer: (state: SettingsSlice) => state.setMinBuffer,
+  maxBuffer: (state: SettingsSlice) => state.settings.maxBuffer,
+  setMaxBuffer: (state: SettingsSlice) => state.setMaxBuffer,
+
+  pingServer: (state: SettingsSlice) => state.pingServer,
+
+  setLibraryAlbumFilter: (state: SettingsSlice) => state.setLibraryAlbumFilter,
+  libraryAlbumFilter: (state: SettingsSlice) => state.settings.screens.library.albums,
+  setLibraryArtistFiler: (state: SettingsSlice) => state.setLibraryArtistFiler,
+  libraryArtistFilter: (state: SettingsSlice) => state.settings.screens.library.artists,
 }
 
-export const createSettingsSlice = (set: SetStore, get: GetStore): SettingsSlice => ({
+export const createSettingsSlice = (set: SetState<Store>, get: GetState<Store>): SettingsSlice => ({
   settings: {
-    servers: {},
+    servers: [],
     screens: {
       home: {
-        listTypes: ['frequent', 'recent', 'starred', 'random'],
+        lists: ['frequent', 'recent', 'starred', 'random'],
       },
       library: {
-        albumsFilter: {
+        albums: {
           type: 'alphabeticalByArtist',
           fromYear: 1,
           toYear: 9999,
           genre: '',
         },
-        artistsFilter: {
+        artists: {
           type: 'alphabeticalByName',
         },
       },
     },
     scrobble: false,
+    estimateContentLength: true,
     maxBitrateWifi: 0,
     maxBitrateMobile: 192,
     minBuffer: 6,
     maxBuffer: 60,
-    cacheBuster: newCacheBuster(),
-  },
-
-  disableMusicTabs: false,
-  setDisableMusicTabs: value => {
-    set(store => {
-      store.disableMusicTabs = value
-    })
-  },
-
-  changeCacheBuster: () => {
-    set(store => {
-      store.settings.cacheBuster = newCacheBuster()
-    })
   },
 
   setActiveServer: async (id, force) => {
     const servers = get().settings.servers
-    const currentActiveServerId = get().settings.activeServerId
-    const newActiveServer = id ? servers[id] : undefined
+    const currentActiveServerId = get().settings.activeServer
+    const newActiveServer = servers.find(s => s.id === id)
 
     if (!newActiveServer) {
-      set(state => {
-        state.client = undefined
+      set({
+        client: undefined,
       })
       return
     }
@@ -110,60 +109,82 @@ export const createSettingsSlice = (set: SetStore, get: GetStore): SettingsSlice
       return
     }
 
-    set(state => {
-      state.disableMusicTabs = true
-    })
+    get().prepareCache(newActiveServer.id)
 
-    set(state => {
-      state.settings.activeServerId = newActiveServer.id
+    set(
+      produce<Store>(state => {
+        state.settings.activeServer = newActiveServer.id
         state.client = new SubsonicApiClient(newActiveServer)
-    })
-
-    set(state => {
-      state.disableMusicTabs = false
-    })
+      }),
+    )
   },
 
-  addServer: server => {
-    const serverIds = Object.keys(get().settings.servers)
-    server.id =
-      serverIds.length === 0 ? '0' : (serverIds.map(i => parseInt(i, 10)).sort((a, b) => b - a)[0] + 1).toString()
+  getActiveServer: () => get().settings.servers.find(s => s.id === get().settings.activeServer),
 
-    set(state => {
-      state.settings.servers[server.id] = server
-    })
+  addServer: async server => {
+    await get().createCache(server.id)
 
-    if (Object.keys(get().settings.servers).length === 1) {
+    set(
+      produce<SettingsSlice>(state => {
+        state.settings.servers.push(server)
+      }),
+    )
+
+    if (get().settings.servers.length === 1) {
       get().setActiveServer(server.id)
     }
   },
 
-  removeServer: id => {
-    set(state => {
-      delete state.settings.servers[id]
-    })
+  removeServer: async id => {
+    await get().removeCache(id)
+
+    set(
+      produce<SettingsSlice>(state => {
+        state.settings.servers = state.settings.servers.filter(s => s.id !== id)
+      }),
+    )
   },
 
   updateServer: server => {
-    set(state => {
-      state.settings.servers[server.id] = server
-    })
+    set(
+      produce<SettingsSlice>(state => {
+        state.settings.servers = replaceIndex(
+          state.settings.servers,
+          state.settings.servers.findIndex(s => s.id === server.id),
+          server,
+        )
+      }),
+    )
 
-    if (get().settings.activeServerId === server.id) {
+    if (get().settings.activeServer === server.id) {
       get().setActiveServer(server.id, true)
     }
   },
 
   setScrobble: scrobble => {
-    set(state => {
+    set(
+      produce<SettingsSlice>(state => {
         state.settings.scrobble = scrobble
-    })
+      }),
+    )
+  },
+
+  setEstimateContentLength: estimateContentLength => {
+    set(
+      produce<SettingsSlice>(state => {
+        state.settings.estimateContentLength = estimateContentLength
+      }),
+    )
+
+    get().rebuildQueue()
   },
 
   setMaxBitrateWifi: maxBitrateWifi => {
-    set(state => {
+    set(
+      produce<SettingsSlice>(state => {
         state.settings.maxBitrateWifi = maxBitrateWifi
-    })
+      }),
+    )
 
     if (get().netState === 'wifi') {
       get().rebuildQueue()
@@ -171,9 +192,11 @@ export const createSettingsSlice = (set: SetStore, get: GetStore): SettingsSlice
   },
 
   setMaxBitrateMobile: maxBitrateMobile => {
-    set(state => {
+    set(
+      produce<SettingsSlice>(state => {
         state.settings.maxBitrateMobile = maxBitrateMobile
-    })
+      }),
+    )
 
     if (get().netState === 'mobile') {
       get().rebuildQueue()
@@ -185,9 +208,11 @@ export const createSettingsSlice = (set: SetStore, get: GetStore): SettingsSlice
       return
     }
 
-    set(state => {
+    set(
+      produce<SettingsSlice>(state => {
         state.settings.minBuffer = Math.max(1, Math.min(minBuffer, state.settings.maxBuffer / 2))
-    })
+      }),
+    )
 
     get().rebuildQueue()
   },
@@ -197,9 +222,11 @@ export const createSettingsSlice = (set: SetStore, get: GetStore): SettingsSlice
       return
     }
 
-    set(state => {
+    set(
+      produce<SettingsSlice>(state => {
         state.settings.maxBuffer = Math.min(5 * 60, Math.max(maxBuffer, state.settings.minBuffer * 2))
-    })
+      }),
+    )
 
     get().rebuildQueue()
   },
@@ -224,15 +251,25 @@ export const createSettingsSlice = (set: SetStore, get: GetStore): SettingsSlice
     }
   },
 
-  setLibraryAlbumFilterType: type => {
-    set(state => {
-      state.settings.screens.library.albumsFilter.type = type
-    })
+  setLibraryAlbumFilter: filter => {
+    set(
+      produce<SettingsSlice>(state => {
+        state.settings.screens.library.albums = filter
+      }),
+    )
   },
 
-  setLibraryArtistFilterType: type => {
-    set(state => {
-      state.settings.screens.library.artistsFilter.type = type
-    })
+  setLibraryArtistFiler: filter => {
+    set(
+      produce<SettingsSlice>(state => {
+        state.settings.screens.library.artists = filter
+      }),
+    )
   },
 })
+
+function replaceIndex<T>(array: T[], index: number, replacement: T): T[] {
+  const start = array.slice(0, index)
+  const end = array.slice(index + 1)
+  return [...start, replacement, ...end]
+}

app/state/store.ts

@@ -1,95 +1,79 @@
+import { createMusicSlice, MusicSlice } from '@app/state/music'
 import { createSettingsSlice, SettingsSlice } from '@app/state/settings'
 import AsyncStorage from '@react-native-async-storage/async-storage'
-import equal from 'fast-deep-equal'
-import create, { GetState, Mutate, SetState, State, StateCreator, StateSelector, StoreApi } from 'zustand'
-import { persist, subscribeWithSelector } from 'zustand/middleware'
+import create from 'zustand'
+import { persist, StateStorage } from 'zustand/middleware'
+import { CacheSlice, createCacheSlice } from './cache'
 import migrations from './migrations'
+import { createMusicMapSlice, MusicMapSlice } from './musicmap'
 import { createTrackPlayerSlice, TrackPlayerSlice } from './trackplayer'
-import produce, { Draft } from 'immer'
-import { WritableDraft } from 'immer/dist/internal'
+import { createTrackPlayerMapSlice, TrackPlayerMapSlice } from './trackplayermap'
 
 const DB_VERSION = migrations.length
 
 export type Store = SettingsSlice &
-  TrackPlayerSlice & {
+  MusicSlice &
+  MusicMapSlice &
+  TrackPlayerSlice &
+  TrackPlayerMapSlice &
+  CacheSlice & {
     hydrated: boolean
     setHydrated: (hydrated: boolean) => void
   }
 
-// taken from zustand test examples:
-// https://github.com/pmndrs/zustand/blob/v3.7.1/tests/middlewareTypes.test.tsx#L20
-const immer =
-  <
-    T extends State,
-    CustomSetState extends SetState<T>,
-    CustomGetState extends GetState<T>,
-    CustomStoreApi extends StoreApi<T>,
-  >(
-    config: StateCreator<
-      T,
-      (partial: ((draft: Draft<T>) => void) | T, replace?: boolean) => void,
-      CustomGetState,
-      CustomStoreApi
-    >,
-  ): StateCreator<T, CustomSetState, CustomGetState, CustomStoreApi> =>
-  (set, get, api) =>
-    config(
-      (partial, replace) => {
-        const nextState = typeof partial === 'function' ? produce(partial as (state: Draft<T>) => T) : (partial as T)
-        return set(nextState, replace)
+const storage: StateStorage = {
+  getItem: async name => {
+    try {
+      return await AsyncStorage.getItem(name)
+    } catch (err) {
+      console.error(`getItem error (key: ${name})`, err)
+      return null
+    }
   },
-      get,
-      api,
-    )
+  setItem: async (name, item) => {
+    try {
+      await AsyncStorage.setItem(name, item)
+    } catch (err) {
+      console.error(`setItem error (key: ${name})`, err)
+    }
+  },
+}
 
-export type SetStore = (partial: Store | ((draft: WritableDraft<Store>) => void), replace?: boolean | undefined) => void
-export type GetStore = GetState<Store>
-
-// types taken from zustand test examples:
-// https://github.com/pmndrs/zustand/blob/v3.7.1/tests/middlewareTypes.test.tsx#L584
-export const useStore = create<
-  Store,
-  SetState<Store>,
-  GetState<Store>,
-  Mutate<StoreApi<Store>, [['zustand/subscribeWithSelector', never], ['zustand/persist', Partial<Store>]]>
->(
-  subscribeWithSelector(
+export const useStore = create<Store>(
   persist(
-      immer((set, get) => ({
+    (set, get) => ({
       ...createSettingsSlice(set, get),
+      ...createMusicSlice(set, get),
+      ...createMusicMapSlice(set, get),
       ...createTrackPlayerSlice(set, get),
+      ...createTrackPlayerMapSlice(set, get),
+      ...createCacheSlice(set, get),
 
       hydrated: false,
-        setHydrated: hydrated =>
-          set(state => {
-            state.hydrated = hydrated
+      setHydrated: hydrated => set({ hydrated }),
     }),
-      })),
     {
       name: '@appStore',
       version: DB_VERSION,
-        getStorage: () => AsyncStorage,
-        partialize: state => ({ settings: state.settings }),
+      getStorage: () => storage,
+      whitelist: ['settings', 'cacheFiles'],
       onRehydrateStorage: _preState => {
         return async (postState, _error) => {
-            await postState?.setActiveServer(postState.settings.activeServerId, true)
+          await postState?.setActiveServer(postState.settings.activeServer, true)
           postState?.setHydrated(true)
         }
       },
-        migrate: async (persistedState, version) => {
+      migrate: (persistedState, version) => {
         if (version > DB_VERSION) {
           throw new Error('cannot migrate db on a downgrade, delete all data first')
         }
 
         for (let i = version; i < DB_VERSION; i++) {
-            persistedState = await migrations[i](persistedState)
+          persistedState = migrations[i](persistedState)
         }
 
         return persistedState
       },
     },
   ),
-  ),
 )
-
-export const useStoreDeep = <U>(stateSelector: StateSelector<Store, U>) => useStore(stateSelector, equal)

app/state/trackplayer.ts

@@ -1,22 +1,28 @@
 import { NoClientError } from '@app/models/error'
-import { Progress, QueueContextType, TrackExt } from '@app/models/trackplayer'
+import { Song } from '@app/models/music'
 import PromiseQueue from '@app/util/PromiseQueue'
 import produce from 'immer'
-import TrackPlayer, { PlayerOptions, RepeatMode, State } from 'react-native-track-player'
-import { GetStore, SetStore } from './store'
+import TrackPlayer, { PlayerOptions, RepeatMode, State, Track } from 'react-native-track-player'
+import { GetState, SetState } from 'zustand'
+import { Store } from './store'
 
-export type SetQueueOptions = {
-  title: string
-  playTrack?: number
-  shuffle?: boolean
+export type TrackExt = Track & {
+  id: string
+  coverArt?: string
+  artistId?: string
+  albumId?: string
+  track?: number
+  discNumber?: number
 }
 
-export type SetQueueOptionsInternal = SetQueueOptions & {
-  queue: TrackExt[]
-  contextId: string
-  type: QueueContextType
+export type Progress = {
+  position: number
+  duration: number
+  buffered: number
 }
 
+export type QueueContextType = 'album' | 'playlist' | 'song' | 'artist'
+
 export type TrackPlayerSlice = {
   queueName?: string
   setQueueName: (name?: string) => void
@@ -36,15 +42,19 @@ export type TrackPlayerSlice = {
   playerState: State
   setPlayerState: (playerState: State) => void
 
-  duckPaused: boolean
-  setDuckPaused: (duckPaused: boolean) => void
-
   currentTrack?: TrackExt
   currentTrackIdx?: number
   setCurrentTrackIdx: (idx?: number) => void
 
   queue: TrackExt[]
-  setQueue: (options: SetQueueOptionsInternal) => Promise<void>
+  setQueue: (
+    songs: Song[],
+    name: string,
+    contextType: QueueContextType,
+    contextId: string,
+    playTrack?: number,
+    shuffle?: boolean,
+  ) => Promise<void>
 
   progress: Progress
   setProgress: (progress: Progress) => void
@@ -55,33 +65,61 @@ export type TrackPlayerSlice = {
   setNetState: (netState: 'mobile' | 'wifi') => Promise<void>
 
   rebuildQueue: (forcePlay?: boolean) => Promise<void>
-  updateQueue: () => Promise<void>
   buildStreamUri: (id: string) => string
   resetTrackPlayerState: () => void
 
   getPlayerOptions: () => PlayerOptions
 }
 
+export const selectTrackPlayer = {
+  queueName: (store: TrackPlayerSlice) => store.queueName,
+  setQueueName: (store: TrackPlayerSlice) => store.setQueueName,
+
+  queueContextType: (store: TrackPlayerSlice) => store.queueContextType,
+  setQueueContextType: (store: TrackPlayerSlice) => store.setQueueContextType,
+
+  queueContextId: (store: TrackPlayerSlice) => store.queueContextId,
+  setQueueContextId: (store: TrackPlayerSlice) => store.setQueueContextId,
+
+  shuffleOrder: (store: TrackPlayerSlice) => store.shuffleOrder,
+  shuffled: (store: TrackPlayerSlice) => !!store.shuffleOrder,
+  toggleShuffle: (store: TrackPlayerSlice) => store.toggleShuffle,
+
+  repeatMode: (store: TrackPlayerSlice) => store.repeatMode,
+  toggleRepeatMode: (store: TrackPlayerSlice) => store.toggleRepeatMode,
+
+  playerState: (store: TrackPlayerSlice) => store.playerState,
+  setPlayerState: (store: TrackPlayerSlice) => store.setPlayerState,
+
+  currentTrack: (store: TrackPlayerSlice) => store.currentTrack,
+  currentTrackIdx: (store: TrackPlayerSlice) => store.currentTrackIdx,
+  setCurrentTrackIdx: (store: TrackPlayerSlice) => store.setCurrentTrackIdx,
+
+  queue: (store: TrackPlayerSlice) => store.queue,
+  setQueue: (store: TrackPlayerSlice) => store.setQueue,
+
+  progress: (store: TrackPlayerSlice) => store.progress,
+  setProgress: (store: TrackPlayerSlice) => store.setProgress,
+
+  scrobbleTrack: (store: TrackPlayerSlice) => store.scrobbleTrack,
+
+  setNetState: (store: TrackPlayerSlice) => store.setNetState,
+  buildStreamUri: (store: TrackPlayerSlice) => store.buildStreamUri,
+
+  resetTrackPlayerState: (store: TrackPlayerSlice) => store.resetTrackPlayerState,
+}
+
 export const trackPlayerCommands = new PromiseQueue(1)
 
-export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlayerSlice => ({
+export const createTrackPlayerSlice = (set: SetState<Store>, get: GetState<Store>): TrackPlayerSlice => ({
   queueName: undefined,
-  setQueueName: name =>
-    set(state => {
-      state.queueName = name
-    }),
+  setQueueName: name => set({ queueName: name }),
 
   queueContextType: undefined,
-  setQueueContextType: queueContextType =>
-    set(state => {
-      state.queueContextType = queueContextType
-    }),
+  setQueueContextType: queueContextType => set({ queueContextType }),
 
   queueContextId: undefined,
-  setQueueContextId: queueContextId =>
-    set(state => {
-      state.queueContextId = queueContextId
-    }),
+  setQueueContextId: queueContextId => set({ queueContextId }),
 
   shuffleOrder: undefined,
   toggleShuffle: async () => {
@@ -99,9 +137,7 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
         }
 
         await TrackPlayer.add(tracks)
-        set(state => {
-          state.shuffleOrder = shuffleOrder
-        })
+        set({ shuffleOrder })
       } else {
         const tracks = unshuffleTracks(queue, queueShuffleOrder)
 
@@ -116,18 +152,11 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
           await TrackPlayer.add(tracks)
         }
 
-        set(state => {
-          state.shuffleOrder = undefined
-        })
+        set({ shuffleOrder: undefined })
       }
 
-      const newQueue = await getQueue()
-      const newCurrentTrackIdx = await getCurrentTrack()
-
-      set(state => {
-        state.queue = newQueue
-      })
-      get().setCurrentTrackIdx(newCurrentTrackIdx)
+      set({ queue: await getQueue() })
+      get().setCurrentTrackIdx(await getCurrentTrack())
     })
   },
 
@@ -150,17 +179,12 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
       }
 
       await TrackPlayer.setRepeatMode(nextMode)
-      set(state => {
-        state.repeatMode = nextMode
-      })
+      set({ repeatMode: nextMode })
     })
   },
 
   playerState: State.None,
-  setPlayerState: playerState =>
-    set(state => {
-      state.playerState = playerState
-    }),
+  setPlayerState: playerState => set({ playerState }),
 
   currentTrack: undefined,
   currentTrackIdx: undefined,
@@ -173,45 +197,45 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
     )
   },
 
-  duckPaused: false,
-  setDuckPaused: duckPaused =>
-    set(state => {
-      state.duckPaused = duckPaused
-    }),
-
   queue: [],
-  setQueue: async ({ queue, title, type, contextId, playTrack, shuffle }) => {
+  setQueue: async (songs, name, contextType, contextId, playTrack, shuffle) => {
     return trackPlayerCommands.enqueue(async () => {
       const shuffled = shuffle !== undefined ? shuffle : !!get().shuffleOrder
 
       await TrackPlayer.setupPlayer(get().getPlayerOptions())
       await TrackPlayer.reset()
 
-      if (queue.length === 0) {
+      if (songs.length === 0) {
+        return
+      }
+
+      let queue = await get().mapSongstoTrackExts(songs)
+
+      try {
+        for (const t of queue) {
+          t.url = get().buildStreamUri(t.id)
+        }
+      } catch {
         return
       }
 
       if (shuffled) {
         const { tracks, shuffleOrder } = shuffleTracks(queue, playTrack)
-        set(state => {
-          state.shuffleOrder = shuffleOrder
-        })
+        set({ shuffleOrder })
         queue = tracks
         playTrack = 0
       } else {
-        set(state => {
-          state.shuffleOrder = undefined
-        })
+        set({ shuffleOrder: undefined })
       }
 
       playTrack = playTrack || 0
 
       try {
-        set(state => {
-          state.queue = queue
-          state.queueName = title
-          state.queueContextType = type
-          state.queueContextId = contextId
+        set({
+          queue,
+          queueName: name,
+          queueContextType: contextType,
+          queueContextId: contextId,
         })
         get().setCurrentTrackIdx(playTrack)
 
@@ -234,10 +258,7 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
   },
 
   progress: { position: 0, duration: 0, buffered: 0 },
-  setProgress: progress =>
-    set(state => {
-      state.progress = progress
-    }),
+  setProgress: progress => set({ progress }),
 
   scrobbleTrack: async id => {
     const client = get().client
@@ -259,9 +280,7 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
     if (netState === get().netState) {
       return
     }
-    set(state => {
-      state.netState = netState
-    })
+    set({ netState })
     get().rebuildQueue()
   },
 
@@ -273,9 +292,8 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
       }
 
       const currentTrack = await getCurrentTrack()
-      const playerState = await getPlayerState()
+      const state = await getPlayerState()
       const position = (await TrackPlayer.getPosition()) || 0
-      const repeatMode = await getRepeatMode()
 
       const queueName = get().queueName
       const queueContextId = get().queueContextId
@@ -292,11 +310,11 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
         return
       }
 
-      set(state => {
-        state.queue = queue
-        state.queueName = queueName
-        state.queueContextType = queueContextType
-        state.queueContextId = queueContextId
+      set({
+        queue,
+        queueName,
+        queueContextId,
+        queueContextType,
       })
       get().setCurrentTrackIdx(currentTrack)
 
@@ -306,26 +324,14 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
         await TrackPlayer.skip(currentTrack)
       }
 
-      await TrackPlayer.setRepeatMode(repeatMode)
       await TrackPlayer.seekTo(position)
 
-      if (playerState === State.Playing || forcePlay) {
+      if (state === State.Playing || forcePlay) {
         await TrackPlayer.play()
       }
     })
   },
 
-  updateQueue: async () => {
-    const newQueue = await getQueue()
-    const currentTrack = await getCurrentTrack()
-    set(state => {
-      state.queue = newQueue
-      if (currentTrack !== undefined) {
-        state.currentTrack = newQueue[currentTrack]
-      }
-    })
-  },
-
   buildStreamUri: id => {
     const client = get().client
     if (!client) {
@@ -334,23 +340,23 @@ export const createTrackPlayerSlice = (set: SetStore, get: GetStore): TrackPlaye
 
     return client.streamUri({
       id,
-      estimateContentLength: true,
+      estimateContentLength: get().settings.estimateContentLength,
       maxBitRate: get().netState === 'mobile' ? get().settings.maxBitrateMobile : get().settings.maxBitrateWifi,
     })
   },
 
   resetTrackPlayerState: () => {
-    set(state => {
-      state.queueName = undefined
-      state.queueContextType = undefined
-      state.queueContextId = undefined
-      state.shuffleOrder = undefined
-      state.repeatMode = RepeatMode.Off
-      state.playerState = State.None
-      state.currentTrack = undefined
-      state.currentTrackIdx = undefined
-      state.queue = []
-      state.progress = { position: 0, duration: 0, buffered: 0 }
+    set({
+      queueName: undefined,
+      queueContextType: undefined,
+      queueContextId: undefined,
+      shuffleOrder: undefined,
+      repeatMode: RepeatMode.Off,
+      playerState: State.None,
+      currentTrack: undefined,
+      currentTrackIdx: undefined,
+      queue: [],
+      progress: { position: 0, duration: 0, buffered: 0 },
     })
   },
 

app/state/trackplayermap.ts

@@ -0,0 +1,64 @@
+import { Song } from '@app/models/music'
+import userAgent from '@app/util/userAgent'
+import { GetState, SetState } from 'zustand'
+import { Store } from './store'
+import { TrackExt } from './trackplayer'
+
+export type TrackPlayerMapSlice = {
+  mapSongtoTrackExt: (song: Song) => Promise<TrackExt>
+  mapSongstoTrackExts: (songs: Song[]) => Promise<TrackExt[]>
+  mapTrackExtToSong: (song: TrackExt) => Song
+}
+
+export const selectTrackPlayerMap = {
+  mapTrackExtToSong: (store: TrackPlayerMapSlice) => store.mapTrackExtToSong,
+}
+
+export const createTrackPlayerMapSlice = (set: SetState<Store>, get: GetState<Store>): TrackPlayerMapSlice => ({
+  mapSongtoTrackExt: async song => {
+    let artwork = require('@res/fallback.png')
+    if (song.coverArt) {
+      const filePath = await get().fetchCoverArtFilePath(song.coverArt)
+      if (filePath) {
+        artwork = filePath
+      }
+    }
+
+    return {
+      id: song.id,
+      title: song.title,
+      artist: song.artist || 'Unknown Artist',
+      album: song.album || 'Unknown Album',
+      url: song.streamUri,
+      userAgent,
+      artwork,
+      coverArt: song.coverArt,
+      duration: song.duration,
+      artistId: song.artistId,
+      albumId: song.albumId,
+      track: song.track,
+      discNumber: song.discNumber,
+    }
+  },
+
+  mapSongstoTrackExts: async songs => {
+    return await Promise.all(songs.map(get().mapSongtoTrackExt))
+  },
+
+  mapTrackExtToSong: track => {
+    return {
+      itemType: 'song',
+      id: track.id,
+      title: track.title as string,
+      artist: track.artist,
+      album: track.album,
+      streamUri: track.url as string,
+      coverArt: track.coverArt,
+      duration: track.duration,
+      artistId: track.artistId,
+      albumId: track.albumId,
+      track: track.track,
+      discNumber: track.discNumber,
+    }
+  },
+})