Use Dart 2.6 extension-methods

KagurazakaHanabi · Mar 26, 2020 · 63ad162 · 63ad162
1 parent f289baa
commit 63ad162
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 43 deletions.
diff --git a/lib/extension.dart b/lib/extension.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/widgets.dart';
+
+extension ColorX on Color {
+  static Color fromHexString(String source) {
+    String s = source.toUpperCase().replaceAll('#', '');
+    if (s.length == 6) {
+      s = 'FF$s';
+    } else if (s.length == 3) {
+      s = 'FF${s[0] * 2}${s[1] * 2}${s[2] * 2}';
+    }
+    return Color(int.parse(s, radix: 16));
+  }
+
+  String get hexString {
+    return '#${value.toRadixString(16).padLeft(8, '0')}';
+  }
+
+  bool get isDark {
+    // See https://github.com/FooStudio/tinycolor
+    return (red * 299 + green * 587 + blue * 114) / 1000 < 128;
+  }
+}
+
+extension StringX on String {
+  bool get isUuid {
+    if (isEmpty) return false;
+    return RegExp(
+      r'^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$',
+      caseSensitive: false,
+    ).hasMatch(this);
+  }
+}
diff --git a/lib/misc/bean.dart b/lib/misc/bean.dart
@@ -14,6 +14,7 @@
 
 import 'dart:convert';
 
+import 'package:dailypics/extension.dart';
 import 'package:flutter/widgets.dart';
 import 'package:json_annotation/json_annotation.dart';
 
@@ -80,26 +81,23 @@ class Picture {
     })?.toList();
   }
 
+  String getCompressedUrl([String style = 'w1080']) {
+    if (url != null) return url;
+    return '${cdnUrl}!$style';
+  }
+
   String toJson() => jsonEncode(_$PictureToJson(this));
 
   static String _urlFromJson(String s) {
     return 'https://s1.images.dailypics.cn$s';
   }
 
-  static Color _colorFromHex(String hex) {
-    if (hex == null) return null;
-    hex = hex.toUpperCase().replaceAll('#', '');
-    if (hex.length == 6) {
-      hex = 'FF' + hex;
-    } else if (hex.length == 3) {
-      hex = 'FF' + hex[0] * 2 + hex[1] * 2 + hex[2] * 2;
-    }
-    return Color(int.parse(hex, radix: 16));
+  static Color _colorFromHex(String source) {
+    return ColorX.fromHexString(source);
   }
 
   static String _colorToHex(Color color) {
-    if (color == null) return null;
-    return '#' + color.value.toRadixString(16);
+    return color?.hexString;
   }
 }
 

diff --git a/lib/pages/details.dart b/lib/pages/details.dart
@@ -17,6 +17,7 @@ import 'dart:math' as math;
 import 'dart:typed_data';
 import 'dart:ui' as ui;
 
+import 'package:dailypics/extension.dart';
 import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/model/app.dart';
 import 'package:dailypics/utils/api.dart';
