From 69404c94c9da26e2a7ee2593f290c7b6845a3b74 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Wed, 23 Nov 2016 19:18:08 +1100
Subject: [PATCH] [Project64] Add game list setting page

---
 Android/res/drawable-hdpi/ic_storage.png      | Bin 0 -> 1137 bytes
 Android/res/drawable-mdpi/ic_storage.png      | Bin 0 -> 1213 bytes
 Android/res/drawable-xhdpi/ic_storage.png     | Bin 0 -> 1360 bytes
 Android/res/values/strings.xml                |   5 +++-
 Android/res/xml/setting_gamelist.xml          |  16 ++++++++++
 Android/res/xml/settings.xml                  |   6 ++++
 .../settings/BaseSettingsFragment.java        |   4 +++
 .../project64/settings/GameListFragment.java  |  28 ++++++++++++++++++
 .../project64/settings/SettingsActivity.java  |   2 ++
 9 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 Android/res/drawable-hdpi/ic_storage.png
 create mode 100644 Android/res/drawable-mdpi/ic_storage.png
 create mode 100644 Android/res/drawable-xhdpi/ic_storage.png
 create mode 100644 Android/res/xml/setting_gamelist.xml
 create mode 100644 Android/src/emu/project64/settings/GameListFragment.java

diff --git a/Android/res/drawable-hdpi/ic_storage.png b/Android/res/drawable-hdpi/ic_storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..e00c51602ac4a41b7108aeace119922211e666cb
GIT binary patch
literal 1137
zcmb_bPfXKL9B#rONV3FuF#bu*v*2G?+qZRKD-+l{*b+L)w!|G*+Beof`%3$8gLr`(
z#sdd0MvsP*F-GIbL;;CL1*7q%B*IM-6FnIYCi*%UcmPknq<w$#ec$i<{oe1*4rK;{
zEyr3Ih6$!qN|w%o|1~$ze{t==V>%rr$pXpY5~*k|V)_g`j6mAbMo<=M#^m@b)Xgvr
zZDzhe3hJP&V~f*#3|F-r%4V4Eo~oniqlkcEG-BE@_WP4(EHI52dnKw0s*^xvGd1O+
z+*Bs7PmSu5!S-AN-Bp<iScqt#YK_^RT#d0cU74=^W1a;y2pNsBTc!%?5J+GbfhZ@0
zbfFW1PLYG6Ac;~32n$f)VVD=XLQs&SU9ted_F!o=*C@$ZrGGmX-No24A&$)Rl}d%H
zL^$k@@KBN@UI_EyaEKy8-lR>mYRL9l>k10;bk}r<iEZF3YQuPf#8~QdD+SBhk+r?;
zGSPzZRn6fcC-^DVfvWm%sAcV-J(5Mce)kmi@{<nYv&h2}u1+tm)ar+F<b;bfg55mE
zWA!Qyl`+9y89N}6i*gXCnr_<uNsXbZa@zKYX6q=e#8|4qnWiBtQ6(8kC_*$Y^h210
zk_e@w7*F)|M`4#3hjp%k^$82vq|P;Vxo}^u-wc*RBP+-?uOg%0#TKX~Et`9Ki7Ha$
z!v1>OTw_l!HEwucFFZBF`&awdRo9Pb|M<(D#-*E`)<-t&cb7Kyuimo%EHXob`Q-2a
zI_A3bNveE|WHULYSSpXr-MaI1VR7mCi`OfwZ{NND`04Zdm#?RnH^(VTPb+=-)Jwg1
zq_H*l;Nhc<z_)t^vHAM!dSG~_AUZ9Hw#H33eelfT;M%p0!QO?X_SD^`6I}D^$-(yH
zf#p+e)4lPVh0Bp}WFxS0qv6npwu`1XKcG*E^XJZ<A6Wd+#JowdKLNg-qT!fyGNas&
H7iaze$U~l~

literal 0
HcmV?d00001

diff --git a/Android/res/drawable-mdpi/ic_storage.png b/Android/res/drawable-mdpi/ic_storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..539bad7d7def01ac5efa6f50f55d353636f3dbc8
GIT binary patch
literal 1213
zcmaJ>TWs4@7<M+AW`$%IiH%ZKI(54-iN%*RX=T%_mpECh%~?nT%L5W|?9;}yzRY$T
zH$wD+D6P~DsXX*$5{b&o_AuyP1_DG!%LC&HjTaC?>ck5x2#|O{Vp}-wnvMs8CHtK7
z>;Jz0`_KQ$i|N!Ef6KEi7>4=zB$q)ea9^JneXVl&Pqeh!@ti%ZkJu&AgxH|07a-tO
zaTI2tC{JDd3ie^x{w^h(vva~ZR?<~MbaMztH4qxZ`uZJ1l*XV93UE}>qWEv0e2xP}
zj^Y<00wowRSX7c_6AqVCS*biGF*4qN8uU3VB2b|%0!JO!EY^wQJG?B~yI~RsJ1O>9
z6n`WtC!|44Hz9}+R8XRNXwVZT=rF~EnNuJ{(G*FCNUAqTQ*5M{rD(AG;Ha7@kFXgo
zv0DqBqIl7^4VENJr4mu<CUkR@q#1@GsSp_o1yM%On$m3132Ihnoq>avWGaTO=o)Yt
z#ezOzM{%U|Q46ZEN2^)8*Mu&NbVP%s3CeA$o+t?apQ@^R*_NGwkM;g1v6Y=NAen)d
zK4D5|a3h^=DT9rfP_%V3tLx+STTB;qTeph30b;`uf(C*pDViJEK?nlNYnCl)66Cok
zjyMQKky$Rn#k*r%I5I>fXgW?aVVa4Dhhl??2;CbVqU%^rmnKxG*>$Y^7#nGbb<Lm}
zs4@plWfIB>Q&+)G)2z~1OQ<2=E>>==rMn@PL}EyHwEr4)J%s$@Zug9f4tv&z8uGh|
zjGgvsA7Ge=<hjAD^L^odt=7LWu<yjY$GaMMW@3Hjg_)*zen^0$-n-Mu!u0H4{jHOq
zHW#Kd?ZCJB%fS71eyMrkyQKZZlOHdGueWEN=azGAhyM2bap6d8>mU=zd+&CE$=H!Q
zZ{OQGam#!eJmfF$@A0hpzU`olqYLLTy7NE)`?)rEcKKpud*ACF`SXdnje9(J*tFTq
z`#tIO+114d>noMt-=DoXFrIqNH}lG8#}?iLi>=t&Q;V1Lw^qh{aO0)ijcTa1x;~J?
z`wnbgDK;HG7Eadgbhg~C1oD*+PtG6zqPpVWuEN@@Ex*n@&0UHSZFASQG;sP-m-kxR
zscN7))g#Z}?q0n*+L8UTu=eI#SGbQn3&+3Nd}H}=lhf9<wA%jei_J@HzS52z%441%
VQxAUfpM2i^q44n(cYP>7_YaaDkU9VW

literal 0
HcmV?d00001

diff --git a/Android/res/drawable-xhdpi/ic_storage.png b/Android/res/drawable-xhdpi/ic_storage.png
new file mode 100644
index 0000000000000000000000000000000000000000..2caf74c9530c6682a81d35456a08d72cbf531143
GIT binary patch
literal 1360
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Isi}*lvALV6lYyI|p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaT(5-zPQ9SSkXrz>*(J3ovn(~mttdZN0qkk3Ox$j9
z!D${;ZwgMgn7iWCs}FRHJ}7FDq8cUyOg|tdJmCU4@T8xb2Tbopz=XZ8_){VS1LGl2
z7srr_TW@ChdNDf+w5IzUS-}{)^COSaE@45YCiB9lq9spRZJH}s!WkU}4o+2ybNt?=
z##WzJ(`)+R*t?l(cSEe!KX|Lf^VxUR>(H}LQX|tY%UCiBFrcF=-F90zL{Gg-Ws`EK
zUdR}u&A#F86ZhPHZc!y?z4a5Njiut(zm2xKp#CNCWTs;=lUME!CIi(1M%l=sstcT7
zW+^cQ=PSRsJL$7dWn>q_nfvvkx3)f6W9gNWbo+tm7KIPbbSvYFw4P6VxAYa0^+Luw
z+WF0|7czc%(sEtm{sq;w28;p@0Sw0j++QkM6wTPYkzq&kE-%JCj?#uT4bRMOoM8W9
z<>;InHdC-GtF>2nPvbe6u!{SJ`aU`gpTEpcQTn6bcENEK1J_HIZ9)-Y6@EQ$1>T%m
zvOH5!C|6?Dtp(YtVQGci9piE@EN3}4Ra!ABkx79;&!vfJ#;>Uo?TRnomu@?BIHX<C
znA^sQf7%?;4CCLm?Gv7uRB+2i6>VD({KD0k;p_T!Tlk#4xx5u_8HCg-T%0u1;k2T}
uTjtJ#^XE1kGxN~)VPJ7UM}0p86Bu^C`zW~fiPLdV8RzNh=d#Wzp$Pz~x6axC

literal 0
HcmV?d00001

diff --git a/Android/res/values/strings.xml b/Android/res/values/strings.xml
index 1f070a012..40f6c6c6d 100644
--- a/Android/res/values/strings.xml
+++ b/Android/res/values/strings.xml
@@ -107,6 +107,8 @@
     <string name="video_screen_title">Video</string>
     <string name="audio_screen_summary">Sound settings</string>
     <string name="audio_screen_title">Audio</string>
+    <string name="game_list_summary">Game list settings</string>
+    <string name="game_list_title">Game list</string>
     <string name="advanced_screen_summary">advanced/debugging settings</string>
     <string name="advanced_screen_title">Advanced</string>
     <string name="reset_summary">Restore default settings</string>
@@ -181,7 +183,8 @@
     <string name="gamepad_title">Gamepad settings</string>
     <string name="settings_reset_title">Reset settings</string>
     <string name="settings_reset_message">Reset all settings back to their defaults?</string>
-        
+    <string name="MaxRomsRemembered_title">Max # of games remembered</string>
+
     <string-array name="DisplaySpeed_list">
         <item>@string/DListPerSecond</item>
         <item>@string/PercentageOfSpeed</item>
diff --git a/Android/res/xml/setting_gamelist.xml b/Android/res/xml/setting_gamelist.xml
new file mode 100644
index 000000000..508c363ee
--- /dev/null
+++ b/Android/res/xml/setting_gamelist.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:project64="http://schemas.android.com/apk/res/emu.project64"
+    android:key="screenRoot" >
+
+    <emu.project64.settings.SeekBarPreference
+        android:defaultValue="10"
+        android:key="MaxRomsRemembered"
+        android:title="@string/MaxRomsRemembered_title"
+        project64:maximumValue="20"
+        project64:minimumValue="0"
+        project64:stepSize="1"
+        project64:units=""
+    /> 
+
+	</PreferenceScreen>
diff --git a/Android/res/xml/settings.xml b/Android/res/xml/settings.xml
index 446a0d055..40d2e2649 100644
--- a/Android/res/xml/settings.xml
+++ b/Android/res/xml/settings.xml
@@ -21,6 +21,12 @@
             android:key="settings_audio" 
             android:icon="@drawable/ic_speaker"
             />
+      <Preference
+          android:summary="@string/game_list_summary"
+          android:title="@string/game_list_title"
+          android:key="settings_game_list"
+          android:icon="@drawable/ic_storage"
+            />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/Other" >
         <Preference
diff --git a/Android/src/emu/project64/settings/BaseSettingsFragment.java b/Android/src/emu/project64/settings/BaseSettingsFragment.java
index 80a41d69a..77869986e 100644
--- a/Android/src/emu/project64/settings/BaseSettingsFragment.java
+++ b/Android/src/emu/project64/settings/BaseSettingsFragment.java
@@ -113,6 +113,10 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat
         {
             loadFragment(new VideoFragment());
         }
+        else if (preference.getKey().equals("settings_game_list"))
+        {
+            loadFragment(new GameListFragment());
+        }
         else if (preference.getKey().equals("settings_audio"))
         {
             loadFragment(new AudioFragment());
diff --git a/Android/src/emu/project64/settings/GameListFragment.java b/Android/src/emu/project64/settings/GameListFragment.java
new file mode 100644
index 000000000..7568f0004
--- /dev/null
+++ b/Android/src/emu/project64/settings/GameListFragment.java
@@ -0,0 +1,28 @@
+/****************************************************************************
+*                                                                           *
+* Project64 - A Nintendo 64 emulator.                                       *
+* http://www.pj64-emu.com/                                                  *
+* Copyright (C) 2012 Project64. All rights reserved.                        *
+*                                                                           *
+* License:                                                                  *
+* GNU/GPLv2 http://www.gnu.org/licenses/gpl-2.0.html                        *
+*                                                                           *
+****************************************************************************/
+package emu.project64.settings;
+
+import emu.project64.R;
+
+public class GameListFragment extends BaseSettingsFragment
+{
+    @Override
+    protected int getXml() 
+    {
+        return R.xml.setting_gamelist;
+    }
+
+    @Override
+    protected int getTitleId() 
+    {
+        return R.string.game_list_title;
+    }
+}
diff --git a/Android/src/emu/project64/settings/SettingsActivity.java b/Android/src/emu/project64/settings/SettingsActivity.java
index 37514020c..6e4e8059b 100644
--- a/Android/src/emu/project64/settings/SettingsActivity.java
+++ b/Android/src/emu/project64/settings/SettingsActivity.java
@@ -85,6 +85,7 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
         .putString("Debugger_TraceUserInterface",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceUserInterface.getValue())))
         .putString("Debugger_TraceRomList",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceRomList.getValue())))
         .putString("Debugger_TraceExceptionHandler",String.valueOf(NativeExports.SettingsLoadDword(SettingsID.Debugger_TraceExceptionHandler.getValue())))
+        .putInt("MaxRomsRemembered",NativeExports.UISettingsLoadDword(UISettingID.File_RecentGameFileCount.getValue()))
         .apply();
 
         sharedPrefs.registerOnSharedPreferenceChangeListener(this);
@@ -203,5 +204,6 @@ public class SettingsActivity extends AppCompatActivity implements SharedPrefere
         {
             NativeExports.SettingsSaveDword(SettingsID.Debugger_TraceExceptionHandler.getValue(), Integer.valueOf(sharedPreferences.getString(key, "1")));
         }
+        else if (key.equals("MaxRomsRemembered")) { NativeExports.UISettingsSaveDword(UISettingID.File_RecentGameFileCount.getValue(), sharedPreferences.getInt(key, 10)); }
     }
 }