Skip to content
This repository has been archived by the owner on Apr 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #103 from CCXXXI/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
CCXXXI authored Oct 2, 2021
2 parents 865100a + 42b8470 commit 0534916
Show file tree
Hide file tree
Showing 18 changed files with 325 additions and 110 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,23 @@ jobs:
needs: check-duplication
if: ${{ needs.check-duplication.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
strategy:
matrix:
channel: [ stable, beta, dev, master ]
steps:
- uses: CCXXXI/flutter-action@main
with:
channel: ${{ matrix.channel }}

- run: flutter analyze

coverage:
needs: check-duplication
if: ${{ needs.check-duplication.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
strategy:
matrix:
channel: [ stable, beta, dev, master ]
steps:
- uses: CCXXXI/flutter-action@main
with:
channel: ${{ matrix.channel }}

- run: flutter test --coverage
- uses: codecov/codecov-action@v2

dependency_validator:
needs: check-duplication
if: ${{ needs.check-duplication.outputs.should_skip != 'true' }}
runs-on: ubuntu-latest
strategy:
matrix:
channel: [ stable, beta, dev, master ]
steps:
- uses: CCXXXI/flutter-action@main
with:
channel: ${{ matrix.channel }}

- run: flutter pub run dependency_validator
Binary file added assets/fonts/NotoSansSC-Regular.otf
Binary file not shown.
Binary file added assets/fonts/NotoSerifSC-Regular.otf
Binary file not shown.
93 changes: 93 additions & 0 deletions assets/fonts/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2012 Google Inc. All Rights Reserved.

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
3 changes: 2 additions & 1 deletion lib/home/home_logic.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_settings_screens/flutter_settings_screens.dart';
import 'package:get/get.dart';

import '../utils/logger.dart';

class HomeLogic extends GetxController {
final idx = 1.obs;
final idx = Settings.getValue('launchPage', 1).obs;
final isAnimating = false.obs;

late PageController _pageController;
Expand Down
15 changes: 10 additions & 5 deletions lib/home/home_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ class HomePage extends StatelessWidget {
return Scaffold(
appBar: context.isPortrait
? AppBar(
title: Text('求实创造 为人师表'.s),
title: const Text(
'求实创造 为人师表',
style: TextStyle(fontFamily: fontSerif),
),
)
: null,
body: Row(
Expand All @@ -36,6 +39,7 @@ class HomePage extends StatelessWidget {
icon: _labelIcons[i].icon,
),
],
selectedIconTheme: IconTheme.of(context),
);
}),
Expanded(
Expand Down Expand Up @@ -69,6 +73,7 @@ class HomePage extends StatelessWidget {
BottomNavyBarItem(
title: labelIcon.label,
icon: labelIcon.icon,
activeColor: Colors.white,
),
],
);
Expand All @@ -82,13 +87,13 @@ class _LabelIcon {
final Widget label;
final Widget icon;

_LabelIcon(String label, this.icon) : label = Text(label.s);
_LabelIcon(String label, this.icon) : label = Text(label);
}

final _labelIcons = [
_LabelIcon('Toolbox', const FaIcon(FontAwesomeIcons.toolbox)),
_LabelIcon('Timetable', const Icon(Icons.calendar_view_month)),
_LabelIcon('Settings', const Icon(Icons.settings)),
_LabelIcon('工具箱', const FaIcon(FontAwesomeIcons.toolbox)),
_LabelIcon('课程表', const Icon(Icons.calendar_view_month)),
_LabelIcon('设置', const Icon(Icons.settings)),
];

final _pages = [ToolboxPage(), TimetablePage(), SettingsPage()];
2 changes: 2 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:get/get.dart';
import 'package:sentry_flutter/sentry_flutter.dart';

import 'home/home_view.dart';
import 'settings/theme.dart';
import 'utils/desktop.dart';
import 'utils/logger.dart';
import 'utils/messages.dart';
Expand All @@ -25,6 +26,7 @@ class MyApp extends StatelessWidget {
navigatorObservers: [SentryNavigatorObserver()],
title: appName,
home: HomePage(),
theme: theme,
);
}
}
3 changes: 3 additions & 0 deletions lib/settings/settings_logic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter_settings_screens/flutter_settings_screens.dart';
import 'package:get/get.dart';

import '../utils/gu.dart';
import 'theme.dart' as theme;

class SettingsLogic extends GetxController {
bool get loggedIn => id != null;
Expand All @@ -11,4 +12,6 @@ class SettingsLogic extends GetxController {
String? get username => Settings.getValue('username', null);

void login() => gu(); // todo

void updateTheme(_) => theme.updateTheme();
}
61 changes: 58 additions & 3 deletions lib/settings/settings_view.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_settings_screens/flutter_settings_screens.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:get/get.dart';

import '../utils/messages.dart';
import 'settings_logic.dart';
import 'theme.dart';

class SettingsPage extends StatelessWidget {
SettingsPage({Key? key}) : super(key: key);
Expand All @@ -16,7 +18,8 @@ class SettingsPage extends StatelessWidget {
children: [
user(),
const Divider(),
const Placeholder(),
SettingsGroup(title: '主题', children: [dark(), font(), color()]),
SettingsGroup(title: '杂项', children: [launchPage()]),
],
);
}
Expand All @@ -31,8 +34,60 @@ class SettingsPage extends StatelessWidget {
: ListTile(
leading: const FaIcon(FontAwesomeIcons.userSecret),
trailing: const Icon(Icons.login),
title: Text('Anonymous'.s),
subtitle: Text('Tap to login.'.s),
title: const Text('无名者'),
subtitle: const Text('点击以登录'),
onTap: logic.login,
);

// region theme
Widget dark() => DropDownSettingsTile(
title: '深色模式',
settingKey: 'themeMode',
values: {
ThemeMode.system.index: '跟随系统',
ThemeMode.dark.index: '开',
ThemeMode.light.index: '关',
},
selected: ThemeMode.system.index,
onChange: logic.updateTheme,
);

Widget font() => SimpleDropDownSettingsTile(
title: '字体',
settingKey: 'font',
values: const [fontSans, fontSerif],
selected: fontSans,
onChange: logic.updateTheme,
);

Widget color() => SwitchSettingsTile(
title: '自定义',
settingKey: 'overrideColor',
onChange: logic.updateTheme,
childrenIfEnabled: [
for (final c in ['primary', 'secondary', 'surface'])
ColorPickerSettingsTile(
settingKey: 'color.$c',
title: c,
defaultValue: ecnuColor,
onChange: logic.updateTheme,
),
],
);

//endregion

// region misc
Widget launchPage() => DropDownSettingsTile(
title: '启动页',
settingKey: 'launchPage',
values: const {
0: '工具箱',
1: '课程表',
2: '设置',
},
selected: 1,
);

// endregion
}
43 changes: 43 additions & 0 deletions lib/settings/theme.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import 'package:flutter/material.dart';
import 'package:flutter_settings_screens/flutter_settings_screens.dart';
import 'package:get/get.dart';

import '../utils/messages.dart';

const _ecnuColorStr = '#ffa41f35';
final ecnuColor = ConversionUtils.colorFromString(_ecnuColorStr);

ThemeMode get _themeMode =>
ThemeMode.values[Settings.getValue('themeMode', ThemeMode.system.index)];

bool get _dark =>
_themeMode == ThemeMode.dark ||
_themeMode == ThemeMode.system && Get.isPlatformDarkMode;

Color _c(String key) => Settings.getValue('overrideColor', false)
? ConversionUtils.colorFromString(
Settings.getValue('color.$key', _ecnuColorStr))
: ecnuColor;

ThemeData get theme => ThemeData.from(
colorScheme: (_dark ? ColorScheme.dark : ColorScheme.light)(
primary: _c('primary'),
secondary: _c('secondary'),
surface: _c('surface'),
),
textTheme: (_dark ? ThemeData.dark : ThemeData.light)()
.textTheme
.apply(fontFamily: Settings.getValue('font', fontSans)),
);

// void updateTheme() => Get.changeTheme(theme);
// todo: wait for https://github.com/jonataslaw/getx/issues/1878
void updateTheme() {
if (!(Get.isSnackbarOpen ?? false)) {
Get.snackbar(
'主题切换目前有 bug,请手动重启以使更改生效',
'https://github.com/jonataslaw/getx/issues/1878',
duration: const Duration(days: 42),
);
}
}
17 changes: 10 additions & 7 deletions lib/utils/messages.dart
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import 'pangu.dart';

// package_info_plus 1.0.6 cannot get real info on windows
// package_info_plus cannot get real info on windows
// record them manually
const appName = 'ECNU Timetable';
const packageName = 'io.github.ccxxxi.ecnu_timetable';
const version = '0.3.1';
const buildNumber = '5';
const version = '0.4.0';
const buildNumber = '6';

extension Messages on String {
String get s {
return spacingText(this);
}
const release = '$packageName@$version+$buildNumber';

const fontSans = 'NotoSansSC';
const fontSerif = 'NotoSerifSC';

extension PanGu on String {
String get s => spacingText(this);
}
3 changes: 2 additions & 1 deletion lib/utils/sentry.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Future<void> initSentry(Widget app) async {
final id = Settings.getValue('id', null);
final username = Settings.getValue('username', null);
logger.i('id: $id, username: $username');
logger.i('release: $release');

Sentry.configureScope(
(scope) => scope.user =
Expand All @@ -21,7 +22,7 @@ Future<void> initSentry(Widget app) async {
..dsn =
'https://ca1d394e0da94a11a1c32d650b781ea0@o996799.ingest.sentry.io/5975191'
..sendDefaultPii = true
..release = '$packageName@$version+$buildNumber';
..release = release;
},
appRunner: () => runApp(app),
);
Expand Down
Loading

0 comments on commit 0534916

Please sign in to comment.