summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java5
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java89
2 files changed, 54 insertions, 40 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index c9d00cc225..199d80cf72 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -327,6 +327,11 @@ public final class NativeLibrary
public static native void LoadStateAs(String path);
/**
+ * Returns when the savestate in the given slot was created, or 0 if the slot is empty.
+ */
+ public static native long GetUnixTimeOfStateSlot(int slot);
+
+ /**
* Sets the current working user directory
* If not set, it auto-detects a location
*/
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
index 9a145d9dce..3454b6d83d 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
@@ -1,6 +1,7 @@
package org.dolphinemu.dolphinemu.fragments;
import android.os.Bundle;
+import android.text.format.DateUtils;
import android.util.SparseIntArray;
import android.view.LayoutInflater;
import android.view.View;
@@ -11,6 +12,7 @@ import android.widget.GridLayout;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
+import org.dolphinemu.dolphinemu.NativeLibrary;
import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.activities.EmulationActivity;
@@ -22,40 +24,35 @@ public final class SaveLoadStateFragment extends Fragment implements View.OnClic
}
private static final String KEY_SAVEORLOAD = "saveorload";
- private static SparseIntArray saveButtonsActionsMap = new SparseIntArray();
- static
- {
- saveButtonsActionsMap
- .append(R.id.loadsave_state_button_1, EmulationActivity.MENU_ACTION_SAVE_SLOT1);
- saveButtonsActionsMap
- .append(R.id.loadsave_state_button_2, EmulationActivity.MENU_ACTION_SAVE_SLOT2);
- saveButtonsActionsMap
- .append(R.id.loadsave_state_button_3, EmulationActivity.MENU_ACTION_SAVE_SLOT3);
- saveButtonsActionsMap
- .append(R.id.loadsave_state_button_4, EmulationActivity.MENU_ACTION_SAVE_SLOT4);
- saveButtonsActionsMap
- .append(R.id.loadsave_state_button_5, EmulationActivity.MENU_ACTION_SAVE_SLOT5);
- saveButtonsActionsMap
- .append(R.id.loadsave_state_button_6, EmulationActivity.MENU_ACTION_SAVE_SLOT6);
- }
-
- private static SparseIntArray loadButtonsActionsMap = new SparseIntArray();
+ private static int[] saveActionsMap = new int[]{
+ EmulationActivity.MENU_ACTION_SAVE_SLOT1,
+ EmulationActivity.MENU_ACTION_SAVE_SLOT2,
+ EmulationActivity.MENU_ACTION_SAVE_SLOT3,
+ EmulationActivity.MENU_ACTION_SAVE_SLOT4,
+ EmulationActivity.MENU_ACTION_SAVE_SLOT5,
+ EmulationActivity.MENU_ACTION_SAVE_SLOT6,
+ };
+
+ private static int[] loadActionsMap = new int[]{
+ EmulationActivity.MENU_ACTION_LOAD_SLOT1,
+ EmulationActivity.MENU_ACTION_LOAD_SLOT2,
+ EmulationActivity.MENU_ACTION_LOAD_SLOT3,
+ EmulationActivity.MENU_ACTION_LOAD_SLOT4,
+ EmulationActivity.MENU_ACTION_LOAD_SLOT5,
+ EmulationActivity.MENU_ACTION_LOAD_SLOT6,
+ };
+
+ private static SparseIntArray buttonsMap = new SparseIntArray();
static
{
- loadButtonsActionsMap
- .append(R.id.loadsave_state_button_1, EmulationActivity.MENU_ACTION_LOAD_SLOT1);
- loadButtonsActionsMap
- .append(R.id.loadsave_state_button_2, EmulationActivity.MENU_ACTION_LOAD_SLOT2);
- loadButtonsActionsMap
- .append(R.id.loadsave_state_button_3, EmulationActivity.MENU_ACTION_LOAD_SLOT3);
- loadButtonsActionsMap
- .append(R.id.loadsave_state_button_4, EmulationActivity.MENU_ACTION_LOAD_SLOT4);
- loadButtonsActionsMap
- .append(R.id.loadsave_state_button_5, EmulationActivity.MENU_ACTION_LOAD_SLOT5);
- loadButtonsActionsMap
- .append(R.id.loadsave_state_button_6, EmulationActivity.MENU_ACTION_LOAD_SLOT6);
+ buttonsMap.append(R.id.loadsave_state_button_1, 0);
+ buttonsMap.append(R.id.loadsave_state_button_2, 1);
+ buttonsMap.append(R.id.loadsave_state_button_3, 2);
+ buttonsMap.append(R.id.loadsave_state_button_4, 3);
+ buttonsMap.append(R.id.loadsave_state_button_5, 4);
+ buttonsMap.append(R.id.loadsave_state_button_6, 5);
}
private SaveOrLoad mSaveOrLoad;
@@ -88,6 +85,7 @@ public final class SaveLoadStateFragment extends Fragment implements View.OnClic
for (int childIndex = 0; childIndex < grid.getChildCount(); childIndex++)
{
Button button = (Button) grid.getChildAt(childIndex);
+ setButtonText(button, childIndex);
button.setOnClickListener(this);
}
@@ -99,20 +97,31 @@ public final class SaveLoadStateFragment extends Fragment implements View.OnClic
@SuppressWarnings("WrongConstant")
@Override
- public void onClick(View button)
+ public void onClick(View view)
+ {
+ int buttonIndex = buttonsMap.get(view.getId(), -1);
+
+ int action = (mSaveOrLoad == SaveOrLoad.SAVE ? saveActionsMap : loadActionsMap)[buttonIndex];
+ ((EmulationActivity) getActivity()).handleMenuAction(action);
+
+ // The savestate most likely hasn't gotten saved yet (it happens asynchronously),
+ // so we unfortunately can't rely on setButtonText/GetUnixTimeOfStateSlot here.
+ Button button = (Button) view;
+ CharSequence time = DateUtils.getRelativeTimeSpanString(0, 0, DateUtils.MINUTE_IN_MILLIS);
+ button.setText(getString(R.string.emulation_state_slot, buttonIndex + 1, time));
+ }
+
+ private void setButtonText(Button button, int index)
{
- int action = 0;
- switch (mSaveOrLoad)
+ long creationTime = NativeLibrary.GetUnixTimeOfStateSlot(index);
+ if (creationTime != 0)
{
- case SAVE:
- action = saveButtonsActionsMap.get(button.getId(), -1);
- break;
- case LOAD:
- action = loadButtonsActionsMap.get(button.getId(), -1);
+ CharSequence relativeTime = DateUtils.getRelativeTimeSpanString(creationTime);
+ button.setText(getString(R.string.emulation_state_slot, index + 1, relativeTime));
}
- if (action >= 0)
+ else
{
- ((EmulationActivity) getActivity()).handleMenuAction(action);
+ button.setText(getString(R.string.emulation_state_slot_empty, index + 1));
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-25 22:18:24 +0000