Merge pull request #5862 from pingwang2011/timob-17222

Timob 17222: Android: support the theme property for windows
tidev · Jul 15, 2014 · 35966fb · 35966fb
2 parents b992c1d + 52de443
commit 35966fb
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java b/android/modules/ui/src/java/ti/modules/titanium/ui/WindowProxy.java
@@ -22,10 +22,10 @@
 import org.appcelerator.titanium.TiDimension;
 import org.appcelerator.titanium.TiTranslucentActivity;
 import org.appcelerator.titanium.proxy.ActivityProxy;
-import org.appcelerator.titanium.proxy.DecorViewProxy;
 import org.appcelerator.titanium.proxy.TiViewProxy;
 import org.appcelerator.titanium.proxy.TiWindowProxy;
 import org.appcelerator.titanium.util.TiConvert;
+import org.appcelerator.titanium.util.TiRHelper;
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.widget.TiView;
@@ -310,6 +310,19 @@ private void fillIntent(Activity activity, Intent intent)
 		if (hasProperty(TiC.PROPERTY_WINDOW_PIXEL_FORMAT)) {
 			intent.putExtra(TiC.PROPERTY_WINDOW_PIXEL_FORMAT, TiConvert.toInt(getProperty(TiC.PROPERTY_WINDOW_PIXEL_FORMAT), PixelFormat.UNKNOWN));
 		}
+
+		// Set the theme property
+		if (hasProperty(TiC.PROPERTY_THEME)) {
+			String theme = TiConvert.toString(getProperty(TiC.PROPERTY_THEME));
+			if (theme != null) {
+				try {
+					intent.putExtra(TiC.PROPERTY_THEME,
+						TiRHelper.getResource("style." + theme.replaceAll("[^A-Za-z0-9_]", "_")));
+				} catch (Exception e) {
+					Log.w(TAG, "Cannot find the theme: " + theme);
+				}
+			}
+		}
 	}
 
 	@Override

diff --git a/android/templates/build/theme.xml b/android/templates/build/theme.xml
@@ -4,12 +4,17 @@
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowFullscreen">true</item>
 		<item name="android:windowContentOverlay">@null</item>
+		<item name="android:windowActionBar">false</item>
+		<!-- AppCompat Compatibility -->
+		<item name="windowActionBar">false</item>
 	</style>
 
 	<style name="Theme.Titanium" parent="@style/<%- flags %>">
 		<item name="android:windowBackground">@drawable/background</item>
 		<item name="android:windowActionBar">false</item>		
 		<item name="android:windowNoTitle">true</item>
+		<!-- AppCompat Compatibility -->
+		<item name="windowActionBar">false</item>
 	</style>
 
 	<style name="Theme.AppCompat.Translucent">
@@ -24,6 +29,9 @@
 	<style name="Theme.AppCompat.Translucent.NoTitleBar">
 		<item name="android:windowNoTitle">true</item>
 		<item name="android:windowContentOverlay">@null</item>
+		<item name="android:windowActionBar">false</item>
+		<!-- AppCompat Compatibility -->
+		<item name="windowActionBar">false</item>
 	</style>
 
 	<style name="Theme.AppCompat.Translucent.NoTitleBar.Fullscreen">

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java b/android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
@@ -231,7 +231,6 @@ public TiWindowProxy getWindowProxy()
 	public void setWindowProxy(TiWindowProxy proxy)
 	{
 		this.window = proxy;
-		updateTitle();
 	}
 
 	/**
@@ -508,6 +507,13 @@ protected void onCreate(Bundle savedInstanceState)
 			layout.setKeepScreenOn(intent.getBooleanExtra(TiC.PROPERTY_KEEP_SCREEN_ON, layout.getKeepScreenOn()));
 		}
 
+		// Set the theme of the activity before calling super.onCreate().
+		// On 2.3 devices, it does not work if the theme is set after super.onCreate.
+		int theme = getIntentInt(TiC.PROPERTY_THEME, -1);
+		if (theme != -1) {
+			this.setTheme(theme);
+		}
+
 		super.onCreate(savedInstanceState);
 
 		// we only want to set the current activity for good in the resume state but we need it right now.
@@ -527,6 +533,10 @@ protected void onCreate(Bundle savedInstanceState)
 
 		setContentView(layout);
 
+		// Set the title of the activity after setContentView.
+		// On 2.3 devices, if the title is set before setContentView, the app will crash when a NoTitleBar theme is used.
+		updateTitle();
+
 		sendMessage(msgActivityCreatedId);
 		// for backwards compatibility
 		sendMessage(msgId);

diff --git a/android/titanium/src/java/org/appcelerator/titanium/TiC.java b/android/titanium/src/java/org/appcelerator/titanium/TiC.java
@@ -2204,6 +2204,11 @@ public class TiC
 	 */
 	public static final String PROPERTY_TEXTID = "textid";
 
+	/**
+	 * @module.api
+	 */
+	public static final String PROPERTY_THEME = "theme";
+
 	/**
 	 * @module.api
 	 */

diff --git a/apidoc/Titanium/UI/Window.yml b/apidoc/Titanium/UI/Window.yml
@@ -703,6 +703,16 @@ properties:
     platforms: [iphone,ipad]
     type: Boolean
 
+  - name: theme
+    summary: Name of the theme to apply to the window.
+    description: |
+        Set the theme of the window. It can be either a [built-in theme](http://docs.appcelerator.com/titanium/3.0/#!/guide/Android_Themes-section-34636181_AndroidThemes-Built-inThemes)
+        or a [custom theme](http://docs.appcelerator.com/titanium/3.0/#!/guide/Android_Themes-section-34636181_AndroidThemes-CustomThemes).
+    platforms: [android]
+    type: String
+    since: "3.4.0"
+    availability: creation
+
   - name: title
     summary: Title of the window.
     description: |