From fd347223a266295362e6e1171d7be5b5bc1947d4 Mon Sep 17 00:00:00 2001 From: Ming Ming Date: Fri, 26 May 2023 19:45:46 +0800 Subject: [PATCH] Migrate deprecated text themes --- app/lib/legacy/connect.dart | 4 ++-- app/lib/legacy/sign_in.dart | 2 +- app/lib/widget/album_dir_picker.dart | 2 +- app/lib/widget/album_importer.dart | 2 +- app/lib/widget/export_collection_dialog.dart | 2 +- app/lib/widget/new_collection_dialog.dart | 2 +- app/lib/widget/photo_date_time_edit_dialog.dart | 4 ++-- app/lib/widget/root_picker.dart | 2 +- app/lib/widget/setup.dart | 12 +++++++----- app/lib/widget/share_folder_picker.dart | 2 +- app/lib/widget/slideshow_dialog.dart | 2 +- app/lib/widget/splash.dart | 2 +- 12 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/lib/legacy/connect.dart b/app/lib/legacy/connect.dart index 1e33ae30..ff1e2b67 100644 --- a/app/lib/legacy/connect.dart +++ b/app/lib/legacy/connect.dart @@ -95,8 +95,8 @@ class _ConnectState extends State { Text( L10n.global().connectingToServer(widget.account.url), textAlign: TextAlign.center, - style: Theme.of(context).textTheme.headline6, - ) + style: Theme.of(context).textTheme.titleLarge, + ), ], ), ), diff --git a/app/lib/legacy/sign_in.dart b/app/lib/legacy/sign_in.dart index 51cc87e7..b6a181f9 100644 --- a/app/lib/legacy/sign_in.dart +++ b/app/lib/legacy/sign_in.dart @@ -79,7 +79,7 @@ class _SignInState extends State { padding: const EdgeInsets.all(24), child: Text( L10n.global().signInHeaderText, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, textAlign: TextAlign.center, ), ), diff --git a/app/lib/widget/album_dir_picker.dart b/app/lib/widget/album_dir_picker.dart index 2f14356e..e4b8de93 100644 --- a/app/lib/widget/album_dir_picker.dart +++ b/app/lib/widget/album_dir_picker.dart @@ -63,7 +63,7 @@ class _AlbumDirPickerState extends State { children: [ Text( L10n.global().albumDirPickerHeaderText, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, textAlign: TextAlign.center, ), const SizedBox(height: 8), diff --git a/app/lib/widget/album_importer.dart b/app/lib/widget/album_importer.dart index fd36fb9e..fa54e10c 100644 --- a/app/lib/widget/album_importer.dart +++ b/app/lib/widget/album_importer.dart @@ -111,7 +111,7 @@ class _AlbumImporterState extends State { children: [ Text( L10n.global().albumImporterHeaderText, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, textAlign: TextAlign.center, ), const SizedBox(height: 8), diff --git a/app/lib/widget/export_collection_dialog.dart b/app/lib/widget/export_collection_dialog.dart index c5488f02..7d00db7e 100644 --- a/app/lib/widget/export_collection_dialog.dart +++ b/app/lib/widget/export_collection_dialog.dart @@ -196,7 +196,7 @@ class _ProviderDescription extends StatelessWidget { previous.formValue.provider != current.formValue.provider, builder: (context, state) => Text( state.formValue.provider.toDescription(context), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ); } diff --git a/app/lib/widget/new_collection_dialog.dart b/app/lib/widget/new_collection_dialog.dart index 1e89b73b..491b2ccb 100644 --- a/app/lib/widget/new_collection_dialog.dart +++ b/app/lib/widget/new_collection_dialog.dart @@ -271,7 +271,7 @@ class _ProviderDescription extends StatelessWidget { previous.formValue.provider != current.formValue.provider, builder: (context, state) => Text( state.formValue.provider.toDescription(context), - style: Theme.of(context).textTheme.bodyText2, + style: Theme.of(context).textTheme.bodyMedium, ), ); } diff --git a/app/lib/widget/photo_date_time_edit_dialog.dart b/app/lib/widget/photo_date_time_edit_dialog.dart index 2bd69972..b307c5fb 100644 --- a/app/lib/widget/photo_date_time_edit_dialog.dart +++ b/app/lib/widget/photo_date_time_edit_dialog.dart @@ -32,7 +32,7 @@ class _PhotoDateTimeEditDialogState extends State { children: [ Text( L10n.global().dateSubtitle, - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), Row( children: [ @@ -104,7 +104,7 @@ class _PhotoDateTimeEditDialogState extends State { const SizedBox(height: 16), Text( L10n.global().timeSubtitle, - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), Row( children: [ diff --git a/app/lib/widget/root_picker.dart b/app/lib/widget/root_picker.dart index 091d4835..fd41a359 100644 --- a/app/lib/widget/root_picker.dart +++ b/app/lib/widget/root_picker.dart @@ -93,7 +93,7 @@ class _RootPickerState extends State { children: [ Text( L10n.global().rootPickerHeaderText, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, textAlign: TextAlign.center, ), const SizedBox(height: 8), diff --git a/app/lib/widget/setup.dart b/app/lib/widget/setup.dart index a7272d4c..ef20e7ea 100644 --- a/app/lib/widget/setup.dart +++ b/app/lib/widget/setup.dart @@ -157,11 +157,13 @@ class _ExifState extends State<_Exif> { const SizedBox(height: 16), Padding( padding: const EdgeInsets.symmetric(horizontal: 16), - child: Text(L10n.global().setupSettingsModifyLaterHint, - style: Theme.of(context) - .textTheme - .bodyText2! - .copyWith(fontStyle: FontStyle.italic)), + child: Text( + L10n.global().setupSettingsModifyLaterHint, + style: Theme.of(context) + .textTheme + .bodyMedium + ?.copyWith(fontStyle: FontStyle.italic), + ), ), const SizedBox(height: 8), ], diff --git a/app/lib/widget/share_folder_picker.dart b/app/lib/widget/share_folder_picker.dart index 46d6adee..5818c617 100644 --- a/app/lib/widget/share_folder_picker.dart +++ b/app/lib/widget/share_folder_picker.dart @@ -67,7 +67,7 @@ class _ShareFolderPickerState extends State { children: [ Text( L10n.global().settingsShareFolderDialogTitle, - style: Theme.of(context).textTheme.headline5, + style: Theme.of(context).textTheme.headlineSmall, textAlign: TextAlign.center, ), const SizedBox(height: 8), diff --git a/app/lib/widget/slideshow_dialog.dart b/app/lib/widget/slideshow_dialog.dart index 61db30dd..d8228d7e 100644 --- a/app/lib/widget/slideshow_dialog.dart +++ b/app/lib/widget/slideshow_dialog.dart @@ -74,7 +74,7 @@ class _SlideshowDialogState extends State { children: [ Text( L10n.global().slideshowSetupDialogDurationTitle, - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, ), Row( children: [ diff --git a/app/lib/widget/splash.dart b/app/lib/widget/splash.dart index 8c8978f6..853f9354 100644 --- a/app/lib/widget/splash.dart +++ b/app/lib/widget/splash.dart @@ -91,7 +91,7 @@ class _SplashState extends State { Text( L10n.global().appTitle, textAlign: TextAlign.center, - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.headlineMedium, ), ], ),