Add Windows support

lib/components/today.dart

@@ -25,18 +25,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_ionicons/flutter_ionicons.dart';
 import 'package:http/http.dart' as http;
 
-class Hitokoto {
-  String source;
-  String content;
-
-  Hitokoto({this.source, this.hitokoto});
-
-  Hitokoto.fromJson(Map<String, dynamic> json) {
-    source = json['source'];
-    content = json['hitokoto'];
-  }
-}
-
 class TodayComponent extends StatefulWidget {
   @override
   _TodayComponentState createState() => _TodayComponentState();

lib/misc/bean.dart

@@ -149,6 +149,22 @@ class Splash {
   static DateTime _parseDateTime(String s) => DateTime.parse(s);
 }
 
+@JsonSerializable()
+class Hitokoto {
+  Hitokoto({this.source, this.content});
+
+  factory Hitokoto.fromJson(Map<String, dynamic> json) {
+    return _$HitokotoFromJson(json);
+  }
+
+  String source;
+
+  @JsonKey(name: 'hitokoto')
+  String content;
+
+  String toJson() => jsonEncode(_$HitokotoToJson(this));
+}
+
 @JsonSerializable()
 class Contributor {
   Contributor({this.avatar, this.name, this.position, this.url});

lib/pages/about.dart

@@ -136,7 +136,7 @@ class _AboutPageState extends State<AboutPage> {
                       member.position,
                       style: TextStyle(
                         fontSize: 14,
-                        color: CupertinoDynamicColor.withBrightness(
+                        color: const CupertinoDynamicColor.withBrightness(
                           color: Colors.black54,
                           darkColor: Colors.white70,
                         ).resolveFrom(context),
@@ -187,7 +187,7 @@ class _AboutPageState extends State<AboutPage> {
   Widget _buildAppInfo() {
     final String version = packageInfo?.version ?? '0.0.0';
     final String buildNumber = packageInfo?.buildNumber ?? '190000';
-    Color textColor = CupertinoDynamicColor.withBrightness(
+    Color textColor = const CupertinoDynamicColor.withBrightness(
       color: Colors.black54,
       darkColor: Colors.white70,
     ).resolveFrom(context);

lib/pages/details.dart

@@ -22,7 +22,6 @@ import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/model/app.dart';
 import 'package:dailypics/utils/api.dart';
 import 'package:dailypics/utils/utils.dart';
-import 'package:dailypics/utils/wallpaper.dart';
 import 'package:dailypics/widget/adaptive_scaffold.dart';
 import 'package:dailypics/widget/optimized_image.dart';
 import 'package:dailypics/widget/photo_card.dart';
@@ -223,7 +222,7 @@ class _DetailsPageState extends State<DetailsPage> {
       styleSheet: MarkdownStyleSheet(
         a: const TextStyle(color: CupertinoColors.link),
         p: textStyle.copyWith(
-          color: CupertinoDynamicColor.withBrightness(
+          color: const CupertinoDynamicColor.withBrightness(
             color: Colors.black54,
             darkColor: Colors.white70,
           ).resolveFrom(context),
@@ -291,7 +290,7 @@ class _DetailsPageState extends State<DetailsPage> {
   }
 
   Widget _buildDivider() {
-    Color dividerColor = CupertinoDynamicColor.withBrightness(
+    Color dividerColor = const CupertinoDynamicColor.withBrightness(
       color: Colors.black38,
       darkColor: Colors.white54,
     ).resolveFrom(context);
@@ -312,7 +311,7 @@ class _DetailsPageState extends State<DetailsPage> {
     return DefaultTextStyle(
       style: TextStyle(
         fontSize: 14,
-        color: CupertinoDynamicColor.withBrightness(
+        color: const CupertinoDynamicColor.withBrightness(
           color: Colors.black45,
           darkColor: Colors.white60,
         ).resolveFrom(context),
@@ -337,7 +336,7 @@ class _DetailsPageState extends State<DetailsPage> {
   }
 
   Widget _buildShareButton() {
-    Color color = CupertinoDynamicColor.withBrightness(
+    Color color = const CupertinoDynamicColor.withBrightness(
       color: CupertinoColors.systemBlue,
       darkColor: Colors.white,
     ).resolveFrom(context);
@@ -516,12 +515,7 @@ class _DownloadButtonState extends State<_DownloadButton> {
               SystemUtils.openAppSettings();
               break;
             case _DownloadState.successful:
-              if (Platform.isAndroid) {
-                SystemUtils.useAsWallpaper(file);
-              }
-              if (Platform.isWindows) {
-                Wallpaper.set(file);
-              }
+              SystemUtils.useAsWallpaper(file);
               break;
           }
         }

lib/pages/home.dart

@@ -92,7 +92,7 @@ class _HomePageState extends State<HomePage> {
   }
 
   BottomNavigationBarItem _buildNavigationItem(IconData icon, String title) {
-    return BottomNavigationBarItem(icon: Icon(icon), title: Text(title));
+    return BottomNavigationBarItem(icon: Icon(icon), label: title);
   }
 
   void _handleUniLink(Uri uri) {

lib/pages/upload.dart

@@ -44,6 +44,8 @@ class _UploadPageState extends State<UploadPage> {
   String type;
   double progress = -1;
 
+  ImagePicker picker = ImagePicker();
+
   @override
   Widget build(BuildContext context) {
     return CupertinoPageScaffold(
@@ -153,9 +155,9 @@ class _UploadPageState extends State<UploadPage> {
     }
     return GestureDetector(
       onTap: () async {
-        File file = await ImagePicker.pickImage(source: ImageSource.gallery);
+        PickedFile file = await picker.getImage(source: ImageSource.gallery);
         if (file != null) {
-          setState(() => imageFile = file);
+          setState(() => imageFile = File(file.path));
         }
       },
       child: AspectRatio(
@@ -240,12 +242,12 @@ class _UploadPageState extends State<UploadPage> {
         children: <Widget>[
           CupertinoButton(
             padding: EdgeInsets.zero,
-            child: Icon(Ionicons.ios_arrow_up),
+            child: const Icon(Ionicons.ios_arrow_up),
             onPressed: () => FocusScope.of(context).previousFocus(),
           ),
           CupertinoButton(
             padding: EdgeInsets.zero,
-            child: Icon(Ionicons.ios_arrow_down),
+            child: const Icon(Ionicons.ios_arrow_down),
             onPressed: () => FocusScope.of(context).nextFocus(),
           ),
           Expanded(child: Container()),

lib/pages/user_space.dart

@@ -44,6 +44,8 @@ class _UserSpacePageState extends State<UserSpacePage> {
   ScrollController controller = ScrollController();
   ScrollPosition position;
 
+  ImagePicker picker = ImagePicker();
+
   @override
   void initState() {
     super.initState();
@@ -246,7 +248,7 @@ class _UserSpacePageState extends State<UserSpacePage> {
             CupertinoActionSheetAction(
               child: const Text('从相册选择'),
               onPressed: () async => Navigator.of(context).pop(
-                await ImagePicker.pickImage(source: ImageSource.gallery),
+                await picker.getImage(source: ImageSource.gallery),
               ),
             ),
           ],

lib/utils/utils.dart

@@ -17,6 +17,7 @@ import 'dart:io';
 
 import 'package:dailypics/misc/bean.dart';
 import 'package:dailypics/utils/http.dart';
+import 'package:dailypics/utils/windows.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/services.dart';
@@ -39,7 +40,14 @@ class SystemUtils {
   }
 
   static Future<void> useAsWallpaper(File file) async {
-    await _channel.invokeMethod('useAsWallpaper', file.path);
+    switch (Platform.operatingSystem) {
+      case "android":
+        await _channel.invokeMethod('useAsWallpaper', file.path);
+        break;
+      case "windows":
+        Windows.useAsWallpaper(file);
+        break;
+    }
   }
 
   static Future<void> useAsWallpaperForWindows(File file) async {

lib/utils/wallpaper.dart → lib/utils/windows.dart

@@ -4,8 +4,8 @@ import 'dart:io';
 import 'package:ffi/ffi.dart';
 import 'package:win32/win32.dart';
 
-class Wallpaper {
-  static void set(File wallpaperFile) {
+class Windows {
+  static void useAsWallpaper(File wallpaperFile) {
     final hr = CoInitializeEx(
         nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
     if (FAILED(hr)) throw WindowsException(hr);
@@ -21,4 +21,4 @@ class Wallpaper {
 
     CoUninitialize();
   }
-}
+}

lib/widget/error.dart

@@ -32,7 +32,7 @@ class CustomErrorWidget extends StatelessWidget {
       child: Text(
         details.exceptionAsString(),
         style: TextStyle(
-          color: CupertinoDynamicColor.withBrightness(
+          color: const CupertinoDynamicColor.withBrightness(
             color: Colors.black54,
             darkColor: Colors.white70,
           ).resolveFrom(context),

pubspec.lock

@@ -242,7 +242,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "055cc1942a142a40c3fafbc6e970cc5ecb682683"
+      resolved-ref: e3fb9a4b950b8006fea393561c14b1b695ca59bd
       url: "https://github.com/KagurazakaHanabi/flutter_markdown.git"
     source: git
     version: "0.3.2"
@@ -797,4 +797,4 @@ packages:
     version: "3.1.0"
 sdks:
   dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.24.0-10"
+  flutter: ">=2.0.0"

pubspec.yaml

@@ -1,10 +1,11 @@
 name: dailypics
 description: A new Flutter application.
 version: 2.2.7+200325
+publish_to: none
 
 environment:
   sdk: ">=2.6.0 <3.0.0"
-  flutter: ">=1.12.13 <2.0.0"
+  flutter: ">=2.0.0 <3.0.0"
 
 dependencies:
   flutter: