Updated color scheme.

SoftwareAG · Jan 12, 2023 · e8542f2 · e8542f2
1 parent 46cc9ed
commit e8542f2
Show file tree

Hide file tree

Showing 34 changed files with 251 additions and 216 deletions.
diff --git a/ios/AlarmApp/AlarmApp.xcodeproj/project.pbxproj b/ios/AlarmApp/AlarmApp.xcodeproj/project.pbxproj
@@ -16,6 +16,7 @@
 		3008B04B296C17FA00A05731 /* MaterialButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008B04A296C17FA00A05731 /* MaterialButton.swift */; };
 		3008B04D296C1A4800A05731 /* C8yAlarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008B04C296C1A4800A05731 /* C8yAlarm.swift */; };
 		3008B04F296C245500A05731 /* MaterialTextfield.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3008B04E296C245500A05731 /* MaterialTextfield.swift */; };
+		3008B05329700CF500A05731 /* ColorScheme.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3008B05229700CF500A05731 /* ColorScheme.xcassets */; };
 		300B2B5B27C9103B0051CDBC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300B2B5A27C9103B0051CDBC /* AppDelegate.swift */; };
 		300B2B5D27C9103B0051CDBC /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300B2B5C27C9103B0051CDBC /* SceneDelegate.swift */; };
 		300B2B5F27C9103C0051CDBC /* DashboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 300B2B5E27C9103C0051CDBC /* DashboardViewController.swift */; };
@@ -93,6 +94,7 @@
 		3008B04A296C17FA00A05731 /* MaterialButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaterialButton.swift; sourceTree = "<group>"; };
 		3008B04C296C1A4800A05731 /* C8yAlarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = C8yAlarm.swift; sourceTree = "<group>"; };
 		3008B04E296C245500A05731 /* MaterialTextfield.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MaterialTextfield.swift; sourceTree = "<group>"; };
+		3008B05229700CF500A05731 /* ColorScheme.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = ColorScheme.xcassets; sourceTree = "<group>"; };
 		300B2B5727C9103B0051CDBC /* AlarmApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AlarmApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		300B2B5A27C9103B0051CDBC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		300B2B5C27C9103B0051CDBC /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = "<group>"; };
@@ -218,6 +220,7 @@
 				3056B77A27CE896F00ED443B /* Material */,
 				309A860B27DF659F00F69ED0 /* MaterialUI */,
 				307385EB27E2798B00D05F03 /* AlarmApp.entitlements */,
+				3008B05229700CF500A05731 /* ColorScheme.xcassets */,
 				300B2B6327C910470051CDBC /* Assets.xcassets */,
 				300B2B6827C910470051CDBC /* Info.plist */,
 				300B2B6527C910470051CDBC /* LaunchScreen.storyboard */,
@@ -454,6 +457,7 @@
 				300B2B6727C910470051CDBC /* LaunchScreen.storyboard in Resources */,
 				30F6C36327D6B89300884CE8 /* SeparatorItem.xib in Resources */,
 				30CFCAE727CFF32A0061BF71 /* AuditRecordItem.xib in Resources */,
+				3008B05329700CF500A05731 /* ColorScheme.xcassets in Resources */,
 				30FBB9CA27CD417F008302D0 /* DetailsItem.xib in Resources */,
 				3056B77727CE696B00ED443B /* AlarmListItem.xib in Resources */,
 				300B2B6427C910470051CDBC /* Assets.xcassets in Resources */,

diff --git a/ios/AlarmApp/AlarmApp/Assets.xcassets/onBackground.colorset/Contents.json b/ios/AlarmApp/AlarmApp/Assets.xcassets/onBackground.colorset/Contents.json
diff --git a/ios/AlarmApp/AlarmApp/Assets.xcassets/onSurface.colorset/Contents.json b/ios/AlarmApp/AlarmApp/Assets.xcassets/onSurface.colorset/Contents.json
diff --git a/ios/AlarmApp/AlarmApp/Assets.xcassets/secondary.colorset/Contents.json b/ios/AlarmApp/AlarmApp/Assets.xcassets/secondary.colorset/Contents.json
diff --git a/ios/AlarmApp/AlarmApp/Base.lproj/Main.storyboard b/ios/AlarmApp/AlarmApp/Base.lproj/Main.storyboard
@@ -62,13 +62,13 @@
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%dashboard_subscribed_alarms_title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6a8-vd-5pZ" customClass="MaterialLabel" customModule="AlarmApp" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="382" height="17"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
-                                                <nil key="textColor"/>
+                                                <color key="textColor" name="onSurface"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%subscribed_alarms_filter_description" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DRu-hU-JxC" customClass="MaterialLabel" customModule="AlarmApp" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="21" width="382" height="13.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                                                <nil key="textColor"/>
+                                                <color key="textColor" name="onSurface"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
@@ -189,7 +189,7 @@
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%dashboard_active_alarms_title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OGj-eP-ls6" customClass="MaterialLabel" customModule="AlarmApp" customModuleProvider="target">
                                         <rect key="frame" x="16" y="16" width="350" height="23"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle2"/>
-                                        <nil key="textColor"/>
+                                        <color key="textColor" name="onPrimaryContainer"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="dAk-3C-y5o">
@@ -633,7 +633,7 @@
                                 </connections>
                             </containerView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3VN-Nh-uV5" userLabel="newCommentButton" customClass="MaterialButton" customModule="AlarmApp" customModuleProvider="target">
