修改：更換資料載入中小部件

RPMTW · Sep 20, 2021 · 588bc69 · 588bc69
1 parent 1a829df
commit 588bc69
Show file tree

Hide file tree

Showing 23 changed files with 160 additions and 119 deletions.
diff --git a/lib/Mod/CurseForge/ModPackHandler.dart b/lib/Mod/CurseForge/ModPackHandler.dart
@@ -4,6 +4,7 @@ import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/DownloadCurseModPack.dart';
 import 'package:archive/archive.dart';
 import 'package:flutter/material.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 
 class CurseModPackHandler {
   static Widget Setup(File ModPackZipFile, [String ModPackIconUrl = ""]) {
@@ -36,21 +37,21 @@ class CurseModPackHandler {
                       ]);
                 }
               } on ArchiveException {
-                return CircularProgressIndicator();
+                return RWLLoading();
               }
             } else {
               return AlertDialog(
                 title: Text("正在解析模組包資訊中..."),
                 content: Row(
                   mainAxisSize: MainAxisSize.min,
                   mainAxisAlignment: MainAxisAlignment.center,
-                  children: [CircularProgressIndicator()],
+                  children: [RWLLoading()],
                 ),
               );
             }
           });
     } on FormatException {
-      return CircularProgressIndicator();
+      return RWLLoading();
     }
   }
 }
diff --git a/lib/Screen/Account.dart b/lib/Screen/Account.dart
@@ -7,6 +7,7 @@ import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/CheckDialog.dart';
 import 'package:flutter/material.dart';
 import 'package:rpmlauncher/Widget/OkClose.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 
 import '../main.dart';
 import 'MSOauth2Login.dart';
@@ -255,7 +256,7 @@ class AccountScreen_ extends State<AccountScreen> {
                                                                             SizedBox(
                                                                               height: 10,
                                                                             ),
-                                                                            CircularProgressIndicator(),
+                                                                            RWLLoading(),
                                                                             SizedBox(
                                                                               height: 10,
                                                                             ),

diff --git a/lib/Screen/CurseForgeMod.dart b/lib/Screen/CurseForgeMod.dart
@@ -2,10 +2,10 @@ import 'dart:io';
 
 import 'package:rpmlauncher/Launcher/InstanceRepository.dart';
 import 'package:rpmlauncher/Mod/CurseForge/Handler.dart';
-import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/CurseForgeModVersion.dart';
 import 'package:flutter/material.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -251,7 +251,7 @@ class CurseForgeMod_ extends State<CurseForgeMod> {
                   },
                 );
               } else {
-                return Center(child: CircularProgressIndicator());
+                return Center(child: RWLLoading());
               }
             }),
       ),

diff --git a/lib/Screen/CurseForgeModPack.dart b/lib/Screen/CurseForgeModPack.dart
@@ -8,6 +8,7 @@ import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -160,7 +161,7 @@ class CurseForgeModPack_ extends State<CurseForgeModPack> {
                             }).toList(),
                           );
                         } else {
-                          return Center(child: CircularProgressIndicator());
+                          return Center(child: RWLLoading());
                         }
                       })
                 ],
@@ -318,7 +319,7 @@ class CurseForgeModPack_ extends State<CurseForgeModPack> {
                                                             MainAxisAlignment
                                                                 .center,
                                                         children: [
-                                                          CircularProgressIndicator()
+                                                          RWLLoading()
                                                         ],
                                                       );
                                                     }
@@ -357,7 +358,7 @@ class CurseForgeModPack_ extends State<CurseForgeModPack> {
                   },
                 );
               } else {
-                return Center(child: CircularProgressIndicator());
+                return Center(child: RWLLoading());
               }
             }),
       ),

diff --git a/lib/Screen/CurseForgeModVersion.dart b/lib/Screen/CurseForgeModVersion.dart
@@ -9,6 +9,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/main.dart';
 
 class CurseForgeModVersion extends StatefulWidget {
@@ -131,7 +132,7 @@ class CurseForgeModVersion_ extends State<CurseForgeModVersion> {
                       } else {
                         return Row(
                           mainAxisAlignment: MainAxisAlignment.center,
-                          children: [CircularProgressIndicator()],
+                          children: [RWLLoading()],
                         );
                       }
                     });

diff --git a/lib/Screen/DownloadGameDialog.dart b/lib/Screen/DownloadGameDialog.dart
@@ -6,6 +6,7 @@ import 'package:rpmlauncher/Widget/AddInstance.dart';
 import 'package:rpmlauncher/Widget/FabricVersion.dart';
 import 'package:rpmlauncher/Widget/ForgeVersion.dart';
 import 'package:flutter/material.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 
 late var Data;
 late var ModLoaderID;