@@ -104,7 +105,7 @@ class _DetailsPageState extends State<DetailsPage> {
     Radius radius = Radius.circular(SystemUtils.isIPad(context) ? 16 : 0);
     CupertinoThemeData theme = CupertinoTheme.of(context);
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: Utils.isDarkColor(data.color) && !SystemUtils.isIPad(context)
+      value: (data.color?.isDark ?? false) && !SystemUtils.isIPad(context)
           ? SystemUiOverlayStyle.light
           : SystemUiOverlayStyle.dark,
       child: AdaptiveScaffold(
@@ -136,7 +137,7 @@ class _DetailsPageState extends State<DetailsPage> {
                   AspectRatio(
                     aspectRatio: data.width / data.height,
                     child: OptimizedImage(
-                      Utils.getCompressed(data),
+                      data.getCompressedUrl(),
                       borderRadius: BorderRadius.vertical(top: radius),
                       heroTag: widget.heroTag,
                     ),

diff --git a/lib/pages/home.dart b/lib/pages/home.dart
@@ -14,12 +14,12 @@
 
 import 'dart:async';
 
+import 'package:dailypics/extension.dart';
 import 'package:dailypics/components/suggest.dart';
 import 'package:dailypics/components/today.dart';
 import 'package:dailypics/pages/about.dart';
 import 'package:dailypics/pages/details.dart';
 import 'package:dailypics/pages/recent.dart';
-import 'package:dailypics/utils/utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_ionicons/flutter_ionicons.dart';
@@ -54,7 +54,7 @@ class _HomePageState extends State<HomePage> {
   @override
   Widget build(BuildContext context) {
     return AnnotatedRegion<SystemUiOverlayStyle>(
-      value: Utils.isDarkColor(CupertinoTheme.of(context).barBackgroundColor)
+      value: CupertinoTheme.of(context).barBackgroundColor.isDark
           ? SystemUiOverlayStyle.light
           : SystemUiOverlayStyle.dark,
       child: CupertinoTabScaffold(

diff --git a/lib/pages/recent.dart b/lib/pages/recent.dart
@@ -359,7 +359,7 @@ class _TileState extends State<_Tile> {
               AspectRatio(
                 aspectRatio: aspectRatio,
                 child: OptimizedImage(
-                  Utils.getCompressed(widget.data, 'w480'),
+                  widget.data.getCompressedUrl('w480'),
                   heroTag: widget.heroTag,
                 ),
               ),

diff --git a/lib/pages/search.dart b/lib/pages/search.dart
@@ -15,6 +15,7 @@
 import 'dart:async';
 import 'dart:ui' show ImageFilter, window;
 
+import 'package:dailypics/extension.dart';
 import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/utils/api.dart';
 import 'package:dailypics/utils/utils.dart';
@@ -116,7 +117,7 @@ class _SearchPageState extends State<SearchPage> {
             showCancelButton: true,
             autofocus: true,
             onSubmitted: (value) {
-              if (Utils.isUuid(value)) {
+              if (value.isUuid) {
                 _fetchData(value);
               } else if (value.isNotEmpty) {
                 query = value;

diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
@@ -15,6 +15,7 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:dailypics/extension.dart';
 import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/utils/http.dart';
 import 'package:dio/dio.dart';
@@ -54,6 +55,22 @@ class SystemUtils {
     await _channel.invokeMethod('openAppSettings');
   }
 
+  static Future<void> makeH2Wallpaper(
+    Size size,
+    Offset offset,
+    Color shadowColor,
+    double shadowRadius,
+  ) async {
+    await _channel.invokeMethod('makeH2Wallpaper', {
+      'width': size.width,
+      'height': size.height,
+      'offsetX': offset.dx,
+      'offsetY': offset.dy,
+      'shadowColor': shadowColor.hexString,
+      'shadowRadius': shadowRadius,
+    });
+  }
+
   static Future<void> openUrl(String url) {
     return launch(url, forceSafariVC: false, forceWebView: false);
   }
@@ -72,27 +89,6 @@ class SystemUtils {
   }
 }
 
-class Utils {
-  static String getCompressed(Picture data, [String style = 'w720']) {
-    if (data.url != null) return data.url;
-    return '${data.cdnUrl}!$style';
-  }
-
-  static bool isDarkColor(Color c) {
-    if (c == null) return false;
-    // See https://github.com/FooStudio/tinycolor
-    return (c.red * 299 + c.green * 587 + c.blue * 114) / 1000 < 128;
-  }
-
-  static bool isUuid(String input) {
-    RegExp regExp = RegExp(
-      r'^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$',
-      caseSensitive: false,
-    );
-    return regExp.hasMatch(input);
-  }
-}
-
 class Settings {
   static SharedPreferences _prefs;
 

diff --git a/lib/widget/image_card.dart b/lib/widget/image_card.dart
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import 'package:dailypics/extension.dart';
 import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/pages/details.dart';
-import 'package:dailypics/utils/utils.dart';
 import 'package:dailypics/widget/animated_transform.dart';
 import 'package:dailypics/widget/optimized_image.dart';
 import 'package:dailypics/widget/qrcode.dart';
@@ -69,9 +69,7 @@ class _ImageCardState extends State<ImageCard> {
 
   @override
   Widget build(BuildContext context) {
-    Color textColor = Utils.isDarkColor(widget.data.color)
-        ? CupertinoColors.white
-        : CupertinoColors.black;
+    Color textColor = widget.data.color?.isDark ?? false ? Colors.white : Colors.black;
     return AnimatedTransform.scale(
       scale: scale,
       duration: duration,
@@ -109,7 +107,7 @@ class _ImageCardState extends State<ImageCard> {
                   AspectRatio(
                     aspectRatio: widget.aspectRatio,
                     child: OptimizedImage(
-                      Utils.getCompressed(widget.data),
+                      widget.data.getCompressedUrl(),
                       heroTag: widget.heroTag,
                       borderRadius: BorderRadius.circular(16),
                     ),