Theme adjustments.

olmps · Jun 26, 2024 · 31ca12d · 31ca12d
1 parent 37b64a1
commit 31ca12d
Show file tree

Hide file tree

Showing 22 changed files with 72 additions and 70 deletions.
diff --git a/lib/application/pages/details/collection_details_page.dart b/lib/application/pages/details/collection_details_page.dart
@@ -83,7 +83,7 @@ class CollectionDetailsPage extends ConsumerWidget {
           context.verticalBox(Spacing.small),
           Text(
             strings.detailsResourcesWarning,
-            style: Theme.of(context).textTheme.caption?.copyWith(color: memoTheme.neutralSwatch.shade300),
+            style: Theme.of(context).textTheme.bodySmall?.copyWith(color: memoTheme.neutralSwatch.shade300),
           ),
           context.verticalBox(Spacing.small),
           ResourcesList(
@@ -156,7 +156,7 @@ class CollectionDetailsPage extends ConsumerWidget {
   Widget _buildSectionTitle(BuildContext context, WidgetRef ref, String text) => Text(
         text,
         style:
-            Theme.of(context).textTheme.subtitle1?.copyWith(color: ref.watch(themeController).neutralSwatch.shade300),
+            Theme.of(context).textTheme.titleMedium?.copyWith(color: ref.watch(themeController).neutralSwatch.shade300),
       );
 }
 

diff --git a/lib/application/pages/details/contributor_view.dart b/lib/application/pages/details/contributor_view.dart
@@ -70,7 +70,7 @@ class MultiContributorsView extends ConsumerWidget {
           size: dimens.contributorImageSize,
           child: Text(
             '+${contributorsAmount - _visibleContributorsLimit}',
-            style: Theme.of(context).textTheme.subtitle2,
+            style: Theme.of(context).textTheme.titleSmall,
           ),
         ),
       );

diff --git a/lib/application/pages/execution/completed_execution_contents.dart b/lib/application/pages/execution/completed_execution_contents.dart
@@ -51,7 +51,7 @@ class CompletedExecutionContents extends ConsumerWidget {
 
   Widget _buildSectionTitle(BuildContext context, MemoThemeData theme, String text) => Text(
         text,
-        style: Theme.of(context).textTheme.subtitle1?.copyWith(color: theme.neutralSwatch.shade300),
+        style: Theme.of(context).textTheme.titleMedium?.copyWith(color: theme.neutralSwatch.shade300),
       );
 
   Widget _wrapInVerticalSection(Widget child, MemoThemeData theme) {
@@ -146,19 +146,19 @@ class _Header extends ConsumerWidget {
         context.verticalBox(Spacing.xLarge),
         Text(
           strings.executionWellDone,
-          style: textTheme.subtitle1?.copyWith(color: memoTheme.primarySwatch.shade400),
+          style: textTheme.titleMedium?.copyWith(color: memoTheme.primarySwatch.shade400),
           textAlign: TextAlign.center,
         ),
         context.verticalBox(Spacing.small),
         Text(
           strings.executionImprovedKnowledgeDescription,
-          style: textTheme.subtitle1?.copyWith(color: memoTheme.neutralSwatch.shade400),
+          style: textTheme.titleMedium?.copyWith(color: memoTheme.neutralSwatch.shade400),
           textAlign: TextAlign.center,
         ),
         context.verticalBox(Spacing.large),
         Text(
           '# $collectionName',
-          style: textTheme.headline6,
+          style: textTheme.headlineSmall,
           textAlign: TextAlign.center,
         ),
       ],
@@ -199,13 +199,13 @@ class _PerformanceIndicators extends ConsumerWidget {
           context.verticalBox(Spacing.small),
           Text(
             readableAnswersForDifficulty(difficulty) + strings.percentSymbol,
-            style: textTheme.subtitle1?.copyWith(color: memoTheme.secondarySwatch.shade400),
+            style: textTheme.titleMedium?.copyWith(color: memoTheme.secondarySwatch.shade400),
             textAlign: TextAlign.center,
           ),
           context.verticalBox(Spacing.xxSmall),
           Text(
             strings.answeredMemos(difficulty).toUpperCase(),
-            style: textTheme.caption,
+            style: textTheme.bodySmall,
             textAlign: TextAlign.center,
           ),
         ],

diff --git a/lib/application/pages/execution/execution_terminal.dart b/lib/application/pages/execution/execution_terminal.dart
@@ -371,7 +371,8 @@ class _TerminalActions extends HookWidget {
               Expanded(
                 child: Text(
                   strings.memoDifficulty(difficulty),
-                  style: Theme.of(context).textTheme.bodyText2?.copyWith(color: isMarkedAnswer ? highlightColor : null),
+                  style:
+                      Theme.of(context).textTheme.bodyMedium?.copyWith(color: isMarkedAnswer ? highlightColor : null),
                 ),
               ),
             ],

diff --git a/lib/application/pages/home/collections/collections_list_view.dart b/lib/application/pages/home/collections/collections_list_view.dart
@@ -52,7 +52,7 @@ class _CollectionsSectionHeader extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final titleColor = ref.watch(themeController).neutralSwatch.shade300;
-    final sectionTitleStyle = Theme.of(context).textTheme.headline6?.copyWith(color: titleColor);
+    final sectionTitleStyle = Theme.of(context).textTheme.headlineSmall?.copyWith(color: titleColor);
     return Text(title, style: sectionTitleStyle);
   }
 }
diff --git a/lib/application/pages/home/collections/collections_page.dart b/lib/application/pages/home/collections/collections_page.dart
@@ -134,11 +134,11 @@ class _CollectionsEmptyState extends ConsumerWidget {
           color: theme.neutralSwatch.shade700,
         ),
         context.verticalBox(Spacing.xLarge),
-        Text(title, style: textTheme.headline6, textAlign: TextAlign.center),
+        Text(title, style: textTheme.headlineSmall, textAlign: TextAlign.center),
         context.verticalBox(Spacing.medium),
         Text(
           description,
-          style: textTheme.bodyText2?.copyWith(color: theme.neutralSwatch.shade400),
+          style: textTheme.bodyMedium?.copyWith(color: theme.neutralSwatch.shade400),
           textAlign: TextAlign.center,
         ),
         context.verticalBox(Spacing.xLarge),

diff --git a/lib/application/pages/home/collections/update/update_collection_details.dart b/lib/application/pages/home/collections/update/update_collection_details.dart
@@ -148,7 +148,7 @@ class _DescriptionField extends HookConsumerWidget {
           controller: controller,
           modalTitle: Text(
             strings.detailsDescription,
-            style: textTheme.bodyText1?.copyWith(color: theme.primarySwatch.shade400),
+            style: textTheme.bodyLarge?.copyWith(color: theme.primarySwatch.shade400),
           ),
           placeholder: strings.collectionDescription,
           helperText: strings.fieldCharactersAmount(descriptionLength, validators.collectionDescriptionMaxLength),

diff --git a/lib/application/pages/home/collections/update/update_collection_memos.dart b/lib/application/pages/home/collections/update/update_collection_memos.dart
@@ -184,7 +184,7 @@ class _NavigationIndicator extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         AssetIconButton(images.chevronLeftAsset, onPressed: onLeftTapped),
-        Text('$currentPage/$pagesAmount', style: textTheme.subtitle2),
+        Text('$currentPage/$pagesAmount', style: textTheme.titleSmall),
         AssetIconButton(images.chevronRightAsset, onPressed: onRightTapped),
       ],
     );
