flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [17/44] git commit: [flex-sdk] [refs/heads/develop] - iOS7+ specific ButtonBar skin for all supported DPIs
Date Mon, 24 Nov 2014 21:13:07 GMT
iOS7+ specific ButtonBar skin for all supported DPIs


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e6f03954
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e6f03954
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e6f03954

Branch: refs/heads/develop
Commit: e6f039540c7ef80693ef03eadf92823199fa7a64
Parents: 89e7d8c
Author: OmPrakash Muppirala <bigosmallm@gmail.com>
Authored: Fri Oct 3 18:23:13 2014 -0700
Committer: OmPrakash Muppirala <bigosmallm@gmail.com>
Committed: Fri Oct 3 18:23:13 2014 -0700

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 frameworks/projects/mobiletheme/defaults.css    |   1 +
 .../skins/ios7/ButtonBarFirstButtonSkin.as      |  47 +-----
 .../spark/skins/ios7/ButtonBarLastButtonSkin.as |  56 +++++++
 .../skins/ios7/ButtonBarMiddleButtonSkin.as     |  46 +-----
 .../src/spark/skins/ios7/ButtonBarSkin.as       |   8 +-
 .../skins/ios7/IOS7ButtonBarButtonSkinBase.as   | 161 +++++++++++++++++++
 .../ios7/assets/ButtonBarFirstButton_down.fxg   |  13 +-
 .../ios7/assets/ButtonBarFirstButton_up.fxg     |   6 +-
 .../ios7/assets/ButtonBarLastButton_down.fxg    |  35 ++++
 .../ios7/assets/ButtonBarLastButton_up.fxg      |  30 ++++
 .../ios7/assets/ButtonBarMiddleButton_down.fxg  |  48 +-----
 .../ios7/assets/ButtonBarMiddleButton_up.fxg    |  43 +----
 13 files changed, 311 insertions(+), 184 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index bdec6d1..58381a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -138,3 +138,4 @@ samples/descriptor-sample.xml
 include/FlashRuntimeExtensions.h
 
 /frameworks/projects/mobiletheme/src/spark/skins/ios7/visualcomps/*.ai
+visualcomps

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index 8e93db5..f552889 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -944,6 +944,7 @@ global
 		fontWeight: "normal";
 		fontSize: 24;
 		color: #007AFF;
+		highlightTextColor: #FFFFFF;
 		textShadowColor: #FFFFFF;
 		textShadowAlpha: 0;
 	}

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarFirstButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarFirstButtonSkin.as
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarFirstButtonSkin.as
index b1d0e28..ab4a73a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarFirstButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarFirstButtonSkin.as
@@ -19,12 +19,10 @@
 
 package spark.skins.ios7
 {
-	import spark.skins.ios7.assets.ButtonBarFirstButton_selectedDown;
-	import spark.skins.ios7.assets.ButtonBarFirstButton_selectedUp;
-	import spark.skins.mobile.supportClasses.ButtonBarButtonSkinBase;
+	import spark.skins.ios7.assets.ButtonBarFirstButton_up;
 	
 	/**
-	 *  Android 4.x specific Button skin for the first Button in a ButtonBar.
+	 *  iOS7+ specific Button skin for the first Button in a ButtonBar.
 	 * 
 	 *  @see spark.components.ButtonBar#firstButton
 	 * 
@@ -33,19 +31,8 @@ package spark.skins.ios7
 	 *  @playerversion AIR 2.5 
 	 *  @productversion Flex 4.5
 	 */
