From 178dbea80116821bca9fe184903067cb7dc15694 Mon Sep 17 00:00:00 2001 From: Abandoned Cart Date: Sat, 22 Apr 2023 05:51:42 -0400 Subject: [PATCH] Use the searching text to specify load state --- app/src/main/java/emu/skyline/MainActivity.kt | 9 ++++++++- app/src/main/res/layout/main_activity.xml | 6 ++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/emu/skyline/MainActivity.kt b/app/src/main/java/emu/skyline/MainActivity.kt index 725845bb..660d0745 100644 --- a/app/src/main/java/emu/skyline/MainActivity.kt +++ b/app/src/main/java/emu/skyline/MainActivity.kt @@ -263,13 +263,20 @@ class MainActivity : AppCompatActivity() { } private fun loadRoms(loadFromFile : Boolean) { + if (!loadFromFile) { + binding.romPlaceholder.isVisible = true + binding.romPlaceholder.text = getString(R.string.searching_roms) + } viewModel.loadRoms(this, loadFromFile, Uri.parse(appSettings.searchLocation), EmulationSettings.global.systemLanguage) appSettings.refreshRequired = false } private fun populateAdapter() { val items = getAppItems() - binding.emptyPlaceholder.isVisible = items.isEmpty() + if (items.isEmpty()) + binding.romPlaceholder.text = getString(R.string.no_rom) + else + binding.romPlaceholder.isVisible = false adapter.setItems(items) } diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml index 6ce42cb1..abfce0c9 100644 --- a/app/src/main/res/layout/main_activity.xml +++ b/app/src/main/res/layout/main_activity.xml @@ -115,13 +115,12 @@ app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraLarge" /> @@ -132,7 +131,6 @@ android:id="@+id/swipe_refresh_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="-8dp" app:layout_behavior="@string/appbar_scrolling_view_behavior">