You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/11/24 22:13:08 UTC
[18/44] git commit: [flex-sdk] [refs/heads/develop] - iOS7 CheckBox
skin (best attempt, developer art ; -)
iOS7 CheckBox skin (best attempt, developer art ;-)
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e05bd08c
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e05bd08c
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e05bd08c
Branch: refs/heads/develop
Commit: e05bd08ccc9a15a1d7ed9dd6f07c14ee7c880858
Parents: e6f0395
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Wed Oct 8 11:44:30 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Wed Oct 8 11:44:30 2014 +0200
----------------------------------------------------------------------
frameworks/projects/mobiletheme/defaults.css | 3 +-
.../src/spark/skins/ios7/CheckBoxSkin.as | 66 ++++++++++----------
.../spark/skins/ios7/assets/CheckBox_down.fxg | 34 ----------
.../skins/ios7/assets/CheckBox_downSelected.fxg | 35 -----------
.../ios7/assets/CheckBox_downSymbolSelected.fxg | 29 ---------
.../src/spark/skins/ios7/assets/CheckBox_up.fxg | 14 ++---
.../skins/ios7/assets/CheckBox_upSelected.fxg | 14 ++---
.../ios7/assets/CheckBox_upSymbolSelected.fxg | 21 ++++---
8 files changed, 57 insertions(+), 159 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/defaults.css b/frameworks/projects/mobiletheme/defaults.css
index f552889..cc35e63 100644
--- a/frameworks/projects/mobiletheme/defaults.css
+++ b/frameworks/projects/mobiletheme/defaults.css
@@ -1040,8 +1040,9 @@ global
CheckBox
{
- skinClass: ClassReference("spark.skins.ios7.CheckBoxSkin");
chromeColor: #FFFFFF;
+ color: #000000;
+ skinClass: ClassReference("spark.skins.ios7.CheckBoxSkin");
}
HScrollBar
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/CheckBoxSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/CheckBoxSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/ios7/CheckBoxSkin.as
index a6a4b9b..1e77c87 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/CheckBoxSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/CheckBoxSkin.as
@@ -83,14 +83,15 @@ package spark.skins.ios7
layoutPaddingBottom = 0;
upIconClass = spark.skins.ios7.assets.CheckBox_up;
- upSelectedIconClass = spark.skins.ios7.assets.CheckBox_upSelected;
- downIconClass = spark.skins.ios7.assets.CheckBox_down;
- downSelectedIconClass = spark.skins.ios7.assets.CheckBox_downSelected;
upSymbolIconClass = null;
+ upSelectedIconClass = spark.skins.ios7.assets.CheckBox_upSelected;
upSymbolIconSelectedClass = spark.skins.ios7.assets.CheckBox_upSymbolSelected;
- downSymbolIconSelectedClass = spark.skins.ios7.assets.CheckBox_downSymbolSelected;
- downSymbolIconClass = null;
-
+
+ downIconClass = spark.skins.ios7.assets.CheckBox_up;
+ downSymbolIconClass = null
+ downSelectedIconClass = spark.skins.ios7.assets.CheckBox_up;
+ downSymbolIconSelectedClass = null;
+
switch (applicationDPI)
{
case DPIClassification.DPI_640:
@@ -102,10 +103,10 @@ package spark.skins.ios7
layoutBorderSize = 6;
iconWidth = 128;
iconHeight = 128;
- symbolWidth = 64;
- symbolHeight = 64;
- symbolOffsetX = 32;
- symbolOffsetY = 32;
+ symbolWidth = 80;
+ symbolHeight = 80;
+ symbolOffsetX = 2;
+ symbolOffsetY = 0;
break;
}
@@ -118,10 +119,10 @@ package spark.skins.ios7
layoutBorderSize = 4;
iconWidth = 96;
iconHeight = 96;
- symbolWidth = 48;
- symbolHeight = 48;
- symbolOffsetX = 24;
- symbolOffsetY = 24;
+ symbolWidth = 60;
+ symbolHeight = 60;
+ symbolOffsetX = 2;
+ symbolOffsetY = 0;
break;
}
@@ -134,11 +135,11 @@ package spark.skins.ios7
layoutBorderSize = 3;
iconWidth = 64;
iconHeight = 64;
- symbolWidth = 32;
- symbolHeight = 32;
- symbolOffsetX = 16;
- symbolOffsetY = 16;
-
+ symbolWidth = 40;
+ symbolHeight = 40;
+ symbolOffsetX = 1;
+ symbolOffsetY = 0;
+
break;
}
case DPIClassification.DPI_240:
@@ -150,10 +151,10 @@ package spark.skins.ios7
layoutBorderSize = 2;
iconWidth = 48;
iconHeight = 48;
- symbolWidth = 24;
- symbolHeight = 24;
- symbolOffsetX = 12;
- symbolOffsetY = 12;
+ symbolWidth = 30;
+ symbolHeight = 30;
+ symbolOffsetX = 0;
+ symbolOffsetY = 0;
break;
}
@@ -166,28 +167,25 @@ package spark.skins.ios7
layoutBorderSize = 1;
iconWidth = 24;
iconHeight = 24;
- symbolWidth = 12;
- symbolHeight = 12;
- symbolOffsetX = 6;
- symbolOffsetY = 6;
+ symbolWidth = 16;
+ symbolHeight = 16;
+ symbolOffsetX = 0;
+ symbolOffsetY = -1;
break;
}
default:
{
- // default DPI_160
-
layoutGap = 4;
minWidth = 32;
minHeight = 32;
layoutBorderSize = 2;
iconWidth = 32;
iconHeight = 32;
- symbolWidth = 16;
- symbolHeight = 16;
- symbolOffsetX = 8;
- symbolOffsetY = 8;
-
+ symbolWidth = 20;
+ symbolHeight = 20;
+ symbolOffsetX = 0.5;
+ symbolOffsetY = 0;
break;
}
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_down.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_down.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_down.fxg
deleted file mode 100644
index 426df3d..0000000
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_down.fxg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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="8" scaleGridRight="24" scaleGridTop="24" scaleGridBottom="8">
- <Path winding="nonZero" data="M32 31.001C32 31.5527 31.5527 32 31.001 32L0.999023 32C0.447266 32 0 31.5527 0 31.001L0 0.999023C0 0.447266 0.447266 0 0.999023 0L31.001 0C31.5527 0 32 0.447266 32 0.999023L32 31.001Z">
- <fill>
- <SolidColor color="#DEDEDD"/>
- </fill>
- </Path>
- <Path x="8" y="8" winding="nonZero" data="M16 16 0 16 0 0 16 0 16 16ZM1 15 15 15 15 1 1 1 1 15Z">
- <fill>
- <SolidColor color="#676767"/>
- </fill>
- </Path>
- </Group>
-</Graphic>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSelected.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSelected.fxg
deleted file mode 100644
index ea7c3c4..0000000
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSelected.fxg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="8" scaleGridRight="24" scaleGridTop="24" scaleGridBottom="8">
- <Path winding="nonZero" data="M32 31.001C32 31.5527 31.5527 32 31.001 32L0.999023 32C0.447266 32 0 31.5527 0 31.001L0 0.999023C0 0.447266 0.447266 0 0.999023 0L31.001 0C31.5527 0 32 0.447266 32 0.999023L32 31.001Z">
- <fill>
- <SolidColor color="#DEDEDD"/>
- </fill>
- </Path>
- <Path x="8" y="8" winding="nonZero" data="M15 7 15 15 1 15 1 1 14 1 14 0 0 0 0 16 16 16 16 7 15 7Z">
- <fill>
- <SolidColor color="#676767"/>
- </fill>
- </Path>
- <Path visible="false" winding="nonZero" data="M0 0 32 0 32 32 0 32 0 0Z"/>
- </Group>
-</Graphic>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSymbolSelected.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSymbolSelected.fxg
deleted file mode 100644
index f59d001..0000000
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_downSymbolSelected.fxg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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="4.09595" scaleGridRight="12.2878" scaleGridTop="9.99243" scaleGridBottom="3.33081">
- <Path winding="nonZero" data="M14.165 0 16.3838 2.21924 5.24023 13.3232 0 8.52441 2.18164 6.11719 5.37305 9.06348 14.165 0Z">
- <fill>
- <SolidColor color="#676767"/>
- </fill>
- </Path>
- </Group>
-</Graphic>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_up.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_up.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_up.fxg
index 9d65260..89165c9 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_up.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_up.fxg
@@ -19,13 +19,9 @@
-->
<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight="32" viewWidth="32">
- <Group alpha="0.5" x="8" y="8">
- <Group>
- <Path winding="nonZero" data="M16 16 0 16 0 0 16 0 16 16ZM1 15 15 15 15 1 1 1 1 15Z">
- <fill>
- <SolidColor color="#676767"/>
- </fill>
- </Path>
- </Group>
- </Group>
+ <Ellipse width="16" height="16" x="8" y="8">
+ <stroke>
+ <SolidColorStroke color="#CCCCCC" alpha="1" weight="1"/>
+ </stroke>
+ </Ellipse>
</Graphic>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSelected.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSelected.fxg
index f51d7df..6cb00f8 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSelected.fxg
@@ -18,12 +18,10 @@
-->
-<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" viewHeight="32" viewWidth="32">
- <Group x="8" y="8" scaleGridLeft="4" scaleGridRight="12" scaleGridTop="12" scaleGridBottom="4">
- <Path winding="nonZero" data="M15 7 15 15 1 15 1 1 14 1 14 0 0 0 0 16 16 16 16 7 15 7Z">
- <fill>
- <SolidColor color="#676767"/>
- </fill>
- </Path>
- </Group>
+<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008" xmlns:fxg="http://ns.adobe.com/fxg/2008" xmlns:d="http://ns.adobe.com/fxg/2008/dt" viewHeight="32" viewWidth="32">
+ <Ellipse width="16" height="16" x="8" y="8">
+ <fill>
+ <SolidColor color="#167EFB" alpha="1"/>
+ </fill>
+ </Ellipse>
</Graphic>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e05bd08c/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSymbolSelected.fxg
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSymbolSelected.fxg b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSymbolSelected.fxg
index a728d3d..3738ae5 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSymbolSelected.fxg
+++ b/frameworks/projects/mobiletheme/src/spark/skins/ios7/assets/CheckBox_upSymbolSelected.fxg
@@ -19,15 +19,18 @@
-->
<Graphic version="2.0" xmlns="http://ns.adobe.com/fxg/2008">
<Group>
- <Path x="0.624023" y="0.399414" winding="nonZero" data="M14.165 0 16.3838 2.21924 5.24023 13.3232 0 8.52441 2.18164 6.11719 5.37305 9.06348 14.165 0Z">
- <fill>
- <SolidColor color="#33B5E5"/>
- </fill>
- </Path>
- <Path x="0.704102" y="0.712402" winding="nonZero" data="M14.165 0 16.3838 2.21924 5.24023 13.3232 0 8.52441 2.18164 6.11719 5.37305 9.06348 14.165 0Z">
- <stroke>
- <SolidColorStroke caps="none" joints="miter" miterLimit="10" color="#676767"/>
- </stroke>
+ <Path x="8" y="8"
+ data="
+ M 4 7.5
+ L 3 8.5
+ L 6 11.25
+ L 12.25 5.25
+ L 11.25 4.25
+ L 6 9.5"
+ winding="nonZero">
+ <fill>
+ <SolidColor color="#FFFFFF" alpha="1"/>
+ </fill>
</Path>
</Group>
</Graphic>
\ No newline at end of file