lib/util/color_schemes.g.dart

@@ -20,11 +20,9 @@ const lightColorScheme = ColorScheme(
   errorContainer: Color(0xFFFFDAD6),
   onError: Color(0xFFFFFFFF),
   onErrorContainer: Color(0xFF410002),
-  background: Color(0xFFFBFDF8),
-  onBackground: Color(0xFF191C19),
   surface: Color(0xFFFBFDF8),
   onSurface: Color(0xFF191C19),
-  surfaceVariant: Color(0xFFDCE5DB),
+  surfaceContainerHighest: Color(0xFFDCE5DB),
   onSurfaceVariant: Color(0xFF414942),
   outline: Color(0xFF717971),
   onInverseSurface: Color(0xFFF0F1EC),
@@ -54,11 +52,9 @@ const darkColorScheme = ColorScheme(
   errorContainer: Color(0xFF93000A),
   onError: Color(0xFF690005),
   onErrorContainer: Color(0xFFFFDAD6),
-  background: Color(0xFF191C19),
-  onBackground: Color(0xFFE1E3DE),
   surface: Color(0xFF191C19),
   onSurface: Color(0xFFE1E3DE),
-  surfaceVariant: Color(0xFF414942),
+  surfaceContainerHighest: Color(0xFF414942),
   onSurfaceVariant: Color(0xFFC0C9BF),
   outline: Color(0xFF8B938A),
   onInverseSurface: Color(0xFF191C19),

lib/views/create_entry.dart

@@ -29,6 +29,7 @@ class CreateSingleEntryView extends StatefulWidget {
   /// Is null unless we are editing an existing entry
   final WalletSingleEntry? editEntry;
 
+  /// Locale as set on user's system
   final String locale;
 
   @override
@@ -191,10 +192,10 @@ class _CreateSingleEntryViewState extends State<CreateSingleEntryView> {
                 Text(AppLocalizations.of(context).date),
                 PlatformButton(
                   style: ButtonStyle(
-                    backgroundColor: MaterialStateProperty.all(
+                    backgroundColor: WidgetStateProperty.all(
                       Theme.of(context).colorScheme.primary,
                     ),
-                    foregroundColor: MaterialStateProperty.all(
+                    foregroundColor: WidgetStateProperty.all(
                       Theme.of(context).colorScheme.onPrimary,
                     ),
                   ),

lib/views/home.dart

@@ -355,7 +355,7 @@ class _HomeViewState extends State<HomeView> {
                                           style: TextStyle(
                                             color: Theme.of(context)
                                                 .colorScheme
-                                                .onBackground,
+                                                .onSurface,
                                           ),
                                         ),
                                         TextSpan(
@@ -405,7 +405,7 @@ class _HomeViewState extends State<HomeView> {
                                           style: TextStyle(
                                             color: Theme.of(context)
                                                 .colorScheme
-                                                .onBackground,
+                                                .onSurface,
                                           ),
                                         ),
                                       ],
@@ -590,7 +590,7 @@ class _HomeViewState extends State<HomeView> {
                                                 style: TextStyle(
                                                   color: Theme.of(context)
                                                       .colorScheme
-                                                      .background
+                                                      .surface
                                                       .calculateTextColor(),
                                                 ),
                                               ),

lib/views/settings/graph_type.dart

@@ -37,7 +37,7 @@ class _GraphTypeSettingsViewState extends State<GraphTypeSettingsView> {
       body: SettingsList(
         applicationType: ApplicationType.both,
         darkTheme: SettingsThemeData(
-          settingsListBackground: Theme.of(context).colorScheme.background,
+          settingsListBackground: Theme.of(context).colorScheme.surface,
           titleTextColor: Theme.of(context).colorScheme.primary,
         ),
         sections: [

lib/views/settings/settings.dart

@@ -42,7 +42,7 @@ class _SettingsViewState extends State<SettingsView> {
       body: SettingsList(
         applicationType: ApplicationType.both,
         darkTheme: SettingsThemeData(
-          settingsListBackground: Theme.of(context).colorScheme.background,
+          settingsListBackground: Theme.of(context).colorScheme.surface,
           titleTextColor: Theme.of(context).colorScheme.primary,
         ),
         sections: [