From 8a8586968fcca33fad8d704a2ce506d611ddcbcd Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sun, 21 May 2023 20:04:18 -0600
Subject: [PATCH] all: cleanup

Final pre-release cleanup.
---
 .../java/org/oxycblt/auxio/IntegerTable.kt    |  6 ++--
 .../detail/list/PlaylistDetailListAdapter.kt  |  5 ++-
 .../oxycblt/auxio/music/device/RawMusic.kt    |  1 -
 .../music/picker/RenamePlaylistDialog.kt      |  3 +-
 .../auxio/music/user/UserMusicDatabase.kt     |  2 +-
 app/src/main/res/layout/item_divider.xml      |  4 ---
 app/src/main/res/menu/menu_playlist_sort.xml  | 33 -------------------
 app/src/main/res/values-be/strings.xml        |  1 -
 app/src/main/res/values-cs/strings.xml        |  1 -
 app/src/main/res/values-de/strings.xml        |  1 -
 app/src/main/res/values-es/strings.xml        |  1 -
 app/src/main/res/values-fi/strings.xml        |  1 -
 app/src/main/res/values-fr/strings.xml        |  1 -
 app/src/main/res/values-gl/strings.xml        |  1 -
 app/src/main/res/values-hr/strings.xml        |  1 -
 app/src/main/res/values-it/strings.xml        |  1 -
 app/src/main/res/values-ja/strings.xml        |  1 -
 app/src/main/res/values-ko/strings.xml        |  1 -
 app/src/main/res/values-lt/strings.xml        |  1 -
 app/src/main/res/values-ml/strings.xml        |  1 -
 app/src/main/res/values-pl/strings.xml        |  1 -
 app/src/main/res/values-ro/strings.xml        |  1 -
 app/src/main/res/values-ru/strings.xml        |  1 -
 app/src/main/res/values-tr/strings.xml        |  1 -
 app/src/main/res/values-uk/strings.xml        |  1 -
 app/src/main/res/values-zh-rCN/strings.xml    |  1 -
 app/src/main/res/values/settings.xml          |  1 -
 app/src/main/res/values/strings.xml           |  1 -
 28 files changed, 6 insertions(+), 69 deletions(-)
 delete mode 100644 app/src/main/res/layout/item_divider.xml
 delete mode 100644 app/src/main/res/menu/menu_playlist_sort.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt b/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt
index db14d5882..d0bff5315 100644
--- a/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt
+++ b/app/src/main/java/org/oxycblt/auxio/IntegerTable.kt
@@ -51,10 +51,8 @@ object IntegerTable {
     const val VIEW_TYPE_DISC_HEADER = 0xA00B
     /** EditHeaderViewHolder */
     const val VIEW_TYPE_EDIT_HEADER = 0xA00C
-    /** ConfirmHeaderViewHolder */
-    const val VIEW_TYPE_CONFIRM_HEADER = 0xA00D
-    /** EditableSongViewHolder */
-    const val VIEW_TYPE_EDITABLE_SONG = 0xA00E
+    /** PlaylistSongViewHolder */
+    const val VIEW_TYPE_PLAYLIST_SONG = 0xA00E
     /** "Music playback" notification code */
     const val PLAYBACK_NOTIFICATION_CODE = 0xA0A0
     /** "Music loading" notification code */
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt
index 47737f7f7..7b4147621 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt
@@ -139,8 +139,7 @@ class PlaylistDetailListAdapter(private val listener: Listener) :
 }
 
 /**
- * A [RecyclerView.ViewHolder] that displays a [SortHeader] and it's actions. Use [from] to create
- * an instance.
+ * A [Header] variant that displays an edit button.
  *
  * @param titleRes The string resource to use as the header title
  * @author Alexander Capehart (OxygenCobalt)
@@ -265,7 +264,7 @@ private constructor(private val binding: ItemEditableSongBinding) :
 
     companion object {
         /** A unique ID for this [RecyclerView.ViewHolder] type. */
