Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update inline font for f-droid publication metric #107

Merged
merged 2 commits into from
Apr 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Added inline font, remove google-font dependency in pubspec.
Binary file added mobile/fonts/SnowburstOne.ttf
Binary file not shown.
Binary file added mobile/fonts/WorkSans-Italic.ttf
Binary file not shown.
Binary file added mobile/fonts/WorkSans.ttf
Binary file not shown.
2 changes: 1 addition & 1 deletion mobile/ios/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions mobile/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -94,10 +93,11 @@ class _ImmichAppState extends ConsumerState<ImmichApp> 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,
Expand Down
12 changes: 5 additions & 7 deletions mobile/lib/modules/home/ui/immich_sliver_appbar.dart
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -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: [
Expand Down
10 changes: 6 additions & 4 deletions mobile/lib/modules/login/ui/login_form.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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),
Expand Down
7 changes: 0 additions & 7 deletions mobile/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 11 additions & 2 deletions mobile/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "immich",
"version": "1.3.2",
"version": "1.5.1",
"description": "",
"author": "",
"private": true,
Expand Down
4 changes: 2 additions & 2 deletions server/src/constants/server_version.constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
export const serverVersion = {
major: 1,
minor: 5,
patch: 0,
build: 8,
patch: 1,
build: 9,
};