Remove "Group Games By Format" option

app/src/main/java/emu/skyline/MainActivity.kt

@@ -216,30 +216,17 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun getDataItems() = mutableListOf<AppViewItem>().apply {
-        if (appSettings.groupByFormat) {
-            appEntries?.let { entries ->
-                val formats = formatFilter?.let { listOf(it) } ?: formatOrder
-                for (format in formats) {
-                    entries[format]?.let {
-                        sortGameList(it).forEach { entry ->
-                            add(AppItem(entry).toViewItem())
-                        }
-                    }
+        val gameList = mutableListOf<AppEntry>()
+        appEntries?.let { entries ->
+            val formats = formatFilter?.let { listOf(it) } ?: formatOrder
+            for (format in formats) {
+                entries[format]?.let {
+                    it.forEach { entry -> gameList.add(entry) }
                 }
             }
-        } else {
-            val gameList = mutableListOf<AppEntry>()
-            appEntries?.let { entries ->
-                val formats = formatFilter?.let { listOf(it) } ?: formatOrder
-                for (format in formats) {
-                    entries[format]?.let {
-                        it.forEach { entry -> gameList.add(entry) }
-                    }
-                }
-            }
-            sortGameList(gameList.toList()).forEach { entry ->
-                add(AppItem(entry).toViewItem())
-            }
+        }
+        sortGameList(gameList.toList()).forEach { entry ->
+            add(AppItem(entry).toViewItem())
         }
     }
 

app/src/main/java/emu/skyline/settings/AppSettings.kt

@@ -24,7 +24,6 @@ class AppSettings @Inject constructor(@ApplicationContext private val context :
     var useMaterialYou by sharedPreferences(context, false)
     var layoutType by sharedPreferences(context, 1)
     var sortAppsBy by sharedPreferences(context, 0)
-    var groupByFormat by sharedPreferences(context, true)
     var selectAction by sharedPreferences(context, false)
 
     // Input
@@ -34,7 +33,6 @@ class AppSettings @Inject constructor(@ApplicationContext private val context :
     var onScreenControlSnapToGrid by sharedPreferences(context, false)
 
     // Other
-    var romFormatFilter by sharedPreferences(context, 0)
     var refreshRequired by sharedPreferences(context, false)
     var logLevel by sharedPreferences(context, 3)
 }

app/src/main/res/values-b+es+419/strings.xml

@@ -44,9 +44,6 @@
     <string name="app_language_default">Usar idioma del sistema</string>
     <string name="layout_type">Tipo de vista de juegos</string>
     <string name="sort_apps_by">Ordenar juegos por</string>
-    <string name="group_by_format">Agrupar juegos por formato</string>
-    <string name="group_by_format_desc_off">Los juegos se mostrarán en una lista</string>
-    <string name="group_by_format_desc_on">Los juegos se agruparán por formato</string>
     <string name="select_action">Mostrar siempre información del juego</string>
     <string name="select_action_desc_on">La información del juego se mostrará al seleccionar un juego</string>
     <string name="select_action_desc_off">La información del juego solo se mostrará al mantener presionado un juego</string>

app/src/main/res/values-b+zh+Hans/strings.xml

@@ -44,9 +44,6 @@
     <string name="app_language_default">使用系统默认值</string>
     <string name="layout_type">游戏显示布局</string>
     <string name="sort_apps_by">游戏排序顺序</string>
-    <string name="group_by_format">按格式分组游戏</string>
-    <string name="group_by_format_desc_off">游戏将显示为单个列表</string>
-    <string name="group_by_format_desc_on">游戏将按格式分组显示</string>
     <string name="select_action">始终显示游戏信息</string>
     <string name="select_action_desc_on">游戏信息将在点击游戏时显示</string>
     <string name="select_action_desc_off">游戏信息只会在长按游戏时显示</string>

app/src/main/res/values-b+zh+Hant/strings.xml

@@ -44,9 +44,6 @@
     <string name="app_language_default">使用系統默認值</string>
     <string name="layout_type">遊戲顯示佈局</string>
     <string name="sort_apps_by">遊戲排序順序</string>
-    <string name="group_by_format">按格式分組遊戲</string>
-    <string name="group_by_format_desc_off">遊戲將顯示為單個列表</string>
-    <string name="group_by_format_desc_on">遊戲將按格式分組顯示</string>
     <string name="select_action">始終顯示遊戲信息</string>
     <string name="select_action_desc_on">遊戲信息將在點擊遊戲時顯示</string>
     <string name="select_action_desc_off">遊戲信息只會在長按遊戲時顯示</string>

app/src/main/res/values-de/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Es wurde kein Dateimanager zum Anzeigen des internen Ordners von Skyline gefunden</string>
     <string name="theme">Theme</string>
     <string name="layout_type">Spieldarstellung</string>
-    <string name="group_by_format">Gruppiere Spiele nach Format</string>
-    <string name="group_by_format_desc_off">Spiele werden in einer einzigen Liste angezeigt</string>
-    <string name="group_by_format_desc_on">Spiele werden nach ihrem Dateiformat gruppiert</string>
     <string name="sort_apps_by">Spielesortierung</string>
     <string name="select_action">Spielinformationen immer anzeigen</string>
     <string name="select_action_desc_on">Spielinformationen werden beim Antippen eines Spiels angezeigt </string>

app/src/main/res/values-el/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Δεν βρέθηκε εξωτερικός διαχειριστής αρχείων για να ανοίξει το ευρετήριο της Skyline</string>
     <string name="theme">Θέμα</string>
     <string name="layout_type">Οθόνη διάταξης παιχνιδιών</string>
-    <string name="group_by_format">Ομαδοποίηση παιχνιδιών ανά μορφή</string>
-    <string name="group_by_format_desc_off">Τα παιχνίδια θα εμφανίζονται ως ενιαία λίστα</string>
-    <string name="group_by_format_desc_on">Τα παιχνίδια θα εμφανίζονται ομαδοποιημένα κατά μορφή</string>
     <string name="sort_apps_by">Σειρά ταξινόμησης παιχνιδιών</string>
     <string name="select_action">Πάντα εμφάνισε τις πληροφορίες παιχνιδιού</string>
     <string name="select_action_desc_on">Οι πληροφορίες του παιχνιδιού θα εμφανιστούν όταν πατηθεί το παιχνίδι</string>

app/src/main/res/values-es/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">No se pudo encontrar un explorador de archivos externo para abrir el directorio interno de skyline </string>
     <string name="theme">Tema</string>
     <string name="layout_type">Tipo de vista de juegos</string>
-    <string name="group_by_format">Agrupar Juegos por Formato</string>
-    <string name="group_by_format_desc_off">Los juegos se mostrarán como una sola lista</string>
-    <string name="group_by_format_desc_on">Los juegos se agruparán por formato</string>
     <string name="sort_apps_by">Ordenar juegos por</string>
     <string name="select_action">Siempre Mostrar Información Del Juego</string>
     <string name="select_action_desc_on">La información del juego se mostrará al hacer clic en un juego</string>

app/src/main/res/values-fr/strings.xml

@@ -44,9 +44,6 @@
     <string name="app_language_default">Utiliser Langue Système</string>
     <string name="layout_type">Mode d\'affichage des jeux</string>
     <string name="sort_apps_by">Ordre de tri des jeux</string>
-    <string name="group_by_format">Grouper les jeux par format</string>
-    <string name="group_by_format_desc_off">Les jeux seront affichés sous forme de liste unique</string>
-    <string name="group_by_format_desc_on">Les jeux seront groupés par format</string>
     <string name="select_action">Toujours afficher les informations du jeu</string>
     <string name="select_action_desc_on">Les informations du jeu seront affichées en cliquant sur un jeu</string>
     <string name="select_action_desc_off">Les informations du jeu seront uniquement affichées en cliquant longtemps sur un jeu</string>

app/src/main/res/values-hu/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Nem található külső fájlkezelő a Skyline belső mappájának megnyitásához</string>
     <string name="theme">Téma</string>
     <string name="layout_type">Játékkönyvtár elrendezés</string>
-    <string name="group_by_format">Játékok csoportosítása formátum szerint</string>
-    <string name="group_by_format_desc_off">Játékok megjelenítése listában</string>
-    <string name="group_by_format_desc_on">Játékok csoportosítása formátum szerint</string>
     <string name="sort_apps_by">Játékok rendezési szempontja</string>
     <string name="select_action">A játékinformációk állandó mutatása</string>
     <string name="select_action_desc_on">A játékinformációk mutatása játékra kattintáskor</string>

app/src/main/res/values-in/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Tidak dapat mencari aplikasi manajemen berkas untuk membuka direktori Skyline</string>
     <string name="theme">Tema</string>
     <string name="layout_type">Letak Tampilan Game</string>
-    <string name="group_by_format">Kelompokan Game Sesuai Format</string>
-    <string name="group_by_format_desc_off">Game akan ditampilkan dalam satu daftar. </string>
-    <string name="group_by_format_desc_on">Game akan ditampilkan dalam format berkelompok </string>
     <string name="sort_apps_by">Sortir Urutan Game</string>
     <string name="select_action">Selalu Perlihatkan Informasi Game</string>
     <string name="select_action_desc_on">Informasi game akan muncul ketika di klik</string>

app/src/main/res/values-it/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Non è stato trovato nessun gestore file in grado di aprire la cartella interna dell\'emulatore</string>
     <string name="theme">Tema</string>
     <string name="layout_type">Disposizione dei giochi</string>
-    <string name="group_by_format">Raggruppa Giochi Per Formato</string>
-    <string name="group_by_format_desc_off">I giochi verranno mostrati in un\'unica lista</string>
-    <string name="group_by_format_desc_on">I giochi verranno mostrati raggruppati per formato</string>
     <string name="sort_apps_by">Ordine Dei Giochi</string>
     <string name="select_action">Mostra sempre le informazioni sui giochi</string>
     <string name="select_action_desc_on">Le informazioni sul gioco verranno mostrate quando il gioco viene cliccato</string>

app/src/main/res/values-ko/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Skyline의 내부 디렉토리를 여는 외부 파일 관리자를 찾을 수 없습니다</string>
     <string name="theme">테마</string>
     <string name="layout_type">게임 디스플레이 레이아웃</string>
-    <string name="group_by_format">형식별로 게임 그룹화</string>
-    <string name="group_by_format_desc_off">게임은 단일 목록으로 표시됩니다</string>
-    <string name="group_by_format_desc_on">게임은 형식별로 그룹화되어 표시됩니다</string>
     <string name="sort_apps_by">게임 정렬 순서</string>
     <string name="select_action">항상 게임 정보 표시</string>
     <string name="select_action_desc_on">클릭하면 게임 정보가 나타납니다</string>

app/src/main/res/values-pl/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Nie udało się znaleźć zewnętrznego menedżera plików, aby otworzyć wewnętrzny katalog Skyline\'a</string>
     <string name="theme">Motyw</string>
     <string name="layout_type">Układ wyświetlanych gier</string>
-    <string name="group_by_format">Grupuj gry według formatu</string>
-    <string name="group_by_format_desc_off">Gry będą wyświetlane w pojedyńczej liście</string>
-    <string name="group_by_format_desc_on">Gry będą wyświetlane jako pogrupowane według formatu</string>
     <string name="sort_apps_by">Kolejność sortowania gier</string>
     <string name="select_action">Zawsze pokazuj informacje gier</string>
     <string name="select_action_desc_on">Informacje gry będą pokazane po jej naciśnięciu</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -44,9 +44,6 @@
     <string name="app_language_default">Usar Padrão do Sistema</string>
     <string name="layout_type">Modo de Exibição dos Jogos</string>
     <string name="sort_apps_by">Ordem de Classificação dos Jogos</string>
-    <string name="group_by_format">Agrupar Jogos por Formato</string>
-    <string name="group_by_format_desc_off">Jogos serão exibidos em lista única</string>
-    <string name="group_by_format_desc_on">Jogos serão exibidos agrupados por formato</string>
     <string name="select_action">Sempre Mostrar Informação dos Jogos</string>
     <string name="select_action_desc_on">Informação do jogo será mostrada ao clicar em um jogo</string>
     <string name="select_action_desc_off">Informação do jogo será mostrada somente em um clique longo sobre um jogo</string>

app/src/main/res/values-pt/strings.xml

@@ -44,9 +44,6 @@
     <string name="app_language_default">Usar padrão do sistema</string>
     <string name="layout_type">Modo de Exibição dos Jogos</string>
     <string name="sort_apps_by">Ordem de Classificação dos Jogos</string>
-    <string name="group_by_format">Agrupar Jogos por Formato</string>
-    <string name="group_by_format_desc_off">Jogos serão exibidos em lista única</string>
-    <string name="group_by_format_desc_on">Jogos serão exibidos agrupados por formato</string>
     <string name="select_action">Sempre Mostrar Informação dos Jogos</string>
     <string name="select_action_desc_on">Informação do Jogo Será Mostrada ao Clicar em um Jogo</string>
     <string name="select_action_desc_off">Informação do jogo será mostrada somente ao pressionar um jogo</string>

app/src/main/res/values-ru/strings.xml

@@ -29,9 +29,6 @@
     <string name="failed_open_directory">Не удается найти внешний файловый менеджер для открытия внутренний директории Skyline</string>
     <string name="theme">Тема</string>
     <string name="layout_type">Схема отображения игр</string>
-    <string name="group_by_format">Группировать игры по формату</string>
-    <string name="group_by_format_desc_off">Игры будут отображаться единым списком</string>
-    <string name="group_by_format_desc_on">Игры будут показаны сгруппированными по формату</string>
     <string name="sort_apps_by">Порядок сортировки игр</string>
     <string name="select_action">Всегда показывать информацию об игре</string>
     <string name="select_action_desc_on">Информация об игре будет показана при нажатии на игру</string>

app/src/main/res/values/strings.xml

@@ -51,9 +51,6 @@
     <string name="app_language_default">Use System Default</string>
     <string name="layout_type">Game Display Layout</string>
     <string name="sort_apps_by">Games Sorting Order</string>
-    <string name="group_by_format">Group Games By Format</string>
-    <string name="group_by_format_desc_off">Games will be shown as a single list</string>
-    <string name="group_by_format_desc_on">Games will be shown grouped by format</string>
     <string name="select_action">Always Show Game Information</string>
     <string name="select_action_desc_on">Game information will be shown on clicking a game</string>
     <string name="select_action_desc_off">Game information will only be shown on long-clicking a game</string>

app/src/main/res/xml/app_preferences.xml

@@ -51,12 +51,6 @@
             app:refreshRequired="true"
             app:title="@string/sort_apps_by"
             app:useSimpleSummaryProvider="true" />
-        <emu.skyline.preference.RefreshSwitchPreferenceCompat
-            android:defaultValue="true"
-            android:summaryOff="@string/group_by_format_desc_off"
-            android:summaryOn="@string/group_by_format_desc_on"
-            app:key="group_by_format"
-            app:title="@string/group_by_format" />
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:summaryOff="@string/select_action_desc_off"