Merge pull request #1429 from reicast/ac/ui_cleanup

AbandonedCart · web-flow · commit d9f8187d6d14 · 2018-10-03T14:29:17.000-04:00
Android/UI: UI cleanup (themes, views, scaling, etc)
diff --git a/core/nullDC.cpp b/core/nullDC.cpp
@@ -319,10 +319,10 @@ void LoadSettings()
 	// Configured on a per-game basis
 	settings.dynarec.safemode		= 0;
 	settings.rend.ModifierVolumes	= 1;
-#endif
 
 	settings.pvr.HashLogFile		= cfgLoadStr("testing", "ta.HashLogFile", "");
 	settings.pvr.HashCheckFile		= cfgLoadStr("testing", "ta.HashCheckFile", "");
+#endif
 
 #if SUPPORT_DISPMANX
 	settings.dispmanx.Width			= cfgLoadInt("dispmanx","width",640);
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/Emulator.java
@@ -19,7 +19,7 @@ public class Emulator extends Application {
     public static final String pref_limitfps = "limit_fps";
     public static final String pref_nosound = "sound_disabled";
     public static final String pref_mipmaps = "use_mipmaps";
-    public static final String pref_widescreen = "stretch_view";
+    public static final String pref_resolution = "resolution";
     public static final String pref_frameskip = "frame_skip";
     public static final String pref_pvrrender = "pvr_render";
     public static final String pref_syncedrender = "synced_render";
@@ -39,6 +39,7 @@ public class Emulator extends Application {
     public static boolean nosound = false;
     public static boolean mipmaps = true;
     public static boolean widescreen = false;
+    public static boolean crtview = false;
     public static boolean subdivide = false;
     public static int frameskip = 0;
     public static boolean pvrrender = false;
@@ -60,7 +61,8 @@ public void getConfigurationPrefs(SharedPreferences mPrefs) {
         Emulator.limitfps = mPrefs.getBoolean(pref_limitfps, limitfps);
         Emulator.nosound = mPrefs.getBoolean(pref_nosound, nosound);
         Emulator.mipmaps = mPrefs.getBoolean(pref_mipmaps, mipmaps);
-        Emulator.widescreen = mPrefs.getBoolean(pref_widescreen, widescreen);
+        Emulator.widescreen = mPrefs.getInt(pref_resolution, 0) == 2;
+        Emulator.crtview = mPrefs.getInt(pref_resolution, 0) == 1;
         Emulator.frameskip = mPrefs.getInt(pref_frameskip, frameskip);
         Emulator.pvrrender = mPrefs.getBoolean(pref_pvrrender, pvrrender);
         Emulator.syncedrender = mPrefs.getBoolean(pref_syncedrender, syncedrender);
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/config/OptionsFragment.java
@@ -365,15 +365,8 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 		mipmap_opt.setChecked(mPrefs.getBoolean(Emulator.pref_mipmaps, Emulator.mipmaps));
 		mipmap_opt.setOnCheckedChangeListener(mipmaps_option);
 
-		OnCheckedChangeListener full_screen = new OnCheckedChangeListener() {
-
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				mPrefs.edit().putBoolean(Emulator.pref_widescreen, isChecked).apply();
-			}
-		};
-		CompoundButton stretch_view = (CompoundButton) getView().findViewById(R.id.stretch_option);
-		stretch_view.setChecked(mPrefs.getBoolean(Emulator.pref_widescreen, Emulator.widescreen));
-		stretch_view.setOnCheckedChangeListener(full_screen);
+		setSpinner(R.array.resolution, R.id.resolution_spinner,
+				Emulator.pref_resolution, 0, false);
 
 		int frameskip = mPrefs.getInt(Emulator.pref_frameskip, Emulator.frameskip);
 
@@ -695,7 +688,7 @@ private void resetEmuSettings() {
 		mPrefs.edit().remove(Emulator.pref_broadcast).apply();
 		mPrefs.edit().remove(Emulator.pref_limitfps).apply();
 		mPrefs.edit().remove(Emulator.pref_mipmaps).apply();
-		mPrefs.edit().remove(Emulator.pref_widescreen).apply();
+		mPrefs.edit().remove(Emulator.pref_resolution).apply();
 		mPrefs.edit().remove(Emulator.pref_frameskip).apply();
 		mPrefs.edit().remove(Emulator.pref_pvrrender).apply();
 		mPrefs.edit().remove(Emulator.pref_syncedrender).apply();
@@ -715,6 +708,7 @@ private void resetEmuSettings() {
 		Emulator.limitfps = true;
 		Emulator.mipmaps = true;
 		Emulator.widescreen = false;
+		Emulator.crtview = false;
 		Emulator.frameskip = 0;
 		Emulator.pvrrender = false;
 		Emulator.syncedrender = false;
diff --git a/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java b/shell/android-studio/reicast/src/main/java/com/reicast/emulator/emu/GL2JNIView.java
@@ -524,6 +524,8 @@ public void onSurfaceChanged(GL10 gl,int width,int height)
             gl.glViewport(0, 0, width, height);
             if (Emulator.widescreen) {
                 JNIdc.rendinit(width, height);
+            } else if (Emulator.crtview) {
+                JNIdc.rendinit(640, 480);
             } else {
                 JNIdc.rendinit(height * (4 / 3), height);
             }
@@ -638,7 +640,7 @@ void showMessage(final String msg) {
             handler.post(new Runnable() {
                 public void run() {
                     Log.d(context.getPackageName(), msg);
-                    Toast.makeText(context.getApplicationContext(), msg, Toast.LENGTH_SHORT).show();
+                    Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
                 }
             });
         }
diff --git a/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml b/shell/android-studio/reicast/src/main/res/layout-v14/configure_fragment.xml
@@ -307,13 +307,13 @@
                 android:gravity="center_vertical" >
 
                 <TextView
-                    android:id="@+id/stretch_text"
+                    android:id="@+id/resolution_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
                     android:ems="10"
                     android:gravity="center_vertical|left"
-                    android:text="@string/select_stretch" />
+                    android:text="@string/select_resolution" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -322,11 +322,12 @@
                     android:gravity="right"
                     android:orientation="vertical" >
 
-                    <Switch
-                        android:id="@+id/stretch_option"
+                    <Spinner
+                        android:id="@+id/resolution_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="true" />
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:ems="10" />
                 </LinearLayout>
             </TableRow>
 
diff --git a/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml b/shell/android-studio/reicast/src/main/res/layout/configure_fragment.xml
@@ -307,13 +307,13 @@
                 android:gravity="center_vertical" >
 
                 <TextView
-                    android:id="@+id/stretch_text"
+                    android:id="@+id/resolution_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="0.5"
                     android:ems="10"
                     android:gravity="center_vertical|left"
-                    android:text="@string/select_stretch" />
+                    android:text="@string/select_resolution" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -322,11 +322,12 @@
                     android:gravity="right"
                     android:orientation="vertical" >
 
-                    <Checkbox
-                        android:id="@+id/stretch_option"
+                    <Spinner
+                        android:id="@+id/resolution_spinner"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:focusable="true" />
+                        android:layout_height="0dp"
+                        android:layout_weight="1"
+                        android:ems="10" />
                 </LinearLayout>
             </TableRow>
 
diff --git a/shell/android-studio/reicast/src/main/res/menu-v23/activity_main.xml b/shell/android-studio/reicast/src/main/res/menu-v23/activity_main.xml
@@ -34,5 +34,8 @@
         android:id="@+id/about_menu"
         android:icon="@drawable/ic_info_outline"
         android:title="@string/about" />
+    <item
+        android:id="@+id/version_spacer"
+        android:title=""/>
 
 </menu>
diff --git a/shell/android-studio/reicast/src/main/res/menu/activity_main.xml b/shell/android-studio/reicast/src/main/res/menu/activity_main.xml
@@ -25,4 +25,7 @@
     <item android:title="@string/about"
         android:id="@+id/about_menu"
         android:icon="@mipmap/menu_question" />
+    <item
+        android:id="@+id/version_spacer"
+        android:title=""/>
 </menu>
diff --git a/shell/android-studio/reicast/src/main/res/values/colors.xml b/shell/android-studio/reicast/src/main/res/values/colors.xml
@@ -9,8 +9,8 @@
 
     <color name="colorBluePrimary">#226696</color>
     <color name="colorBluePrimaryDark">#164f6e</color>
-    <color name="colorBlueAccent">#e040fb</color>
-    <color name="colorBlueAccentDark">#9c27b0</color>
+    <color name="colorBlueAccent">#ffca28</color>
+    <color name="colorBlueAccentDark">#ffb74d</color>
     <color name="colorBlueText">#e0e0e0</color>
     <color name="colorBlueTint">#072540</color>
 
diff --git a/shell/android-studio/reicast/src/main/res/values/donottranslate.xml b/shell/android-studio/reicast/src/main/res/values/donottranslate.xml
@@ -77,6 +77,12 @@
         <item>Purupuru</item>
     </string-array>
 
+    <string-array name="resolution">
+        <item>Standard</item>
+        <item>CRT (640x480)</item>
+        <item>Widescreen</item>
+    </string-array>
+
     <string-array name="right_stick">
         <item>None</item>
         <item>L / R</item>
diff --git a/shell/android-studio/reicast/src/main/res/values/strings.xml b/shell/android-studio/reicast/src/main/res/values/strings.xml
@@ -45,7 +45,7 @@
     <string name="select_broadcast">Broadcast</string>
     <string name="select_limitfps">Limit FPS</string>
     <string name="select_mipmaps">Use Mipmaps (fixes SGX540)</string>
-    <string name="select_stretch">Widescreen Mode</string>
+    <string name="select_resolution">Resolution Mode</string>
     <string name="set_frameskip">Frameskip Value</string>
     <string name="select_render">PVR Rendering (does nothing for now)</string>
     <string name="select_syncrender">Synchronous Rendering</string>

Original file line number	Diff line number	Diff line change
`@@ -524,6 +524,8 @@ public void onSurfaceChanged(GL10 gl,int width,int height)`
`524`	`524`	`gl.glViewport(0, 0, width, height);`
`525`	`525`	`if (Emulator.widescreen) {`
`526`	`526`	`JNIdc.rendinit(width, height);`
	`527`	`+ } else if (Emulator.crtview) {`
	`528`	`+ JNIdc.rendinit(640, 480);`
`527`	`529`	`} else {`
`528`	`530`	`JNIdc.rendinit(height * (4 / 3), height);`
`529`	`531`	`}`
`@@ -638,7 +640,7 @@ void showMessage(final String msg) {`
`638`	`640`	`handler.post(new Runnable() {`
`639`	`641`	`public void run() {`
`640`	`642`	`Log.d(context.getPackageName(), msg);`
`641`		`- Toast.makeText(context.getApplicationContext(), msg, Toast.LENGTH_SHORT).show();`
	`643`	`+ Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();`
`642`	`644`	`}`
`643`	`645`	`});`
`644`	`646`	`}`