From f33a6c102ff8fd2eb0ba63a2a8503ae634d1cd7a Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Thu, 11 Aug 2016 19:52:30 +1000
Subject: [PATCH] [Android] Update UI style

---
 Android/AndroidManifest.xml                   |  6 +-
 Android/res/layout/about_licence.xml          |  1 -
 Android/res/values-v11/styles.xml             |  5 +-
 Android/res/values/styles.xml                 | 62 ++++++++++++-------
 Android/res/xml/settings.xml                  |  2 -
 .../src/emu/project64/game/GameOverlay.java   |  2 +-
 Source/Android/Bridge/SyncBridge.cpp          | 36 +++++++++++
 Source/Android/Bridge/SyncBridge.h            | 26 ++++++++
 8 files changed, 107 insertions(+), 33 deletions(-)
 create mode 100644 Source/Android/Bridge/SyncBridge.cpp
 create mode 100644 Source/Android/Bridge/SyncBridge.h

diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml
index de695cb3d..81f0df3c8 100644
--- a/Android/AndroidManifest.xml
+++ b/Android/AndroidManifest.xml
@@ -17,7 +17,7 @@
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/appTheme" >
+        android:theme="@style/Theme.Project64" >
         <activity
             android:name="emu.project64.SplashActivity"
             android:label="@string/SplashActivity_title"
@@ -53,13 +53,13 @@
             android:name="emu.project64.game.GameActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/GameActivity_title"
-            android:theme="@style/appTheme.Black" >
+            android:theme="@style/Theme.Project64.GameActivity" >
         </activity>
         <activity
             android:name="emu.project64.game.GameActivityXperiaPlay"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/GameActivity_title"
-            android:theme="@style/appTheme.Black" >
+            android:theme="@style/Theme.Project64.GameActivity" >
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="xperia-touchpad" />
diff --git a/Android/res/layout/about_licence.xml b/Android/res/layout/about_licence.xml
index a718e1eff..7406d34ab 100644
--- a/Android/res/layout/about_licence.xml
+++ b/Android/res/layout/about_licence.xml
@@ -4,5 +4,4 @@
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
 </merge>
\ No newline at end of file
diff --git a/Android/res/values-v11/styles.xml b/Android/res/values-v11/styles.xml
index b2798e5a2..d4ce6ff3f 100644
--- a/Android/res/values-v11/styles.xml
+++ b/Android/res/values-v11/styles.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="appTheme" parent="@android:style/Theme.Holo" />
-
-
+    <style name="Theme.Project64" parent="@android:style/Theme.Holo" />
 </resources>
diff --git a/Android/res/values/styles.xml b/Android/res/values/styles.xml
index e0da1ebfd..222d485c0 100644
--- a/Android/res/values/styles.xml
+++ b/Android/res/values/styles.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="appTheme" parent="@android:style/Theme" />
-
-    <style name="appTheme.Black">
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:colorBackground">@android:color/black</item>
+    <style name="Theme.Project64" parent="@android:style/Theme">
+        <item name="android:alertDialogTheme">@style/Theme.Project64.Dialog</item>
     </style>
 
-    <style name="Theme.AppCompat.Black">
+    <style name="Theme.Project64.Apearance" parent="Theme.AppCompat.NoActionBar">
+        <item name="background_actionbar">#4683ec</item>
+        <item name="background_gallerymenu">@color/black</item>
+        <item name="android:textColor">@color/black</item>
+        <item name="font_actionbar">@color/grey600</item>
+        <item name="font_actionbar_selected">@color/grey200</item>
+        <item name="textMenuColor">@color/white</item>
+        <item name="preferenceTheme">@style/Theme.Project64.Preference</item>
+        <item name="android:alertDialogTheme">@style/Theme.Project64.Dialog</item>
+    </style>
+
+    <style name="Theme.Project64.GameActivity">
         <item name="android:windowBackground">@android:color/black</item>
         <item name="android:colorBackground">@android:color/black</item>
     </style>
@@ -19,22 +27,32 @@
         <item name="android:textColor">#000000</item>
     </style>
 
