Merge pull request #320 from SeannyM/Android-Theme

Make the Android UI more like the desktop UI
dolphin-emu · May 1, 2014 · 7f00cae · 7f00cae
2 parents c4221e8 + 5865ae2
commit 7f00cae
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 4 deletions.
diff --git a/Source/Android/AndroidManifest.xml b/Source/Android/AndroidManifest.xml
@@ -33,8 +33,13 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="org.dolphinemu.dolphinemu.about.AboutActivity"/>
-        <activity android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"/>
+        <activity
+            android:name="org.dolphinemu.dolphinemu.about.AboutActivity"
+            android:theme="@android:style/Theme.Holo.Light" />
+
+        <activity
+            android:name="org.dolphinemu.dolphinemu.gamelist.GameListActivity"
+            android:theme="@android:style/Theme.Holo.Light" />
 
         <activity
             android:name="org.dolphinemu.dolphinemu.emulation.EmulationActivity"
@@ -47,7 +52,8 @@
 
         <activity
             android:name="org.dolphinemu.dolphinemu.settings.PrefsActivity"
-            android:label="@string/settings" />
+            android:label="@string/settings"
+            android:theme="@android:style/Theme.Holo.Light" />
 
     </application>
 

diff --git a/Source/Android/res/drawable-hdpi/ic_menu_file.png b/Source/Android/res/drawable-hdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-hdpi/ic_menu_folder.png b/Source/Android/res/drawable-hdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_file.png b/Source/Android/res/drawable-mdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-mdpi/ic_menu_folder.png b/Source/Android/res/drawable-mdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_file.png b/Source/Android/res/drawable-xhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_menu_file.png b/Source/Android/res/drawable-xxhdpi/ic_menu_file.png
diff --git a/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png b/Source/Android/res/drawable-xxhdpi/ic_menu_folder.png
diff --git a/Source/Android/res/layout/sidemenu.xml b/Source/Android/res/layout/sidemenu.xml
@@ -14,6 +14,7 @@
         android:singleLine="true"
         android:text="@+id/TextView01"
         android:textAppearance="?android:attr/textAppearanceLarge" 
-        android:textStyle="bold" />
+        android:textStyle="bold"
+        android:textColor="#FFFFFF" />
 
 </LinearLayout>
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListAdapter.java
@@ -70,6 +70,10 @@ public View getView(int position, View convertView, ViewGroup parent)
 			}
 		}
 
+		// Make every other game in the list grey
+		if (position % 2 == 1)
+			convertView.setBackgroundColor(0xFFE3E3E3);
+
 		return convertView;
 	}
 }