diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index cd740ef8..4d990781 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -357,7 +357,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = XQPP7CHG9D; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = XQPP7CHG9D; ENABLE_BITCODE = NO; @@ -372,7 +372,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.9.1; + MARKETING_VERSION = 2.9.2; PRODUCT_BUNDLE_IDENTIFIER = "com.toly1994.flutter-unit"; PRODUCT_NAME = "$(TARGET_NAME)"; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = flutter_unit_profile; @@ -498,7 +498,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = XQPP7CHG9D; ENABLE_BITCODE = NO; @@ -513,7 +513,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.9.1; + MARKETING_VERSION = 2.9.2; PRODUCT_BUNDLE_IDENTIFIER = "com.toly1994.flutter-unit"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -534,7 +534,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = XQPP7CHG9D; ENABLE_BITCODE = NO; @@ -549,7 +549,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.9.1; + MARKETING_VERSION = 2.9.2; PRODUCT_BUNDLE_IDENTIFIER = "com.toly1994.flutter-unit"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/lib/app/flutter_unit.dart b/lib/app/flutter_unit.dart index aae8048a..3594ca75 100644 --- a/lib/app/flutter_unit.dart +++ b/lib/app/flutter_unit.dart @@ -20,6 +20,7 @@ class FlutterUnit extends StatelessWidget { return DefaultTextStyle( style: TextStyle(fontFamily: state.fontFamily), child: MaterialApp( + // routes: , showPerformanceOverlay: state.showPerformanceOverlay, title: StrUnit.appName, debugShowCheckedModeBanner: false, diff --git a/lib/app/navigation/route/route.dart b/lib/app/navigation/route/route.dart new file mode 100644 index 00000000..70f18eb0 --- /dev/null +++ b/lib/app/navigation/route/route.dart @@ -0,0 +1,41 @@ +import 'dart:io'; + +import 'package:app/app.dart'; +import 'package:flutter/material.dart'; + +import '../../views/setting/code_style_setting.dart'; +import '../../views/setting/font_setting.dart'; +import '../../views/setting/setting_page.dart'; +import '../../views/setting/theme_color_setting.dart'; +import '../unit_navigation.dart'; + +class RoutePath { + + static const String nav = 'nav'; + + static const String themeColorSetting = 'ThemeColorSettingPage'; + static const String codeStyleSetting = 'CodeStyleSettingPage'; + static const String itemStyleSetting = 'ItemStyleSettingPage'; + static const String fontSetting = 'FountSettingPage'; + + Map get routes => + { + themeColorSetting: (ctx) => const ThemeColorSettingPage(), + codeStyleSetting: (ctx) => const CodeStyleSettingPage(), + fontSetting: (ctx) => const FontSettingPage(), + }; + + + static Route? generateRoute(RouteSettings settings) { + switch (settings.name) { + case nav: + if (Platform.isWindows || Platform.isMacOS || Platform.isLinux) { + return ZeroPageRoute(child: UnitNavigation()); + } + return SlidePageRoute(child: UnitNavigation()); + } + + return null; + } + +} \ No newline at end of file diff --git a/lib/app/router/unit_router.dart b/lib/app/router/unit_router.dart index 0ccc3951..687a8dfe 100644 --- a/lib/app/router/unit_router.dart +++ b/lib/app/router/unit_router.dart @@ -81,8 +81,7 @@ class UnitRouters { ); } - return SlidePageRoute( - child: child); + return SlidePageRoute(child: child); // case search: // return Right2LeftRouter(child: const SearchPageProvider());