Skip to content

Commit

Permalink
Jwoo/ios luminosity (#5089)
Browse files Browse the repository at this point in the history 
* Updated luminosity

* fixed luminosity issue on container styles

* Updated contrast values

Co-authored-by: RebeccaAnne <[email protected]>
  • Loading branch information
@jwoo-msft
jwoo-msft and RebeccaAnne authored Nov 20, 2020
1 parent 3a1d6c8 commit c5a0f17
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 113 deletions.
6 changes: 3 additions & 3 deletions samples/v1.0/Tests/CustomParsingTestUsingProgressBar.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"type": "ProgressBar",
"payload": [
{
"red":187,
"green":160,
"blue":209,
"red":168,
"green":123,
"blue":180,
"alpha":1,
"progress":0.95,
"thickness":1
Expand Down
237 changes: 136 additions & 101 deletions source/ios/AdaptiveCards/ADCIOSVisualizer/resources/sample.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
{
"spacing": {
"small": 3,
"default": 8,
"medium": 20,
"large": 30,
"extraLarge": 40,
"padding": 10
},
"separator": {
"lineThickness": 1,
"lineColor": "#EEEEEE"
},
"supportsInteractivity": true,
"imageBaseUrl": "https://pbs.twimg.com/profile_images/3647943215/",
"fontTypes": {
"default": {
"fontFamily": "San Francisco",
"fontFamily": "'Segoe UI', 'sans-serif', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue'",
"fontSizes": {
"small": 12,
"default": 14,
Expand All @@ -18,7 +30,7 @@
}
},
"monospace": {
"fontFamily": "Courier New",
"fontFamily": "'Courier New', Courier, monospace",
"fontSizes": {
"small": 12,
"default": 14,
Expand All @@ -33,179 +45,202 @@
}
}
},
"imageSizes": {
"small": 40,
"medium": 80,
"large": 160
},
"containerStyles": {
"default": {
"backgroundColor": "#FFFFFF",
"foregroundColors": {
"default": {
"default": "#333333",
"subtle": "#EE333333"
"default": "#000000",
"subtle": "#6f6f6f"
},
"accent": {
"default": "#2E89FC",
"subtle": "#882E89FC"
"default": "#0063B1",
"subtle": "#007AB0"
},
"attention": {
"default": "#EC130E",
"subtle": "#DDEC130E"
},
"good": {
"default": "#028A02",
"subtle": "#DD027502"
"default": "#0B7814",
"subtle": "#DD028A02"
},
"light": {
"default": "#646464",
"subtle": "#767676"
},
"warning": {
"default": "#B75C00",
"subtle": "#DDB75C00"
},
"attention": {
"default": "#FF0000",
"subtle": "#DDFF0000"
}
},
"backgroundColor": "#EAEAEA"
}
},
"emphasis": {
"backgroundColor": "#EFEFEF",
"foregroundColors": {
"default": {
"default": "#333333",
"subtle": "#EE333333"
"default": "#000000",
"subtle": "#6f6f6f"
},
"accent": {
"default": "#2E89FC",
"subtle": "#882E89FC"
"default": "#4A54F0",
"subtle": "#881F6BF1"
},
"attention": {
"default": "#C42C07",
"subtle": "#DDE31B13"
},
"good": {
"default": "#028A02",
"subtle": "#DD027502"
"default": "#0B7814",
"subtle": "#DD0D860A"
},
"warning": {
"default": "#B75C00",
"subtle": "#DDB75C00"
"default": "#935A10",
"subtle": "#DDBD5400"
},
"attention": {
"default": "#ED0000",
"subtle": "#DDED0000"
"light": {
"default": "#575757",
"subtle": "#DD737373"
}
},
"backgroundColor": "#08000000",
"borderColor": "#FF000000",
"borderThickness": 1
}
},
"good": {
"accent": {
"backgroundColor": "#D7E7FA",
"foregroundColors": {
"default": {
"default": "#333333",
"subtle": "#EE333333"
},
"dark": {
"default": "#000000",
"subtle": "#66000000"
},
"light": {
"default": "#646464",
"subtle": "#33646464"
},
"accent": {
"default": "#2E89FC",
"subtle": "#882E89FC"
"default": "#145FDD",
"subtle": "#88145FDD"
},
"attention": {
"default": "#C42C07",
"subtle": "#DDC42C07"
},
"good": {
"default": "#028A02",
"subtle": "#DD027502"
"default": "#0B7814",
"subtle": "#DD0B7814"
},
"warning": {
"default": "#B75C00",
"subtle": "#DDB75C00"
},
"attention": {
"default": "#ED0000",
"subtle": "#DDED0000"
"default": "#935A10",
"subtle": "#DD935A10"
}
},
"backgroundColor": "#DD027502"
}
},
"warning": {
"good": {
"backgroundColor": "#CCFFCC",
"foregroundColors": {
"default": {
"default": "#333333",
"subtle": "#EE333333"
},
"dark": {
"default": "#000000",
"subtle": "#66000000"
},
"light": {
"default": "#6E6E6E",
"subtle": "#336E6E6E"
},
"accent": {
"default": "#2E89FC",
"subtle": "#882E89FC"
"default": "#2168E4",
"subtle": "#882168E4"
},
"attention": {
"default": "#CC3300",
"subtle": "#DDCC3300"
},
"good": {
"default": "#028A02",
"subtle": "#DD027502"
"default": "#0F8109",
"subtle": "#DD0F8109"
},
"warning": {
"default": "#B75C00",
"subtle": "#DDB75C00"
},
"attention": {
"default": "#ED0000",
"subtle": "#DDED0000"
"default": "#9A630D",
"subtle": "#DD9A630D"
}
},
"backgroundColor": "#DDB75C00"
}
},
"attention": {
"backgroundColor": "#FFC5B2",
"foregroundColors": {
"default": {
"default": "#333333",
"subtle": "#EE333333"
},
"dark": {
"default": "#000000",
"subtle": "#66000000"
},
"light": {
"default": "#5A5A5A",
"subtle": "#335A5A5A"
},
"accent": {
"default": "#2E89FC",
"subtle": "#882E89FC"
"default": "#0854C5",
"subtle": "#880854C5"
},
"attention": {
"default": "#A92E0E",
"subtle": "#DDA92E0E"
},
"good": {
"default": "#028A02",
"subtle": "#DD027502"
"default": "#256824",
"subtle": "#DD256824"
},
"warning": {
"default": "#B75C00",
"subtle": "#DDB75C00"
},
"attention": {
"default": "#ED0000",
"subtle": "#DDED0000"
"default": "#775502",
"subtle": "#DD775502"
}
},
"backgroundColor": "#DDFF0000",
"borderColor": "#FF000000",
"borderThickness": 2
}
},
"accent": {
"warning": {
"backgroundColor": "#FFE2B2",
"foregroundColors": {
"default": {
"default": "#333333",
"subtle": "#EE333333"
},
"dark": {
"default": "#000000",
"subtle": "#66000000"
},
"light": {
"default": "#646464",
"subtle": "#33646464"
},
"accent": {
"default": "#2E89FC",
"subtle": "#882E89FC"
"default": "#0F60DC",
"subtle": "#880F60DC"
},
"attention": {
"default": "#BF3505",
"subtle": "#DDBF3505"
},
"good": {
"default": "#028A02",
"subtle": "#DD027502"
"default": "#207725",
"subtle": "#DD207725"
},
"warning": {
"default": "#B75C00",
"subtle": "#DDB75C00"
},
"attention": {
"default": "#ED0000",
"subtle": "#DDED0000"
"default": "#866107",
"subtle": "#DD866107"
}
},
"backgroundColor": "#882E89FC",
"borderThickness": 1
}
}
},
"spacing": {
"small": 3,
"default": 8,
"medium": 20,
"large": 30,
"extraLarge": 40,
"padding": 10
},
"separator": {
"lineThickness": 1,
"lineColor": "#FF000000"
"imageSizes": {
"small": 40,
"medium": 80,
"large": 160
},
"actions": {
"maxActions": 5,
Expand All @@ -224,8 +259,8 @@
"allowCustomStyle": true
},
"imageSet": {
"imageSize": "Medium",
"maxImageHeight": 999
"imageSize": "medium",
"maxImageHeight": 100
},
"factSet": {
"title": {
Expand Down
13 changes: 4 additions & 9 deletions source/ios/AdaptiveCards/AdaptiveCards/AdaptiveCards/ACRDatePicker.xib
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -14,10 +12,7 @@
<datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" id="j3j-us-bMu">
<rect key="frame" x="0.0" y="0.0" width="375" height="215"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<date key="date" timeIntervalSinceReferenceDate="544572879.81824601">
<!--2018-04-04 22:14:39 +0000-->
</date>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<point key="canvasLocation" x="-406.5" y="40.5"/>
</datePicker>
</objects>
Expand Down

0 comments on commit c5a0f17

Please sign in to comment.