Merge remote-tracking branch 'origin/main'

# Conflicts:
#	lib/common/pubspec.yaml.g.dart

.github/workflows/ci_ios.yml

@@ -1,9 +1,6 @@
-name: CI-iOS
+name: Automated-CI-iOS-Beta
 
 on:
-  push:
-    tags:        
-      - '*'
   workflow_dispatch:
 
 jobs:

ios/Runner.xcodeproj/project.pbxproj

@@ -656,7 +656,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -692,7 +692,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = nano_Extension;
@@ -727,7 +727,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = nano_Extension;
@@ -759,7 +759,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				IBSC_MODULE = nano_Extension;
@@ -790,7 +790,7 @@
 				CODE_SIGN_ENTITLEMENTS = "nano Extension/nano Extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_ASSET_PATHS = "\"nano Extension/Preview Content\"";
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				ENABLE_PREVIEWS = YES;
@@ -830,7 +830,7 @@
 				CODE_SIGN_ENTITLEMENTS = "nano Extension/nano Extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_ASSET_PATHS = "\"nano Extension/Preview Content\"";
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				ENABLE_PREVIEWS = YES;
@@ -867,7 +867,7 @@
 				CODE_SIGN_ENTITLEMENTS = "nano Extension/nano Extension.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_ASSET_PATHS = "\"nano Extension/Preview Content\"";
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				ENABLE_PREVIEWS = YES;
@@ -1015,7 +1015,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				ENABLE_BITCODE = YES;
@@ -1050,7 +1050,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 151;
+				CURRENT_PROJECT_VERSION = 155;
 				DEVELOPMENT_TEAM = QZ9KCS2T78;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = Runner/Info.plist;

ios/Runner/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.5</string>
+	<string>1.3.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>151</string>
+	<string>155</string>
 	<key>GADApplicationIdentifier</key>
 	<string>ca-app-pub-3940256099942544~1458002511</string>
 	<key>ITSAppUsesNonExemptEncryption</key>

ios/nano Extension/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.5</string>
+	<string>1.3.6</string>
 	<key>CFBundleVersion</key>
-	<string>151</string>
+	<string>155</string>
 	<key>CLKComplicationPrincipalClass</key>
 	<string>$(PRODUCT_MODULE_NAME).ComplicationController</string>
 	<key>NSExtension</key>

ios/nano/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.5</string>
+	<string>1.3.6</string>
 	<key>CFBundleVersion</key>
-	<string>151</string>
+	<string>155</string>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

lib/feature/fudan_daily_warning_notification.dart

