Merge remote-tracking branch 'origin/material' into material

android/app/src/main/AndroidManifest.xml

@@ -56,17 +56,6 @@
  </intent-filter>
  </activity>
 
- <provider android:name="androidx.core.content.FileProvider"
- tools:replace="android:authorities"
- android:authorities="${applicationId}.fileProvider.install"
- android:exported="false"
- android:grantUriPermissions="true">
- <meta-data
- tools:replace="android:resource"
- android:name="android.support.FILE_PROVIDER_PATHS"
- android:resource="@xml/provider_install_paths"/>
- </provider>
-
  <receiver android:name=".HomeWidgetProvider"
  android:label="桌面课表"
  android:exported="false">
@@ -75,9 +64,16 @@
  <action android:name="cc.xuty.custed2.UPDATE_WIDGET"/>
  <action android:name="miui.appwidget.action.APPWIDGET_UPDATE" />
  </intent-filter>
+ <!-- <meta-data
+ android:name="miuiWidget"
+ android:value="true" /> -->
  <meta-data android:name="android.appwidget.provider"
  android:resource="@xml/home_widget" />
  </receiver>
+
+ <!-- <meta-data
+ android:name="miuiWidgetVersion"
+ android:value="1" /> -->
 
  <!-- Don't delete the meta-data below.
  This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

android/app/src/main/res/layout/home_widget.xml

@@ -4,7 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:background="@drawable/widget_background"
- android:padding="40px"
+ android:padding="47px"
  android:orientation="vertical"
  tools:ignore="PxUsage">
 

android/app/src/main/res/values-night/colors.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
- <color name="widgetBackgroundStart">#020202</color>
- <color name="widgetBackgroundEnd">#1B1B1B</color>
+ <color name="widgetBackgroundStart">#002323</color>
+ <color name="widgetBackgroundEnd">#003023</color>
  <color name="widgetTitleText">#FFFFFF</color>
  <color name="widgetSummaryText">#BBBBBB</color>
 </resources>

lib/app.dart

@@ -120,7 +120,7 @@ class _CustedState extends State<Custed> with AfterLayoutMixin<Custed> {
  if (Platform.isIOS && Platform.isAndroid) {
  await initPushService(userName);
  await requestUpdateHomeWidget(
- userName, setting.pushNotification.fetch());
+ userName: userName, enablePush: setting.pushNotification.fetch());
  }
  }
  }
@@ -151,16 +151,17 @@ Future<String> getToken() async {
  return null;
 }
 
