MinecraftCube · Tokenyet · Jan 27, 2023 · Jan 26, 2023 · Jan 26, 2023 · Jan 26, 2023
diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json
@@ -1,4 +1,4 @@
 {
-  "flutterSdkVersion": "3.0.1",
+  "flutterSdkVersion": "3.7.0",
   "flavors": {}
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       MACHINE_OS: windows
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Doctor
@@ -55,7 +55,7 @@ jobs:
       MACHINE_OS: linux
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Linux dependencies	
@@ -91,7 +91,7 @@ jobs:
       MACHINE_OS: macos
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Doctor

diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -16,7 +16,7 @@ jobs:
       MACHINE_OS: linux
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Linux dependencies	

diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
@@ -16,7 +16,7 @@ jobs:
       MACHINE_OS: macos
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Doctor

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -16,7 +16,7 @@ jobs:
       MACHINE_OS: windows
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Doctor

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,6 +28,9 @@ on:
   pull_request:
     types:
       - opened
+      - reopened
+      - ready_for_review
+      - synchronize
     branches:
       - 'main'
     paths:
@@ -46,15 +49,15 @@ on:
       - 'pubspec.yaml'
 
 concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
   analyze: 
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies
@@ -69,7 +72,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies
@@ -84,7 +87,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies
@@ -103,7 +106,7 @@ jobs:
           top -l 1 -s 0 | grep PhysMem | awk '{print $2}'
           top -l 1 -s 0 | grep PhysMem | awk '{print $6}'
       - uses: actions/checkout@v3
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies
@@ -192,7 +195,7 @@ jobs:
       # - name: Setup Java
       #   run: |
       #     .\.github\workflows\scripts\windows_integration_setup.bat
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies
@@ -251,7 +254,7 @@ jobs:
       # - name: Setup Java
       #   run: |
       #     ./.github/workflows/scripts/linux_integration_setup.sh
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies
@@ -311,7 +314,7 @@ jobs:
       # - name: Setup Java
       #   run: |
       #     ./.github/workflows/scripts/macos_integratin_setup.sh
-      - uses: subosito/flutter-action@v2.3.0
+      - uses: subosito/flutter-action@v2.8.0
         with:
           channel: 'stable'
       - name: Install Dependencies

diff --git a/lib/pages/app_page/pages/about_page/about_page.dart b/lib/pages/app_page/pages/about_page/about_page.dart
@@ -82,7 +82,7 @@ class AboutBanner extends StatelessWidget {
               color: Colors.black26,
               child: Text(
                 aboutPageTitle.i18n,
-                style: Theme.of(context).textTheme.headline3?.copyWith(
+                style: Theme.of(context).textTheme.displaySmall?.copyWith(
                   shadows: <Shadow>[
                     const Shadow(
                       offset: Offset(10.0, 10.0),
@@ -188,7 +188,7 @@ class AuthorCard extends StatelessWidget {
           Expanded(
             child: RichText(
               text: TextSpan(
-                style: textTheme.bodyText1?.copyWith(height: 1.5),
+                style: textTheme.bodyLarge?.copyWith(height: 1.5),
                 children: getAuthorTextSpan(
                   () => context.read<LauncherRepository>().launch(
                         path:
@@ -225,7 +225,7 @@ class AppCard extends StatelessWidget {
               text: TextSpan(
                 style: Theme.of(context)
                     .textTheme
-                    .bodyText1
+                    .bodyLarge
                     ?.copyWith(height: 1.5),
                 children: getAppTextSpan(),
               ),
@@ -246,7 +246,7 @@ class SecretCard extends StatelessWidget {
       bgColor: Colors.grey.shade300,
       child: RichText(
         text: TextSpan(
-          style: Theme.of(context).textTheme.bodyText1?.copyWith(height: 1.5),
+          style: Theme.of(context).textTheme.bodyLarge?.copyWith(height: 1.5),
           children: getSecretTextSpan(),
         ),
       ),

diff --git a/lib/pages/app_page/pages/about_page/about_page.i18n.dart b/lib/pages/app_page/pages/about_page/about_page.i18n.dart
@@ -72,7 +72,7 @@ List<InlineSpan> _getAuthorTextSpanEnUS(
     ),
     TextSpan(
       text: 'Youtube',
-      style: textTheme.subtitle1?.copyWith(color: Colors.red),
+      style: textTheme.titleMedium?.copyWith(color: Colors.red),
       recognizer: TapGestureRecognizer()..onTap = onTapYoutube,
     ),
   ];
@@ -109,7 +109,7 @@ List<InlineSpan> _getAuthorTextSpanZhTW(
     ),
     TextSpan(
       text: 'Youtube',
-      style: textTheme.subtitle1?.copyWith(color: Colors.red),
+      style: textTheme.titleMedium?.copyWith(color: Colors.red),
       recognizer: TapGestureRecognizer()..onTap = onTapYoutube,
     ),
   ];

diff --git a/lib/pages/app_page/pages/craft_page/craft_page.dart b/lib/pages/app_page/pages/craft_page/craft_page.dart
@@ -134,16 +134,16 @@ class CraftIntroPageState extends State<CraftIntroPage> {
         gap,
         Text(
           craftPageSelectAnApproach.i18n.toUpperCase(),
-          style: textTheme.headline5,
+          style: textTheme.headlineSmall,
         ),
         gap,
         GroupButton(
           options: GroupButtonOptions(
             spacing: 4,
             textPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 8),
             selectedTextStyle:
-                textTheme.headline6?.copyWith(color: Colors.white),
-            unselectedTextStyle: textTheme.headline6,
+                textTheme.titleLarge?.copyWith(color: Colors.white),
+            unselectedTextStyle: textTheme.titleLarge,
           ),
           controller: _controller,
           onSelected: (_, index, __) {
@@ -193,7 +193,7 @@ class CraftIntroPageState extends State<CraftIntroPage> {
                       ),
                       Text(
                         craftPagePlaylist.i18n,
-                        style: textTheme.bodyText1?.copyWith(
+                        style: textTheme.bodyLarge?.copyWith(
                           decoration: TextDecoration.underline,
                         ),
                       ),
@@ -202,12 +202,10 @@ class CraftIntroPageState extends State<CraftIntroPage> {
                   onTap: () async {
                     const link =
                         'https://www.youtube.com/playlist?list=PLhinMkAHNXof487STGZe50wHG3rS92jv3';
-                    if (await context
-                        .read<LauncherRepository>()
-                        .canLaunch(path: link)) {
-                      await context
-                          .read<LauncherRepository>()
-                          .launch(path: link);
+                    final launcherRepository =
+                        context.read<LauncherRepository>();
+                    if (await launcherRepository.canLaunch(path: link)) {
+                      await launcherRepository.launch(path: link);
                     }
                   },
                 ),
@@ -239,7 +237,7 @@ class CraftIntroPageInstallerSection extends StatelessWidget {
     final textTheme = Theme.of(context).textTheme;
     return RichText(
       text: TextSpan(
-        style: textTheme.bodyText2,
+        style: textTheme.bodyMedium,
         children: [
           TextSpan(
             text: craftPageInstallerDesc.i18n,
@@ -259,11 +257,11 @@ class CraftIntroPageIntegrateSection extends StatelessWidget {
 
     return RichText(
       text: TextSpan(
-        style: textTheme.bodyText2,
+        style: textTheme.bodyMedium,
         children: [
           TextSpan(
             text: craftPageManualDescFollowing.i18n,
-            style: textTheme.subtitle2?.copyWith(fontWeight: FontWeight.bold),
+            style: textTheme.titleSmall?.copyWith(fontWeight: FontWeight.bold),
           ),
           TextSpan(
             text: craftPageManualDescFollowingA.i18n,
@@ -279,7 +277,7 @@ class CraftIntroPageIntegrateSection extends StatelessWidget {
           ),
           TextSpan(
             text: craftPageManualDescIntegrate.i18n,
-            style: textTheme.subtitle2?.copyWith(fontWeight: FontWeight.bold),
+            style: textTheme.titleSmall?.copyWith(fontWeight: FontWeight.bold),
           ),
           TextSpan(
             text: craftPageManualDescIntegrateA.i18n,

diff --git a/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/craft_navi_page.dart b/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/craft_navi_page.dart
@@ -81,7 +81,7 @@ class _CraftNaviPageViewState extends State<CraftNaviPageView> {
     // final double itemWidth = MediaQuery.of(context).size.width / 2;
     // TextStyle _ = Theme.of(context)
     //     .textTheme
-    //     .headline6
+    //     .titleLarge
     //     .copyWith(color: ColorPalette.primaryColor);
 
     void onMenuPressed() {

diff --git a/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/base_page.dart b/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/base_page.dart
@@ -44,11 +44,11 @@ class BuildPageBasePage extends StatelessWidget {
     ColorScheme scheme = Theme.of(context).colorScheme;
     TextTheme textTheme = Theme.of(context).textTheme;
     TextStyle? titleStyle =
-        textTheme.subtitle1?.copyWith(color: scheme.primary);
-    // TextStyle descriptionTitleStyle = textTheme.headline6.copyWith(color: ColorPalette.accentColor);
+        textTheme.titleMedium?.copyWith(color: scheme.primary);
+    // TextStyle descriptionTitleStyle = textTheme.titleLarge.copyWith(color: ColorPalette.accentColor);
     TextStyle? descriptionStyle = Theme.of(context)
         .textTheme
-        .subtitle1
+        .titleMedium
         ?.copyWith(color: scheme.secondary);
 
     Widget nextButton = BasePageNextButton(
@@ -132,7 +132,7 @@ class BasePageNextButton extends StatelessWidget {
     ColorScheme scheme = Theme.of(context).colorScheme;
     TextStyle? headerBtnStyle = Theme.of(context)
         .textTheme
-        .subtitle1
+        .titleMedium
         ?.copyWith(color: scheme.onPrimary);
     return ElevatedButton(
       style: ButtonStyle(
@@ -177,10 +177,10 @@ class BaseTitle extends StatelessWidget {
     ColorScheme scheme = Theme.of(context).colorScheme;
     TextTheme textTheme = Theme.of(context).textTheme;
     TextStyle? headerStyle =
-        textTheme.headline6?.copyWith(color: scheme.primary);
+        textTheme.titleLarge?.copyWith(color: scheme.primary);
     TextStyle? headerBtnStyle = Theme.of(context)
         .textTheme
-        .subtitle1
+        .titleMedium
         ?.copyWith(color: scheme.onPrimary);
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,

diff --git a/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/description_page.dart b/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/description_page.dart
@@ -40,7 +40,7 @@ class _DescriptionNaviPageState extends State<DescriptionNaviPage> {
     // TextStyle headerBtnStyle = Theme.of(context).textTheme.title.copyWith(color: ColorPalette.fontColor);
     final TextTheme textTheme = Theme.of(context).textTheme;
     TextStyle? descriptionTitleStyle =
-        textTheme.subtitle1?.copyWith(color: Colors.grey);
+        textTheme.titleMedium?.copyWith(color: Colors.grey);
     // TextStyle descriptionStyle = Theme.of(context).textTheme.title.copyWith(color: ColorPalette.secondaryColor);
 
     // return BlocBuilder<MPB.NaviPageBloc, MPB.NaviPageState>(

diff --git a/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/installer_name_page.dart b/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/installer_name_page.dart
@@ -59,7 +59,7 @@ class _InstallerNameNaviPageState extends State<InstallerNameNaviPage> {
     // TextStyle headerBtnStyle = Theme.of(context).textTheme.title.copyWith(color: ColorPalette.fontColor);
     final TextTheme textTheme = Theme.of(context).textTheme;
     TextStyle? descriptionTitleStyle =
-        textTheme.subtitle1?.copyWith(color: Colors.grey);
+        textTheme.titleMedium?.copyWith(color: Colors.grey);
     // TextStyle descriptionStyle = Theme.of(context).textTheme.title.copyWith(color: ColorPalette.secondaryColor);
 
     /*return BlocBuilder<NaviPageBloc, NaviPageState>(

diff --git a/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/map_download_page.dart b/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/map_download_page.dart
@@ -63,7 +63,7 @@ class _MapDownloadNaviPageState extends State<MapDownloadNaviPage>
     // TextStyle headerBtnStyle = Theme.of(context).textTheme.title.copyWith(color: ColorPalette.fontColor);
     final TextTheme textTheme = Theme.of(context).textTheme;
     TextStyle? descriptionTitleStyle =
-        textTheme.subtitle1?.copyWith(color: Colors.grey);
+        textTheme.titleMedium?.copyWith(color: Colors.grey);
 
     // return BlocBuilder<MPB.NaviPageBloc, MPB.NaviPageState>(
     //   buildWhen: (state, oldState) => oldState.mapDownloadPath != state.mapDownloadPath,

diff --git a/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/mod_pack_page.dart b/lib/pages/app_page/pages/craft_page/pages/craft_navi_page/pages/mod_pack_page.dart
@@ -65,7 +65,7 @@ class _ModpackNaviPageState extends State<ModpackNaviPage> {
     // TextStyle titleStyle = Theme.of(context).textTheme.title.copyWith(color: ColorPalette.primaryColor);
     final TextTheme textTheme = Theme.of(context).textTheme;
     TextStyle? descriptionTitleStyle =
-        textTheme.subtitle1?.copyWith(color: Colors.grey);
+        textTheme.titleMedium?.copyWith(color: Colors.grey);
 
     const currentMode = ModelSettingType.pack;
     // return BlocBuilder<MPB.NaviPageBloc, MPB.NaviPageState>(