From 21d43d7f97107a8d214c6c9fc914af2ac6738afc Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Mon, 16 Apr 2012 11:21:10 -0400
Subject: [PATCH] Added dynamic themes for slecting holo were avaiable

fixed the button bars in the map fragment, and parking timer to use
android's button bar styles

Change-Id: I63e1d2a07f6d13964616f23cc3772dd99437bbee
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 FindMyCarFull/AndroidManifest.xml             |  12 +-
 FindMyCarLib/res/layout/map_buttons.xml       | 113 ++++++------------
 .../res/layout/parkingtimer_layout.xml        |  19 ++-
 FindMyCarLib/res/values-v11/theme.xml         |  10 ++
 FindMyCarLib/res/values/theme.xml             |   8 +-
 FindMyCarLite/AndroidManifest.xml             |  12 +-
 6 files changed, 70 insertions(+), 104 deletions(-)
 create mode 100644 FindMyCarLib/res/values-v11/theme.xml

diff --git a/FindMyCarFull/AndroidManifest.xml b/FindMyCarFull/AndroidManifest.xml
index a93fb3e..23ddf43 100644
--- a/FindMyCarFull/AndroidManifest.xml
+++ b/FindMyCarFull/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:installLocation="auto"
     package="com.TwentyCodes.android.FindMyCarFull"
+    android:installLocation="auto"
     android:versionCode="200"
     android:versionName="4.0" >
 
@@ -27,14 +27,14 @@
 
     <application
         android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@style/MyTheme" >
         <uses-library android:name="com.google.android.maps" />
 
         <activity
             android:name="Main"
             android:configChanges="keyboard|keyboardHidden|orientation"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.Light.NoTitleBar"
             android:uiOptions="splitActionBarWhenNarrow" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -54,9 +54,7 @@
             android:name="com.TwentyCodes.android.FindMyCarLib.ParkingTimerService"
             android:process=":parkingtimer" />
 
-        <activity
-            android:name="com.TwentyCodes.android.FindMyCarLib.Settings"
-            android:theme="@android:style/Theme.Light" />
+        <activity android:name="com.TwentyCodes.android.FindMyCarLib.Settings" />
         <activity
             android:name="com.TwentyCodes.android.exception.ExceptionReportActivity"
             android:configChanges="keyboard|keyboardHidden|orientation" />
@@ -65,7 +63,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
         <activity
             android:name="com.TwentyCodes.android.FindMyCarLib.ParkignTimerActivity"
-            android:theme="@android:style/Theme.Dialog" />
+            android:theme="@style/MyDialogTheme" />
 
         <service android:name="com.TwentyCodes.android.exception.ReportPostingService" />
     </application>
diff --git a/FindMyCarLib/res/layout/map_buttons.xml b/FindMyCarLib/res/layout/map_buttons.xml
index 8314db9..4190cd1 100644
--- a/FindMyCarLib/res/layout/map_buttons.xml
+++ b/FindMyCarLib/res/layout/map_buttons.xml
@@ -1,94 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="?android:attr/buttonBarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/distance_background"
-    android:baselineAligned="false"
     android:orientation="horizontal" >
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <ImageButton
+        android:id="@+id/my_location"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="10dip"
-        android:paddingTop="10dip" >
+        android:contentDescription="@string/my_location"
+        android:src="@drawable/my_location_action_bar" />
 
-        <com.TwentyCodes.android.FindMyCarLib.UI.DelegatedImageButton
-            android:id="@+id/my_location"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/my_location_action_bar"
-            android:contentDescription="@string/my_location"
-            android:duplicateParentState="true" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <ImageButton
+        android:id="@+id/mark_my_location"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="10dip"
-        android:paddingTop="10dip" >
+        android:contentDescription="@string/mark_car"
+        android:src="@drawable/mark_my_location_action_bar" />
 
-        <com.TwentyCodes.android.FindMyCarLib.UI.DelegatedImageButton
-            android:id="@+id/mark_my_location"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/mark_my_location_action_bar"
-            android:contentDescription="@string/mark_car"
-            android:duplicateParentState="true" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <ImageButton
+        android:id="@+id/show_both"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_weight="1"
-        android:paddingBottom="10dip"
-        android:paddingTop="10dip" >
+        android:contentDescription="@string/show_both"
+        android:src="@drawable/car_action_bar" />
 
-        <com.TwentyCodes.android.FindMyCarLib.UI.DelegatedImageButton
-            android:id="@+id/show_both"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_gravity="center"
-            android:background="@drawable/car_action_bar"
-            android:duplicateParentState="true" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <ImageButton
+        android:id="@+id/parking_timer"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="10dip"
-        android:paddingTop="10dip" >
+        android:contentDescription="@string/parking_timer"
+        android:src="@drawable/time_action_bar" />
 