@@ -97,5 +98,5 @@ DownloadGameDialog(BorderColour, NameController, Data, ModLoaderName, context) {
       );
     }
   });
-  return Center(child: CircularProgressIndicator());
+  return Center(child: RWLLoading());
 }
diff --git a/lib/Screen/Edit.dart b/lib/Screen/Edit.dart
@@ -25,6 +25,7 @@ import 'package:rpmlauncher/Widget/ModListView.dart';
 import 'package:rpmlauncher/Widget/ModSourceSelection.dart';
 import 'package:rpmlauncher/Widget/OkClose.dart';
 import 'package:rpmlauncher/Widget/OptionsView.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/Widget/ShaderpackSourceSelection.dart';
 import 'package:rpmlauncher/Widget/WIPWidget.dart';
 import 'package:split_view/split_view.dart';
@@ -380,7 +381,7 @@ class EditInstance_ extends State<EditInstance> {
                       } else if (snapshot.hasError) {
                         return Text(snapshot.error.toString());
                       } else {
-                        return Center(child: CircularProgressIndicator());
+                        return Center(child: RWLLoading());
                       }
                     },
                   ),
@@ -549,7 +550,7 @@ class EditInstance_ extends State<EditInstance> {
                         } else if (snapshot.hasError) {
                           return Center(child: Text(snapshot.error.toString()));
                         } else {
-                          return Center(child: CircularProgressIndicator());
+                          return Center(child: RWLLoading());
                         }
                       },
                     ),
@@ -702,7 +703,7 @@ class EditInstance_ extends State<EditInstance> {
                                                 mainAxisAlignment:
                                                     MainAxisAlignment.center,
                                                 children: [
-                                                  CircularProgressIndicator(),
+                                                  RWLLoading(),
                                                   SizedBox(width: 12),
                                                   Text("正在處理世界檔案中，請稍後..."),
                                                 ],
@@ -788,7 +789,7 @@ class EditInstance_ extends State<EditInstance> {
                       } else if (snapshot.hasError) {
                         return Center(child: Text("No snapshot found"));
                       } else {
-                        return Center(child: CircularProgressIndicator());
+                        return Center(child: RWLLoading());
                       }
                     },
                   ),
@@ -845,7 +846,7 @@ class EditInstance_ extends State<EditInstance> {
                       } else if (snapshot.hasError) {
                         return Center(child: Text(snapshot.error.toString()));
                       } else {
-                        return Center(child: CircularProgressIndicator());
+                        return Center(child: RWLLoading());
                       }
                     },
                   ),
@@ -1012,15 +1013,15 @@ class EditInstance_ extends State<EditInstance> {
                                         return Container();
                                       }
                                     } else {
-                                      return CircularProgressIndicator();
+                                      return RWLLoading();
                                     }
                                   });
                             },
                           );
                         } else if (snapshot.hasError) {
                           return Center(child: Text(snapshot.error.toString()));
                         } else {
-                          return Center(child: CircularProgressIndicator());
+                          return Center(child: RWLLoading());
                         }
                       },
                     ),

diff --git a/lib/Screen/FTBModPack.dart b/lib/Screen/FTBModPack.dart
@@ -16,6 +16,7 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../main.dart';
@@ -151,7 +152,7 @@ class FTBModPack_ extends State<FTBModPack> {
                             }).toList(),
                           );
                         } else {
-                          return Center(child: CircularProgressIndicator());
+                          return Center(child: RWLLoading());
                         }
                       })
                 ],
@@ -312,7 +313,7 @@ class FTBModPack_ extends State<FTBModPack> {
                                                                       MainAxisAlignment
                                                                           .center,
                                                                   children: [
-                                                                    CircularProgressIndicator()
+                                                                    RWLLoading()
                                                                   ],
                                                                 );
                                                               }
@@ -355,13 +356,13 @@ class FTBModPack_ extends State<FTBModPack> {
                           } else {
                             return ListTile(
                                 title:
-                                    Center(child: CircularProgressIndicator()));
+                                    Center(child: RWLLoading()));
                           }
                         });
                   },
                 );
               } else {
-                return Center(child: CircularProgressIndicator());
+                return Center(child: RWLLoading());
               }
             }),
       ),

diff --git a/lib/Screen/FabricVersion.dart b/lib/Screen/FabricVersion.dart
@@ -4,7 +4,7 @@ import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:rpmlauncher/Widget/AddInstance.dart';
-
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 
 FabricVersion(BorderColour, NameController, Data, ModLoaderName, context) {
   return AlertDialog(
@@ -57,7 +57,7 @@ FabricVersion(BorderColour, NameController, Data, ModLoaderName, context) {
                     );
                   });
             } else {
-              return Center(child: CircularProgressIndicator());
+              return Center(child: RWLLoading());
             }
           },
         ),