-    <style name="Theme.Project64.Preference" parent="PreferenceThemeOverlay">
-    </style>
-    
-    <style name="Theme.Project64.Apearance" parent="Theme.AppCompat.NoActionBar">
-        <item name="background_actionbar">#4683ec</item>
-        <item name="background_gallerymenu">#000000</item>
-        <item name="android:textColor">#000000</item>
-        <item name="font_actionbar">@color/grey600</item>
-        <item name="font_actionbar_selected">@color/grey200</item>
-        <item name="textMenuColor">#FFFFFF</item>      
-        <item name="preferenceTheme">@style/Theme.Project64.Preference</item>       
-    </style>
-    
+    <style name="Theme.Project64.Preference" parent="PreferenceThemeOverlay" />
+
     <style name="Theme.Project64.About" parent="Theme.Project64.Apearance">
-      <item name="android:windowBackground">@android:color/white</item>
-      <item name="android:colorBackground">@android:color/white</item>
-    </style>       
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:colorBackground">@android:color/white</item>
+    </style>
+    <style name="Theme.Project64.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowTitleStyle">@style/Theme.Project64.DialogWindowTitle</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
+        <item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
+    </style>
+
+    <style name="Theme.Project64.DialogWindowTitle">
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textAppearance">@style/Theme.Project64.DialogWindowTitleStyle</item>
+    </style>
+    
+    <style name="Theme.Project64.DialogWindowTitleStyle">
+        <item name="android:textSize">25sp</item>
+    </style>
+    
     <style name="Project64.Toolbar" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 </resources>
diff --git a/Android/res/xml/settings.xml b/Android/res/xml/settings.xml
index d19cb9318..5dde352c9 100644
--- a/Android/res/xml/settings.xml
+++ b/Android/res/xml/settings.xml
@@ -7,6 +7,4 @@
         android:key="audio_Enabled"
         android:summary="@string/audioEnabled_summary"
         android:title="@string/audioEnabled_title" />
-
-
 </PreferenceScreen>
diff --git a/Android/src/emu/project64/game/GameOverlay.java b/Android/src/emu/project64/game/GameOverlay.java
index e9455fed8..ee9d81c75 100644
--- a/Android/src/emu/project64/game/GameOverlay.java
+++ b/Android/src/emu/project64/game/GameOverlay.java
@@ -94,6 +94,6 @@ public class GameOverlay extends View implements TouchController.OnStateChangedL
             
             // Redraw the autoHold mask
             mTouchMap.drawAutoHold( canvas );
-        }        
+        }
     }
 }
diff --git a/Source/Android/Bridge/SyncBridge.cpp b/Source/Android/Bridge/SyncBridge.cpp
new file mode 100644
index 000000000..2af94d040
--- /dev/null
+++ b/Source/Android/Bridge/SyncBridge.cpp
@@ -0,0 +1,36 @@
+/****************************************************************************
+*                                                                           *
+* Project 64 - 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                        *
+*                                                                           *
+****************************************************************************/
+#include "SyncBridge.h"
+
+#ifdef ANDROID
+SyncBridge::SyncBridge(JavaBridge * javaBridge) :
+    m_JavaBridge(javaBridge)
+{
+}
+
+void SyncBridge::GfxThreadInit()
+{
+}
+
+void SyncBridge::GfxThreadDone()
+{
+}
+
+void SyncBridge::SwapWindow()
+{
+    if (m_JavaBridge)
+    {
+        m_JavaBridge->SwapWindow();
+    }
+}
+
+
+#endif
\ No newline at end of file
diff --git a/Source/Android/Bridge/SyncBridge.h b/Source/Android/Bridge/SyncBridge.h
new file mode 100644
index 000000000..711c5fc98
--- /dev/null
+++ b/Source/Android/Bridge/SyncBridge.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#ifdef ANDROID
+
+#include "JavaBridge.h"
+
+class SyncBridge : 
+	public RenderWindow
+{
+public:
+	SyncBridge (JavaBridge * javaBridge);
+
+    //Render window functions
+	void GfxThreadInit();
+    void GfxThreadDone();
+    void SwapWindow();
+
+private:
+	SyncBridge(void);		                    // Disable default constructor
+	SyncBridge(const SyncBridge&);				// Disable copy constructor
+    SyncBridge& operator=(const SyncBridge&);	// Disable assignment
+
+	JavaBridge * m_JavaBridge;
+};
+
+#endif
\ No newline at end of file