-        <com.TwentyCodes.android.FindMyCarLib.UI.DelegatedImageButton
-            android:id="@+id/parking_timer"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/time_action_bar"
-            android:contentDescription="@string/parking_timer"
-            android:duplicateParentState="true" />
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+    <ImageButton
+        android:id="@+id/directions"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:paddingBottom="10dip"
-        android:paddingTop="10dip" >
-
-        <com.TwentyCodes.android.FindMyCarLib.UI.DelegatedImageButton
-            android:id="@+id/directions"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/nav_action_bar"
-            android:contentDescription="@string/directions"
-            android:duplicateParentState="true" />
-    </RelativeLayout>
+        android:contentDescription="@string/directions"
+        android:src="@drawable/nav_action_bar" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/FindMyCarLib/res/layout/parkingtimer_layout.xml b/FindMyCarLib/res/layout/parkingtimer_layout.xml
index 4e5a660..3c5d792 100644
--- a/FindMyCarLib/res/layout/parkingtimer_layout.xml
+++ b/FindMyCarLib/res/layout/parkingtimer_layout.xml
@@ -15,7 +15,7 @@
         android:orientation="horizontal"
         android:stretchColumns="0,2" >
 
-        <TableRow >
+        <TableRow>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -102,31 +102,28 @@
 
     <LinearLayout
         android:id="@+id/llButtons"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@id/notiyfyme"
-        android:layout_marginTop="10dip"
         android:background="@drawable/distance_background"
-        android:gravity="center"
         android:orientation="horizontal" >
 
         <Button
             android:id="@+id/btSetTimer"
-            android:layout_width="130dip"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_horizontal|center_vertical"
-            android:text="@string/setTimer"
-            android:textSize="14dip" />
+            android:text="@string/setTimer" />
 
         <Button
             android:id="@+id/btRemoveTimer"
-            android:layout_width="130dip"
+            style="?android:attr/buttonBarButtonStyle"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:gravity="center_horizontal|center_vertical"
-            android:text="@string/removeTimer"
-            android:textSize="14dip" />
+            android:text="@string/removeTimer" />
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/FindMyCarLib/res/values-v11/theme.xml b/FindMyCarLib/res/values-v11/theme.xml
new file mode 100644
index 0000000..0fc6677
--- /dev/null
+++ b/FindMyCarLib/res/values-v11/theme.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Any customizations for your app running on devices with Theme.Holo here -->
+
+    <style name="MyTheme" parent="@android:style/Theme.Holo.Light.NoActionBar"></style>
+
+    <style name="MyDialogTheme" parent="@android:style/Theme.Holo.Dialog"></style>
+
+</resources>
\ No newline at end of file
diff --git a/FindMyCarLib/res/values/theme.xml b/FindMyCarLib/res/values/theme.xml
index a714770..f05b72b 100644
--- a/FindMyCarLib/res/values/theme.xml
+++ b/FindMyCarLib/res/values/theme.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="MyTheme" parent="@android:style/Theme">
-        <!-- Any customizations for your app running on pre-3.0 devices here -->
-    </style>
+    <!-- Any customizations for your app running on pre-3.0 devices here -->
+
+    <style name="MyTheme" parent="@android:style/Theme.Light.NoTitleBar"></style>
+
+    <style name="MyDialogTheme" parent="@android:style/Theme.Dialog"></style>
 
 </resources>
\ No newline at end of file
diff --git a/FindMyCarLite/AndroidManifest.xml b/FindMyCarLite/AndroidManifest.xml
index ed214d2..0f4cbec 100644
--- a/FindMyCarLite/AndroidManifest.xml
+++ b/FindMyCarLite/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:installLocation="auto"
     package="com.TwentyCodes.android.FindMyCarLite"
+    android:installLocation="auto"
     android:versionCode="200"
     android:versionName="4.0" >
 
@@ -27,14 +27,14 @@
 
     <application
         android:icon="@drawable/icon"
-        android:label="@string/app_name" >
+        android:label="@string/app_name"
+        android:theme="@style/MyTheme" >
         <uses-library android:name="com.google.android.maps" />
 
         <activity
             android:name="FindMyCar"
             android:configChanges="keyboard|keyboardHidden|orientation"
             android:label="@string/app_name_lite"
-            android:theme="@android:style/Theme.Light.NoTitleBar"
             android:uiOptions="splitActionBarWhenNarrow" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -54,9 +54,7 @@
             android:name="com.TwentyCodes.android.FindMyCarLib.ParkingTimerService"
             android:process=":parkingtimer" />
 
-        <activity
-            android:name="com.TwentyCodes.android.FindMyCarLib.Settings"
-            android:theme="@android:style/Theme.Light" />
+        <activity android:name="com.TwentyCodes.android.FindMyCarLib.Settings" />
         <activity
             android:name="com.TwentyCodes.android.exception.ExceptionReportActivity"
             android:configChanges="keyboard|keyboardHidden|orientation" />
@@ -65,7 +63,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize" />
         <activity
             android:name="com.TwentyCodes.android.FindMyCarLib.ParkignTimerActivity"
-            android:theme="@android:style/Theme.Dialog" />
+            android:theme="@style/MyDialogTheme" />
 
         <service android:name="com.TwentyCodes.android.exception.ReportPostingService" />
     </application>