@times-design-system/theme-android 1.9.0 → 2.0.1-alpha.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/TimesTypography.kt +6 -1
- package/dist/interfaces/TDSColors.kt +3 -0
- package/dist/interfaces/TDSTypography.kt +2 -1
- package/dist/palettes/DarkBusinessColors.kt +75 -50
- package/dist/palettes/DarkChannelsColors.kt +21 -21
- package/dist/palettes/DarkCommentColors.kt +75 -50
- package/dist/palettes/DarkCoreColors.kt +130 -127
- package/dist/palettes/DarkCultureColors.kt +75 -50
- package/dist/palettes/DarkHomeColors.kt +73 -48
- package/dist/palettes/DarkIrelandColors.kt +75 -50
- package/dist/palettes/DarkLifeAndStyleColors.kt +61 -36
- package/dist/palettes/DarkMoneyColors.kt +75 -50
- package/dist/palettes/DarkObituariesColors.kt +75 -50
- package/dist/palettes/DarkPuzzlesColors.kt +74 -49
- package/dist/palettes/DarkSportColors.kt +75 -50
- package/dist/palettes/DarkTravelColors.kt +75 -50
- package/dist/palettes/DarkUkColors.kt +75 -50
- package/dist/palettes/DarkWorldColors.kt +75 -50
- package/dist/palettes/LightBusinessColors.kt +44 -42
- package/dist/palettes/LightChannelsColors.kt +21 -21
- package/dist/palettes/LightCommentColors.kt +43 -41
- package/dist/palettes/LightCoreColors.kt +156 -153
- package/dist/palettes/LightCultureColors.kt +49 -47
- package/dist/palettes/LightHomeColors.kt +41 -39
- package/dist/palettes/LightIrelandColors.kt +49 -47
- package/dist/palettes/LightLifeAndStyleColors.kt +37 -35
- package/dist/palettes/LightMoneyColors.kt +50 -48
- package/dist/palettes/LightObituariesColors.kt +40 -38
- package/dist/palettes/LightPuzzlesColors.kt +41 -39
- package/dist/palettes/LightSportColors.kt +48 -46
- package/dist/palettes/LightTravelColors.kt +41 -39
- package/dist/palettes/LightUkColors.kt +55 -53
- package/dist/palettes/LightWorldColors.kt +36 -34
- package/package.json +2 -2
|
@@ -5,6 +5,7 @@ import androidx.compose.ui.graphics.Color
|
|
|
5
5
|
open class LightCoreColors : TDSColors {
|
|
6
6
|
override val surfaceUndercanvas = Color(0xFFF2F2F2)
|
|
7
7
|
override val surfaceCanvas = Color(0xFFFFFFFF)
|
|
8
|
+
override val surfaceTransparent = Color(0xFFFFFFFF)
|
|
8
9
|
override val surfaceLevel1 = Color(0xFFFFFFFF)
|
|
9
10
|
override val surfaceLevel2 = Color(0xFFFFFFFF)
|
|
10
11
|
override val surfaceLevel3 = Color(0xFFFFFFFF)
|
|
@@ -12,95 +13,97 @@ open class LightCoreColors : TDSColors {
|
|
|
12
13
|
override val surfaceInverse = Color(0xFF000000)
|
|
13
14
|
override val surfaceOverlay = Color(0x73000000)
|
|
14
15
|
override val surfaceChannel50 = Color(0xFFFFFFFF)
|
|
15
|
-
override val surfaceChannel100 = Color(
|
|
16
|
-
override val surfaceChannel200 = Color(
|
|
16
|
+
override val surfaceChannel100 = Color(0xFFE6E6E6)
|
|
17
|
+
override val surfaceChannel200 = Color(0xFFA8A8A8)
|
|
17
18
|
override val surfaceChannel300 = Color(0xFF737373)
|
|
18
19
|
override val surfaceChannel400 = Color(0xFF4D4D4D)
|
|
19
20
|
override val surfaceChannel500 = Color(0xFF262626)
|
|
20
21
|
override val surfaceStaticDark = Color(0xFF000000)
|
|
21
22
|
override val surfaceStaticLight = Color(0xFFFFFFFF)
|
|
22
|
-
override val textPrimary = Color(
|
|
23
|
+
override val textPrimary = Color(0xFF1A1A1A)
|
|
23
24
|
override val textInverse = Color(0xFFFFFFFF)
|
|
24
25
|
override val textSecondary = Color(0xFF404040)
|
|
25
26
|
override val textTertiary = Color(0xFF737373)
|
|
26
27
|
override val textChannelPrimary = Color(0xFF4D4D4D)
|
|
27
|
-
override val textChannelSecondary = Color(
|
|
28
|
+
override val textChannelSecondary = Color(0xFF666666)
|
|
29
|
+
override val textChannelTertiary = Color(0xFF8C8C8C)
|
|
28
30
|
override val textStaticDark = Color(0xFF000000)
|
|
29
31
|
override val textStaticLight = Color(0xFFFFFFFF)
|
|
30
|
-
override val iconPrimary = Color(
|
|
32
|
+
override val iconPrimary = Color(0xFF1A1A1A)
|
|
31
33
|
override val iconInverse = Color(0xFFFFFFFF)
|
|
32
34
|
override val iconSecondary = Color(0xFF404040)
|
|
33
35
|
override val iconTertiary = Color(0xFF737373)
|
|
34
36
|
override val iconChannelPrimary = Color(0xFF4D4D4D)
|
|
35
|
-
override val iconChannelSecondary = Color(
|
|
36
|
-
override val
|
|
37
|
+
override val iconChannelSecondary = Color(0xFF666666)
|
|
38
|
+
override val iconChannelTertiary = Color(0xFF8C8C8C)
|
|
39
|
+
override val borderPrimary = Color(0xFFB3B3B3)
|
|
37
40
|
override val borderSecondary = Color(0xFFCCCCCC)
|
|
38
|
-
override val borderTertiary = Color(
|
|
39
|
-
override val borderChannelPrimary = Color(
|
|
41
|
+
override val borderTertiary = Color(0xFFE6E6E6)
|
|
42
|
+
override val borderChannelPrimary = Color(0xFFB3B3B3)
|
|
40
43
|
override val borderChannelSecondary = Color(0xFFCCCCCC)
|
|
41
|
-
override val borderChannelTertiary = Color(
|
|
42
|
-
override val borderElevation = Color(
|
|
44
|
+
override val borderChannelTertiary = Color(0xFFE6E6E6)
|
|
45
|
+
override val borderElevation = Color(0xFFE6E6E6)
|
|
43
46
|
override val borderStaticDark = Color(0xFF000000)
|
|
44
47
|
override val borderStaticLight = Color(0xFFFFFFFF)
|
|
45
48
|
override val inputFillDefault = Color(0xFFFFFFFF)
|
|
46
|
-
override val inputFillError = Color(
|
|
49
|
+
override val inputFillError = Color(0xFFFFEFEF)
|
|
47
50
|
override val inputFillHover = Color(0xFFF2F2F2)
|
|
48
51
|
override val inputFillActive = Color(0xFFFFFFFF)
|
|
49
52
|
override val inputFillCompleted = Color(0xFFFFFFFF)
|
|
50
|
-
override val inputFillSuccess = Color(
|
|
51
|
-
override val inputFillWarning = Color(
|
|
52
|
-
override val inputFillInfo = Color(
|
|
53
|
+
override val inputFillSuccess = Color(0xFFE9F3ED)
|
|
54
|
+
override val inputFillWarning = Color(0xFFFFF7EF)
|
|
55
|
+
override val inputFillInfo = Color(0xFFEFF2F8)
|
|
53
56
|
override val inputBorderDefault = Color(0xFF8C8C8C)
|
|
54
|
-
override val inputBorderError = Color(
|
|
55
|
-
override val inputBorderHover = Color(
|
|
57
|
+
override val inputBorderError = Color(0xFFB20908)
|
|
58
|
+
override val inputBorderHover = Color(0xFF6D6D6D)
|
|
56
59
|
override val inputBorderActive = Color(0xFF595959)
|
|
57
60
|
override val inputBorderCompleted = Color(0xFF262626)
|
|
58
|
-
override val inputBorderSuccess = Color(
|
|
59
|
-
override val inputBorderWarning = Color(
|
|
60
|
-
override val inputBorderInfo = Color(
|
|
61
|
+
override val inputBorderSuccess = Color(0xFF298458)
|
|
62
|
+
override val inputBorderWarning = Color(0xFFCC8103)
|
|
63
|
+
override val inputBorderInfo = Color(0xFF2658A9)
|
|
61
64
|
override val inputTextDefault = Color(0xFF737373)
|
|
62
|
-
override val inputTextError = Color(
|
|
65
|
+
override val inputTextError = Color(0xFF1A1A1A)
|
|
63
66
|
override val inputTextHover = Color(0xFF404040)
|
|
64
|
-
override val inputTextActive = Color(
|
|
65
|
-
override val inputTextCompleted = Color(
|
|
66
|
-
override val inputTextSuccess = Color(
|
|
67
|
-
override val inputTextWarning = Color(
|
|
68
|
-
override val inputTextInfo = Color(
|
|
67
|
+
override val inputTextActive = Color(0xFF1A1A1A)
|
|
68
|
+
override val inputTextCompleted = Color(0xFF1A1A1A)
|
|
69
|
+
override val inputTextSuccess = Color(0xFF1A1A1A)
|
|
70
|
+
override val inputTextWarning = Color(0xFF1A1A1A)
|
|
71
|
+
override val inputTextInfo = Color(0xFF1A1A1A)
|
|
69
72
|
override val inputIconDefault = Color(0xFF8C8C8C)
|
|
70
|
-
override val inputIconHover = Color(
|
|
73
|
+
override val inputIconHover = Color(0xFF6D6D6D)
|
|
71
74
|
override val inputIconActive = Color(0xFF595959)
|
|
72
75
|
override val inputIconCompleted = Color(0xFF262626)
|
|
73
|
-
override val inputIconError = Color(
|
|
74
|
-
override val inputIconSuccess = Color(
|
|
75
|
-
override val inputIconWarning = Color(
|
|
76
|
-
override val inputIconInfo = Color(
|
|
77
|
-
override val messagingFillError = Color(
|
|
78
|
-
override val messagingFillSuccess = Color(
|
|
79
|
-
override val messagingFillWarning = Color(
|
|
80
|
-
override val messagingFillInfo = Color(
|
|
81
|
-
override val messagingBorderError = Color(
|
|
82
|
-
override val messagingBorderSuccess = Color(
|
|
83
|
-
override val messagingBorderWarning = Color(
|
|
76
|
+
override val inputIconError = Color(0xFFB20908)
|
|
77
|
+
override val inputIconSuccess = Color(0xFF298458)
|
|
78
|
+
override val inputIconWarning = Color(0xFFCC8103)
|
|
79
|
+
override val inputIconInfo = Color(0xFF2658A9)
|
|
80
|
+
override val messagingFillError = Color(0xFFFFEFEF)
|
|
81
|
+
override val messagingFillSuccess = Color(0xFFE9F3ED)
|
|
82
|
+
override val messagingFillWarning = Color(0xFFFFF7EF)
|
|
83
|
+
override val messagingFillInfo = Color(0xFFEFF2F8)
|
|
84
|
+
override val messagingBorderError = Color(0xFFB20908)
|
|
85
|
+
override val messagingBorderSuccess = Color(0xFF298458)
|
|
86
|
+
override val messagingBorderWarning = Color(0xFFE49307)
|
|
84
87
|
override val messagingBorderInfo = Color(0xFF0F4AA2)
|
|
85
|
-
override val messagingIconError = Color(
|
|
88
|
+
override val messagingIconError = Color(0xFFCB0705)
|
|
86
89
|
override val messagingIconSuccess = Color(0xFF31A46F)
|
|
87
|
-
override val messagingIconWarning = Color(
|
|
90
|
+
override val messagingIconWarning = Color(0xFFE49307)
|
|
88
91
|
override val messagingIconInfo = Color(0xFF0F4AA2)
|
|
89
|
-
override val messagingLinkTextDefault = Color(
|
|
90
|
-
override val messagingLinkTextHover = Color(
|
|
91
|
-
override val messagingLinkTextPressed = Color(
|
|
92
|
-
override val messagingLinkTextVisited = Color(
|
|
93
|
-
override val messagingLinkIconDefault = Color(
|
|
94
|
-
override val messagingLinkIconHover = Color(
|
|
95
|
-
override val messagingLinkIconPressed = Color(
|
|
96
|
-
override val messagingLinkIconVisited = Color(
|
|
97
|
-
override val messagingLinkUnderlineDefault = Color(
|
|
98
|
-
override val messagingLinkUnderlineHover = Color(
|
|
99
|
-
override val messagingLinkUnderlinePressed = Color(
|
|
100
|
-
override val messagingLinkUnderlineVisited = Color(
|
|
92
|
+
override val messagingLinkTextDefault = Color(0xFF1A1A1A)
|
|
93
|
+
override val messagingLinkTextHover = Color(0xFF161616)
|
|
94
|
+
override val messagingLinkTextPressed = Color(0xFF151515)
|
|
95
|
+
override val messagingLinkTextVisited = Color(0xFF484848)
|
|
96
|
+
override val messagingLinkIconDefault = Color(0xFF1A1A1A)
|
|
97
|
+
override val messagingLinkIconHover = Color(0xFF161616)
|
|
98
|
+
override val messagingLinkIconPressed = Color(0xFF151515)
|
|
99
|
+
override val messagingLinkIconVisited = Color(0xFF484848)
|
|
100
|
+
override val messagingLinkUnderlineDefault = Color(0xFF1A1A1A)
|
|
101
|
+
override val messagingLinkUnderlineHover = Color(0xFF3C3C3C)
|
|
102
|
+
override val messagingLinkUnderlinePressed = Color(0xFF484848)
|
|
103
|
+
override val messagingLinkUnderlineVisited = Color(0xFF4E4E4E)
|
|
101
104
|
override val interactivePrimaryFillDefault = Color(0xFF005C8A)
|
|
102
105
|
override val interactivePrimaryFillHover = Color(0xFF004E75)
|
|
103
|
-
override val interactivePrimaryFillPressed = Color(
|
|
106
|
+
override val interactivePrimaryFillPressed = Color(0xFF00496E)
|
|
104
107
|
override val interactivePrimaryTextDefault = Color(0xFFFFFFFF)
|
|
105
108
|
override val interactivePrimaryTextHover = Color(0xFFFFFFFF)
|
|
106
109
|
override val interactivePrimaryTextPressed = Color(0xFFFFFFFF)
|
|
@@ -111,56 +114,56 @@ open class LightCoreColors : TDSColors {
|
|
|
111
114
|
override val interactiveSecondaryFillHover = Color(0xFFD9D9D9)
|
|
112
115
|
override val interactiveSecondaryFillPressed = Color(0xFFCCCCCC)
|
|
113
116
|
override val interactiveSecondaryBorderDefault = Color(0xFF8C8C8C)
|
|
114
|
-
override val interactiveSecondaryBorderHover = Color(
|
|
115
|
-
override val interactiveSecondaryBorderPressed = Color(
|
|
116
|
-
override val interactiveSecondaryTextDefault = Color(
|
|
117
|
-
override val interactiveSecondaryTextHover = Color(
|
|
118
|
-
override val interactiveSecondaryTextPressed = Color(
|
|
119
|
-
override val interactiveSecondaryIconDefault = Color(
|
|
120
|
-
override val interactiveSecondaryIconHover = Color(
|
|
121
|
-
override val interactiveSecondaryIconPressed = Color(
|
|
117
|
+
override val interactiveSecondaryBorderHover = Color(0xFF777777)
|
|
118
|
+
override val interactiveSecondaryBorderPressed = Color(0xFF707070)
|
|
119
|
+
override val interactiveSecondaryTextDefault = Color(0xFF1A1A1A)
|
|
120
|
+
override val interactiveSecondaryTextHover = Color(0xFF161616)
|
|
121
|
+
override val interactiveSecondaryTextPressed = Color(0xFF151515)
|
|
122
|
+
override val interactiveSecondaryIconDefault = Color(0xFF1A1A1A)
|
|
123
|
+
override val interactiveSecondaryIconHover = Color(0xFF161616)
|
|
124
|
+
override val interactiveSecondaryIconPressed = Color(0xFF111111)
|
|
122
125
|
override val interactiveDisabledA = Color(0xFFD9D9D9)
|
|
123
126
|
override val interactiveDisabledB = Color(0xFFBFBFBF)
|
|
124
|
-
override val interactiveDisabledC = Color(
|
|
127
|
+
override val interactiveDisabledC = Color(0xFFA8A8A8)
|
|
125
128
|
override val interactiveNegativeFillDefault = Color(0xFFFFFFFF)
|
|
126
129
|
override val interactiveNegativeFillHover = Color(0xFFD9D9D9)
|
|
127
130
|
override val interactiveNegativeFillPressed = Color(0xFFCCCCCC)
|
|
128
|
-
override val interactiveNegativeBorderDefault = Color(
|
|
129
|
-
override val interactiveNegativeBorderHover = Color(
|
|
130
|
-
override val interactiveNegativeBorderPressed = Color(
|
|
131
|
-
override val interactiveNegativeTextDefault = Color(
|
|
132
|
-
override val interactiveNegativeTextHover = Color(
|
|
133
|
-
override val interactiveNegativeTextPressed = Color(
|
|
134
|
-
override val interactiveNegativeIconDefault = Color(
|
|
135
|
-
override val interactiveNegativeIconHover = Color(
|
|
136
|
-
override val interactiveNegativeIconPressed = Color(
|
|
137
|
-
override val interactiveLinkPrimaryTextDefault = Color(
|
|
138
|
-
override val interactiveLinkPrimaryTextHover = Color(
|
|
139
|
-
override val interactiveLinkPrimaryTextPressed = Color(
|
|
140
|
-
override val interactiveLinkPrimaryTextVisited = Color(
|
|
141
|
-
override val interactiveLinkPrimaryIconDefault = Color(
|
|
142
|
-
override val interactiveLinkPrimaryIconHover = Color(
|
|
143
|
-
override val interactiveLinkPrimaryIconPressed = Color(
|
|
144
|
-
override val interactiveLinkPrimaryIconVisited = Color(
|
|
145
|
-
override val interactiveLinkPrimaryUnderlineDefault = Color(
|
|
146
|
-
override val interactiveLinkPrimaryUnderlineHover = Color(
|
|
147
|
-
override val interactiveLinkPrimaryUnderlinePressed = Color(
|
|
148
|
-
override val interactiveLinkPrimaryUnderlineVisited = Color(
|
|
149
|
-
override val interactiveLinkSecondaryTextDefault = Color(
|
|
150
|
-
override val interactiveLinkSecondaryTextHover = Color(
|
|
151
|
-
override val interactiveLinkSecondaryTextPressed = Color(
|
|
152
|
-
override val interactiveLinkSecondaryTextVisited = Color(
|
|
153
|
-
override val interactiveLinkSecondaryIconDefault = Color(
|
|
154
|
-
override val interactiveLinkSecondaryIconHover = Color(
|
|
155
|
-
override val interactiveLinkSecondaryIconPressed = Color(
|
|
156
|
-
override val interactiveLinkSecondaryIconVisited = Color(
|
|
157
|
-
override val interactiveLinkSecondaryUnderlineDefault = Color(
|
|
158
|
-
override val interactiveLinkSecondaryUnderlineHover = Color(
|
|
159
|
-
override val interactiveLinkSecondaryUnderlinePressed = Color(
|
|
160
|
-
override val interactiveLinkSecondaryUnderlineVisited = Color(
|
|
131
|
+
override val interactiveNegativeBorderDefault = Color(0xFFCB0705)
|
|
132
|
+
override val interactiveNegativeBorderHover = Color(0xFFAD0604)
|
|
133
|
+
override val interactiveNegativeBorderPressed = Color(0xFFA20604)
|
|
134
|
+
override val interactiveNegativeTextDefault = Color(0xFFCB0705)
|
|
135
|
+
override val interactiveNegativeTextHover = Color(0xFFAD0604)
|
|
136
|
+
override val interactiveNegativeTextPressed = Color(0xFFA20604)
|
|
137
|
+
override val interactiveNegativeIconDefault = Color(0xFFCB0705)
|
|
138
|
+
override val interactiveNegativeIconHover = Color(0xFFAD0604)
|
|
139
|
+
override val interactiveNegativeIconPressed = Color(0xFFA20604)
|
|
140
|
+
override val interactiveLinkPrimaryTextDefault = Color(0xFF266D95)
|
|
141
|
+
override val interactiveLinkPrimaryTextHover = Color(0xFF205C7F)
|
|
142
|
+
override val interactiveLinkPrimaryTextPressed = Color(0xFF1E5777)
|
|
143
|
+
override val interactiveLinkPrimaryTextVisited = Color(0xFF2D7FAF)
|
|
144
|
+
override val interactiveLinkPrimaryIconDefault = Color(0xFF266D95)
|
|
145
|
+
override val interactiveLinkPrimaryIconHover = Color(0xFF205C7F)
|
|
146
|
+
override val interactiveLinkPrimaryIconPressed = Color(0xFF1E5777)
|
|
147
|
+
override val interactiveLinkPrimaryIconVisited = Color(0xFF2D7FAF)
|
|
148
|
+
override val interactiveLinkPrimaryUnderlineDefault = Color(0xFF266D95)
|
|
149
|
+
override val interactiveLinkPrimaryUnderlineHover = Color(0xFF205C7F)
|
|
150
|
+
override val interactiveLinkPrimaryUnderlinePressed = Color(0xFF1E5777)
|
|
151
|
+
override val interactiveLinkPrimaryUnderlineVisited = Color(0xFF2D7FAF)
|
|
152
|
+
override val interactiveLinkSecondaryTextDefault = Color(0xFF1A1A1A)
|
|
153
|
+
override val interactiveLinkSecondaryTextHover = Color(0xFF161616)
|
|
154
|
+
override val interactiveLinkSecondaryTextPressed = Color(0xFF151515)
|
|
155
|
+
override val interactiveLinkSecondaryTextVisited = Color(0xFF484848)
|
|
156
|
+
override val interactiveLinkSecondaryIconDefault = Color(0xFF1A1A1A)
|
|
157
|
+
override val interactiveLinkSecondaryIconHover = Color(0xFF161616)
|
|
158
|
+
override val interactiveLinkSecondaryIconPressed = Color(0xFF151515)
|
|
159
|
+
override val interactiveLinkSecondaryIconVisited = Color(0xFF484848)
|
|
160
|
+
override val interactiveLinkSecondaryUnderlineDefault = Color(0xFF1A1A1A)
|
|
161
|
+
override val interactiveLinkSecondaryUnderlineHover = Color(0xFF3C3C3C)
|
|
162
|
+
override val interactiveLinkSecondaryUnderlinePressed = Color(0xFF484848)
|
|
163
|
+
override val interactiveLinkSecondaryUnderlineVisited = Color(0xFF4E4E4E)
|
|
161
164
|
override val interactiveChipPrimaryOnFillDefault = Color(0xFF005C8A)
|
|
162
165
|
override val interactiveChipPrimaryOnFillHover = Color(0xFF004E75)
|
|
163
|
-
override val interactiveChipPrimaryOnFillPressed = Color(
|
|
166
|
+
override val interactiveChipPrimaryOnFillPressed = Color(0xFF00496E)
|
|
164
167
|
override val interactiveChipPrimaryOnTextDefault = Color(0xFFFFFFFF)
|
|
165
168
|
override val interactiveChipPrimaryOnTextHover = Color(0xFFD9D9D9)
|
|
166
169
|
override val interactiveChipPrimaryOnTextPressed = Color(0xFFCCCCCC)
|
|
@@ -168,106 +171,106 @@ open class LightCoreColors : TDSColors {
|
|
|
168
171
|
override val interactiveChipPrimaryOnIconHover = Color(0xFFD9D9D9)
|
|
169
172
|
override val interactiveChipPrimaryOnIconPressed = Color(0xFFCCCCCC)
|
|
170
173
|
override val interactiveChipPrimaryOffFillDefault = Color(0xFFF2F2F2)
|
|
171
|
-
override val interactiveChipPrimaryOffFillHover = Color(
|
|
172
|
-
override val interactiveChipPrimaryOffFillPressed = Color(
|
|
174
|
+
override val interactiveChipPrimaryOffFillHover = Color(0xFFCECECE)
|
|
175
|
+
override val interactiveChipPrimaryOffFillPressed = Color(0xFFC2C2C2)
|
|
173
176
|
override val interactiveChipPrimaryOffTextDefault = Color(0xFF005C8A)
|
|
174
177
|
override val interactiveChipPrimaryOffTextHover = Color(0xFF004E75)
|
|
175
|
-
override val interactiveChipPrimaryOffTextPressed = Color(
|
|
178
|
+
override val interactiveChipPrimaryOffTextPressed = Color(0xFF00496E)
|
|
176
179
|
override val interactiveChipPrimaryOffIconDefault = Color(0xFF005C8A)
|
|
177
180
|
override val interactiveChipPrimaryOffIconHover = Color(0xFF004E75)
|
|
178
|
-
override val interactiveChipPrimaryOffIconPressed = Color(
|
|
181
|
+
override val interactiveChipPrimaryOffIconPressed = Color(0xFF00496E)
|
|
179
182
|
override val interactiveChipPrimaryOffBorderDefault = Color(0xFF005C8A)
|
|
180
183
|
override val interactiveChipPrimaryOffBorderHover = Color(0xFF004E75)
|
|
181
|
-
override val interactiveChipPrimaryOffBorderPressed = Color(
|
|
182
|
-
override val interactiveChipSecondaryOnTextDefault = Color(
|
|
183
|
-
override val interactiveChipSecondaryOnTextHover = Color(
|
|
184
|
-
override val interactiveChipSecondaryOnTextPressed = Color(
|
|
184
|
+
override val interactiveChipPrimaryOffBorderPressed = Color(0xFF00496E)
|
|
185
|
+
override val interactiveChipSecondaryOnTextDefault = Color(0xFF1A1A1A)
|
|
186
|
+
override val interactiveChipSecondaryOnTextHover = Color(0xFF161616)
|
|
187
|
+
override val interactiveChipSecondaryOnTextPressed = Color(0xFF151515)
|
|
185
188
|
override val interactiveChipSecondaryOnFillDefault = Color(0xFFFFFFFF)
|
|
186
189
|
override val interactiveChipSecondaryOnFillHover = Color(0xFFD9D9D9)
|
|
187
190
|
override val interactiveChipSecondaryOnFillPressed = Color(0xFFCCCCCC)
|
|
188
191
|
override val interactiveChipSecondaryOnBorderDefault = Color(0xFF8C8C8C)
|
|
189
|
-
override val interactiveChipSecondaryOnBorderHover = Color(
|
|
190
|
-
override val interactiveChipSecondaryOnBorderPressed = Color(
|
|
191
|
-
override val interactiveChipSecondaryOnIconDefault = Color(
|
|
192
|
-
override val interactiveChipSecondaryOnIconHover = Color(
|
|
193
|
-
override val interactiveChipSecondaryOnIconPressed = Color(
|
|
192
|
+
override val interactiveChipSecondaryOnBorderHover = Color(0xFF777777)
|
|
193
|
+
override val interactiveChipSecondaryOnBorderPressed = Color(0xFF707070)
|
|
194
|
+
override val interactiveChipSecondaryOnIconDefault = Color(0xFF1A1A1A)
|
|
195
|
+
override val interactiveChipSecondaryOnIconHover = Color(0xFF161616)
|
|
196
|
+
override val interactiveChipSecondaryOnIconPressed = Color(0xFF151515)
|
|
194
197
|
override val interactiveChipSecondaryOffFillDefault = Color(0xFFF2F2F2)
|
|
195
|
-
override val interactiveChipSecondaryOffFillHover = Color(
|
|
196
|
-
override val interactiveChipSecondaryOffFillPressed = Color(
|
|
198
|
+
override val interactiveChipSecondaryOffFillHover = Color(0xFFCECECE)
|
|
199
|
+
override val interactiveChipSecondaryOffFillPressed = Color(0xFFC2C2C2)
|
|
197
200
|
override val interactiveChipSecondaryOffTextDefault = Color(0xFF404040)
|
|
198
|
-
override val interactiveChipSecondaryOffTextHover = Color(
|
|
199
|
-
override val interactiveChipSecondaryOffTextPressed = Color(
|
|
201
|
+
override val interactiveChipSecondaryOffTextHover = Color(0xFF363636)
|
|
202
|
+
override val interactiveChipSecondaryOffTextPressed = Color(0xFF333333)
|
|
200
203
|
override val interactiveChipSecondaryOffIconDefault = Color(0xFF404040)
|
|
201
|
-
override val interactiveChipSecondaryOffIconHover = Color(
|
|
202
|
-
override val interactiveChipSecondaryOffIconPressed = Color(
|
|
204
|
+
override val interactiveChipSecondaryOffIconHover = Color(0xFF363636)
|
|
205
|
+
override val interactiveChipSecondaryOffIconPressed = Color(0xFF333333)
|
|
203
206
|
override val interactiveChipChannelSecondaryOnFillDefault = Color(0xFFFFFFFF)
|
|
204
207
|
override val interactiveChipChannelSecondaryOnFillHover = Color(0xFFD9D9D9)
|
|
205
208
|
override val interactiveChipChannelSecondaryOnFillPressed = Color(0xFFCCCCCC)
|
|
206
209
|
override val interactiveChipChannelSecondaryOnTextDefault = Color(0xFF737373)
|
|
207
|
-
override val interactiveChipChannelSecondaryOnTextHover = Color(
|
|
208
|
-
override val interactiveChipChannelSecondaryOnTextPressed = Color(
|
|
210
|
+
override val interactiveChipChannelSecondaryOnTextHover = Color(0xFF626262)
|
|
211
|
+
override val interactiveChipChannelSecondaryOnTextPressed = Color(0xFF5C5C5C)
|
|
209
212
|
override val interactiveChipChannelSecondaryOnIconDefault = Color(0xFF737373)
|
|
210
|
-
override val interactiveChipChannelSecondaryOnIconHover = Color(
|
|
211
|
-
override val interactiveChipChannelSecondaryOnIconPressed = Color(
|
|
213
|
+
override val interactiveChipChannelSecondaryOnIconHover = Color(0xFF626262)
|
|
214
|
+
override val interactiveChipChannelSecondaryOnIconPressed = Color(0xFF5C5C5C)
|
|
212
215
|
override val interactiveChipChannelSecondaryOnBorderDefault = Color(0xFF737373)
|
|
213
|
-
override val interactiveChipChannelSecondaryOnBorderHover = Color(
|
|
214
|
-
override val interactiveChipChannelSecondaryOnBorderPressed = Color(
|
|
215
|
-
override val interactiveChipChannelSecondaryOffFillDefault = Color(
|
|
216
|
-
override val interactiveChipChannelSecondaryOffFillHover = Color(
|
|
216
|
+
override val interactiveChipChannelSecondaryOnBorderHover = Color(0xFF626262)
|
|
217
|
+
override val interactiveChipChannelSecondaryOnBorderPressed = Color(0xFF5C5C5C)
|
|
218
|
+
override val interactiveChipChannelSecondaryOffFillDefault = Color(0xFFE6E6E6)
|
|
219
|
+
override val interactiveChipChannelSecondaryOffFillHover = Color(0xFFC4C4C4)
|
|
217
220
|
override val interactiveChipChannelSecondaryOffFillPressed = Color(0xFFCCCCCC)
|
|
218
221
|
override val interactiveChipChannelSecondaryOffTextDefault = Color(0xFF4D4D4D)
|
|
219
|
-
override val interactiveChipChannelSecondaryOffTextHover = Color(
|
|
220
|
-
override val interactiveChipChannelSecondaryOffTextPressed = Color(
|
|
222
|
+
override val interactiveChipChannelSecondaryOffTextHover = Color(0xFF424242)
|
|
223
|
+
override val interactiveChipChannelSecondaryOffTextPressed = Color(0xFF3E3E3E)
|
|
221
224
|
override val interactiveChipChannelSecondaryOffIconDefault = Color(0xFF4D4D4D)
|
|
222
|
-
override val interactiveChipChannelSecondaryOffIconHover = Color(
|
|
223
|
-
override val interactiveChipChannelSecondaryOffIconPressed = Color(
|
|
225
|
+
override val interactiveChipChannelSecondaryOffIconHover = Color(0xFF424242)
|
|
226
|
+
override val interactiveChipChannelSecondaryOffIconPressed = Color(0xFF3E3E3E)
|
|
224
227
|
override val interactiveChipChannelPrimaryOnFillDefault = Color(0xFF737373)
|
|
225
|
-
override val interactiveChipChannelPrimaryOnFillHover = Color(
|
|
226
|
-
override val interactiveChipChannelPrimaryOnFillPressed = Color(
|
|
228
|
+
override val interactiveChipChannelPrimaryOnFillHover = Color(0xFF626262)
|
|
229
|
+
override val interactiveChipChannelPrimaryOnFillPressed = Color(0xFF5C5C5C)
|
|
227
230
|
override val interactiveChipChannelPrimaryOnTextDefault = Color(0xFFFFFFFF)
|
|
228
231
|
override val interactiveChipChannelPrimaryOnTextHover = Color(0xFFD9D9D9)
|
|
229
232
|
override val interactiveChipChannelPrimaryOnTextPressed = Color(0xFFCCCCCC)
|
|
230
233
|
override val interactiveChipChannelPrimaryOnIconDefault = Color(0xFFFFFFFF)
|
|
231
234
|
override val interactiveChipChannelPrimaryOnIconHover = Color(0xFFD9D9D9)
|
|
232
235
|
override val interactiveChipChannelPrimaryOnIconPressed = Color(0xFFCCCCCC)
|
|
233
|
-
override val interactiveChipChannelPrimaryOffFillDefault = Color(
|
|
234
|
-
override val interactiveChipChannelPrimaryOffFillHover = Color(
|
|
235
|
-
override val interactiveChipChannelPrimaryOffFillPressed = Color(
|
|
236
|
+
override val interactiveChipChannelPrimaryOffFillDefault = Color(0xFFE6E6E6)
|
|
237
|
+
override val interactiveChipChannelPrimaryOffFillHover = Color(0xFFC4C4C4)
|
|
238
|
+
override val interactiveChipChannelPrimaryOffFillPressed = Color(0xFFB8B8B8)
|
|
236
239
|
override val interactiveChipChannelPrimaryOffTextDefault = Color(0xFF262626)
|
|
237
|
-
override val interactiveChipChannelPrimaryOffTextHover = Color(
|
|
238
|
-
override val interactiveChipChannelPrimaryOffTextPressed = Color(
|
|
240
|
+
override val interactiveChipChannelPrimaryOffTextHover = Color(0xFF202020)
|
|
241
|
+
override val interactiveChipChannelPrimaryOffTextPressed = Color(0xFF1E1E1E)
|
|
239
242
|
override val interactiveChipChannelPrimaryOffIconDefault = Color(0xFF262626)
|
|
240
|
-
override val interactiveChipChannelPrimaryOffIconHover = Color(
|
|
241
|
-
override val interactiveChipChannelPrimaryOffIconPressed = Color(
|
|
242
|
-
override val interactiveChipChannelPrimaryOffBorderDefault = Color(
|
|
243
|
-
override val interactiveChipChannelPrimaryOffBorderHover = Color(
|
|
244
|
-
override val interactiveChipChannelPrimaryOffBorderPressed = Color(
|
|
243
|
+
override val interactiveChipChannelPrimaryOffIconHover = Color(0xFF202020)
|
|
244
|
+
override val interactiveChipChannelPrimaryOffIconPressed = Color(0xFF1E1E1E)
|
|
245
|
+
override val interactiveChipChannelPrimaryOffBorderDefault = Color(0xFFA8A8A8)
|
|
246
|
+
override val interactiveChipChannelPrimaryOffBorderHover = Color(0xFF8F8F8F)
|
|
247
|
+
override val interactiveChipChannelPrimaryOffBorderPressed = Color(0xFF868686)
|
|
245
248
|
override val activeFill = Color(0xFF000000)
|
|
246
249
|
override val activeText = Color(0xFFFFFFFF)
|
|
247
250
|
override val activeBorder = Color(0xFF000000)
|
|
248
251
|
override val activeIcon = Color(0xFFFFFFFF)
|
|
249
252
|
override val focusBorder = Color(0xFF737373)
|
|
250
|
-
override val labelPrimary = Color(
|
|
253
|
+
override val labelPrimary = Color(0xFF1A1A1A)
|
|
251
254
|
override val labelSecondary = Color(0xFF737373)
|
|
252
255
|
override val labelChannel = Color(0xFF595959)
|
|
253
|
-
override val labelCallout = Color(
|
|
256
|
+
override val labelCallout = Color(0xFFB20908)
|
|
254
257
|
override val flagPrimaryFill = Color(0xFF000000)
|
|
255
258
|
override val flagPrimaryText = Color(0xFFF2F2F2)
|
|
256
259
|
override val flagPrimaryIcon = Color(0xFFF2F2F2)
|
|
257
|
-
override val flagSecondaryText = Color(
|
|
258
|
-
override val flagSecondaryIcon = Color(
|
|
259
|
-
override val flagChannelFill = Color(
|
|
260
|
+
override val flagSecondaryText = Color(0xFF1A1A1A)
|
|
261
|
+
override val flagSecondaryIcon = Color(0xFF1A1A1A)
|
|
262
|
+
override val flagChannelFill = Color(0xFFA8A8A8)
|
|
260
263
|
override val flagChannelText = Color(0xFF262626)
|
|
261
264
|
override val flagChannelIcon = Color(0xFF262626)
|
|
262
|
-
override val flagCalloutFill = Color(
|
|
265
|
+
override val flagCalloutFill = Color(0xFFB20908)
|
|
263
266
|
override val flagCalloutText = Color(0xFFFFFFFF)
|
|
264
267
|
override val flagCalloutIcon = Color(0xFFFFFFFF)
|
|
265
|
-
override val toastFillInfo = Color(
|
|
266
|
-
override val toastFillSuccess = Color(
|
|
267
|
-
override val toastFillWarning = Color(
|
|
268
|
-
override val toastFillError = Color(
|
|
269
|
-
override val toastIconInfo = Color(
|
|
270
|
-
override val toastIconSuccess = Color(
|
|
268
|
+
override val toastFillInfo = Color(0xFF0A3472)
|
|
269
|
+
override val toastFillSuccess = Color(0xFF22724F)
|
|
270
|
+
override val toastFillWarning = Color(0xFFE49307)
|
|
271
|
+
override val toastFillError = Color(0xFFCB0705)
|
|
272
|
+
override val toastIconInfo = Color(0xFF97AED7)
|
|
273
|
+
override val toastIconSuccess = Color(0xFFA9D8BE)
|
|
271
274
|
override val toastIconWarning = Color(0xFFFFDFB5)
|
|
272
275
|
override val toastIconError = Color(0xFFFFB4B0)
|
|
273
276
|
override val toastTextInfo = Color(0xFFFFFFFF)
|
|
@@ -284,8 +287,8 @@ open class LightCoreColors : TDSColors {
|
|
|
284
287
|
override val toastLinkErrorHover = Color(0xFFD9D9D9)
|
|
285
288
|
override val toastLinkErrorPressed = Color(0xFFCCCCCC)
|
|
286
289
|
override val toastLinkWarningDefault = Color(0xFF000000)
|
|
287
|
-
override val toastLinkWarningHover = Color(
|
|
288
|
-
override val toastLinkWarningPressed = Color(
|
|
290
|
+
override val toastLinkWarningHover = Color(0xFF000000)
|
|
291
|
+
override val toastLinkWarningPressed = Color(0xFF000000)
|
|
289
292
|
override val tooltipFill = Color(0xFF000000)
|
|
290
293
|
override val tooltipText = Color(0xFFFFFFFF)
|
|
291
294
|
override val tooltipIcon = Color(0xFFFFFFFF)
|
|
@@ -3,57 +3,59 @@ package uk.co.thetimes.timesDesignSystem
|
|
|
3
3
|
import androidx.compose.ui.graphics.Color
|
|
4
4
|
|
|
5
5
|
class LightCultureColors : LightCoreColors() {
|
|
6
|
-
override val surfaceChannel50 = Color(
|
|
7
|
-
override val surfaceChannel100 = Color(
|
|
8
|
-
override val surfaceChannel200 = Color(
|
|
6
|
+
override val surfaceChannel50 = Color(0xFFFDFAFA)
|
|
7
|
+
override val surfaceChannel100 = Color(0xFFF9EFF2)
|
|
8
|
+
override val surfaceChannel200 = Color(0xFFDDB3C8)
|
|
9
9
|
override val surfaceChannel300 = Color(0xFF942364)
|
|
10
|
-
override val surfaceChannel400 = Color(
|
|
11
|
-
override val surfaceChannel500 = Color(
|
|
12
|
-
override val textChannelPrimary = Color(
|
|
13
|
-
override val textChannelSecondary = Color(
|
|
10
|
+
override val surfaceChannel400 = Color(0xFF671846)
|
|
11
|
+
override val surfaceChannel500 = Color(0xFF4B1331)
|
|
12
|
+
override val textChannelPrimary = Color(0xFF942364)
|
|
13
|
+
override val textChannelSecondary = Color(0xFFA4477C)
|
|
14
|
+
override val textChannelTertiary = Color(0xFFBA729B)
|
|
14
15
|
override val iconChannelPrimary = Color(0xFF942364)
|
|
15
|
-
override val iconChannelSecondary = Color(
|
|
16
|
-
override val
|
|
17
|
-
override val
|
|
18
|
-
override val
|
|
19
|
-
override val
|
|
20
|
-
override val
|
|
21
|
-
override val
|
|
16
|
+
override val iconChannelSecondary = Color(0xFFA4477C)
|
|
17
|
+
override val iconChannelTertiary = Color(0xFFBA729B)
|
|
18
|
+
override val borderChannelPrimary = Color(0xFFDDB3C8)
|
|
19
|
+
override val borderChannelSecondary = Color(0xFFEEDBE3)
|
|
20
|
+
override val borderChannelTertiary = Color(0xFFF9EFF2)
|
|
21
|
+
override val interactiveChipChannelSecondaryOnFillDefault = Color(0xFFFDFAFA)
|
|
22
|
+
override val interactiveChipChannelSecondaryOnFillHover = Color(0xFFE7C4C4)
|
|
23
|
+
override val interactiveChipChannelSecondaryOnFillPressed = Color(0xFFE0B2B2)
|
|
22
24
|
override val interactiveChipChannelSecondaryOnTextDefault = Color(0xFF942364)
|
|
23
|
-
override val interactiveChipChannelSecondaryOnTextHover = Color(
|
|
24
|
-
override val interactiveChipChannelSecondaryOnTextPressed = Color(
|
|
25
|
+
override val interactiveChipChannelSecondaryOnTextHover = Color(0xFF7E1E56)
|
|
26
|
+
override val interactiveChipChannelSecondaryOnTextPressed = Color(0xFF761C51)
|
|
25
27
|
override val interactiveChipChannelSecondaryOnIconDefault = Color(0xFF942364)
|
|
26
|
-
override val interactiveChipChannelSecondaryOnIconHover = Color(
|
|
27
|
-
override val interactiveChipChannelSecondaryOnIconPressed = Color(
|
|
28
|
+
override val interactiveChipChannelSecondaryOnIconHover = Color(0xFF7E1E56)
|
|
29
|
+
override val interactiveChipChannelSecondaryOnIconPressed = Color(0xFF761C51)
|
|
28
30
|
override val interactiveChipChannelSecondaryOnBorderDefault = Color(0xFF942364)
|
|
29
|
-
override val interactiveChipChannelSecondaryOnBorderHover = Color(
|
|
30
|
-
override val interactiveChipChannelSecondaryOnBorderPressed = Color(
|
|
31
|
-
override val interactiveChipChannelSecondaryOffFillDefault = Color(
|
|
32
|
-
override val interactiveChipChannelSecondaryOffFillHover = Color(
|
|
33
|
-
override val interactiveChipChannelSecondaryOffFillPressed = Color(
|
|
34
|
-
override val interactiveChipChannelSecondaryOffTextDefault = Color(
|
|
35
|
-
override val interactiveChipChannelSecondaryOffTextHover = Color(
|
|
36
|
-
override val interactiveChipChannelSecondaryOffTextPressed = Color(
|
|
37
|
-
override val interactiveChipChannelSecondaryOffIconDefault = Color(
|
|
38
|
-
override val interactiveChipChannelSecondaryOffIconHover = Color(
|
|
39
|
-
override val interactiveChipChannelSecondaryOffIconPressed = Color(
|
|
31
|
+
override val interactiveChipChannelSecondaryOnBorderHover = Color(0xFF7E1E56)
|
|
32
|
+
override val interactiveChipChannelSecondaryOnBorderPressed = Color(0xFF761C51)
|
|
33
|
+
override val interactiveChipChannelSecondaryOffFillDefault = Color(0xFFF9EFF2)
|
|
34
|
+
override val interactiveChipChannelSecondaryOffFillHover = Color(0xFFE5BAC7)
|
|
35
|
+
override val interactiveChipChannelSecondaryOffFillPressed = Color(0xFFDEA8B8)
|
|
36
|
+
override val interactiveChipChannelSecondaryOffTextDefault = Color(0xFF671846)
|
|
37
|
+
override val interactiveChipChannelSecondaryOffTextHover = Color(0xFF58143C)
|
|
38
|
+
override val interactiveChipChannelSecondaryOffTextPressed = Color(0xFF521338)
|
|
39
|
+
override val interactiveChipChannelSecondaryOffIconDefault = Color(0xFF671846)
|
|
40
|
+
override val interactiveChipChannelSecondaryOffIconHover = Color(0xFF58143C)
|
|
41
|
+
override val interactiveChipChannelSecondaryOffIconPressed = Color(0xFF521338)
|
|
40
42
|
override val interactiveChipChannelPrimaryOnFillDefault = Color(0xFF942364)
|
|
41
|
-
override val interactiveChipChannelPrimaryOnFillHover = Color(
|
|
42
|
-
override val interactiveChipChannelPrimaryOnFillPressed = Color(
|
|
43
|
-
override val interactiveChipChannelPrimaryOffFillDefault = Color(
|
|
44
|
-
override val interactiveChipChannelPrimaryOffFillHover = Color(
|
|
45
|
-
override val interactiveChipChannelPrimaryOffFillPressed = Color(
|
|
46
|
-
override val interactiveChipChannelPrimaryOffTextDefault = Color(
|
|
47
|
-
override val interactiveChipChannelPrimaryOffTextHover = Color(
|
|
48
|
-
override val interactiveChipChannelPrimaryOffTextPressed = Color(
|
|
49
|
-
override val interactiveChipChannelPrimaryOffIconDefault = Color(
|
|
50
|
-
override val interactiveChipChannelPrimaryOffIconHover = Color(
|
|
51
|
-
override val interactiveChipChannelPrimaryOffIconPressed = Color(
|
|
52
|
-
override val interactiveChipChannelPrimaryOffBorderDefault = Color(
|
|
53
|
-
override val interactiveChipChannelPrimaryOffBorderHover = Color(
|
|
54
|
-
override val interactiveChipChannelPrimaryOffBorderPressed = Color(
|
|
55
|
-
override val labelChannel = Color(
|
|
56
|
-
override val flagChannelFill = Color(
|
|
57
|
-
override val flagChannelText = Color(
|
|
58
|
-
override val flagChannelIcon = Color(
|
|
43
|
+
override val interactiveChipChannelPrimaryOnFillHover = Color(0xFF7E1E56)
|
|
44
|
+
override val interactiveChipChannelPrimaryOnFillPressed = Color(0xFF761C51)
|
|
45
|
+
override val interactiveChipChannelPrimaryOffFillDefault = Color(0xFFF9EFF2)
|
|
46
|
+
override val interactiveChipChannelPrimaryOffFillHover = Color(0xFFE5BAC7)
|
|
47
|
+
override val interactiveChipChannelPrimaryOffFillPressed = Color(0xFFDEA8B8)
|
|
48
|
+
override val interactiveChipChannelPrimaryOffTextDefault = Color(0xFF4B1331)
|
|
49
|
+
override val interactiveChipChannelPrimaryOffTextHover = Color(0xFF40102A)
|
|
50
|
+
override val interactiveChipChannelPrimaryOffTextPressed = Color(0xFF3C0F27)
|
|
51
|
+
override val interactiveChipChannelPrimaryOffIconDefault = Color(0xFF4B1331)
|
|
52
|
+
override val interactiveChipChannelPrimaryOffIconHover = Color(0xFF40102A)
|
|
53
|
+
override val interactiveChipChannelPrimaryOffIconPressed = Color(0xFF3C0F27)
|
|
54
|
+
override val interactiveChipChannelPrimaryOffBorderDefault = Color(0xFFDDB3C8)
|
|
55
|
+
override val interactiveChipChannelPrimaryOffBorderHover = Color(0xFFCB8AAA)
|
|
56
|
+
override val interactiveChipChannelPrimaryOffBorderPressed = Color(0xFFC47CA0)
|
|
57
|
+
override val labelChannel = Color(0xFFBA729B)
|
|
58
|
+
override val flagChannelFill = Color(0xFFDDB3C8)
|
|
59
|
+
override val flagChannelText = Color(0xFF4B1331)
|
|
60
|
+
override val flagChannelIcon = Color(0xFF4B1331)
|
|
59
61
|
}
|