diff --git a/mobile/fonts/bevietnampro/BeVietnamPro-Bold.ttf b/mobile/fonts/bevietnampro/BeVietnamPro-Bold.ttf new file mode 100644 index 000000000..10b68f9b6 Binary files /dev/null and b/mobile/fonts/bevietnampro/BeVietnamPro-Bold.ttf differ diff --git a/mobile/fonts/bevietnampro/BeVietnamPro-Italic.ttf b/mobile/fonts/bevietnampro/BeVietnamPro-Italic.ttf new file mode 100644 index 000000000..f8987cb02 Binary files /dev/null and b/mobile/fonts/bevietnampro/BeVietnamPro-Italic.ttf differ diff --git a/mobile/fonts/bevietnampro/BeVietnamPro-Medium.ttf b/mobile/fonts/bevietnampro/BeVietnamPro-Medium.ttf new file mode 100644 index 000000000..874fcf400 Binary files /dev/null and b/mobile/fonts/bevietnampro/BeVietnamPro-Medium.ttf differ diff --git a/mobile/fonts/bevietnampro/BeVietnamPro-Regular.ttf b/mobile/fonts/bevietnampro/BeVietnamPro-Regular.ttf new file mode 100644 index 000000000..880ed948b Binary files /dev/null and b/mobile/fonts/bevietnampro/BeVietnamPro-Regular.ttf differ diff --git a/mobile/fonts/bevietnampro/BeVietnamPro-SemiBold.ttf b/mobile/fonts/bevietnampro/BeVietnamPro-SemiBold.ttf new file mode 100644 index 000000000..19c4f52e1 Binary files /dev/null and b/mobile/fonts/bevietnampro/BeVietnamPro-SemiBold.ttf differ diff --git a/mobile/lib/modules/login/ui/login_form.dart b/mobile/lib/modules/login/ui/login_form.dart index 5c7049a4e..a58d36c13 100644 --- a/mobile/lib/modules/login/ui/login_form.dart +++ b/mobile/lib/modules/login/ui/login_form.dart @@ -307,7 +307,7 @@ class LoginForm extends HookConsumerWidget { children: [ Text( sanitizeUrl(serverEndpointController.text), - style: context.textTheme.displaySmall, + style: context.textTheme.titleSmall, textAlign: TextAlign.center, ), if (isPasswordLoginEnable.value) ...[ diff --git a/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart b/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart index 24ee7e693..8cfb16139 100644 --- a/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart +++ b/mobile/lib/shared/ui/app_bar_dialog/app_bar_dialog.dart @@ -15,6 +15,7 @@ import 'package:immich_mobile/shared/providers/websocket.provider.dart'; import 'package:immich_mobile/shared/ui/app_bar_dialog/app_bar_profile_info.dart'; import 'package:immich_mobile/shared/ui/app_bar_dialog/app_bar_server_info.dart'; import 'package:immich_mobile/shared/ui/confirm_dialog.dart'; +import 'package:immich_mobile/shared/ui/immich_title_text.dart'; import 'package:immich_mobile/utils/bytes_units.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -48,17 +49,11 @@ class ImmichAppBarDialog extends HookConsumerWidget { size: 20, ), ), - Expanded( + const Expanded( child: Align( alignment: Alignment.center, - child: Text( - 'IMMICH', - style: TextStyle( - fontFamily: 'SnowburstOne', - fontWeight: FontWeight.bold, - color: context.primaryColor, - fontSize: 16, - ), + child: ImmichTitleText( + fontSize: 16, ), ), ), @@ -75,15 +70,12 @@ class ImmichAppBarDialog extends HookConsumerWidget { leading: SizedBox( child: Icon( icon, - color: theme.textTheme.labelLarge?.color?.withAlpha(250), size: 20, ), ), title: Text( text, - style: theme.textTheme.labelLarge?.copyWith( - color: theme.textTheme.labelLarge?.color?.withAlpha(250), - ), + style: theme.textTheme.labelLarge?.copyWith(), ).tr(), onTap: onTap, ); @@ -161,9 +153,7 @@ class ImmichAppBarDialog extends HookConsumerWidget { ), title: Text( "backup_controller_page_server_storage", - style: context.textTheme.labelLarge?.copyWith( - fontWeight: FontWeight.w500, - ), + style: context.textTheme.titleSmall, ).tr(), isThreeLine: true, subtitle: Padding( @@ -182,8 +172,10 @@ class ImmichAppBarDialog extends HookConsumerWidget { ), Padding( padding: const EdgeInsets.only(top: 12.0), - child: - const Text('backup_controller_page_storage_format').tr( + child: Text( + 'backup_controller_page_storage_format', + style: context.textTheme.bodySmall, + ).tr( args: [ usedDiskSpace, totalDiskSpace, diff --git a/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart b/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart index e36a887d4..66093dce3 100644 --- a/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart +++ b/mobile/lib/shared/ui/app_bar_dialog/app_bar_server_info.dart @@ -62,10 +62,8 @@ class AppBarServerInfo extends HookConsumerWidget { ? serverInfoState.versionMismatchErrorMessage : "profile_drawer_client_server_up_to_date".tr(), textAlign: TextAlign.center, - style: TextStyle( - fontSize: 11, + style: context.textTheme.labelMedium?.copyWith( color: context.primaryColor, - fontWeight: FontWeight.w500, ), ), ), @@ -102,7 +100,7 @@ class AppBarServerInfo extends HookConsumerWidget { fontSize: contentFontSize, color: context.textTheme.labelSmall?.color ?.withOpacity(0.5), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, ), ), ), @@ -144,7 +142,7 @@ class AppBarServerInfo extends HookConsumerWidget { fontSize: contentFontSize, color: context.textTheme.labelSmall?.color ?.withOpacity(0.5), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, ), ), ), @@ -199,7 +197,7 @@ class AppBarServerInfo extends HookConsumerWidget { fontSize: contentFontSize, color: context.textTheme.labelSmall?.color ?.withOpacity(0.5), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, overflow: TextOverflow.ellipsis, ), textAlign: TextAlign.end, @@ -257,7 +255,7 @@ class AppBarServerInfo extends HookConsumerWidget { fontSize: contentFontSize, color: context.textTheme.labelSmall?.color ?.withOpacity(0.5), - fontWeight: FontWeight.bold, + fontWeight: FontWeight.w500, ), ), ), diff --git a/mobile/lib/utils/immich_app_theme.dart b/mobile/lib/utils/immich_app_theme.dart index e2ed6cd56..b852b8cb3 100644 --- a/mobile/lib/utils/immich_app_theme.dart +++ b/mobile/lib/utils/immich_app_theme.dart @@ -38,11 +38,11 @@ final ThemeData immichLightTheme = ThemeData( hintColor: Colors.indigo, focusColor: Colors.indigo, splashColor: Colors.indigo.withOpacity(0.15), - fontFamily: 'Overpass', + fontFamily: 'BeVietnamPro', scaffoldBackgroundColor: immichBackgroundColor, snackBarTheme: const SnackBarThemeData( contentTextStyle: TextStyle( - fontFamily: 'Overpass', + fontFamily: 'BeVietnamPro', color: Colors.indigo, fontWeight: FontWeight.bold, ), @@ -50,7 +50,7 @@ final ThemeData immichLightTheme = ThemeData( ), appBarTheme: const AppBarTheme( titleTextStyle: TextStyle( - fontFamily: 'Overpass', + fontFamily: 'BeVietnamPro', color: Colors.indigo, fontWeight: FontWeight.bold, fontSize: 18, @@ -72,35 +72,35 @@ final ThemeData immichLightTheme = ThemeData( drawerTheme: const DrawerThemeData( backgroundColor: immichBackgroundColor, ), - textTheme: const TextTheme( - displayLarge: TextStyle( - fontSize: 26, - fontWeight: FontWeight.bold, - color: Colors.indigo, - ), - displayMedium: TextStyle( - fontSize: 14, - fontWeight: FontWeight.bold, - color: Colors.black87, - ), - displaySmall: TextStyle( - fontSize: 12, - fontWeight: FontWeight.bold, - color: Colors.indigo, - ), - titleSmall: TextStyle( - fontSize: 16.0, - fontWeight: FontWeight.bold, - ), - titleMedium: TextStyle( - fontSize: 18.0, - fontWeight: FontWeight.bold, - ), - titleLarge: TextStyle( - fontSize: 26.0, - fontWeight: FontWeight.bold, - ), - ), + // textTheme: const TextTheme( + // displayLarge: TextStyle( + // fontSize: 26, + // fontWeight: FontWeight.bold, + // color: Colors.indigo, + // ), + // displayMedium: TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.bold, + // color: Colors.black87, + // ), + // displaySmall: TextStyle( + // fontSize: 12, + // fontWeight: FontWeight.bold, + // color: Colors.indigo, + // ), + // titleSmall: TextStyle( + // fontSize: 16.0, + // fontWeight: FontWeight.bold, + // ), + // titleMedium: TextStyle( + // fontSize: 18.0, + // fontWeight: FontWeight.bold, + // ), + // titleLarge: TextStyle( + // fontSize: 26.0, + // fontWeight: FontWeight.bold, + // ), + // ), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( backgroundColor: Colors.indigo, @@ -160,10 +160,10 @@ final ThemeData immichDarkTheme = ThemeData( primaryColor: immichDarkThemePrimaryColor, scaffoldBackgroundColor: immichDarkBackgroundColor, hintColor: Colors.grey[600], - fontFamily: 'Overpass', + fontFamily: 'BeVietnamPro', snackBarTheme: SnackBarThemeData( contentTextStyle: const TextStyle( - fontFamily: 'Overpass', + fontFamily: 'BeVietnamPro', color: immichDarkThemePrimaryColor, fontWeight: FontWeight.bold, ), @@ -176,7 +176,7 @@ final ThemeData immichDarkTheme = ThemeData( ), appBarTheme: const AppBarTheme( titleTextStyle: TextStyle( - fontFamily: 'Overpass', + fontFamily: 'BeVietnamPro', color: immichDarkThemePrimaryColor, fontWeight: FontWeight.bold, fontSize: 18, @@ -196,35 +196,35 @@ final ThemeData immichDarkTheme = ThemeData( backgroundColor: immichDarkBackgroundColor, scrimColor: Colors.white.withOpacity(0.1), ), - textTheme: const TextTheme( - displayLarge: TextStyle( - fontSize: 26, - fontWeight: FontWeight.bold, - color: Color.fromARGB(255, 255, 255, 255), - ), - displayMedium: TextStyle( - fontSize: 14, - fontWeight: FontWeight.bold, - color: Color.fromARGB(255, 255, 255, 255), - ), - displaySmall: TextStyle( - fontSize: 12, - fontWeight: FontWeight.bold, - color: immichDarkThemePrimaryColor, - ), - titleSmall: TextStyle( - fontSize: 16.0, - fontWeight: FontWeight.bold, - ), - titleMedium: TextStyle( - fontSize: 18.0, - fontWeight: FontWeight.bold, - ), - titleLarge: TextStyle( - fontSize: 26.0, - fontWeight: FontWeight.bold, - ), - ), + // textTheme: const TextTheme( + // displayLarge: TextStyle( + // fontSize: 26, + // fontWeight: FontWeight.bold, + // color: Color.fromARGB(255, 255, 255, 255), + // ), + // displayMedium: TextStyle( + // fontSize: 14, + // fontWeight: FontWeight.bold, + // color: Color.fromARGB(255, 255, 255, 255), + // ), + // displaySmall: TextStyle( + // fontSize: 12, + // fontWeight: FontWeight.bold, + // color: immichDarkThemePrimaryColor, + // ), + // titleSmall: TextStyle( + // fontSize: 16.0, + // fontWeight: FontWeight.bold, + // ), + // titleMedium: TextStyle( + // fontSize: 18.0, + // fontWeight: FontWeight.bold, + // ), + // titleLarge: TextStyle( + // fontSize: 26.0, + // fontWeight: FontWeight.bold, + // ), + // ), cardColor: Colors.grey[900], elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 852a2bb08..45791c359 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -110,17 +110,17 @@ flutter: - family: Inconsolata fonts: - asset: fonts/Inconsolata-Regular.ttf - - family: Overpass + - family: BeVietnamPro fonts: - - asset: fonts/overpass/Overpass-Regular.ttf + - asset: fonts/bevietnampro/BeVietnamPro-Regular.ttf weight: 400 - - asset: fonts/overpass/Overpass-Italic.ttf + - asset: fonts/bevietnampro/BeVietnamPro-Italic.ttf style: italic - - asset: fonts/overpass/Overpass-Medium.ttf + - asset: fonts/bevietnampro/BeVietnamPro-Medium.ttf weight: 500 - - asset: fonts/overpass/Overpass-SemiBold.ttf + - asset: fonts/bevietnampro/BeVietnamPro-SemiBold.ttf weight: 600 - - asset: fonts/overpass/Overpass-Bold.ttf + - asset: fonts/bevietnampro/BeVietnamPro-Bold.ttf weight: 700 - family: OverpassMono fonts: