Skip to content
This repository was archived by the owner on Apr 25, 2022. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2cd4560
revert: Revert "fix: correct database dir"
CCXXXI Oct 31, 2021
609452f
refactor(utils): change names of boxes to avoid conflict
CCXXXI Oct 31, 2021
c2270b1
chore: 2.0.0+26
CCXXXI Oct 31, 2021
05ad664
Merge branch 'main' into dev
CCXXXI Nov 1, 2021
5c4a581
Merge branch 'main' into dev
CCXXXI Nov 25, 2021
71e4e82
chore(deps): update dependency gradle to v7.3.1
renovate-bot Dec 1, 2021
f0b9a06
chore(deps): flutter upgrade
CCXXXI Dec 2, 2021
ff7a412
test: home: Placeholder()
CCXXXI Dec 2, 2021
7a2659e
Merge pull request #143 from CCXXXI/renovate/gradle-7.x
CCXXXI Dec 2, 2021
8c1ae4e
test(toolbox): setUpAll
CCXXXI Dec 2, 2021
4daf2ec
docs: add todo
CCXXXI Dec 2, 2021
23b2c3f
build: compileSdkVersion 31
CCXXXI Dec 2, 2021
48ee11c
ci: if: ${{ always() }}
CCXXXI Dec 2, 2021
1484e80
ci: sudo apt-get -y
CCXXXI Dec 8, 2021
0c85424
chore(deps): update dependency com.android.tools.build:gradle to v7.0.4
renovate-bot Dec 9, 2021
149b24b
Merge pull request #144 from CCXXXI/renovate/com.android.tools.build-…
CCXXXI Dec 9, 2021
4165e43
chore(deps): update dependency gradle to v7.3.2
renovate-bot Dec 15, 2021
45739ac
Merge branch 'dev' into renovate/gradle-7.x
CCXXXI Dec 15, 2021
1ea8e95
Merge pull request #145 from CCXXXI/renovate/gradle-7.x
CCXXXI Dec 15, 2021
ae8703f
build: source-maps
CCXXXI Dec 22, 2021
a4242d9
chore(deps): update dependency gradle to v7.3.3
renovate-bot Dec 22, 2021
6936d5b
Merge branch 'dev' into renovate/gradle-7.x
CCXXXI Dec 22, 2021
61e208d
Merge pull request #146 from CCXXXI/renovate/gradle-7.x
CCXXXI Dec 22, 2021
5947228
chore(deps): upgrade
CCXXXI Jan 8, 2022
f04bcd3
chore(deps): sdk: ">=2.15.1"
CCXXXI Jan 8, 2022
a9ba79e
fix: body_might_complete_normally_nullable
CCXXXI Jan 8, 2022
f6c8dca
chore(deps): upgrade
CCXXXI Feb 17, 2022
604455a
fix(home): correct the position of icons
CCXXXI Feb 17, 2022
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
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- uses: CCXXXI/flutter-action@main

- run: flutter build web
- run: flutter build web --source-maps

- uses: peaceiris/actions-gh-pages@v3
with:
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: CCXXXI/flutter-action@main
- run: sudo apt install clang cmake ninja-build pkg-config libgtk-3-dev
- run: sudo apt-get -y install clang cmake ninja-build pkg-config libgtk-3-dev

- run: flutter build linux

Expand Down Expand Up @@ -105,6 +105,7 @@ jobs:
path: ios-release.zip

release:
if: ${{ always() }}
needs: [ build-windows, build-linux, build-macos, build-android, build-ios ]
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 30
compileSdkVersion 31

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
8 changes: 4 additions & 4 deletions lib/home/home_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class HomePage extends StatelessWidget {
NavigationRailDestination(
label: _labelIcons[i].label,
icon: logic.idx.value != 2 && logic.idx.value == i
? const FaIcon(FontAwesomeIcons.edit)
? const Icon(FontAwesomeIcons.edit)
: _labelIcons[i].icon,
),
],
Expand Down Expand Up @@ -138,9 +138,9 @@ class _LabelIcon {
}

final _labelIcons = [
_LabelIcon('工具箱', const FaIcon(FontAwesomeIcons.toolbox)),
_LabelIcon('课程表', const FaIcon(FontAwesomeIcons.th)),
_LabelIcon('设置', const FaIcon(FontAwesomeIcons.cog)),
_LabelIcon('工具箱', const Icon(FontAwesomeIcons.toolbox)),
_LabelIcon('课程表', const Icon(FontAwesomeIcons.th)),
_LabelIcon('设置', const Icon(FontAwesomeIcons.cog)),
];

final _pages = [ToolboxPage(), TimetablePage(), SettingsPage()];
1 change: 1 addition & 0 deletions lib/settings/settings_logic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ class SettingsLogic extends GetxController with L {
} catch (e) {
l.error(e);
Get.snackbar('获取最新版本失败', e.toString());
return null;
}
}
}
1 change: 1 addition & 0 deletions lib/toolbox/toolbox_logic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class ToolboxLogic extends GetxController with L {
} catch (e) {
l.error(e);
Get.snackbar('获取舔狗语录失败', e.toString());
return null;
}
}

Expand Down
7 changes: 4 additions & 3 deletions lib/utils/database.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Future<void> initDatabase({
final dir = await getApplicationSupportDirectory();
Hive.init(dir.path);
} else {
await Hive.initFlutter(packageName);
await Hive.initFlutter();
}

Hive.registerAdapter(UserAdapter());
Expand All @@ -28,7 +28,7 @@ Future<void> initDatabase({
Hive.registerAdapter(MiscAdapter());
Hive.registerAdapter(ThemeAdapter());

conf = await Hive.openBox('conf');
conf = await Hive.openBox('$packageName.conf');

if (clear) await conf.clear();

Expand All @@ -40,7 +40,7 @@ Future<void> initDatabase({

Hive.registerAdapter(CourseAdapter());
Hive.registerAdapter(PeriodAdapter());
courses = await Hive.openBox('courses');
courses = await Hive.openBox('$packageName.courses');
if (clear) await courses.clear();
}

Expand Down Expand Up @@ -268,6 +268,7 @@ class Course extends HiveObject {
String toString() => toJson().toString();
}

// todo: 2.0.0 发布前更新这个,避免再来一次 BREAKING CHANGE 升到 3.0.0
late final Box<Course> courses;

@JsonSerializable()
Expand Down
4 changes: 2 additions & 2 deletions lib/utils/string.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import 'pangu.dart';
// record them manually
const appName = 'ECNU Timetable';
const packageName = 'io.github.ccxxxi.ecnu_timetable';
const version = '1.5.1';
const buildNumber = '26';
const version = '2.0.0';
const buildNumber = '27';

const release = '$packageName@$version+$buildNumber';

Expand Down
Loading