Skip to content
Snippets Groups Projects
Commit c6346730 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '69-remove-deprecations' into 'master'

Resolve "Remove deprecations"

Closes #69

See merge request !67
parents 251401df 49d21363
No related branches found
No related tags found
1 merge request!67Resolve "Remove deprecations"
Pipeline #6012 passed
...@@ -39,11 +39,9 @@ final ColorScheme lightColorScheme = ColorScheme.light( ...@@ -39,11 +39,9 @@ final ColorScheme lightColorScheme = ColorScheme.light(
secondary: primarySwatch.shade500, secondary: primarySwatch.shade500,
onSecondary: Colors.white, onSecondary: Colors.white,
error: errorColor, error: errorColor,
background: textSwatch.shade200,
onBackground: textSwatch.shade500,
onSurface: textSwatch.shade500, onSurface: textSwatch.shade500,
surface: textSwatch.shade50, surface: textSwatch.shade50,
surfaceVariant: Colors.white, surfaceContainerHighest: Colors.white,
shadow: textSwatch.shade900.withOpacity(.1), shadow: textSwatch.shade900.withOpacity(.1),
); );
...@@ -52,11 +50,9 @@ final ColorScheme darkColorScheme = ColorScheme.dark( ...@@ -52,11 +50,9 @@ final ColorScheme darkColorScheme = ColorScheme.dark(
secondary: primarySwatch.shade500, secondary: primarySwatch.shade500,
onSecondary: Colors.white, onSecondary: Colors.white,
error: errorColor, error: errorColor,
background: const Color(0xFF171724),
onBackground: textSwatch.shade400,
onSurface: textSwatch.shade300, onSurface: textSwatch.shade300,
surface: const Color(0xFF262630), surface: const Color(0xFF262630),
surfaceVariant: const Color(0xFF282832), surfaceContainerHighest: const Color(0xFF282832),
shadow: textSwatch.shade900.withOpacity(.2), shadow: textSwatch.shade900.withOpacity(.2),
); );
......
...@@ -12,7 +12,7 @@ class ApiPage extends StatelessWidget { ...@@ -12,7 +12,7 @@ class ApiPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Material( return Material(
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.surface,
child: ListView( child: ListView(
padding: const EdgeInsets.symmetric(horizontal: 4), padding: const EdgeInsets.symmetric(horizontal: 4),
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
......
...@@ -12,7 +12,7 @@ class CameraPage extends StatelessWidget { ...@@ -12,7 +12,7 @@ class CameraPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Material( return Material(
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.surface,
child: const Column( child: const Column(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
......
...@@ -13,7 +13,7 @@ class DemoPage extends StatelessWidget { ...@@ -13,7 +13,7 @@ class DemoPage extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Material( return Material(
color: Theme.of(context).colorScheme.background, color: Theme.of(context).colorScheme.surface,
child: ListView( child: ListView(
padding: const EdgeInsets.symmetric(horizontal: 4), padding: const EdgeInsets.symmetric(horizontal: 4),
physics: const BouncingScrollPhysics(), physics: const BouncingScrollPhysics(),
......
...@@ -24,10 +24,10 @@ class _SkeletonScreenState extends State<SkeletonScreen> { ...@@ -24,10 +24,10 @@ class _SkeletonScreenState extends State<SkeletonScreen> {
return Menu.getPageWidget(pageIndex); return Menu.getPageWidget(pageIndex);
}, },
), ),
backgroundColor: Theme.of(context).colorScheme.background, backgroundColor: Theme.of(context).colorScheme.surface,
bottomNavigationBar: CurvedNavigationBar( bottomNavigationBar: CurvedNavigationBar(
color: Theme.of(context).colorScheme.onBackground, color: Theme.of(context).colorScheme.onSurface,
backgroundColor: Theme.of(context).colorScheme.background, backgroundColor: Theme.of(context).colorScheme.surface,
animationDuration: const Duration(milliseconds: 200), animationDuration: const Duration(milliseconds: 200),
height: 50, height: 50,
items: Menu.items.map((MenuItem item) => item.icon).toList(), items: Menu.items.map((MenuItem item) => item.icon).toList(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment