diff --git a/mobile/android/fastlane/metadata/android/en-US/changelogs/9.txt b/mobile/android/fastlane/metadata/android/en-US/changelogs/9.txt new file mode 100644 index 0000000000..5575258099 --- /dev/null +++ b/mobile/android/fastlane/metadata/android/en-US/changelogs/9.txt @@ -0,0 +1 @@ +* Added inline font, remove google-font dependency in pubspec. \ No newline at end of file diff --git a/mobile/fonts/SnowburstOne.ttf b/mobile/fonts/SnowburstOne.ttf new file mode 100644 index 0000000000..e29832085c Binary files /dev/null and b/mobile/fonts/SnowburstOne.ttf differ diff --git a/mobile/fonts/WorkSans-Italic.ttf b/mobile/fonts/WorkSans-Italic.ttf new file mode 100644 index 0000000000..f2bf331027 Binary files /dev/null and b/mobile/fonts/WorkSans-Italic.ttf differ diff --git a/mobile/fonts/WorkSans.ttf b/mobile/fonts/WorkSans.ttf new file mode 100644 index 0000000000..09829a5169 Binary files /dev/null and b/mobile/fonts/WorkSans.ttf differ diff --git a/mobile/ios/fastlane/Fastfile b/mobile/ios/fastlane/Fastfile index fc4091e3c2..37a16ecc5e 100644 --- a/mobile/ios/fastlane/Fastfile +++ b/mobile/ios/fastlane/Fastfile @@ -19,7 +19,7 @@ platform :ios do desc "iOS Beta" lane :beta do increment_version_number( - version_number: "1.5.0" + version_number: "1.5.1" ) increment_build_number( build_number: latest_testflight_build_number + 1, diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart index cb847f8e61..9a6254f49b 100644 --- a/mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -10,7 +10,6 @@ import 'package:immich_mobile/shared/providers/backup.provider.dart'; import 'package:immich_mobile/shared/providers/server_info.provider.dart'; import 'package:immich_mobile/shared/providers/websocket.provider.dart'; import 'constants/hive_box.dart'; -import 'package:google_fonts/google_fonts.dart'; void main() async { await Hive.initFlutter(); @@ -94,10 +93,11 @@ class _ImmichAppState extends ConsumerState with WidgetsBindingObserv theme: ThemeData( brightness: Brightness.light, primarySwatch: Colors.indigo, - textTheme: GoogleFonts.workSansTextTheme( - Theme.of(context).textTheme.apply(fontSizeFactor: 1.0), - ), - snackBarTheme: SnackBarThemeData(contentTextStyle: TextStyle(fontFamily: GoogleFonts.workSans().fontFamily)), + // textTheme: GoogleFonts.workSansTextTheme( + // Theme.of(context).textTheme.apply(fontSizeFactor: 1.0), + // ), + fontFamily: 'WorkSans', + snackBarTheme: const SnackBarThemeData(contentTextStyle: TextStyle(fontFamily: 'WorkSans')), scaffoldBackgroundColor: const Color(0xFFf6f8fe), appBarTheme: const AppBarTheme( backgroundColor: Colors.white, diff --git a/mobile/lib/modules/home/ui/immich_sliver_appbar.dart b/mobile/lib/modules/home/ui/immich_sliver_appbar.dart index 185fb08b07..18fee2450a 100644 --- a/mobile/lib/modules/home/ui/immich_sliver_appbar.dart +++ b/mobile/lib/modules/home/ui/immich_sliver_appbar.dart @@ -1,7 +1,6 @@ import 'package:auto_route/auto_route.dart'; import 'package:badges/badges.dart'; import 'package:flutter/material.dart'; -import 'package:google_fonts/google_fonts.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; @@ -79,12 +78,11 @@ class ImmichSliverAppBar extends ConsumerWidget { ), title: Text( 'IMMICH', - style: GoogleFonts.snowburstOne( - textStyle: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 22, - color: Theme.of(context).primaryColor, - ), + style: TextStyle( + fontFamily: 'SnowburstOne', + fontWeight: FontWeight.bold, + fontSize: 22, + color: Theme.of(context).primaryColor, ), ), actions: [ diff --git a/mobile/lib/modules/login/ui/login_form.dart b/mobile/lib/modules/login/ui/login_form.dart index 28e086f221..0cde3da48c 100644 --- a/mobile/lib/modules/login/ui/login_form.dart +++ b/mobile/lib/modules/login/ui/login_form.dart @@ -1,7 +1,6 @@ import 'package:auto_route/auto_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:google_fonts/google_fonts.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/modules/home/providers/asset.provider.dart'; import 'package:immich_mobile/modules/login/providers/authentication.provider.dart'; @@ -33,9 +32,12 @@ class LoginForm extends HookConsumerWidget { ), Text( 'IMMICH', - style: GoogleFonts.snowburstOne( - textStyle: - TextStyle(fontWeight: FontWeight.bold, fontSize: 48, color: Theme.of(context).primaryColor)), + style: TextStyle( + fontFamily: 'SnowburstOne', + fontWeight: FontWeight.bold, + fontSize: 48, + color: Theme.of(context).primaryColor, + ), ), EmailInput(controller: usernameController), PasswordInput(controller: passwordController), diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index d395fb34cd..d759ed6b54 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -373,13 +373,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.2" - google_fonts: - dependency: "direct main" - description: - name: google_fonts - url: "https://pub.dartlang.org" - source: hosted - version: "2.2.0" graphs: dependency: transitive description: diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 964b5d0d89..40c9c19d25 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -2,7 +2,7 @@ name: immich_mobile description: Immich - selfhosted backup media file on mobile phone publish_to: "none" -version: 1.5.0+8 +version: 1.5.1+9 environment: sdk: ">=2.15.1 <3.0.0" @@ -18,7 +18,7 @@ dependencies: hive_flutter: dio: ^4.0.4 cached_network_image: ^3.2.0 - google_fonts: ^2.2.0 + # google_fonts: ^2.2.0 percent_indicator: ^3.4.0 intl: ^0.17.0 auto_route: ^3.2.2 @@ -50,6 +50,15 @@ flutter: uses-material-design: true assets: - assets/ + fonts: + - family: WorkSans + fonts: + - asset: fonts/WorkSans.ttf + - asset: fonts/WorkSans-Italic.ttf + style: italic + - family: SnowburstOne + fonts: + - asset: fonts/SnowburstOne.ttf flutter_icons: image_path_android: "assets/immich-logo-no-outline.png" diff --git a/server/package.json b/server/package.json index 9586fc6ee4..ac34a8b750 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "immich", - "version": "1.3.2", + "version": "1.5.1", "description": "", "author": "", "private": true, diff --git a/server/src/constants/server_version.constant.ts b/server/src/constants/server_version.constant.ts index 4a8963e646..b2c5b2f238 100644 --- a/server/src/constants/server_version.constant.ts +++ b/server/src/constants/server_version.constant.ts @@ -4,6 +4,6 @@ export const serverVersion = { major: 1, minor: 5, - patch: 0, - build: 8, + patch: 1, + build: 9, };