🎨 Improve usage of else

Author: AlexV525

lib/src/delegates/asset_picker_builder_delegate.dart

@@ -227,9 +227,8 @@ abstract class AssetPickerBuilderDelegate<A, P> {
           }
           if (isAssetsEmpty) {
             return const Text('Nothing here.');
-          } else {
-            return w!;
           }
+          return w!;
         },
         child: PlatformProgressIndicator(
           color: theme.iconTheme.color,
@@ -397,12 +396,11 @@ abstract class AssetPickerBuilderDelegate<A, P> {
               ),
             ),
           );
-        } else {
-          return IconButton(
-            onPressed: Navigator.of(context).maybePop,
-            icon: const Icon(Icons.close),
-          );
         }
+        return IconButton(
+          onPressed: Navigator.of(context).maybePop,
+          icon: const Icon(Icons.close),
+        );
       }(),
     );
   }
@@ -896,12 +894,11 @@ class DefaultAssetPickerBuilderDelegate
         builder: (_, bool isAssetsEmpty, __) {
           if (isAssetsEmpty) {
             return const Text('Nothing here.');
-          } else {
-            return PlatformProgressIndicator(
-              color: theme.iconTheme.color,
-              size: Screens.width / gridCount / 3,
-            );
           }
+          return PlatformProgressIndicator(
+            color: theme.iconTheme.color,
+            size: Screens.width / gridCount / 3,
+          );
         },
       ),
     );
@@ -1081,11 +1078,8 @@ class DefaultAssetPickerBuilderDelegate
       // 但通过 `File` 读取的文件对象仍然存在，使得返回的数据为空。
       if (data != null) {
         return Image.memory(data, fit: BoxFit.cover);
-      } else {
-        return ColoredBox(
-          color: theme.colorScheme.primary.withOpacity(0.12),
-        );
       }
+      return ColoredBox(color: theme.colorScheme.primary.withOpacity(0.12));
     }
 
     return Material(
@@ -1139,14 +1133,13 @@ class DefaultAssetPickerBuilderDelegate
                 selector: (_, DefaultAssetPickerProvider p) =>
                     p.currentPathEntity,
                 builder: (_, AssetPathEntity? currentPathEntity, __) {
-                  if (currentPathEntity != pathEntity) {
-                    return const SizedBox.shrink();
-                  } else {
+                  if (currentPathEntity == pathEntity) {
                     return AspectRatio(
                       aspectRatio: 1.0,
                       child: Icon(Icons.check, color: themeColor, size: 26.0),
                     );
                   }
+                  return const SizedBox.shrink();
                 },
               ),
             ],
@@ -1259,14 +1252,14 @@ class DefaultAssetPickerBuilderDelegate
           onTap: () {
             if (selected) {
               provider.unSelectAsset(asset);
-            } else {
-              if (isSingleAssetMode) {
-                provider.selectedAssets.clear();
-              }
-              provider.selectAsset(asset);
-              if (isSingleAssetMode && !isPreviewEnabled) {
-                Navigator.of(context).pop(provider.selectedAssets);
-              }
+              return;
+            }
+            if (isSingleAssetMode) {
+              provider.selectedAssets.clear();
+            }
+            provider.selectAsset(asset);
+            if (isSingleAssetMode && !isPreviewEnabled) {
+              Navigator.of(context).pop(provider.selectedAssets);
             }
           },
           child: Container(

lib/src/delegates/asset_picker_viewer_builder_delegate.dart

@@ -639,12 +639,12 @@ class DefaultAssetPickerViewerBuilderDelegate
               }
               if (provider!.isSelectedNotEmpty) {
                 Navigator.of(context).pop(provider.currentlySelectedAssets);
-              } else {
-                selectAsset(currentAsset);
-                Navigator.of(context).pop(
-                  selectedAssets ?? <AssetEntity>[currentAsset],
-                );
+                return;
               }
+              selectAsset(currentAsset);
+              Navigator.of(context).pop(
+                selectedAssets ?? <AssetEntity>[currentAsset],
+              );
             },
             materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
           );
@@ -663,9 +663,9 @@ class DefaultAssetPickerViewerBuilderDelegate
         onTap: () {
           if (isSelected) {
             unSelectAsset(asset);
-          } else {
-            selectAsset(asset);
+            return;
           }
+          selectAsset(asset);
         },
         child: AnimatedContainer(
           duration: kThemeAnimationDuration,
@@ -704,9 +704,9 @@ class DefaultAssetPickerViewerBuilderDelegate
       onChanged: (bool? value) {
         if (isSelected) {
           unSelectAsset(asset);
-        } else {
-          selectAsset(asset);
+          return;
         }
+        selectAsset(asset);
       },
       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
     );
@@ -737,9 +737,8 @@ class DefaultAssetPickerViewerBuilderDelegate
                       currentlySelectedAssets.contains(asset);
                   if (isAppleOS) {
                     return _appleOSSelectButton(isSelected, asset);
-                  } else {
-                    return _androidSelectButton(isSelected, asset);
                   }
+                  return _androidSelectButton(isSelected, asset);
                 },
               ),
             );

lib/src/provider/asset_picker_provider.dart

@@ -355,12 +355,11 @@ class DefaultAssetPickerProvider
             .toList();
     if (assets.isNotEmpty && currentAssets.contains(assets[0])) {
       return;
-    } else {
-      final List<AssetEntity> tempList = <AssetEntity>[];
-      tempList.addAll(_currentAssets);
-      tempList.addAll(assets);
-      currentAssets = tempList;
     }
+    final List<AssetEntity> tempList = <AssetEntity>[];
+    tempList.addAll(_currentAssets);
+    tempList.addAll(assets);
+    currentAssets = tempList;
   }
 
   @override

lib/src/widget/asset_picker.dart

@@ -118,9 +118,8 @@ class AssetPicker<A, P> extends StatelessWidget {
           ),
         );
         return result;
-      } else {
-        return null;
       }
+      return null;
     } catch (e) {
       realDebugPrint('Error when calling assets picker: $e');
       return null;