-                                <rect key="frame" x="138.5" y="741" width="259.5" height="56"/>
+                                <rect key="frame" x="138.5" y="790" width="259.5" height="56"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="56" id="9Wi-cr-DBo"/>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="v09-bl-szo"/>
@@ -642,8 +642,8 @@
                                 <state key="normal" title="Button"/>
                                 <buttonConfiguration key="configuration" style="filled" title="%alarm_details_new_comment" imagePadding="16" cornerStyle="capsule">
                                     <imageReference key="image" image="plus.bubble.fill" catalog="system" symbolScale="default"/>
-                                    <color key="baseForegroundColor" name="onSecondary"/>
-                                    <color key="baseBackgroundColor" name="secondary"/>
+                                    <color key="baseForegroundColor" name="primary"/>
+                                    <color key="baseBackgroundColor" name="primaryContainer"/>
                                 </buttonConfiguration>
                                 <connections>
                                     <segue destination="lLb-fy-ICw" kind="show" identifier="toNewComment" id="gSE-Py-UP6"/>
@@ -721,7 +721,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" id="6at-Wb-oaf">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" name="background"/>
                         <color key="sectionIndexBackgroundColor" name="background"/>
                         <connections>
                             <outlet property="dataSource" destination="kp8-EK-E2H" id="RkH-sm-r2Y"/>
@@ -934,7 +934,7 @@
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="LXJ-qz-wgM" customClass="JVFloatLabeledTextView">
                                 <rect key="frame" x="16" y="156" width="382" height="128"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="128" id="0bO-1X-wiZ"/>
                                 </constraints>
@@ -968,7 +968,7 @@
                             </button>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="MkE-7w-377"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <color key="backgroundColor" name="background"/>
                         <constraints>
                             <constraint firstItem="DCS-Jv-BnZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="MkE-7w-377" secondAttribute="leading" symbolic="YES" id="4j0-QN-ssw"/>
                             <constraint firstItem="DCS-Jv-BnZ" firstAttribute="top" secondItem="LXJ-qz-wgM" secondAttribute="bottom" constant="16" id="8SK-nW-Dl1"/>
@@ -1118,13 +1118,13 @@
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%alarms_filter_title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iYk-Va-PUR" customClass="MaterialLabel" customModule="AlarmApp" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="382" height="17"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleHeadline"/>
-                                                <nil key="textColor"/>
+                                                <color key="textColor" name="onSurface"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="%alarms_filter_descrition" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aSk-zk-67H" customClass="MaterialLabel" customModule="AlarmApp" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="21" width="382" height="13.5"/>
                                                 <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
-                                                <nil key="textColor"/>
+                                                <color key="textColor" name="onSurface"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
@@ -1307,7 +1307,7 @@
         </designable>
     </designables>
     <inferredMetricsTieBreakers>
-        <segue reference="TSw-36-nw0"/>
+        <segue reference="ina-48-qVJ"/>
     </inferredMetricsTieBreakers>
     <resources>
         <image name="arrow.right" catalog="system" width="128" height="98"/>
@@ -1317,28 +1317,31 @@
         <image name="plus.bubble.fill" catalog="system" width="128" height="110"/>
         <image name="splash" width="375" height="667"/>
         <namedColor name="background">
-            <color red="0.9882352941176471" green="0.9882352941176471" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.98431372549019602" green="0.9882352941176471" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="onBackground">
-            <color red="0.10588235294117647" green="0.10588235294117647" blue="0.10588235294117647" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.12156862745098039" blue="0.16470588235294117" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="onPrimary">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="onPrimaryContainer">
+            <color red="0.0" green="0.11372549019607843" blue="0.20784313725490197" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="onSecondary">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="onSurface">
-            <color red="0.10588235294117647" green="0.10588235294117647" blue="0.10588235294117647" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.12156862745098039" blue="0.16470588235294117" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="primary">
-            <color red="0.14117647058823529" green="0.38039215686274508" blue="0.62352941176470589" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.0" green="0.38039215686274508" blue="0.63529411764705879" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
-        <namedColor name="secondary">
-            <color red="0.8784313725490196" green="0.0" blue="0.49803921568627452" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="primaryContainer">
+            <color red="0.81960784313725488" green="0.89411764705882357" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="surface">
-            <color red="0.9882352941176471" green="0.9882352941176471" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.98039215686274506" green="0.9882352941176471" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <systemColor name="labelColor">
             <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

diff --git a/ios/AlarmApp/AlarmApp/ColorScheme.xcassets/Contents.json b/ios/AlarmApp/AlarmApp/ColorScheme.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...cassets/background.colorset/Contents.json → ...cassets/background.colorset/Contents.json b/...cassets/background.colorset/Contents.json → ...cassets/background.colorset/Contents.json
@@ -7,7 +7,7 @@
           "alpha" : "1.000",
           "blue" : "0xFF",
           "green" : "0xFC",
-          "red" : "0xFC"
+          "red" : "0xFB"
         }
       },
       "idiom" : "universal"
@@ -23,8 +23,8 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
+          "blue" : "0x2A",
+          "green" : "0x1F",
           "red" : "0x00"
         }
       },

diff --git a/...xcassets/onPrimary.colorset/Contents.json → ...ssets/onBackground.colorset/Contents.json b/...xcassets/onPrimary.colorset/Contents.json → ...ssets/onBackground.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "1.000",
-          "green" : "1.000",
-          "red" : "1.000"
+          "blue" : "0x2A",
+          "green" : "0x1F",
+          "red" : "0x00"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x00",
-          "green" : "0x00",
-          "red" : "0x00"
+          "blue" : "0xFF",
+          "green" : "0xE9",
+          "red" : "0xBF"
         }
       },
       "idiom" : "universal"