diff --git a/CHANGELOG.md b/CHANGELOG.md index 7231e3e99..a27430a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file. ### Added - support Android KitKat, Lollipop & Marshmallow (API 19 ~ 23) +### Removed +- removed custom font used in titles and info page + ## [v1.3.4] - 2021-02-10 ### Added - hide album / country / tag from collection diff --git a/fonts/ConcourseC3-Regular.ttf b/fonts/ConcourseC3-Regular.ttf deleted file mode 100644 index 5f0223a34..000000000 Binary files a/fonts/ConcourseC3-Regular.ttf and /dev/null differ diff --git a/fonts/ConcourseT3-Regular.ttf b/fonts/ConcourseT3-Regular.ttf deleted file mode 100644 index b09bf70af..000000000 Binary files a/fonts/ConcourseT3-Regular.ttf and /dev/null differ diff --git a/lib/main.dart b/lib/main.dart index 92a0b6e65..09ee98b53 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -74,8 +74,8 @@ class _AvesAppState extends State { textTheme: TextTheme( headline6: TextStyle( fontSize: 20, - fontWeight: FontWeight.bold, - fontFamily: 'Concourse Caps', + fontWeight: FontWeight.normal, + fontFeatures: [FontFeature.enable('smcp')], ), ), ), diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index 25008ae19..bde527b73 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -1,3 +1,5 @@ +import 'dart:ui'; + import 'package:flutter/material.dart'; import 'package:flutter/painting.dart'; import 'package:latlong/latlong.dart'; @@ -8,9 +10,9 @@ class Constants { static const overflowStrutStyle = StrutStyle(height: 1.3); static const titleTextStyle = TextStyle( - color: Color(0xFFEEEEEE), fontSize: 20, - fontFamily: 'Concourse Caps', + fontWeight: FontWeight.w300, + fontFeatures: [FontFeature.enable('smcp')], ); static const embossShadow = Shadow( diff --git a/lib/widgets/about/app_ref.dart b/lib/widgets/about/app_ref.dart index 22dfc740d..6e0057358 100644 --- a/lib/widgets/about/app_ref.dart +++ b/lib/widgets/about/app_ref.dart @@ -1,3 +1,5 @@ +import 'dart:ui'; + import 'package:aves/flutter_version.dart'; import 'package:aves/widgets/common/basic/link_chip.dart'; import 'package:aves/widgets/common/identity/aves_logo.dart'; @@ -32,8 +34,12 @@ class _AppReferenceState extends State { } Widget _buildAvesLine() { - final textTheme = Theme.of(context).textTheme; - final style = textTheme.headline6.copyWith(fontWeight: FontWeight.bold); + final style = TextStyle( + fontSize: 20, + fontWeight: FontWeight.normal, + letterSpacing: 1.0, + fontFeatures: [FontFeature.enable('smcp')], + ); return FutureBuilder( future: _packageInfoLoader, diff --git a/lib/widgets/about/credits.dart b/lib/widgets/about/credits.dart index 027e79f29..913e0f1d4 100644 --- a/lib/widgets/about/credits.dart +++ b/lib/widgets/about/credits.dart @@ -1,3 +1,6 @@ +import 'dart:ui'; + +import 'package:aves/utils/constants.dart'; import 'package:aves/widgets/common/basic/link_chip.dart'; import 'package:flutter/material.dart'; @@ -13,25 +16,22 @@ class AboutCredits extends StatelessWidget { constraints: BoxConstraints(minHeight: 48), child: Align( alignment: AlignmentDirectional.centerStart, - child: Text( - 'Credits', - style: Theme.of(context).textTheme.headline6.copyWith(fontFamily: 'Concourse Caps'), - ), + child: Text('Credits', style: Constants.titleTextStyle), ), ), Text.rich( TextSpan( children: [ - TextSpan(text: 'This app uses the font '), + TextSpan(text: 'This app uses a TopoJSON file from'), WidgetSpan( child: LinkChip( - text: 'Concourse', - url: 'https://mbtype.com/fonts/concourse/', + text: 'World Atlas', + url: 'https://github.com/topojson/world-atlas', textStyle: TextStyle(fontWeight: FontWeight.bold), ), alignment: PlaceholderAlignment.middle, ), - TextSpan(text: ' for titles and the media information page.'), + TextSpan(text: ', under ISC License.'), ], ), ), diff --git a/lib/widgets/about/licenses.dart b/lib/widgets/about/licenses.dart index 583366ab6..7b1415212 100644 --- a/lib/widgets/about/licenses.dart +++ b/lib/widgets/about/licenses.dart @@ -94,10 +94,7 @@ class _LicensesState extends State { child: Row( children: [ Expanded( - child: Text( - 'Open-Source Licenses', - style: Theme.of(context).textTheme.headline6.copyWith(fontFamily: 'Concourse Caps'), - ), + child: Text('Open-Source Licenses', style: Constants.titleTextStyle), ), PopupMenuButton( itemBuilder: (context) => [ diff --git a/lib/widgets/about/new_version.dart b/lib/widgets/about/new_version.dart index 4c77cdffb..a5cb22fc7 100644 --- a/lib/widgets/about/new_version.dart +++ b/lib/widgets/about/new_version.dart @@ -1,4 +1,5 @@ import 'package:aves/model/availability.dart'; +import 'package:aves/utils/constants.dart'; import 'package:aves/widgets/about/news_badge.dart'; import 'package:aves/widgets/common/basic/link_chip.dart'; import 'package:flutter/material.dart'; @@ -45,10 +46,7 @@ class _AboutNewVersionState extends State { ), alignment: PlaceholderAlignment.middle, ), - TextSpan( - text: 'New Version Available', - style: Theme.of(context).textTheme.headline6.copyWith(fontFamily: 'Concourse Caps'), - ), + TextSpan(text: 'New Version Available', style: Constants.titleTextStyle), ], ), ), diff --git a/lib/widgets/collection/empty.dart b/lib/widgets/collection/empty.dart index 522459e96..6bc02eea0 100644 --- a/lib/widgets/collection/empty.dart +++ b/lib/widgets/collection/empty.dart @@ -32,7 +32,6 @@ class EmptyContent extends StatelessWidget { style: TextStyle( color: color, fontSize: 22, - fontFamily: 'Concourse', ), ), ], diff --git a/lib/widgets/common/identity/highlight_title.dart b/lib/widgets/common/identity/highlight_title.dart index 377668dd3..0672f52a8 100644 --- a/lib/widgets/common/identity/highlight_title.dart +++ b/lib/widgets/common/identity/highlight_title.dart @@ -1,3 +1,5 @@ +import 'dart:ui'; + import 'package:aves/utils/color_utils.dart'; import 'package:aves/widgets/common/fx/highlight_decoration.dart'; import 'package:flutter/material.dart'; @@ -29,7 +31,8 @@ class HighlightTitle extends StatelessWidget { ) ], fontSize: fontSize, - fontFamily: 'Concourse Caps', + letterSpacing: 1.0, + fontFeatures: [FontFeature.enable('smcp')], ); return Align( diff --git a/lib/widgets/dialogs/aves_dialog.dart b/lib/widgets/dialogs/aves_dialog.dart index adf8898f8..8427c6af3 100644 --- a/lib/widgets/dialogs/aves_dialog.dart +++ b/lib/widgets/dialogs/aves_dialog.dart @@ -1,3 +1,5 @@ +import 'dart:ui'; + import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; @@ -76,8 +78,8 @@ class DialogTitle extends StatelessWidget { child: Text( title, style: TextStyle( - fontWeight: FontWeight.bold, - fontFamily: 'Concourse Caps', + fontWeight: FontWeight.normal, + fontFeatures: [FontFeature.enable('smcp')], ), ), ); diff --git a/lib/widgets/drawer/app_drawer.dart b/lib/widgets/drawer/app_drawer.dart index 3871da673..0830f9331 100644 --- a/lib/widgets/drawer/app_drawer.dart +++ b/lib/widgets/drawer/app_drawer.dart @@ -109,7 +109,9 @@ class _AppDrawerState extends State { 'Aves', style: TextStyle( fontSize: 44, - fontFamily: 'Concourse Caps', + fontWeight: FontWeight.w300, + letterSpacing: 1.0, + fontFeatures: [FontFeature.enable('smcp')], ), ), ], diff --git a/lib/widgets/viewer/info/common.dart b/lib/widgets/viewer/info/common.dart index 5d99e65f5..6bbb42057 100644 --- a/lib/widgets/viewer/info/common.dart +++ b/lib/widgets/viewer/info/common.dart @@ -44,8 +44,8 @@ class InfoRowGroup extends StatefulWidget { static const keyValuePadding = 16; static const linkColor = Colors.blue; - static final baseStyle = TextStyle(fontFamily: 'Concourse'); - static final keyStyle = baseStyle.copyWith(color: Colors.white70, height: 1.7); + static final baseStyle = TextStyle(fontSize: 13); + static final keyStyle = baseStyle.copyWith(color: Colors.white70, height: 2.0); static final linkStyle = baseStyle.copyWith(color: linkColor, decoration: TextDecoration.underline); const InfoRowGroup( diff --git a/lib/widgets/viewer/info/maps/leaflet_map.dart b/lib/widgets/viewer/info/maps/leaflet_map.dart index d5d2ecaf6..c8c71cd29 100644 --- a/lib/widgets/viewer/info/maps/leaflet_map.dart +++ b/lib/widgets/viewer/info/maps/leaflet_map.dart @@ -119,14 +119,15 @@ class _EntryLeafletMapState extends State with AutomaticKeepAli } Widget _buildAttributionMarkdown(String data) { + final theme = Theme.of(context); return Padding( padding: EdgeInsets.only(top: 4), child: MarkdownBody( data: data, selectable: true, styleSheet: MarkdownStyleSheet( - a: TextStyle(color: Theme.of(context).accentColor), - p: TextStyle(color: Colors.white70, fontSize: 13, fontFamily: 'Concourse'), + a: TextStyle(color: theme.accentColor), + p: TextStyle(color: Colors.white70, fontSize: theme.textTheme.caption.fontSize), ), onTapLink: (text, href, title) async { if (await canLaunch(href)) { diff --git a/lib/widgets/welcome_page.dart b/lib/widgets/welcome_page.dart index a99b8c64f..c7d254449 100644 --- a/lib/widgets/welcome_page.dart +++ b/lib/widgets/welcome_page.dart @@ -68,12 +68,9 @@ class _WelcomePageState extends State { } List _buildTop(BuildContext context) { - const message = Text( + final message = Text( 'Welcome to Aves', - style: TextStyle( - fontSize: 22, - fontFamily: 'Concourse', - ), + style: Theme.of(context).textTheme.headline5, ); return [ ...(MediaQuery.of(context).orientation == Orientation.portrait diff --git a/pubspec.yaml b/pubspec.yaml index d39dc221b..8d699f8c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -97,11 +97,3 @@ flutter: assets: - assets/ - - fonts: - - family: Concourse - fonts: - - asset: fonts/ConcourseT3-Regular.ttf - - family: Concourse Caps - fonts: - - asset: fonts/ConcourseC3-Regular.ttf