@@ -209,7 +209,7 @@ class _CreateMemoEmptyState extends ConsumerWidget {
         context.verticalBox(Spacing.small),
         Text(
           strings.newMemo.toUpperCase(),
-          style: textTheme.button?.copyWith(color: theme.primarySwatch.shade400),
+          style: textTheme.labelLarge?.copyWith(color: theme.primarySwatch.shade400),
           textAlign: TextAlign.center,
         )
       ],

diff --git a/lib/application/pages/home/collections/update/update_collection_page.dart b/lib/application/pages/home/collections/update/update_collection_page.dart
@@ -260,7 +260,7 @@ class _MemosReorderableList extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final textTheme = Theme.of(context).textTheme;
 
-    final listHeader = Text('${strings.jumpTo}...', style: textTheme.subtitle1, textAlign: TextAlign.center);
+    final listHeader = Text('${strings.jumpTo}...', style: textTheme.titleMedium, textAlign: TextAlign.center);
 
     return Theme(
       // Overrides theme to remove canvasColor and shadowColor when dragging a Memo card
@@ -321,7 +321,7 @@ class _MemosReorderableListRow extends ConsumerWidget {
       children: [
         Text(
           strings.updateMemoQuestionTitle(index + 1),
-          style: textTheme.bodyText1?.copyWith(color: theme.secondarySwatch),
+          style: textTheme.bodyLarge?.copyWith(color: theme.secondarySwatch),
         ),
         context.verticalBox(Spacing.xSmall),
         Text(metadata.question.plainContent, maxLines: 3),

diff --git a/lib/application/pages/home/collections/update/update_memo_terminal.dart b/lib/application/pages/home/collections/update/update_memo_terminal.dart
@@ -40,7 +40,7 @@ class UpdateMemoTerminal extends HookConsumerWidget {
 
     final questionTitle = Text(
       strings.updateMemoQuestionTitle(memoIndex),
-      style: textTheme.bodyText1?.copyWith(color: theme.secondarySwatch),
+      style: textTheme.bodyLarge?.copyWith(color: theme.secondarySwatch),
     );
     final questionField = Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -57,7 +57,7 @@ class UpdateMemoTerminal extends HookConsumerWidget {
 
     final answerTitle = Text(
       strings.updateMemoAnswer,
-      style: textTheme.bodyText1?.copyWith(color: theme.primarySwatch),
+      style: textTheme.bodyLarge?.copyWith(color: theme.primarySwatch),
     );
     final answerField = Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,

diff --git a/lib/application/pages/home/progress/progress_page.dart b/lib/application/pages/home/progress/progress_page.dart
@@ -114,8 +114,8 @@ class ProgressPage extends ConsumerWidget {
         TextSpan(
           text: texts[index],
           style: index.isOdd
-              ? textTheme.headline4?.copyWith(color: titleColor)
-              : textTheme.headline3?.copyWith(color: titleColor),
+              ? textTheme.headlineLarge?.copyWith(color: titleColor)
+              : textTheme.displaySmall?.copyWith(color: titleColor),
         ),
       );
     }
@@ -147,7 +147,7 @@ class _ProgressContainer extends ConsumerWidget {
       children: [
         title,
         context.verticalBox(Spacing.xSmall),
-        Text(description, style: textTheme.caption),
+        Text(description, style: textTheme.bodySmall),
       ],
     );
 

diff --git a/lib/application/pages/settings/settings_page.dart b/lib/application/pages/settings/settings_page.dart
@@ -27,7 +27,7 @@ class SettingsPage extends ConsumerWidget {
           if (item is SettingsSectionItem) {
             return Text(
               strings.settingsDescriptionForSection(item.section),
-              style: Theme.of(context).textTheme.subtitle1,
+              style: Theme.of(context).textTheme.titleMedium,
             ).withOnlyPadding(context, top: Spacing.xLarge, bottom: Spacing.xxSmall);
           } else if (item is LinkSettingsItem) {
             return UrlLinkButton(

diff --git a/lib/application/theme/material_theme_data.dart b/lib/application/theme/material_theme_data.dart
@@ -55,7 +55,7 @@ ThemeData buildThemeData({
     elevation: 0,
     iconTheme: iconTheme,
     backgroundColor: Colors.transparent,
-    titleTextStyle: textTheme.subtitle1,
+    titleTextStyle: textTheme.titleMedium,
     foregroundColor: Colors.white,
   );
 
@@ -70,13 +70,13 @@ ThemeData buildThemeData({
     labelPadding: tabBarLabelPadding,
     labelColor: secondarySwatch.shade400,
     unselectedLabelColor: neutralSwatch.shade300,
-    labelStyle: textTheme.subtitle2,
-    unselectedLabelStyle: textTheme.subtitle2,
+    labelStyle: textTheme.titleSmall,
+    unselectedLabelStyle: textTheme.titleSmall,
   );
 
   final snackBarTheme = SnackBarThemeData(
     backgroundColor: neutralSwatch.shade800,
-    contentTextStyle: textTheme.bodyText2,
+    contentTextStyle: textTheme.bodyMedium,
     actionTextColor: secondarySwatch.shade400,
   );
 
@@ -120,91 +120,91 @@ ThemeData buildThemeData({
 //
 TextTheme _buildTextTheme(String fontFamily, {required Color textColor}) {
   return TextTheme(
-    headline1: TextStyle(
+    displayLarge: TextStyle(
       fontFamily: fontFamily,
       fontSize: 96,
       height: 1.17,
       fontWeight: FontWeight.w400,
       color: textColor,
     ),
-    headline2: TextStyle(
+    displayMedium: TextStyle(
       fontFamily: fontFamily,
       fontSize: 60,
       height: 1.2,
       fontWeight: FontWeight.w500,
       color: textColor,
     ),
-    headline3: TextStyle(
+    displaySmall: TextStyle(
       fontFamily: fontFamily,
       fontSize: 48,
       height: 1,
       fontWeight: FontWeight.w500,
       color: textColor,
     ),
-    headline4: TextStyle(
+    headlineLarge: TextStyle(
       fontFamily: fontFamily,
       fontSize: 32,
       height: 1.19,
       fontWeight: FontWeight.w400,
       color: textColor,
     ),
-    headline5: TextStyle(
+    headlineMedium: TextStyle(
       fontFamily: fontFamily,
       fontSize: 24,
       height: 1.17,
       fontWeight: FontWeight.w400,
       color: textColor,
     ),
-    headline6: TextStyle(
+    headlineSmall: TextStyle(
       fontFamily: fontFamily,
       fontSize: 20,
       height: 1.2,
       fontWeight: FontWeight.w400,
       color: textColor,
     ),
-    subtitle1: TextStyle(
+    titleMedium: TextStyle(
       fontFamily: fontFamily,
       fontSize: 16,
       height: 1.25,
       fontWeight: FontWeight.w700,
       color: textColor,
     ),
-    subtitle2: TextStyle(
+    titleSmall: TextStyle(
       fontFamily: fontFamily,
       fontSize: 14,
       height: 1.14,
       fontWeight: FontWeight.w500,
       color: textColor,
     ),
-    bodyText1: TextStyle(
+    bodyLarge: TextStyle(
       fontFamily: fontFamily,
       fontSize: 16,
       height: 1.5,
       fontWeight: FontWeight.w300,
       color: textColor,
     ),
-    bodyText2: TextStyle(
+    bodyMedium: TextStyle(
       fontFamily: fontFamily,
       fontSize: 14,
       height: 1.57,
       fontWeight: FontWeight.w400,
       color: textColor,
     ),
-    button: TextStyle(
+    labelLarge: TextStyle(
       fontFamily: fontFamily,
       fontSize: 16,
       height: 1.25,
       fontWeight: FontWeight.w700,
       color: textColor,
     ),
-    caption: TextStyle(
+    bodySmall: TextStyle(
       fontFamily: fontFamily,
       fontSize: 12,
       height: 1.33,
       fontWeight: FontWeight.w400,
       color: textColor,
     ),
-    overline: TextStyle(
+    labelSmall: TextStyle(
       fontFamily: fontFamily,
       fontSize: 10,
       height: 1,

diff --git a/lib/application/utils/bottom_sheet.dart b/lib/application/utils/bottom_sheet.dart
@@ -41,7 +41,7 @@ Future<T?> showSnappableDraggableModalBottomSheet<T>(
         Text(
           title,
           textAlign: TextAlign.center,
-          style: Theme.of(context).textTheme.headline6,
+          style: Theme.of(context).textTheme.headlineSmall,
           maxLines: 1,
           overflow: TextOverflow.ellipsis,
         ).withSymmetricalPadding(context, vertical: Spacing.small, horizontal: Spacing.medium)
@@ -92,9 +92,9 @@ Future<T?> showDestructiveOperationModalBottomSheet<T>(
     child: Column(
       mainAxisSize: MainAxisSize.min,
       children: [
-        Text(title, style: textTheme.subtitle1),
+        Text(title, style: textTheme.titleMedium),
         context.verticalBox(Spacing.xLarge),
-        Text(message, style: textTheme.bodyText1),
+        Text(message, style: textTheme.bodyLarge),
         context.verticalBox(Spacing.xxxLarge),
         DestructiveButton(onPressed: onDestructiveTapped, text: destructiveActionTitle),
         context.verticalBox(Spacing.medium),

diff --git a/lib/application/widgets/theme/collection_card.dart b/lib/application/widgets/theme/collection_card.dart
@@ -60,7 +60,7 @@ class CollectionCard extends ConsumerWidget {
       mainAxisSize: MainAxisSize.min,
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        Text(name, style: Theme.of(context).textTheme.headline6),
+        Text(name, style: Theme.of(context).textTheme.headlineSmall),
         context.verticalBox(Spacing.xSmall),
         Flexible(child: _buildTagsWrap(context)),
       ],
@@ -141,7 +141,7 @@ class CollectionCard extends ConsumerWidget {
 
   Text _buildMemoryRecallTitle(BuildContext context, MemoThemeData theme) {
     final captionColor = theme.neutralSwatch.shade200;
-    final captionStyle = Theme.of(context).textTheme.caption;
+    final captionStyle = Theme.of(context).textTheme.bodySmall;
     return Text(progressDescription!, style: captionStyle?.copyWith(color: captionColor));
   }
 

diff --git a/lib/application/widgets/theme/custom_button.dart b/lib/application/widgets/theme/custom_button.dart
@@ -112,7 +112,7 @@ class CustomTextButton extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final theme = ref.watch(themeController);
     final buttonColorSwatch = color ?? theme.primarySwatch;
-    final textTheme = Theme.of(context).textTheme.button!;
+    final textTheme = Theme.of(context).textTheme.labelLarge!;
 
     Color? buttonColor(_ButtonState state) {
       switch (state) {
@@ -173,7 +173,7 @@ class _CustomElevatedButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final textTheme = Theme.of(context).textTheme.button!;
+    final textTheme = Theme.of(context).textTheme.labelLarge!;
 
     Widget leadingAssetBuilder(_ButtonState state) => Image.asset(leadingAsset!, color: textTheme.color);