#334: updated text theme

icapps · Oct 11, 2024 · 163313e · 163313e
1 parent ebbdb6d
commit 163313e
Show file tree

Hide file tree

Showing 27 changed files with 192 additions and 196 deletions.
diff --git a/lib/screen/debug/debug_platform_selector_screen.dart b/lib/screen/debug/debug_platform_selector_screen.dart
@@ -24,12 +24,12 @@ class DebugPlatformSelectorScreenState extends State<DebugPlatformSelectorScreen
     return ProviderWidget<DebugPlatformSelectorViewModel>(
       create: getIt.call,
       consumerWithThemeAndLocalization: (context, value, _, theme, localization) => Scaffold(
-        backgroundColor: theme.colorsTheme.background,
+        backgroundColor: theme.background,
         appBar: AppBar(
           systemOverlayStyle: SystemUiOverlayStyle.light,
           leading: FlutterTemplateBackButton.light(onClick: value.onBackClicked),
           title: const Text('Select a platform'),
-          backgroundColor: theme.colorsTheme.primary,
+          backgroundColor: theme.primary,
         ),
         body: Consumer<GlobalViewModel>(
           builder: (context, viewModel, child) => ListView(

diff --git a/lib/screen/license/license_screen.dart b/lib/screen/license/license_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
 import 'package:flutter_template/di/injectable.dart';
+import 'package:flutter_template/styles/theme_data.dart';
 import 'package:flutter_template/viewmodel/license/license_viewmodel.dart';
 import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
 import 'package:flutter_template/widget/provider/provider_widget.dart';
@@ -25,20 +26,20 @@ class LicenseScreenState extends State<LicenseScreen> {
         itemBuilder: (context, index) {
           final item = viewModel.licenses[index];
           return Card(
-            color: theme.colorsTheme.background,
+            color: theme.background,
             child: Padding(
               padding: const EdgeInsets.all(16),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
                     item.name,
-                    style: theme.coreTextTheme.titleNormal,
+                    style: theme.text.titleNormal,
                   ),
                   Container(height: 8),
                   Text(
                     item.license,
-                    style: theme.coreTextTheme.bodySmall,
+                    style: theme.text.bodySmall,
                   ),
                 ],
               ),

diff --git a/lib/screen/login/login_screen.dart b/lib/screen/login/login_screen.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_navigation_generator_annotations/flutter_navigation_generator_annotations.dart';
 import 'package:flutter_template/di/injectable.dart';
+import 'package:flutter_template/styles/theme_data.dart';
 import 'package:flutter_template/util/keys.dart';
 import 'package:flutter_template/viewmodel/login/login_viewmodel.dart';
 import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
@@ -31,13 +32,13 @@ class LoginScreenState extends State<LoginScreen> {
           Container(height: 16),
           Text(
             'Login',
-            style: theme.coreTextTheme.titleNormal,
+            style: theme.text.titleNormal,
             textAlign: TextAlign.center,
           ),
           Container(height: 32),
           Text(
             'Just fill in some text. There is no validator for the login',
-            style: theme.coreTextTheme.labelButtonSmall,
+            style: theme.text.labelButtonSmall,
           ),
           Container(height: 32),
           FlutterTemplateInputField(

diff --git a/lib/screen/permission/analytics_permission_screen.dart b/lib/screen/permission/analytics_permission_screen.dart
@@ -3,6 +3,7 @@ import 'package:flutter_navigation_generator_annotations/flutter_navigation_gene
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:flutter_template/di/injectable.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
+import 'package:flutter_template/styles/theme_data.dart';
 import 'package:flutter_template/viewmodel/permission/analytics_permission_viewmodel.dart';
 import 'package:flutter_template/widget/general/simple_screen/base_screen.dart';
 import 'package:flutter_template/widget/general/styled/flutter_template_button.dart';
@@ -37,13 +38,13 @@ class AnalyticsPermissionScreen extends StatelessWidget {
                   const SizedBox(height: 32),
                   Text(
                     localization.permissionAnalyticsTitle,
-                    style: theme.coreTextTheme.titleNormal,
+                    style: theme.text.titleNormal,
                   ),
                   const SizedBox(height: 16),
                   Text(
                     localization.permissionAnalyticsDescription,
                     textAlign: TextAlign.center,
-                    style: theme.coreTextTheme.bodyNormal,
+                    style: theme.text.bodyNormal,
                   ),
                   const Spacer(),
                 ],

diff --git a/lib/screen/splash/splash_screen.dart b/lib/screen/splash/splash_screen.dart
@@ -25,7 +25,7 @@ class SplashScreenState extends State<SplashScreen> {
       consumerWithThemeAndLocalization: (context, viewModel, child, theme, localization) => StatusBar.animated(
         isDarkStyle: theme.isDarkTheme,
         child: Scaffold(
-          backgroundColor: theme.colorsTheme.primary,
+          backgroundColor: theme.primary,
           body: const Center(
             child: FlutterTemplateProgressIndicator.light(),
           ),

diff --git a/lib/screen/theme_mode/theme_mode_selector.dart b/lib/screen/theme_mode/theme_mode_selector.dart
@@ -22,12 +22,12 @@ class ThemeModeSelectorScreenState extends State<ThemeModeSelectorScreen> {
     return ProviderWidget<DebugThemeSelectorViewModel>(
       create: getIt.call,
       childBuilderWithViewModel: (context, viewModel, theme, localization) => Scaffold(
-        backgroundColor: theme.colorsTheme.background,
+        backgroundColor: theme.background,
         appBar: AppBar(
           systemOverlayStyle: SystemUiOverlayStyle.light,
           leading: FlutterTemplateBackButton.light(onClick: viewModel.onBackClicked),
           title: const Text('Select a theme mode'),
-          backgroundColor: theme.colorsTheme.primary,
+          backgroundColor: theme.primary,
         ),
         body: ListView(
           children: [

diff --git a/lib/screen/todo/todo_add/todo_add_screen.dart b/lib/screen/todo/todo_add/todo_add_screen.dart
@@ -24,14 +24,14 @@ class TodoAddScreenState extends State<TodoAddScreen> {
     return ProviderWidget<TodoAddViewModel>(
       create: getIt.call,
       childBuilderWithViewModel: (context, viewModel, theme, localization) => Scaffold(
-        backgroundColor: theme.colorsTheme.background,
+        backgroundColor: theme.background,
         appBar: AppBar(
           systemOverlayStyle: SystemUiOverlayStyle.light,
           leading: FlutterTemplateBackButton.light(
             onClick: viewModel.onBackClicked,
           ),
           title: Text(localization.todoAddTitle),
-          backgroundColor: theme.colorsTheme.primary,
+          backgroundColor: theme.primary,
         ),
         body: ScrollConfiguration(
           behavior: ScrollWhenNeededBehavior(),

diff --git a/lib/screen/todo/todo_list/todo_list_screen.dart b/lib/screen/todo/todo_list/todo_list_screen.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_template/di/injectable.dart';
 import 'package:flutter_template/model/webservice/todo/todo.dart';
 import 'package:flutter_template/styles/theme_assets.dart';
+import 'package:flutter_template/styles/theme_data.dart';
 import 'package:flutter_template/util/keys.dart';
 import 'package:flutter_template/viewmodel/todo/todo_list/todo_list_viewmodel.dart';
 import 'package:flutter_template/widget/general/action/action_item.dart';
@@ -33,13 +34,13 @@ class TodoListScreenState extends State<TodoListScreen> {
               key: Keys.downloadAction,
               svgAsset: ThemeAssets.downloadIcon(context),
               onClick: viewModel.onDownloadClicked,
-              color: theme.colorsTheme.appBarAction,
+              color: theme.appBarAction,
             ),
             ActionItem(
               key: Keys.addAction,
               svgAsset: ThemeAssets.addIcon(context),
               onClick: viewModel.onAddClicked,
-              color: theme.colorsTheme.appBarAction,
+              color: theme.appBarAction,
             ),
           ],
           child: Builder(
@@ -49,7 +50,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                 return Center(
                   child: Text(
                     localization.getTranslation(errorKey),
-                    style: theme.coreTextTheme.bodyNormal.copyWith(color: theme.colorsTheme.errorText),
+                    style: theme.errorText.bodyNormal,
                   ),
                 );
               }
@@ -67,7 +68,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                           child: Text(
                             localization.todoEmptyState,
                             textAlign: TextAlign.center,
-                            style: theme.coreTextTheme.bodyNormal,
+                            style: theme.text.bodyNormal,
                           ),
                         ),
                       );
@@ -86,7 +87,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                         padding: const EdgeInsets.symmetric(horizontal: 16),
                         child: Container(
                           height: 1,
-                          color: theme.colorsTheme.primary.withOpacity(0.1),
+                          color: theme.primary.withOpacity(0.1),
                         ),
                       ),
                     );