-Future<void> requestUpdateHomeWidget(String userName, bool enablePush) async {
+Future<void> requestUpdateHomeWidget({String userName, bool enablePush}) async {
  if (Platform.isIOS) await HomeWidget.setAppGroupId('group.com.tusi.app');
- final setIdResult =
- await HomeWidget.saveWidgetData('ecardId', userName ?? '');
- print('[WIDGET] Set ecardId: $setIdResult');
+ if (userName != null) {
+ final setIdResult = await HomeWidget.saveWidgetData('ecardId', userName);
+ print('[WIDGET] Set ecardId: $setIdResult');
+ }
 
- if (Platform.isAndroid) {
+ if (Platform.isAndroid && enablePush != null) {
  final setPushResult =
  await HomeWidget.saveWidgetData('enableLessonPush', enablePush);
- print('[WIDGET] Set lessonPush: $setPushResult');
+ print('[WIDGET] Set lessonPush to [$enablePush]: $setPushResult');
  HomeWidget.updateWidget(
  name: 'HomeWidgetProvider', androidName: 'HomeWidgetProvider');
  }

lib/core/open.dart

@@ -1,11 +1,12 @@
 import 'package:url_launcher/url_launcher_string.dart';
 
-Future<bool> openUrl(String url) async {
+Future<bool> openUrl(String url, {LaunchMode mode}) async {
  if (!await canLaunchUrlString(url)) {
  return false;
  }
 
- if (await launchUrlString(url)) {
+ if (await launchUrlString(url,
+ mode: mode ?? LaunchMode.externalApplication)) {
  print('[URL] Launching: $url');
  return true;
  }

lib/core/route.dart

@@ -17,6 +17,4 @@ class AppRoute {
  ),
  );
  }
-
- void exception(e) {}
 }

lib/core/service/cat_client.dart

@@ -40,8 +40,7 @@ class CatClient {
  );
  saveCookies(response);
  final host = request.url.host;
- if ((!host.contains('lolli.tech') && !host.contains('cust.app')) ||
- !BuildMode.isRelease) {
+ if (!host.contains('lolli.tech') || !BuildMode.isRelease) {
  _alice.onHttpResponse(response);
  }
  return await followRedirect(response, maxRedirects, body: body);

lib/core/update.dart

@@ -11,11 +11,17 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:r_upgrade/r_upgrade.dart';
 
-void updateCheck(BuildContext context, {bool force = false}) async {
+bool _isChecking = false;
+
+Future<void> updateCheck(BuildContext context, {bool force = false}) async {
+ if (_isChecking) return;
+ _isChecking = true;
+
  print('[UPDATE] Checking...');
  final update = locator<AppProvider>().config?.update;
 
- _doUpdate(context, update, force: force);
+ await _doUpdate(context, update, force: force);
+ _isChecking = false;
 }
 
 Future<bool> isFileAvailable(String url) async {

lib/core/util/save_image.dart

@@ -1,25 +1,10 @@
-import 'dart:io';
 import 'dart:typed_data';
 
-import 'package:custed2/core/platform/os/app_doc_dir.dart';
 import 'package:custed2/core/util/utils.dart';
 import 'package:flutter/material.dart';
 import 'package:image_save/image_save.dart';
-import 'package:path/path.dart' show join;
-import 'package:share_extend/share_extend.dart';
 
-void saveImageToGallery(BuildContext context, Uint8List data) {
- if (Platform.isAndroid) return _saveAvatarInAndroid(data);
- return _saveAvatarGeneral(context, data);
-}
-
-void _saveAvatarInAndroid(Uint8List data) async {
- final path = join(await getAppDocDir.invoke(), "save.png");
- await File(path).writeAsBytes(data);
- ShareExtend.share(path, 'image');
-}
-
-void _saveAvatarGeneral(BuildContext context, Uint8List data) async {
+void saveImageToGallery(BuildContext context, Uint8List data) async {
  final year = DateTime.now().year;
  final ok = await ImageSave.saveImage(data, 'school_calendar_$year.png');
  final msg = ok ? '保存完成' : '保存失败';

lib/core/util/utils.dart

@@ -185,7 +185,8 @@ Color resolveWithBackground(BuildContext context) {
  return null;
 }
 
-Color get primaryColor => Color(locator<SettingStore>().appPrimaryColor.fetch());
+Color get primaryColor =>
+ Color(locator<SettingStore>().appPrimaryColor.fetch());
 
 /// 根据Appbar背景色判断使用黑/白色
 Color judgeWhiteOrBlack4AppbarContent(BuildContext context) {

lib/locator.dart

@@ -1,15 +1,13 @@
 import 'package:alice/alice.dart';
 import 'package:cookie_jar/cookie_jar.dart';
 import 'package:custed2/data/providers/app_provider.dart';
-import 'package:custed2/data/providers/banner_provider.dart';
 import 'package:custed2/data/providers/cet_avatar_provider.dart';
 import 'package:custed2/data/providers/exam_provider.dart';
 import 'package:custed2/data/providers/grade_provider.dart';
 import 'package:custed2/data/providers/netdisk_provider.dart';
 import 'package:custed2/data/providers/schedule_provider.dart';
 import 'package:custed2/data/providers/user_provider.dart';
 import 'package:custed2/data/providers/weather_provider.dart';
-import 'package:custed2/data/store/banner_store.dart';
 import 'package:custed2/data/store/custom_lesson_store.dart';
 import 'package:custed2/data/store/custom_schedule_store.dart';
 import 'package:custed2/data/store/exam_store.dart';
@@ -41,7 +39,6 @@ void setupLocatorForProviders() {
  locator.registerSingleton(WeatherProvider());
  locator.registerSingleton(CetAvatarProvider());
  locator.registerSingleton(NetdiskProvider());
- locator.registerSingleton(BannerProvider());
  locator.registerSingleton(ExamProvider());
 }
 
@@ -74,12 +71,6 @@ Future<void> setupLocatorForStores() async {
  return store;
  });
 
- locator.registerSingletonAsync<BannerStore>(() async {
- final store = BannerStore();
- await store.init();
- return store;
- });
-
  locator.registerSingletonAsync<ExamStore>(() async {
  final store = ExamStore();
  await store.init();

lib/main.dart

@@ -9,7 +9,6 @@ import 'package:custed2/data/models/schedule.dart';
 import 'package:custed2/data/models/schedule_lesson.dart';
 import 'package:custed2/data/models/user_profile.dart';
 import 'package:custed2/data/providers/app_provider.dart';
-import 'package:custed2/data/providers/banner_provider.dart';
 import 'package:custed2/data/providers/cet_avatar_provider.dart';
 import 'package:custed2/data/providers/debug_provider.dart';
 import 'package:custed2/core/platform/os/app_doc_dir.dart';
@@ -39,18 +38,17 @@ Future<void> initApp() async {
 
  await setupLocator(docDir);
  locator<AppProvider>().loadLocalData();
- locator<BannerProvider>().init();
 }
 
 void runInZone(Function body) {
+ final debugProvider = locator<DebugProvider>();
  final zoneSpec = ZoneSpecification(
  print: (Zone self, ZoneDelegate parent, Zone zone, String line) {
  parent.print(zone, line);
  // This is a hack to avoid
  // `setState() or markNeedsBuild() called during build`
  // error.
  Future.delayed(Duration(milliseconds: 1), () {
- final debugProvider = locator<DebugProvider>();
  debugProvider.addText(line);
  });
  },
@@ -59,7 +57,6 @@ void runInZone(Function body) {
  final onError = (Object obj, StackTrace stack) {
  print('error: $obj');
  Analytics.recordException(obj);
- final debugProvider = locator<DebugProvider>();
  debugProvider.addError(obj);
  debugProvider.addError(stack);
  };
@@ -89,7 +86,6 @@ void main() async {
  ChangeNotifierProvider(create: (_) => locator<CetAvatarProvider>()),
  ChangeNotifierProvider(create: (_) => locator<GradeProvider>()),
  ChangeNotifierProvider(create: (_) => locator<NetdiskProvider>()),
- ChangeNotifierProvider(create: (_) => locator<BannerProvider>()),
  ChangeNotifierProvider(create: (_) => locator<ExamProvider>()),
  ],
  child: Custed(),

lib/res/build_data.dart

@@ -2,9 +2,9 @@
 
 class BuildData {
  static const String name = "CustedNG";
- static const int build = 720;
+ static const int build = 725;
  static const String engine =
  "Flutter 2.10.5 • channel stable • https://github.com/flutter/flutter.git\nFramework • revision 5464c5bac7 (5 months ago) • 2022-04-18 09:55:37 -0700\nEngine • revision 57d3bac3dd\nTools • Dart 2.16.2 • DevTools 2.9.2\n";
- static const String buildAt = "2022-09-03 17:23:47.918983";
- static const int modifications = 1;
+ static const String buildAt = "2022-09-04 21:09:41.334274";
+ static const int modifications = 16;
 }

lib/service/custed_service.dart

@@ -14,7 +14,6 @@ import 'package:custed2/data/models/tiku_update.dart';
 import 'package:http/http.dart' show Client;
 
 class CustedService extends CatClient {
- static const baseUrl = 'https://cust.app';
  static const ccUrl = 'https://cust.cc';
 
  Future<WeatherData> getWeather() async {
@@ -127,9 +126,7 @@ class CustedService extends CatClient {
  }
 
  Future<bool> isServiceAvailable() async {
- final custApp = (await Client().head(baseUrl.uri)).statusCode == 200;
- final backend = (await Client().head(backendUrl.uri)).statusCode == 200;
- return custApp && backend;
+ return (await Client().head(backendUrl.uri)).statusCode == 200;
  }
 
  Future<TikuUpdate> getTikuUpdate() async {

lib/ui/dynamic_color.dart

@@ -7,7 +7,7 @@ class DynamicColor {
  final Color light;
  final Color dark;
 
- resolve(BuildContext context) {
+ Color resolve(BuildContext context) {
  return isDark(context) ? dark : light;
  }
 }