💄 Update webapp's icon size consistence.

openjmu · Feb 13, 2020 · 02b19a4 · 02b19a4
1 parent 00e0261
commit 02b19a4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/lib/pages/post/publish_post_page.dart b/lib/pages/post/publish_post_page.dart
@@ -128,7 +128,7 @@ class PublishPostPageState extends State<PublishPostPage> {
             selectionLimitReachedText: '已达到最大张数限制',
           ),
         ).catchError((e) {
-          debugPrint(e.toString());
+          debugPrint('Error when picking images: $e');
         });
         if (results != null) resultList = results;
         if (_focusNode.canRequestFocus) _focusNode.requestFocus();

diff --git a/lib/providers/settings_provider.dart b/lib/providers/settings_provider.dart
@@ -12,7 +12,6 @@ class SettingsProvider extends ChangeNotifier {
   /// For test page.
   /// TODO: Set this to false before release.
   bool _debug = !kReleaseMode && false;
-//  bool _debug = true;
   bool get debug => _debug;
   set debug(bool value) {
     _debug = value;

diff --git a/lib/widgets/webapp_icon.dart b/lib/widgets/webapp_icon.dart
@@ -23,13 +23,15 @@ class WebAppIcon extends StatelessWidget {
       debugPrint('Error when load webapp icon: $e.\nLoading fallback icon...');
       return ExtendedImage.network(
         oldIconUrl,
-        width: suSetWidth(size),
-        height: suSetWidth(size),
+        width: suSetWidth(oldIconSize),
+        height: suSetWidth(oldIconSize),
         fit: BoxFit.fill,
       );
     }
   }
 
+  double get oldIconSize => size / 1.5;
+
   String get iconPath => 'assets/icons/appCenter/${app.code}-${app.name}.svg';
 
   String get oldIconUrl => '${API.webAppIcons}appid=${app.appId}&code=${app.code}';
@@ -39,20 +41,26 @@ class WebAppIcon extends StatelessWidget {
     return Selector<SettingsProvider, bool>(
       selector: (_, provider) => provider.newAppCenterIcon,
       builder: (_, newAppCenterIcon, __) {
-        return !(currentUser?.isTeacher ?? false) || newAppCenterIcon
+        final shouldUseNew = !(currentUser?.isTeacher ?? false) || newAppCenterIcon;
+        return shouldUseNew
             ? FutureBuilder(
-                initialData: SizedBox(),
+                initialData: SizedBox.shrink(),
                 future: loadAsset(),
-                builder: (_, snapshot) => SizedBox(
-                  width: suSetWidth(size),
-                  height: suSetHeight(size),
+                builder: (_, snapshot) => SizedBox.fromSize(
+                  size: Size.square(suSetWidth(size)),
                   child: Center(child: snapshot.data),
                 ),
               )
-            : SizedBox(
-                width: suSetWidth(size / 1.2),
-                height: suSetHeight(size / 1.2),
-                child: Center(child: ExtendedImage.network(oldIconUrl, fit: BoxFit.fill)),
+            : SizedBox.fromSize(
+                size: Size.square(suSetWidth(size)),
+                child: Center(
+                  child: ExtendedImage.network(
+                    oldIconUrl,
+                    fit: BoxFit.fill,
+                    width: suSetWidth(oldIconSize),
+                    height: suSetWidth(oldIconSize),
+                  ),
+                ),
               );
       },
     );