Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#15 removed custom font

Browse source
This commit is contained in:
Thibault Deckers 2021-02-21 11:18:58 +09:00
parent c34faa1568
commit 6f863c7aca
17 changed files with 46 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -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

BIN
fonts/ConcourseC3-Regular.ttf
View file

Binary file not shown.

BIN
fonts/ConcourseT3-Regular.ttf
View file

Binary file not shown.

4
lib/main.dart
View file

@ -74,8 +74,8 @@ class _AvesAppState extends State<AvesApp> {
textTheme: TextTheme(
headline6: TextStyle(
fontSize: 20,
fontWeight: FontWeight.bold,
fontFamily: 'Concourse Caps',
fontWeight: FontWeight.normal,
fontFeatures: [FontFeature.enable('smcp')],
),
),
),

6
lib/utils/constants.dart
View file

@ -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(

10
lib/widgets/about/app_ref.dart
View file

@ -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<AppReference> {
}
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<PackageInfo>(
future: _packageInfoLoader,

16
lib/widgets/about/credits.dart
View file

@ -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.'),
],
),
),

5
lib/widgets/about/licenses.dart
View file

@ -94,10 +94,7 @@ class _LicensesState extends State<Licenses> {
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<LicenseSort>(
itemBuilder: (context) => [

6
lib/widgets/about/new_version.dart
View file

@ -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<AboutNewVersion> {
),
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),
],
),
),

1
lib/widgets/collection/empty.dart
View file

@ -32,7 +32,6 @@ class EmptyContent extends StatelessWidget {
style: TextStyle(
color: color,
fontSize: 22,
fontFamily: 'Concourse',
),
),
],

5
lib/widgets/common/identity/highlight_title.dart
View file

@ -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(

6
lib/widgets/dialogs/aves_dialog.dart
View file

@ -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')],
),
),
);

4
lib/widgets/drawer/app_drawer.dart
View file

@ -109,7 +109,9 @@ class _AppDrawerState extends State<AppDrawer> {
'Aves',
style: TextStyle(
fontSize: 44,
fontFamily: 'Concourse Caps',
fontWeight: FontWeight.w300,
letterSpacing: 1.0,
fontFeatures: [FontFeature.enable('smcp')],
),
),
],

4
lib/widgets/viewer/info/common.dart
View file

@ -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(

5
lib/widgets/viewer/info/maps/leaflet_map.dart
View file

@ -119,14 +119,15 @@ class _EntryLeafletMapState extends State<EntryLeafletMap> 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)) {

7
lib/widgets/welcome_page.dart
View file

@ -68,12 +68,9 @@ class _WelcomePageState extends State<WelcomePage> {
}
List<Widget> _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

8
pubspec.yaml
View file

@ -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