@@ -31,17 +31,22 @@ class FudanDailyWarningNotification extends Feature {
   bool get removable => true;
 
   @override
-  Widget get icon => PlatformX.isMaterial(context!)
-      ? const Icon(Icons.cloud_off)
-      : const Icon(CupertinoIcons.xmark_circle);
+  Widget get icon => Icon(
+        PlatformX.isMaterial(context!)
+            ? Icons.cloud_off
+            : CupertinoIcons.arrow_up_doc,
+        color: Theme.of(context!).errorColor,
+      );
 
   @override
-  Widget get trailing {
+  Widget get customSubtitle {
     return Row(mainAxisAlignment: MainAxisAlignment.end, children: [
       PlatformTextButton(
         padding: EdgeInsets.zero,
-        child: Text(S.of(context!).fudan_daily_warning_notification_action),
-        // User needs to download the vpn software. Open an external browser.
+        child: Text(
+          S.of(context!).fudan_daily_warning_notification_action,
+          style: TextStyle(color: Theme.of(context!).errorColor),
+        ),
         onPressed: () => FudanDailyFeature.pushFudanDailyWebPage(context!),
       ),
     ]);

lib/feature/welcome_feature.dart

@@ -27,6 +27,7 @@ import 'package:dan_xi/repository/fdu/data_center_repository.dart';
 import 'package:dan_xi/util/noticing.dart';
 import 'package:dan_xi/util/platform_universal.dart';
 import 'package:dan_xi/widget/libraries/scale_transform.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 
@@ -118,12 +119,22 @@ class WelcomeFeature extends Feature {
         _infoText = "";
         break;
       case ConnectionStatus.DONE:
-        if (_cardInfos?.any((element) => element.permission.contains("否")) ??
+        if (_cardInfos?.any((element) => !element.permission.contains("是")) ??
             false) {
-          status = const Icon(Icons.block);
+          status = Icon(
+            PlatformX.isMaterial(context!)
+                ? Icons.block
+                : CupertinoIcons.xmark_circle,
+            color: Theme.of(context!).errorColor,
+          );
           _infoText = S.of(context!).abnormal_entry_permission;
         } else {
-          status = const Icon(Icons.verified);
+          status = Icon(
+            PlatformX.isMaterial(context!)
+                ? Icons.verified
+                : CupertinoIcons.checkmark_alt_circle,
+            color: Colors.green,
+          );
           _infoText = S.of(context!).everything_is_ok;
         }
         break;
@@ -140,10 +151,12 @@ class WelcomeFeature extends Feature {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
           status,
-          if (_infoText.isNotEmpty) ...[
+          /*if (_infoText.isNotEmpty) ...[
             const SizedBox(height: 2),
             Text(_infoText, textScaleFactor: 0.8)
-          ]
+          ]*/
+          const SizedBox(height: 2),
+          Text(S.of(context!).entry_permission, textScaleFactor: 0.8)
         ],
       ),
       onTap: () {

lib/l10n/intl_en.arb

@@ -407,6 +407,6 @@
   "everything_is_ok": "All Okay",
   "entry_permission": "Entry Permission",
   "diagnostic_information": "Diagnostics",
-  "failed_exam_no_grade": "Please check jwfw for make-up exam grades.",
+  "failed_exam_no_grade": "Please check JWFW for make-up exam grades.",
   "set_semester_start_date": "Set Start Date"
 }

lib/page/dashboard/exam_detail.dart

@@ -427,8 +427,7 @@ class _ExamListState extends State<ExamList> {
                       ),
                   ],
                 ),
-                if (!value.type.contains("补考") &&
-                    !value.type.contains("缓考")) ...[
+                if (!value.type.contains("补") && !value.type.contains("缓")) ...[
                   Align(
                     alignment: Alignment.centerLeft,
                     child: FutureWidget<List<ExamScore>?>(

lib/page/subpage_timetable.dart

@@ -49,6 +49,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 import 'package:google_mobile_ads/google_mobile_ads.dart';
+import 'package:intl/intl.dart';
 import 'package:open_file/open_file.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:provider/provider.dart';
@@ -500,15 +501,17 @@ class StartDateSelectionButton extends StatelessWidget {
     });
     return PlatformIconButton(
       padding: PlatformX.isCupertino(context) ? EdgeInsets.zero : null,
-      icon: PlatformX.isCupertino(context)
-          ? AutoSizeText(S.of(context).semester_start_date, minFontSize: 10)
-          : const Icon(Icons.event),
+      icon: AutoSizeText(DateFormat("yyyy-MM-dd").format(startTime), minFontSize: 10),
       onPressed: () async {
         DateTime? newDate = await showPlatformDatePicker(
             context: context,
+            cupertino: (context, __) => CupertinoDatePickerData(
+              doneLabel: S.of(context).ok,
+              cancelLabel: S.of(context).cancel
+            )
             material: (context, __) => MaterialDatePickerData(
                 helpText: S.of(context).semester_start_date,
-                confirmText: S.of(context).set_semester_start_date),
+                confirmText: S.of(context).ok),
             initialDate: startTime,
             firstDate: DateTime.fromMillisecondsSinceEpoch(0),
             lastDate: startTime.add(const Duration(days: 365 * 100)));