-	public class ButtonBarFirstButtonSkin extends ButtonBarButtonSkinBase
+	public class ButtonBarFirstButtonSkin extends IOS7ButtonBarButtonSkinBase
 	{
-		
-		/**
-		 *  Class to use for the border in the selected and down state.
-		 * 
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10
-		 *  @playerversion AIR 2.5 
-		 *  @productversion Flex 4.5
-		 */  
-		protected var selectedDownBorderSkin:Class;
-		
 		/**
 		 *  Constructor.
 		 * 
@@ -60,34 +47,10 @@ package spark.skins.ios7
 			
 			upBorderSkin = spark.skins.ios7.assets.ButtonBarFirstButton_up;
 			downBorderSkin = spark.skins.ios7.assets.ButtonBarFirstButton_down;
-			selectedBorderSkin = spark.skins.ios7.assets.ButtonBarFirstButton_selectedUp;
-			selectedDownBorderSkin = spark.skins.ios7.assets.ButtonBarFirstButton_selectedDown;
+			selectedBorderSkin = spark.skins.ios7.assets.ButtonBarFirstButton_down;
+			selectedDownBorderSkin = spark.skins.ios7.assets.ButtonBarFirstButton_up;
 		}
 		
-		//--------------------------------------------------------------------------
-		//
-		//  Overridden methods
-		//
-		//--------------------------------------------------------------------------
-		
-		override protected function drawBackground(unscaledWidth:Number, unscaledHeight:Number):void
-		{
-			//Dont draw background
-		}
 		
-		override protected function getBorderClassForCurrentState():Class
-		{
-			var isSelected:Boolean = currentState.indexOf("Selected") >= 0;
-			var isDown:Boolean = currentState.indexOf("down") >= 0;
-			
-			if (isSelected && !isDown )
-				return selectedBorderSkin;
-			else if (isSelected && isDown)
-				return selectedDownBorderSkin;
-			else if (!isSelected && !isDown)
-				return upBorderSkin;
-			else 
-				return downBorderSkin;
-		}
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarLastButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarLastButtonSkin.as
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarLastButtonSkin.as
new file mode 100644
index 0000000..8abe433
--- /dev/null
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarLastButtonSkin.as
@@ -0,0 +1,56 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.skins.ios7
+{
+	import spark.skins.ios7.assets.ButtonBarLastButton_up;
+	
+	/**
+	 *  iOS7+ specific Button skin for the last Button in a ButtonBar.
+	 * 
+	 *  @see spark.components.ButtonBar#lastButton
+	 * 
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10
+	 *  @playerversion AIR 2.5 
+	 *  @productversion Flex 4.5
+	 */
+	public class ButtonBarLastButtonSkin extends IOS7ButtonBarButtonSkinBase
+	{
+		
+		/**
+		 *  Constructor.
+		 * 
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10
+		 *  @playerversion AIR 2.5 
+		 *  @productversion Flex 4.5
+		 */
+		public function ButtonBarLastButtonSkin()
+		{
+			super();
+			
+			upBorderSkin = spark.skins.ios7.assets.ButtonBarLastButton_up
+			downBorderSkin = spark.skins.ios7.assets.ButtonBarLastButton_down;
+			selectedBorderSkin = spark.skins.ios7.assets.ButtonBarLastButton_down;
+			selectedDownBorderSkin = spark.skins.ios7.assets.ButtonBarLastButton_up;
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarMiddleButtonSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarMiddleButtonSkin.as
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarMiddleButtonSkin.as
index b4740cd..9f69ab8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarMiddleButtonSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarMiddleButtonSkin.as
@@ -20,10 +20,7 @@
 package spark.skins.ios7
 {
 	
-	import spark.skins.ios7.assets.ButtonBarMiddleButton_selectedDown;
-	import spark.skins.ios7.assets.ButtonBarMiddleButton_selectedUp;
 	import spark.skins.ios7.assets.ButtonBarMiddleButton_up;
-	import spark.skins.mobile.supportClasses.ButtonBarButtonSkinBase;
 	
 	/**
 	 *  Android 4.x specific Button skin for middle Buttons in a ButtonBar.
@@ -35,20 +32,10 @@ package spark.skins.ios7
 	 *  @playerversion AIR 2.5 
 	 *  @productversion Flex 4.5
 	 */
-	public class ButtonBarMiddleButtonSkin extends ButtonBarButtonSkinBase
+	public class ButtonBarMiddleButtonSkin extends IOS7ButtonBarButtonSkinBase
 	{
 		
 		/**
-		 *  Class to use for the border in the selected and down state.
-		 * 
-		 *  @langversion 3.0
-		 *  @playerversion Flash 10
-		 *  @playerversion AIR 2.5 
-		 *  @productversion Flex 4.5
-		 */  
-		protected var selectedDownBorderSkin:Class;
-		
-		/**
 		 *  Constructor.
 		 * 
 		 *  @langversion 3.0
@@ -60,36 +47,11 @@ package spark.skins.ios7
 		{
 			super();
 			
-			upBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_up;
+			upBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_up
 			downBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_down;
-			selectedBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_selectedUp;
-			selectedDownBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_selectedDown;
+			selectedBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_down;
+			selectedDownBorderSkin = spark.skins.ios7.assets.ButtonBarMiddleButton_up;
 		}
 		
-		//--------------------------------------------------------------------------
-		//
-		//  Overridden methods
-		//
-		//--------------------------------------------------------------------------
-		
-		override protected function drawBackground(unscaledWidth:Number, unscaledHeight:Number):void
-		{
-			//Dont draw background
-		}
-		
-		override protected function getBorderClassForCurrentState():Class
-		{
-			var isSelected:Boolean = currentState.indexOf("Selected") >= 0;
-			var isDown:Boolean = currentState.indexOf("down") >= 0;
-			
-			if (isSelected && !isDown )
-				return selectedBorderSkin;
-			else if (isSelected && isDown)
-				return selectedDownBorderSkin;
-			else if (!isSelected && !isDown)
-				return upBorderSkin;
-			else 
-				return downBorderSkin;
-		}
 	}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
index cd120f5..9bc88a2 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/ButtonBarSkin.as
@@ -23,13 +23,11 @@ import spark.components.ButtonBar;
 import spark.components.ButtonBarButton;
 import spark.components.DataGroup;
 import spark.components.supportClasses.ButtonBarHorizontalLayout;
-import spark.skins.ios7.ButtonBarFirstButtonSkin;
-import spark.skins.mobile.ButtonBarLastButtonSkin;
 import spark.skins.mobile.supportClasses.ButtonBarButtonClassFactory;
 import spark.skins.mobile.supportClasses.MobileSkin;
 
 /**
- *  The Android 4.x specific skin class for the Spark ButtonBar component.
+ *  iOS7+ specific skin class for the Spark ButtonBar component.
  *
  *  @see spark.components.ButtonBar
  *
@@ -112,7 +110,7 @@ public class ButtonBarSkin extends MobileSkin
         if (!lastButton)
         {
             lastButton = new ButtonBarButtonClassFactory(ButtonBarButton);
-            lastButton.skinClass = spark.skins.ios7.ButtonBarFirstButtonSkin;
+            lastButton.skinClass = spark.skins.ios7.ButtonBarLastButtonSkin;
         }
         
         if (!middleButton)
@@ -126,7 +124,7 @@ public class ButtonBarSkin extends MobileSkin
         {
             dataGroup = new DataGroup();
             var hLayout:ButtonBarHorizontalLayout = new ButtonBarHorizontalLayout();
-            hLayout.gap = 0;
+            hLayout.gap = -1;
             dataGroup.layout = hLayout;
             addChild(dataGroup);
         }

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/IOS7ButtonBarButtonSkinBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/IOS7ButtonBarButtonSkinBase.as
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/IOS7ButtonBarButtonSkinBase.as
new file mode 100644
index 0000000..9ef5d38
--- /dev/null
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/IOS7ButtonBarButtonSkinBase.as
@@ -0,0 +1,161 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package spark.skins.ios7
+{
+	import mx.core.DPIClassification;
+	
+	import spark.skins.ios7.assets.ButtonBarMiddleButton_down;
+	import spark.skins.ios7.assets.ButtonBarMiddleButton_up;
+	import spark.skins.mobile.supportClasses.ButtonBarButtonSkinBase;
+	
+	/**
+	 *  iOS7+ specific Button skin base for the Buttons in a ButtonBar.
+	 * 
+	 * 
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10
+	 *  @playerversion AIR 2.5 
+	 *  @productversion Flex 4.5
+	 */
+	public class IOS7ButtonBarButtonSkinBase extends ButtonBarButtonSkinBase
+	{
+		
+		/**
+		 *  Class to use for the border in the selected and down state.
+		 * 
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10
+		 *  @playerversion AIR 2.5 
+		 *  @productversion Flex 4.5
+		 */  
+		protected var selectedDownBorderSkin:Class;
+		
+		/**
+		 *  Constructor.
+		 * 
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10
+		 *  @playerversion AIR 2.5 
+		 *  @productversion Flex 4.5
+		 */
+		public function IOS7ButtonBarButtonSkinBase()
+		{
+			super();
+			
+			// set the dimensions to use based on the screen density
+			switch (applicationDPI)
+			{
+				case DPIClassification.DPI_640:
+				{
+					measuredDefaultHeight = 116;
+					measuredDefaultWidth = 400;
+					
+					break;              
+				}
+				case DPIClassification.DPI_480:
+				{
+					measuredDefaultHeight = 88;
+					measuredDefaultWidth = 300;
+					
+					break;
+				}
+				case DPIClassification.DPI_320:
+				{
+					measuredDefaultHeight = 58;
+					measuredDefaultWidth = 200;
+					
+					break;              
+				}
+				case DPIClassification.DPI_240:
+				{
+					measuredDefaultHeight = 44;
+					measuredDefaultWidth = 150;
+					
+					break;
+				}
+				case DPIClassification.DPI_120:
+				{
+					measuredDefaultHeight = 22;
+					measuredDefaultWidth = 75;
+					
+					break;
+				}
+				default:
+				{
+					// default DPI_160
+					measuredDefaultHeight = 29;
+					measuredDefaultWidth = 100;
+					
+					break;
+				}
+			}
+		}	
+		
+		//--------------------------------------------------------------------------
+		//
+		//  Overridden methods
+		//
+		//--------------------------------------------------------------------------
+		
+		override protected function drawBackground(unscaledWidth:Number, unscaledHeight:Number):void
+		{
+			//Dont draw background
+		}
+		
+		override protected function getBorderClassForCurrentState():Class
+		{
+			var isSelected:Boolean = currentState.indexOf("Selected") >= 0;
+			var isDown:Boolean = currentState.indexOf("down") >= 0;
+			
+			if (isSelected && !isDown )
+				return selectedBorderSkin;
+			else if (isSelected && isDown)
+				return selectedDownBorderSkin;
+			else if (!isSelected && !isDown)
+				return upBorderSkin;
+			else 
+				return downBorderSkin;
+		}
+		
+		override protected function commitCurrentState():void
+		{
+			super.commitCurrentState();
+			var isSelected:Boolean = currentState.indexOf("Selected") >= 0;
+			var isDown:Boolean = currentState.indexOf("down") >= 0;
+			
+			if(xor(isSelected,isDown))
+			{
+				var highlightColor:uint = getStyle("highlightTextColor");
+				labelDisplay.setStyle("color",highlightColor);
+			}
+			else
+			{
+				var color:uint = getStyle("color");
+				labelDisplay.setStyle("color",color);
+			}
+			
+		}
+		
+		private function xor(lhs:Boolean, rhs:Boolean):Boolean {
+			return !( lhs && rhs ) && ( lhs || rhs );
+		}
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_down.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_down.fxg
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_down.fxg
index 4a7c5f7..d7fc8a8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_down.fxg
@@ -19,16 +19,11 @@
 -->
 
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Group scaleGridLeft="29.75" scaleGridRight="89.25" scaleGridTop="36" scaleGridBottom="12">
-    <Path winding="nonZero" data="M119 48 0 48 0 0 119 0 119 48Z">
-	  <fill>
-		<SolidColor color="#DEDEDD"/>
-	  </fill>
-	</Path>
-    <Rect alpha="0.5" width="119" height="48">
+  <Group scaleGridLeft="50" scaleGridRight="150" scaleGridTop="43.5" scaleGridBottom="14.5">
+    <Path data="M200 58 9 58C4.02881 58 0 53.9717 0 49L0 9C0 4.0293 4.02881 0 9 0L200
0 200 58Z">
       <fill>
-        <SolidColor color="#33B5E5"/>
+        <SolidColor color="#007AFF"/>
       </fill>
-    </Rect>
+    </Path>
   </Group>
 </Graphic>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_up.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_up.fxg
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_up.fxg
index 59b9cd9..bacd138 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarFirstButton_up.fxg
@@ -19,10 +19,10 @@
 -->
 
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Group scaleGridLeft="29.75" scaleGridRight="89.25" scaleGridTop="36" scaleGridBottom="12">
-    <Path winding="nonZero" data="M119 48 0 48 0 0 119 0 119 48Z">
+  <Group scaleGridLeft="50" scaleGridRight="150" scaleGridTop="43.5" scaleGridBottom="14.5">
+    <Path winding="nonZero" data="M198 2 198 56 9 56C5.13965 56 2 52.8594 2 49L2 9C2 5.14063
5.13965 2 9 2L198 2M200 0 9 0C4.02881 0 0 4.0293 0 9L0 49C0 53.9717 4.02881 58 9 58L200 58
200 0Z">
       <fill>
-        <SolidColor color="#DEDEDD"/>
+        <SolidColor color="#007AFF"/>
       </fill>
     </Path>
   </Group>

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_down.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_down.fxg
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_down.fxg
new file mode 100644
index 0000000..656cce3
--- /dev/null
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_down.fxg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
+  <Group scaleGridLeft="50.5" scaleGridRight="151.5" scaleGridTop="43.5" scaleGridBottom="14.5">
+    <Path x="1" y="1" data="M0 56 0 0 192 0C196.411 0 200 3.58984 200 8L200 48C200 52.4111
196.411 56 192 56L0 56Z">
+      <fill>
+        <SolidColor color="#007AFF"/>
+      </fill>
+    </Path>
+    <Path winding="nonZero" data="M193 2C196.86 2 200 5.1416 200 9L200 49C200 52.8594
196.86 56 193 56L2 56 2 2 193 2M193 0 0 0 0 58 193 58C197.97 58 202 53.9717 202 49L202 9C202
4.0293 197.97 0 193 0">
+      <fill>
+        <SolidColor color="#007AFF"/>
+      </fill>
+    </Path>
+    <Path visible="false" winding="nonZero" data="M0 0 202 0 202 58 0 58 0 0Z"/>
+  </Group>
+</Graphic>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_up.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_up.fxg
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_up.fxg
new file mode 100644
index 0000000..5dfab90
--- /dev/null
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarLastButton_up.fxg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
+  <Group scaleGridLeft="59" scaleGridRight="177" scaleGridTop="43.5" scaleGridBottom="14.5">
+    <Path winding="nonZero" data="M227 2C230.86 2 234 5.1416 234 9L234 49C234 52.8594
230.86 56 227 56L2 56 2 2 227 2M227 0 0 0 0 58 227 58C231.97 58 236 53.9717 236 49L236 9C236
4.0293 231.97 0 227 0">
+      <fill>
+        <SolidColor color="#007AFF"/>
+      </fill>
+    </Path>
+    <Path visible="false" winding="nonZero" data="M0 0 236 0 236 58 0 58 0 0Z"/>
+  </Group>
+</Graphic>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_down.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_down.fxg
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_down.fxg
index 4e4f80b..b0ae67a 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_down.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_down.fxg
@@ -19,52 +19,12 @@
 -->
 
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Group>
-    <Path winding="nonZero" data="M119 48 0 48 0 0 119 0 119 48Z">
+  <Group scaleGridLeft="50.5" scaleGridRight="151.5" scaleGridTop="43.5" scaleGridBottom="14.5">
+    <Path data="M202 58 0 58 0 0 202 0 202 58Z">
       <fill>
-        <SolidColor color="#DEDEDD"/>
-      </fill>
-    </Path>
-    <Group y="12" alpha="0.100006">
-      <Group>
-        <mask>
-          <Group>
-            <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-              <fill>
-                <SolidColor color="#FFFFFF"/>
-              </fill>
-            </Path>
-          </Group>
-        </mask>
-        <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-          <fill>
-            <SolidColor color="#333333"/>
-          </fill>
-        </Path>
-      </Group>
-    </Group>
-    <Group x="118" y="12" alpha="0.100006">
-      <Group>
-        <mask>
-          <Group>
-            <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-              <fill>
-                <SolidColor color="#FFFFFF"/>
-              </fill>
-            </Path>
-          </Group>
-        </mask>
-        <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-          <fill>
-            <SolidColor color="#333333"/>
-          </fill>
-        </Path>
-      </Group>
-    </Group>
-    <Path alpha="0.5" winding="nonZero" data="M119 48 0 48 0 0 119 0 119 48Z">
-      <fill>
-        <SolidColor color="#33B5E5"/>
+        <SolidColor color="#007AFF"/>
       </fill>
     </Path>
+    <Path visible="false" winding="nonZero" data="M0 0 202 0 202 58 0 58 0 0Z"/>
   </Group>
 </Graphic>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e6f03954/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_up.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_up.fxg
b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_up.fxg
index be1b619..0b95878 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/ButtonBarMiddleButton_up.fxg
@@ -19,47 +19,12 @@
 -->
 
 <Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
-  <Group>
-    <Path winding="nonZero" data="M119 48 0 48 0 0 119 0 119 48Z">
+  <Group scaleGridLeft="50.5" scaleGridRight="151.5" scaleGridTop="43.5" scaleGridBottom="14.5">
+    <Path winding="nonZero" data="M200 56 2 56 2 2 200 2 200 56ZM202 0 0 0 0 58 202 58
202 0Z">
       <fill>
-        <SolidColor color="#DEDEDD"/>
+        <SolidColor color="#007AFF"/>
       </fill>
     </Path>
-    <Group y="12" alpha="0.100006">
-      <Group>
-        <mask>
-          <Group>
-            <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-              <fill>
-                <SolidColor color="#FFFFFF"/>
-              </fill>
-            </Path>
-          </Group>
-        </mask>
-        <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-          <fill>
-            <SolidColor color="#333333"/>
-          </fill>
-        </Path>
-      </Group>
-    </Group>
-    <Group x="118" y="12" alpha="0.100006">
-      <Group>
-        <mask>
-          <Group>
-            <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-              <fill>
-                <SolidColor color="#FFFFFF"/>
-              </fill>
-            </Path>
-          </Group>
-        </mask>
-        <Path winding="nonZero" data="M1 24 0 24 0 0 1 0 1 24Z">
-          <fill>
-            <SolidColor color="#333333"/>
-          </fill>
-        </Path>
-      </Group>
-    </Group>
+    <Path visible="false" winding="nonZero" data="M0 0 202 0 202 58 0 58 0 0Z"/>
   </Group>
 </Graphic>
\ No newline at end of file


Mime
View raw message