From 90e0ff33dbe4ee72e9024697dadd6d837326828b Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 17 Apr 2021 21:22:51 +1000
Subject: [PATCH] Android: Improve text in empty game list fragment
---
.../stenzek/duckstation/EmptyGameListFragment.java | 13 +++++++++----
.../main/res/layout/fragment_empty_game_list.xml | 11 -----------
android/app/src/main/res/values/strings.xml | 4 ++--
3 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/EmptyGameListFragment.java b/android/app/src/main/java/com/github/stenzek/duckstation/EmptyGameListFragment.java
index 71b3ab494..b92635331 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/EmptyGameListFragment.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/EmptyGameListFragment.java
@@ -10,7 +10,13 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
public class EmptyGameListFragment extends Fragment {
- private static final String SUPPORTED_FORMATS_STRING = ".cue, .iso, .img, .ecm, .mds, .chd, .pbp (unencrypted)";
+ private static final String SUPPORTED_FORMATS_STRING =
+ ".cue (Cue Sheets)\n" +
+ ".iso/.img (Single Track Image)\n" +
+ ".ecm (Error Code Modeling Image)\n" +
+ ".mds (Media Descriptor Sidecar)\n" +
+ ".chd (Compressed Hunks of Data)\n" +
+ ".pbp (PlayStation Portable, Only Encrypted)";
private MainActivity parent;
@@ -23,9 +29,8 @@ public class EmptyGameListFragment extends Fragment {
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- ((TextView)view.findViewById(R.id.supported_formats)).setText(
+ ((TextView) view.findViewById(R.id.supported_formats)).setText(
getString(R.string.main_activity_empty_game_list_supported_formats, SUPPORTED_FORMATS_STRING));
- ((Button)view.findViewById(R.id.add_game_directory)).setOnClickListener(v -> parent.startAddGameDirectory());
- ((Button)view.findViewById(R.id.start_file)).setOnClickListener(v -> parent.startStartFile());
+ ((Button) view.findViewById(R.id.add_game_directory)).setOnClickListener(v -> parent.startAddGameDirectory());
}
}
diff --git a/android/app/src/main/res/layout/fragment_empty_game_list.xml b/android/app/src/main/res/layout/fragment_empty_game_list.xml
index 3b9f438f2..55f8fd607 100644
--- a/android/app/src/main/res/layout/fragment_empty_game_list.xml
+++ b/android/app/src/main/res/layout/fragment_empty_game_list.xml
@@ -41,15 +41,4 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/supported_formats" />
- <Button
- android:id="@+id/start_file"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="10dp"
- android:text="@string/main_activity_empty_game_list_start_file"
- style="@style/Widget.AppCompat.Button.Borderless.Colored"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/add_game_directory" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 09a187942..52944ebca 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -322,8 +322,8 @@
<string name="controller_auto_mapping_no_devices">No suitable devices found. Automatic binding only supports gamepad devices, but you can still bind other device types manually.</string>
<string name="controller_auto_mapping_select_device">Select Device</string>
<string name="controller_auto_mapping_results">Automatic Binding Results</string>
- <string name="main_activity_empty_game_list_title">No games were found. Please add a directory with games, or manually start a file.</string>
- <string name="main_activity_empty_game_list_supported_formats">Supported formats: %s</string>
+ <string name="main_activity_empty_game_list_title">No games were found. Please add a directory with games to begin.</string>
+ <string name="main_activity_empty_game_list_supported_formats">Supported formats are:\n\n%s\n\nGames in bin format require a cuesheet (.cue) to start.</string>
<string name="main_activity_empty_game_list_add_directory">Add Game Directory</string>
<string name="main_activity_empty_game_list_start_file">Start File</string>
<string name="update_notes_title">Update Notes</string>