diff --git a/lib/Screen/ForgeVersion.dart b/lib/Screen/ForgeVersion.dart
@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
 import 'package:rpmlauncher/Widget/AddInstance.dart';
-
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 
 ForgeVersion(BorderColour, NameController, Data, ModLoaderName, context) {
   return AlertDialog(
@@ -59,7 +59,7 @@ ForgeVersion(BorderColour, NameController, Data, ModLoaderName, context) {
                     );
                   });
             } else {
-              return Center(child: CircularProgressIndicator());
+              return Center(child: RWLLoading());
             }
           },
         ),

diff --git a/lib/Screen/MSOauth2Login.dart b/lib/Screen/MSOauth2Login.dart
@@ -14,6 +14,7 @@ import 'package:rpmlauncher/Account/MSAccountHandler.dart';
 import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/OkClose.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -112,7 +113,7 @@ class _MSLoginState extends State<MSLoginWidget> {
                                           SizedBox(
                                             height: 10,
                                           ),
-                                          CircularProgressIndicator(),
+                                          RWLLoading(),
                                           SizedBox(
                                             height: 10,
                                           )
@@ -131,7 +132,7 @@ class _MSLoginState extends State<MSLoginWidget> {
                                   SizedBox(
                                     height: 10,
                                   ),
-                                  CircularProgressIndicator(),
+                                  RWLLoading(),
                                   SizedBox(
                                     height: 10,
                                   )

diff --git a/lib/Screen/ModrinthMod.dart b/lib/Screen/ModrinthMod.dart
@@ -6,6 +6,7 @@ import 'package:rpmlauncher/Utility/Loggger.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/ModrinthModVersion.dart';
 import 'package:flutter/material.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/main.dart';
 import 'package:url_launcher/url_launcher.dart';
 
@@ -264,7 +265,7 @@ class ModrinthMod_ extends State<ModrinthMod> {
                   },
                 );
               } else {
-                return Center(child: CircularProgressIndicator());
+                return Center(child: RWLLoading());
               }
             }),
       ),

diff --git a/lib/Screen/MojangAccount.dart b/lib/Screen/MojangAccount.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:rpmlauncher/Account/Account.dart';
 import 'package:rpmlauncher/Account/MojangAccountHandler.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 
 import 'Account.dart';
 
@@ -149,7 +150,7 @@ class MojangAccount_ extends State<MojangAccount> {
                                         child: Center(
                                           child: Column(
                                             children: <Widget>[
-                                              CircularProgressIndicator(),
+                                              RWLLoading(),
                                               SizedBox(height: 10),
                                               Text("處理中，請稍後...")
                                             ],

diff --git a/lib/Screen/RefreshMSToken.dart b/lib/Screen/RefreshMSToken.dart
@@ -4,6 +4,7 @@ import 'package:oauth2/oauth2.dart';
 import 'package:rpmlauncher/Account/Account.dart';
 import 'package:rpmlauncher/Utility/i18n.dart';
 import 'package:rpmlauncher/Widget/OkClose.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:rpmlauncher/main.dart';
 
 import 'MSOauth2Login.dart';
@@ -66,7 +67,7 @@ class _RefreshMsTokenScreenState extends State<RefreshMsTokenScreen> {
                 children: [
                   Text("正在嘗試自動更新您的帳號憑證"),
                   SizedBox(height: 12),
-                  CircularProgressIndicator()
+                  RWLLoading()
                 ],
               ),
             );

diff --git a/lib/Screen/VersionSelection.dart b/lib/Screen/VersionSelection.dart
@@ -14,6 +14,7 @@ import 'package:flutter/material.dart';
 import 'package:http/http.dart';
 import 'package:path/path.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
+import 'package:rpmlauncher/Widget/RWLLoading.dart';
 import 'package:split_view/split_view.dart';
 
 import '../main.dart';
@@ -118,7 +119,7 @@ class VersionSelection_ extends State<VersionSelection> {
                         return Container();
                       });
                 } else {
-                  return Center(child: CircularProgressIndicator());
+                  return Center(child: RWLLoading());
                 }
               }),
           Column(

diff --git a/lib/Widget/AddInstance.dart b/lib/Widget/AddInstance.dart
@@ -14,6 +14,7 @@ import 'package:path/path.dart';
 import 'package:rpmlauncher/Utility/utility.dart';
 
 import '../main.dart';
+import 'RWLLoading.dart';
 
 AddInstanceDialog(Color BorderColour, TextEditingController NameController,
     Map Data, String ModLoaderID, String LoaderVersion) {
@@ -172,7 +173,7 @@ AddInstanceDialog(Color BorderColour, TextEditingController NameController,
                             }
                           });
                         } else {
-                          return Center(child: CircularProgressIndicator());
+                          return Center(child: RWLLoading());
                         }
                       });
                 });