Merge pull request #366 from icapps/feature/design-system

Feature/design system
icapps · Jan 28, 2025 · fd6aed2 · fd6aed2
2 parents 022321d + 3fd5786
commit fd6aed2
Show file tree

Hide file tree

Showing 153 changed files with 719 additions and 330 deletions.
diff --git a/assets/fonts/aeonik_pro/AeonikPro-Bold.otf b/assets/fonts/aeonik_pro/AeonikPro-Bold.otf
diff --git a/assets/fonts/aeonik_pro/AeonikPro-Light.otf b/assets/fonts/aeonik_pro/AeonikPro-Light.otf
diff --git a/assets/fonts/aeonik_pro/AeonikPro-Medium.otf b/assets/fonts/aeonik_pro/AeonikPro-Medium.otf
diff --git a/assets/fonts/aeonik_pro/AeonikPro-Regular.otf b/assets/fonts/aeonik_pro/AeonikPro-Regular.otf
diff --git a/assets/fonts/open_sans/OpenSans-Regular.ttf b/assets/fonts/open_sans/OpenSans-Regular.ttf
diff --git a/lib/screen/license/license_screen.dart b/lib/screen/license/license_screen.dart
@@ -26,20 +26,20 @@ class LicenseScreenState extends State<LicenseScreen> {
         itemBuilder: (context, index) {
           final item = viewModel.licenses[index];
           return Card(
-            color: theme.background,
+            color: theme.level1,
             child: Padding(
               padding: const EdgeInsets.all(16),
               child: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   Text(
                     item.name,
-                    style: theme.text.titleNormal,
+                    style: theme.bodyNeutralDefault.headingS,
                   ),
                   Container(height: 8),
                   Text(
                     item.license,
-                    style: theme.text.bodySmall,
+                    style: theme.bodyNeutralDefault.paragraphS,
                   ),
                 ],
               ),

diff --git a/lib/screen/log_detail/log_detail_screen.dart b/lib/screen/log_detail/log_detail_screen.dart
@@ -35,7 +35,7 @@ class LogDetailScreenState extends State<LogDetailScreen> {
                 final log = viewModel.logs.reversed.toList()[index];
                 return Text(
                   log,
-                  style: theme.text.bodySmall,
+                  style: theme.bodyNeutralDefault.paragraphS,
                 );
               },
             ),

diff --git a/lib/screen/login/login_screen.dart b/lib/screen/login/login_screen.dart
@@ -33,13 +33,13 @@ class LoginScreenState extends State<LoginScreen> {
             Container(height: 16),
             Text(
               'Login',
-              style: theme.text.titleNormal,
+              style: theme.bodyNeutralDefault.headingS,
               textAlign: TextAlign.center,
             ),
             Container(height: 32),
             Text(
               'Just fill in some text. There is no validator for the login',
-              style: theme.text.labelButtonSmall,
+              style: theme.bodyNeutralDefault.labelS,
             ),
             Container(height: 32),
             FlutterTemplateInputField(

diff --git a/lib/screen/logs/logs_screen.dart b/lib/screen/logs/logs_screen.dart
@@ -37,7 +37,7 @@ class LogsScreenState extends State<LogsScreen> {
                   final item = viewModel.availableDates[index];
                   return TouchFeedBack(
                     onTapped: () => viewModel.onLogTapped(item),
-                    color: theme.cardBackground,
+                    color: theme.canvas,
                     borderRadius: BorderRadius.circular(12),
                     child: Padding(
                       padding: const EdgeInsets.all(16),
@@ -46,12 +46,12 @@ class LogsScreenState extends State<LogsScreen> {
                           Expanded(
                             child: Text(
                               item.shortDateWeekdayFormat,
-                              style: theme.text.bodyBig,
+                              style: theme.bodyNeutralDefault.paragraphM,
                             ),
                           ),
                           Icon(
                             IcappsIcons.chevronRight,
-                            color: theme.icon,
+                            color: theme.bodyNeutralFaded,
                           )
                         ],
                       ),

diff --git a/lib/screen/permission/analytics_permission_screen.dart b/lib/screen/permission/analytics_permission_screen.dart
@@ -38,13 +38,13 @@ class AnalyticsPermissionScreen extends StatelessWidget {
                   const SizedBox(height: 32),
                   Text(
                     localization.permissionAnalyticsTitle,
-                    style: theme.text.titleNormal,
+                    style: theme.bodyNeutralDefault.headingS,
                   ),
                   const SizedBox(height: 16),
                   Text(
                     localization.permissionAnalyticsDescription,
                     textAlign: TextAlign.center,
-                    style: theme.text.bodyNormal,
+                    style: theme.bodyNeutralDefault.paragraphM,
                   ),
                   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.primary,
+          backgroundColor: theme.main,
           body: const Center(
             child: FlutterTemplateProgressIndicator.light(),
           ),

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.background,
+        backgroundColor: theme.level2,
         appBar: AppBar(
           systemOverlayStyle: SystemUiOverlayStyle.light,
           leading: FlutterTemplateBackButton.light(
             onClick: viewModel.onBackClicked,
           ),
           title: Text(localization.todoAddTitle),
-          backgroundColor: theme.primary,
+          backgroundColor: theme.main,
         ),
         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
@@ -34,13 +34,13 @@ class TodoListScreenState extends State<TodoListScreen> {
               key: Keys.downloadAction,
               icon: IcappsIcons.arrowDownToLine,
               onClick: viewModel.onDownloadClicked,
-              color: theme.appBarAction,
+              color: theme.main,
             ),
             ActionItem(
               key: Keys.addAction,
               icon: IcappsIcons.plus,
               onClick: viewModel.onAddClicked,
-              color: theme.appBarAction,
+              color: theme.main,
             ),
           ],
           child: Builder(
@@ -50,7 +50,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                 return Center(
                   child: Text(
                     localization.getTranslation(errorKey),
-                    style: theme.errorText.bodyNormal,
+                    style: theme.bodySystemNegative.paragraphM,
                   ),
                 );
               }
@@ -68,21 +68,21 @@ class TodoListScreenState extends State<TodoListScreen> {
                           child: Container(
                             padding: const EdgeInsets.all(16),
                             decoration: BoxDecoration(
-                              color: theme.fillInformative,
+                              color: theme.systemInformative,
                               borderRadius: BorderRadius.circular(8),
                             ),
                             child: Column(
                               mainAxisSize: MainAxisSize.min,
                               children: [
                                 Icon(
                                   IcappsIcons.fileData,
-                                  color: theme.accent,
+                                  color: theme.accentThink,
                                 ),
                                 const SizedBox(height: 8),
                                 Text(
                                   localization.todoEmptyState,
                                   textAlign: TextAlign.center,
-                                  style: theme.text.bodyNormal,
+                                  style: theme.bodyNeutralDefault.paragraphM,
                                 ),
                               ],
                             ),
@@ -104,7 +104,7 @@ class TodoListScreenState extends State<TodoListScreen> {
                         padding: const EdgeInsets.symmetric(horizontal: 16),
                         child: Container(
                           height: 1,
-                          color: theme.primary.withOpacity(0.1),
+                          color: theme.main.withOpacity(0.1),
                         ),
                       ),
                     );