Merge pull request #43 from NKUST-ITC/develop

Update to v.3.1.4
NKUST-ITC · Mar 25, 2019 · f362c1a · f362c1a
2 parents b1fe0e7 + c98968f
commit f362c1a
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 40 deletions.
diff --git a/feather/macos/FeatherApp.xcodeproj/project.pbxproj b/feather/macos/FeatherApp.xcodeproj/project.pbxproj
@@ -70,7 +70,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		33CC10ED2044A3C60003C045 /* FeatherApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = FeatherApp.app; path = "app_9vzIF7brk1rN.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* app_9vzIF7brk1rN.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app_9vzIF7brk1rN.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -126,7 +126,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* FeatherApp.app */,
+				33CC10ED2044A3C60003C045 /* app_9vzIF7brk1rN.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -162,7 +162,7 @@
 			);
 			name = FeatherApp;
 			productName = FeatherApp;
-			productReference = 33CC10ED2044A3C60003C045 /* FeatherApp.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* app_9vzIF7brk1rN.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -178,7 +178,7 @@
 					33CC10EC2044A3C60003C045 = {
 						CreatedOnToolsVersion = 9.2;
 						LastSwiftMigration = 0920;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 					33CC111A2044C6BA0003C045 = {
 						CreatedOnToolsVersion = 9.2;
@@ -393,10 +393,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = R7BC26UNC9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -405,7 +405,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.feather-apps.app-9vzIF7brk1rN";
-				PRODUCT_NAME = "app_9vzIF7brk1rN";
+				PRODUCT_NAME = app_9vzIF7brk1rN;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "FeatherApp-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -418,10 +418,10 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Mac Developer";
+				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				DEVELOPMENT_TEAM = "";
+				DEVELOPMENT_TEAM = R7BC26UNC9;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -430,7 +430,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.feather-apps.app-9vzIF7brk1rN";
-				PRODUCT_NAME = "app_9vzIF7brk1rN";
+				PRODUCT_NAME = app_9vzIF7brk1rN;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "FeatherApp-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;

diff --git a/...roj/project.xcworkspace/xcuserdata/rainvisitor.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/rainvisitor.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -249,7 +249,7 @@
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
-				"${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework",
+				"${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
 				"${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework",
 				"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",

diff --git a/lib/models/bus_data.dart b/lib/models/bus_data.dart
@@ -108,7 +108,7 @@ class BusTime {
         'cancelKey': cancelKey,
       };
 
-  bool hasReserve() {
+  bool canReserve() {
     var now = new DateTime.now();
     initializeDateFormatting();
     var formatter = new DateFormat('yyyy-MM-dd HH:mm', 'zh');
@@ -121,13 +121,13 @@ class BusTime {
   Color getColorState() {
     return isReserve == 1
         ? Resource.Colors.blue
-        : hasReserve() ? Resource.Colors.grey : Colors.grey[400];
+        : canReserve() ? Resource.Colors.grey : Colors.grey[400];
   }
 
   String getReserveState(AppLocalizations local) {
     return isReserve == 1
         ? local.reserved
-        : hasReserve() ? local.reserve : local.canNotReserve;
+        : canReserve() ? local.reserve : local.canNotReserve;
   }
 
   String getDate() {

diff --git a/lib/pages/home/bus/bus_reserve_page.dart b/lib/pages/home/bus/bus_reserve_page.dart
@@ -111,7 +111,7 @@ class BusReservePageState extends State<BusReservePage>
         children: <Widget>[
           FlatButton(
             padding: EdgeInsets.symmetric(vertical: 16.0, horizontal: 16.0),
-            onPressed: busTime.hasReserve() && busTime.isReserve == 0
+            onPressed: busTime.canReserve() && busTime.isReserve == 0
                 ? () {
                     String start = "";
                     if (selectStartStation == Station.janGong)
@@ -145,7 +145,7 @@ class BusReservePageState extends State<BusReservePage>
                                           fontSize: 14.0),
                                     ),
                                     TextSpan(
-                                        text: '預約截止時間：\n',
+                                        text: '${app.reserveDeadline}：\n',
                                         style: TextStyle(
                                             fontWeight: FontWeight.bold)),
                                     TextSpan(
@@ -161,27 +161,29 @@ class BusReservePageState extends State<BusReservePage>
                           ),
                     );
                   }
-                : () {
-                    showDialog(
-                      context: context,
-                      builder: (BuildContext context) => YesNoDialog(
-                            title: app.busCancelReserve,
-                            contentWidget: Text(
-                              "${app.busCancelReserveConfirmContent1}${busTime.getStart(app)}"
-                                  "${app.busCancelReserveConfirmContent2}${busTime.getEnd(app)}\n"
-                                  "${busTime.getTime()}${app.busCancelReserveConfirmContent3}",
-                              textAlign: TextAlign.center,
-                            ),
-                            leftActionText: app.back,
-                            rightActionText: app.determine,
-                            rightActionFunction: () {
-                              _cancelBusReservation(busTime);
-                              FA.logAction('cancel_bus', 'click');
-                            },
-                          ),
-                    );
-                    FA.logAction('cancel_bus', 'create');
-                  },
+                : busTime.isReserve != 0
+                    ? () {
+                        showDialog(
+                          context: context,
+                          builder: (BuildContext context) => YesNoDialog(
+                                title: app.busCancelReserve,
+                                contentWidget: Text(
+                                  "${app.busCancelReserveConfirmContent1}${busTime.getStart(app)}"
+                                      "${app.busCancelReserveConfirmContent2}${busTime.getEnd(app)}\n"
+                                      "${busTime.getTime()}${app.busCancelReserveConfirmContent3}",
+                                  textAlign: TextAlign.center,
+                                ),
+                                leftActionText: app.back,
+                                rightActionText: app.determine,
+                                rightActionFunction: () {
+                                  _cancelBusReservation(busTime);
+                                  FA.logAction('cancel_bus', 'click');
+                                },
+                              ),
+                        );
+                        FA.logAction('cancel_bus', 'create');
+                      }
+                    : null,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: <Widget>[

diff --git a/lib/utils/app_localizations.dart b/lib/utils/app_localizations.dart
@@ -907,6 +907,7 @@ class AppLocalizations {
   String get busRule => _vocabularies['bus_rule'];
 
   String get platformError => _vocabularies['platform_error'];
+  String get reserveDeadline => _vocabularies['reserve_deadline'];
 }
 
 class AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: nkust_ap
 description: A new Flutter application.
 
-version: 3.1.3+30103
+version: 3.1.4+30104
 
 environment:
   sdk: ">=2.1.0 <3.0.0"