-        const val VIEW_TYPE = IntegerTable.VIEW_TYPE_EDITABLE_SONG
+        const val VIEW_TYPE = IntegerTable.VIEW_TYPE_PLAYLIST_SONG
 
         /**
          * Create a new instance.
diff --git a/app/src/main/java/org/oxycblt/auxio/music/device/RawMusic.kt b/app/src/main/java/org/oxycblt/auxio/music/device/RawMusic.kt
index 8c91f09f9..23b02b2f1 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/device/RawMusic.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/device/RawMusic.kt
@@ -23,7 +23,6 @@ import org.oxycblt.auxio.music.*
 import org.oxycblt.auxio.music.fs.Directory
 import org.oxycblt.auxio.music.info.Date
 import org.oxycblt.auxio.music.info.ReleaseType
-import org.oxycblt.auxio.music.metadata.*
 
 /**
  * Raw information about a [SongImpl] obtained from the filesystem/Extractor instances.
diff --git a/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt
index f13951212..fcc8b2538 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt
@@ -52,8 +52,7 @@ class RenamePlaylistDialog : ViewBindingDialogFragment<DialogPlaylistNameBinding
 
     override fun onConfigDialog(builder: AlertDialog.Builder) {
         builder
-            // TODO:
-            .setTitle(R.string.lbl_rename)
+            .setTitle(R.string.lbl_rename_playlist)
             .setPositiveButton(R.string.lbl_ok) { _, _ ->
                 val playlist = unlikelyToBeNull(pickerModel.currentPlaylistToRename.value)
                 val chosenName = pickerModel.chosenName.value as ChosenName.Valid
diff --git a/app/src/main/java/org/oxycblt/auxio/music/user/UserMusicDatabase.kt b/app/src/main/java/org/oxycblt/auxio/music/user/UserMusicDatabase.kt
index ed790640a..087e46b35 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/user/UserMusicDatabase.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/user/UserMusicDatabase.kt
@@ -106,7 +106,7 @@ interface PlaylistDao {
     }
 
     /**
-     * Replace the currently-stored [Song]s of the current playlist entry.
+     * Replace the currently stored songs of the given playlist entry.
      *
      * @param playlistUid The [Music.UID] of the playlist to update.
      * @param songs The [PlaylistSong] representing the new list of songs to be placed in the
diff --git a/app/src/main/res/layout/item_divider.xml b/app/src/main/res/layout/item_divider.xml
deleted file mode 100644
index 4767eae41..000000000
--- a/app/src/main/res/layout/item_divider.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.divider.MaterialDivider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_playlist_sort.xml b/app/src/main/res/menu/menu_playlist_sort.xml
deleted file mode 100644
index 167fae26b..000000000
--- a/app/src/main/res/menu/menu_playlist_sort.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:checkableBehavior="single"
-        android:id="@+id/sort_modes">
-        <item
-            android:id="@+id/option_sort_none"
-            android:title="@string/lbl_none" />
-        <item
-            android:id="@+id/option_sort_name"
-            android:title="@string/lbl_name" />
-        <item
-            android:id="@+id/option_sort_artist"
-            android:title="@string/lbl_artist" />
-        <item
-            android:id="@+id/option_sort_album"
-            android:title="@string/lbl_album" />
-        <item
-            android:id="@+id/option_sort_year"
-            android:title="@string/lbl_date" />
-        <item
-            android:id="@+id/option_sort_duration"
-            android:title="@string/lbl_duration" />
-    </group>
-    <group android:checkableBehavior="single"
-        android:id="@+id/sort_direction">
-        <item
-            android:id="@+id/option_sort_asc"
-            android:title="@string/lbl_sort_asc" />
-        <item
-            android:id="@+id/option_sort_dec"
-            android:title="@string/lbl_sort_dec" />
-    </group>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index c8701ec78..833d8340e 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -274,7 +274,6 @@
     <string name="desc_playlist_image">Вокладка плэйліст для %s</string>
     <string name="lbl_playlist">Плэйліст</string>
     <string name="lbl_playlists">Плэйлісты</string>
-    <string name="lbl_none">Адкл.</string>
     <string name="desc_new_playlist">Стварыце новы плэйліст</string>
     <string name="fmt_def_playlist">Плэйліст %d</string>
     <string name="lbl_new_playlist">Новы плэйліст</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 912c15502..900a8e440 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -285,7 +285,6 @@
     <string name="lbl_playlist">Seznam skladeb</string>
     <string name="set_intelligent_sorting">Při řazení ignorovat předložky</string>
     <string name="set_intelligent_sorting_desc">Ignorovat slova jako „the“ při řazení podle názvu (funguje nejlépe u hudby v angličtině)</string>
-    <string name="lbl_none">Žádné</string>
     <string name="desc_new_playlist">Vytvořit nový playlist</string>
     <string name="lbl_playlist_add">Přidat do seznamu skladeb</string>
     <string name="lng_playlist_added">Přidáno do seznamu skladeb</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e52fc3132..72c42e4a7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -276,7 +276,6 @@
     <string name="lbl_playlists">Wiedergabelisten</string>
     <string name="set_intelligent_sorting">Artikel beim Sortieren ignorieren</string>
     <string name="set_intelligent_sorting_desc">Wörter wie „the“ ignorieren (funktioniert am besten mit englischsprachiger Musik)</string>
-    <string name="lbl_none">Keine</string>
     <string name="desc_new_playlist">Neue Wiedergabeliste erstellen</string>
     <string name="lbl_new_playlist">Neue Wiedergabeliste</string>
     <string name="lng_playlist_added">Zur Wiedergabeliste hinzugefügt</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index adcafbaf7..de9f77187 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -278,7 +278,6 @@
     <string name="lbl_playlists">Listas de reproducción</string>
     <string name="desc_playlist_image">Imagen de la lista de reproducción para %s</string>
     <string name="lbl_playlist">Lista de reproducción</string>
-    <string name="lbl_none">Ninguno</string>
     <string name="set_intelligent_sorting">Ignorar artículos al ordenar</string>
     <string name="set_intelligent_sorting_desc">Ignorar palabras como \"the\" al ordenar por nombre (funciona mejor con música en inglés)</string>
     <string name="desc_new_playlist">Crear una nueva lista de reproducción</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 60578993e..85ff6f8e5 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -28,7 +28,6 @@
     <string name="lbl_search">Etsi</string>
     <string name="lbl_filter">Suodata</string>
     <string name="lbl_filter_all">Kaikki</string>
-    <string name="lbl_none">Ei mitään</string>
     <string name="lbl_name">Nimi</string>
     <string name="lbl_song_count">Kappalemäärä</string>
     <string name="lbl_disc">Levy</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fe01d0302..353726d0a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -206,7 +206,6 @@
     <string name="set_playback">Lecture</string>
     <string name="set_state">Persistance</string>
     <string name="set_wipe_state">Vider l\'état de lecture</string>
-    <string name="lbl_none">Aucun</string>
     <string name="set_headset_autoplay_desc">Toujours commencer la lecture lorsqu\'un périphérique audio est connecté (pourrait ne pas fonctionner sur tous les appareils)</string>
     <string name="set_replay_gain_mode">Stratégie de normalisation de volume</string>
     <string name="set_replay_gain_mode_track">Par chanson</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index a74b4072e..022bca385 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -268,5 +268,4 @@
     <string name="desc_playlist_image">Imaxe da lista de reprodución para %s</string>
     <string name="set_separators_and">ampersand</string>
     <string name="set_replay_gain">ganancia da repetición</string>
-    <string name="lbl_none">Ningún</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 698bb0aa4..783f6f805 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -269,7 +269,6 @@
     <string name="set_music">Glazba</string>
     <string name="desc_playlist_image">Slika popisa pjesama za %s</string>
     <string name="set_behavior">Ponašanje</string>
-    <string name="lbl_none">Ništa</string>
     <string name="set_intelligent_sorting">Pametno razvrstavanje</string>
     <string name="set_intelligent_sorting_desc">Ispravno razvrstaj imena koja počinju brojevima ili riječima poput „the” (najbolje radi s glazbom na engleskom jeziku)</string>
     <string name="desc_new_playlist">Stvori novi popis pjesama</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d9fa1243e..19d059cd1 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -287,5 +287,4 @@
     <string name="lng_playlist_added">Aggiunto alla playlist</string>
     <string name="def_song_count">Niente canzoni</string>
     <string name="fmt_def_playlist">Playlist %d</string>
-    <string name="lbl_none">Nessuno</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3670dcba1..62b5683b4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -265,7 +265,6 @@
     <string name="lbl_playlist">プレイリスト</string>
     <string name="lbl_playlists">プレイリスト</string>
     <string name="desc_playlist_image">%s のプレイリスト イメージ</string>
-    <string name="lbl_none">無し</string>
     <string name="lbl_new_playlist">新規プレイリスト</string>
     <string name="lbl_playlist_add">プレイリストに追加する</string>
     <string name="lng_playlist_created">プレイリストが作成されました</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index fd54b0717..c99c87e16 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -276,7 +276,6 @@
     <string name="desc_playlist_image">%s의 재생 목록 이미지</string>
     <string name="set_intelligent_sorting">정렬할 때 기사 무시</string>
     <string name="set_intelligent_sorting_desc">이름으로 정렬할 때 \"the\"와 같은 단어 무시(영어 음악에서 가장 잘 작동함)</string>
-    <string name="lbl_none">없음</string>
     <string name="desc_new_playlist">새 재생 목록 만들기</string>
     <string name="lbl_new_playlist">새 재생목록</string>
     <string name="lbl_playlist_add">재생목록에 추가</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 4c1eb493a..9cc1f6ec5 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -274,6 +274,5 @@
     <string name="lbl_playlist">Grojaraštis</string>
     <string name="lbl_playlists">Grojaraščiai</string>
     <string name="desc_playlist_image">Grojaraščio vaizdas %s</string>
-    <string name="lbl_none">Jokios</string>
     <string name="desc_new_playlist">Sukurti naują grojaraštį</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 0ecf86df0..fd2f7d19c 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -90,7 +90,6 @@
     <string name="lbl_go_artist">കലാകാരനിലേക്ക് പോകുക</string>
     <string name="lbl_song_detail">സവിശേഷതകൾ കാണുക</string>
     <string name="lbl_state_saved">സ്ഥിതി സംരക്ഷിച്ചു</string>
-    <string name="lbl_none">ഒന്നുമില്ല</string>
     <string name="lbl_sort_dec">അവരോഹണം</string>
     <string name="lbl_state_restored">സ്ഥിതി പുനഃസ്ഥാപിച്ചു</string>
     <string name="lbl_wiki">വിക്കി</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5754e7e38..c835f1de5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -281,7 +281,6 @@
     <string name="desc_playlist_image">Obraz playlisty %s</string>
     <string name="set_intelligent_sorting">Inteligentne sortowanie</string>
     <string name="set_intelligent_sorting_desc">Ignoruj słowa takie jak „the” oraz numery w tytule podczas sortowania (działa najlepiej z utworami w języku angielskim)</string>
-    <string name="lbl_none">Brak</string>
     <string name="desc_new_playlist">Utwórz nową playlistę</string>
     <string name="lbl_new_playlist">Nowa playlista</string>
     <string name="lbl_playlist_add">Dodaj do playlisty</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index b99bc7023..1ef092e66 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -142,7 +142,6 @@
     <string name="set_action_mode_next">Treceți la următoarea</string>
     <string name="set_playback_mode_artist">Redă de la artist</string>
     <string name="set_playback_mode_genre">Redă din genul</string>
-    <string name="lbl_none">Nu există</string>
     <string name="lbl_reset">Resetează</string>
     <string name="lbl_wiki">Wiki</string>
     <string name="lng_widget">Vizualizați și controlați redarea muzicii</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 072da2d2d..449dc9662 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -283,7 +283,6 @@
     <string name="desc_playlist_image">Обложка плейлиста для %s</string>
     <string name="set_intelligent_sorting">Игнорировать артикли при сортировке</string>
     <string name="set_intelligent_sorting_desc">Игнорировать такие слова, как «the», при сортировке по имени (лучше всего работает с англоязычной музыкой)</string>
-    <string name="lbl_none">Откл.</string>
     <string name="desc_new_playlist">Создать новый плейлист</string>
     <string name="lbl_new_playlist">Новый плейлист</string>
     <string name="fmt_def_playlist">Плейлист %d</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c73aa22c3..db0b15c59 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -274,6 +274,5 @@
     <string name="lbl_playlists">çalma listeleri</string>
     <string name="set_intelligent_sorting">Sıralama yaparken makaleleri yoksay</string>
     <string name="set_intelligent_sorting_desc">Ada göre sıralarken \"the\" gibi kelimeleri yok sayın (en iyi ingilizce müzikle çalışır)</string>
-    <string name="lbl_none">Hiçbiri</string>
     <string name="desc_new_playlist">Yeni bir oynatma listesi oluştur</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index c7f387bc4..e29bd03a1 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -278,7 +278,6 @@
     <string name="desc_playlist_image">Зображення списку відтворення для %s</string>
     <string name="lbl_playlist">Список відтворення</string>
     <string name="lbl_playlists">Списки відтворення</string>
-    <string name="lbl_none">Немає</string>
     <string name="set_intelligent_sorting">Інтелектуальне сортування</string>
     <string name="set_intelligent_sorting_desc">Ігнорування таких слів, як \"the\", або цифр під час сортування за назвою (найкраще працює з англомовною музикою)</string>
     <string name="desc_new_playlist">Створити новий список відтворення</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 1020ae1eb..60ff2a42b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -272,7 +272,6 @@
     <string name="lbl_playlist">播放列表</string>
     <string name="lbl_playlists">播放列表</string>
     <string name="desc_playlist_image">%s 的播放列表图片</string>
-    <string name="lbl_none">无</string>
     <string name="set_intelligent_sorting">排序时忽略冠词</string>
     <string name="set_intelligent_sorting_desc">按名称排序时忽略类似“the”这样的冠词（对英文歌曲的效果最好）</string>
     <string name="desc_new_playlist">创建新的播放列表</string>
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index e9e9d5f2b..faab5d5cd 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -52,7 +52,6 @@
     <string name="set_key_album_songs_sort" translatable="false">auxio_album_sort</string>
     <string name="set_key_artist_songs_sort" translatable="false">auxio_artist_sort</string>
     <string name="set_key_genre_songs_sort" translatable="false">auxio_genre_sort</string>
-    <string name="set_key_playlist_songs_sort" translatable="false">auxio_playlist_sort</string>
 
     <string-array name="entries_theme">
         <item>@string/set_theme_auto</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0eca031c4..bf01fa3dd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,7 +92,6 @@
     <!-- As in to not filter -->
     <string name="lbl_filter_all">All</string>
 
-    <string name="lbl_none">None</string>
     <string name="lbl_name">Name</string>
     <string name="lbl_date">Date</string>
     <string name="lbl_duration">Duration</string>