Skip to content

Commit 236f335

Browse files
Material Engcopybara-github
authored andcommitted
Update DynamicScheme API for Swift.
PiperOrigin-RevId: 582616798
1 parent 248bb0c commit 236f335

File tree

5 files changed

+352
-188
lines changed

5 files changed

+352
-188
lines changed

swift/Sources/MaterialColorUtilities/Scheme/DynamicScheme.swift renamed to swift/Sources/MaterialColorUtilities/DynamicColor/DynamicScheme.swift

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,4 +130,167 @@ public class DynamicScheme: Equatable, Hashable {
130130
hasher.combine(neutralVariantPalette)
131131
hasher.combine(errorPalette)
132132
}
133+
134+
var primaryPaletteKeyColor: Int {
135+
MaterialDynamicColors.primaryPaletteKeyColor.getArgb(self)
136+
}
137+
var secondaryPaletteKeyColor: Int {
138+
MaterialDynamicColors.secondaryPaletteKeyColor.getArgb(self)
139+
}
140+
var tertiaryPaletteKeyColor: Int {
141+
MaterialDynamicColors.tertiaryPaletteKeyColor.getArgb(self)
142+
}
143+
var neutralPaletteKeyColor: Int {
144+
MaterialDynamicColors.neutralPaletteKeyColor.getArgb(self)
145+
}
146+
var neutralVariantPaletteKeyColor: Int {
147+
MaterialDynamicColors.neutralVariantPaletteKeyColor.getArgb(self)
148+
}
149+
var background: Int {
150+
MaterialDynamicColors.background.getArgb(self)
151+
}
152+
var onBackground: Int {
153+
MaterialDynamicColors.onBackground.getArgb(self)
154+
}
155+
var surface: Int {
156+
MaterialDynamicColors.surface.getArgb(self)
157+
}
158+
var surfaceDim: Int {
159+
MaterialDynamicColors.surfaceDim.getArgb(self)
160+
}
161+
var surfaceBright: Int {
162+
MaterialDynamicColors.surfaceBright.getArgb(self)
163+
}
164+
var surfaceContainerLowest: Int {
165+
MaterialDynamicColors.surfaceContainerLowest.getArgb(self)
166+
}
167+
var surfaceContainerLow: Int {
168+
MaterialDynamicColors.surfaceContainerLow.getArgb(self)
169+
}
170+
var surfaceContainer: Int {
171+
MaterialDynamicColors.surfaceContainer.getArgb(self)
172+
}
173+
var surfaceContainerHigh: Int {
174+
MaterialDynamicColors.surfaceContainerHigh.getArgb(self)
175+
}
176+
var surfaceContainerHighest: Int {
177+
MaterialDynamicColors.surfaceContainerHighest.getArgb(self)
178+
}
179+
var onSurface: Int {
180+
MaterialDynamicColors.onSurface.getArgb(self)
181+
}
182+
var surfaceVariant: Int {
183+
MaterialDynamicColors.surfaceVariant.getArgb(self)
184+
}
185+
var onSurfaceVariant: Int {
186+
MaterialDynamicColors.onSurfaceVariant.getArgb(self)
187+
}
188+
var inverseSurface: Int {
189+
MaterialDynamicColors.inverseSurface.getArgb(self)
190+
}
191+
var inverseOnSurface: Int {
192+
MaterialDynamicColors.inverseOnSurface.getArgb(self)
193+
}
194+
var outline: Int {
195+
MaterialDynamicColors.outline.getArgb(self)
196+
}
197+
var outlineVariant: Int {
198+
MaterialDynamicColors.outlineVariant.getArgb(self)
199+
}
200+
var shadow: Int {
201+
MaterialDynamicColors.shadow.getArgb(self)
202+
}
203+
var scrim: Int {
204+
MaterialDynamicColors.scrim.getArgb(self)
205+
}
206+
var surfaceTint: Int {
207+
MaterialDynamicColors.surfaceTint.getArgb(self)
208+
}
209+
var primary: Int {
210+
MaterialDynamicColors.primary.getArgb(self)
211+
}
212+
var onPrimary: Int {
213+
MaterialDynamicColors.onPrimary.getArgb(self)
214+
}
215+
var primaryContainer: Int {
216+
MaterialDynamicColors.primaryContainer.getArgb(self)
217+
}
218+
var onPrimaryContainer: Int {
219+
MaterialDynamicColors.onPrimaryContainer.getArgb(self)
220+
}
221+
var inversePrimary: Int {
222+
MaterialDynamicColors.inversePrimary.getArgb(self)
223+
}
224+
var secondary: Int {
225+
MaterialDynamicColors.secondary.getArgb(self)
226+
}
227+
var onSecondary: Int {
228+
MaterialDynamicColors.onSecondary.getArgb(self)
229+
}
230+
var secondaryContainer: Int {
231+
MaterialDynamicColors.secondaryContainer.getArgb(self)
232+
}
233+
var onSecondaryContainer: Int {
234+
MaterialDynamicColors.onSecondaryContainer.getArgb(self)
235+
}
236+
var tertiary: Int {
237+
MaterialDynamicColors.tertiary.getArgb(self)
238+
}
239+
var onTertiary: Int {
240+
MaterialDynamicColors.onTertiary.getArgb(self)
241+
}
242+
var tertiaryContainer: Int {
243+
MaterialDynamicColors.tertiaryContainer.getArgb(self)
244+
}
245+
var onTertiaryContainer: Int {
246+
MaterialDynamicColors.onTertiaryContainer.getArgb(self)
247+
}
248+
var error: Int {
249+
MaterialDynamicColors.error.getArgb(self)
250+
}
251+
var onError: Int {
252+
MaterialDynamicColors.onError.getArgb(self)
253+
}
254+
var errorContainer: Int {
255+
MaterialDynamicColors.errorContainer.getArgb(self)
256+
}
257+
var onErrorContainer: Int {
258+
MaterialDynamicColors.onErrorContainer.getArgb(self)
259+
}
260+
var primaryFixed: Int {
261+
MaterialDynamicColors.primaryFixed.getArgb(self)
262+
}
263+
var primaryFixedDim: Int {
264+
MaterialDynamicColors.primaryFixedDim.getArgb(self)
265+
}
266+
var onPrimaryFixed: Int {
267+
MaterialDynamicColors.onPrimaryFixed.getArgb(self)
268+
}
269+
var onPrimaryFixedVariant: Int {
270+
MaterialDynamicColors.onPrimaryFixedVariant.getArgb(self)
271+
}
272+
var secondaryFixed: Int {
273+
MaterialDynamicColors.secondaryFixed.getArgb(self)
274+
}
275+
var secondaryFixedDim: Int {
276+
MaterialDynamicColors.secondaryFixedDim.getArgb(self)
277+
}
278+
var onSecondaryFixed: Int {
279+
MaterialDynamicColors.onSecondaryFixed.getArgb(self)
280+
}
281+
var onSecondaryFixedVariant: Int {
282+
MaterialDynamicColors.onSecondaryFixedVariant.getArgb(self)
283+
}
284+
var tertiaryFixed: Int {
285+
MaterialDynamicColors.tertiaryFixed.getArgb(self)
286+
}
287+
var tertiaryFixedDim: Int {
288+
MaterialDynamicColors.tertiaryFixedDim.getArgb(self)
289+
}
290+
var onTertiaryFixed: Int {
291+
MaterialDynamicColors.onTertiaryFixed.getArgb(self)
292+
}
293+
var onTertiaryFixedVariant: Int {
294+
MaterialDynamicColors.onTertiaryFixedVariant.getArgb(self)
295+
}
133296
}

swift/Sources/MaterialColorUtilities/Scheme/Scheme.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
@available(*, deprecated, message: "Use `DynamicScheme`")
1516
class Scheme {
1617
let primary: Int
1718
let onPrimary: Int

swift/Tests/MaterialColorUtilitiesTests/SchemeTests/SchemeTests.swift

Lines changed: 0 additions & 188 deletions
This file was deleted.

0 commit comments

Comments
 (0)