Merge pull request #10 from chimon89/master

Add Windows support

.gitignore

@@ -7,15 +7,18 @@
 .atom/
 .buildlog/
 .history
+.idea/
 .svn/
 .vscode/
+test/
 
 # IntelliJ related
 *.iml
 *.ipr
 *.iws
 **/.idea/caches
 **/.idea/libraries
+**/.idea/misc.xml
 **/.idea/modules.xml
 **/.idea/workspace.xml
 **/.idea/navEditor.xml

lib/components/today.dart

@@ -150,8 +150,9 @@ class _TodayComponentState extends State<TodayComponent> with AutomaticKeepAlive
   }
 
   Future<void> _fetchText() async {
-    String url = 'https://v1.hitokoto.cn/?encode=text';
-    String source = (await http.get(url)).body;
+    String url = 'https://cloudgw.api.dailypics.cn/release/tu_hitokoto';
+    String body = (await http.get(url)).body;
+    String source = Hitokoto.fromJson(jsonDecode(body)).content;
     if (mounted) setState(() => text = source);
   }
 

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

@@ -222,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),
@@ -290,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);
@@ -311,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),
@@ -336,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);
@@ -515,9 +515,7 @@ class _DownloadButtonState extends State<_DownloadButton> {
               SystemUtils.openAppSettings();
               break;
             case _DownloadState.successful:
-              if (Platform.isAndroid) {
-                SystemUtils.useAsWallpaper(file);
-              }
+              SystemUtils.useAsWallpaper(file);
               break;
           }
         }
@@ -535,7 +533,7 @@ class _DownloadButtonState extends State<_DownloadButton> {
                 ? '授权'
                 : (state == null || state == _DownloadState.pending)
                     ? '获取'
-                    : Platform.isAndroid ? '设定' : '完成',
+                    : (Platform.isAndroid || Platform.isWindows) ? '设定' : '完成',
             style: TextStyle(
               fontSize: 15,
               fontWeight: FontWeight.w500,

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,18 @@ 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 {
+
   }
 
   static Future<void> requestReview(bool inApp) async {
@@ -126,7 +138,7 @@ class DownloadManager {
 
   Future<DownloadTask> runTask(Picture data, ValueNotifier<double> onProgress) async {
     String url = data.url ?? data.cdnUrl;
-    String dest = (await getTemporaryDirectory()).path;
+    String dest = Platform.isWindows ? (await getDownloadsDirectory()).path : (await getTemporaryDirectory()).path;
     File file;
     String name;
     if (url.contains('bing.com/')) {
@@ -156,11 +168,13 @@ class DownloadManager {
         task.progress.value = count / total;
       },
     ).then((value) async {
-      await _channel.invokeMethod('syncAlbum', {
-        'file': file.path,
-        'title': data.title,
-        'content': data.content,
-      });
+      if (!Platform.isWindows) {
+        await _channel.invokeMethod('syncAlbum', {
+          'file': file.path,
+          'title': data.title,
+          'content': data.content,
+        });
+      }
       task.progress.value = -1;
       _tasks.remove(task);
     }, onError: (err) => _tasks.remove(task));

lib/utils/windows.dart

@@ -0,0 +1,24 @@
+import 'dart:ffi';
+import 'dart:io';
+
+import 'package:ffi/ffi.dart';
+import 'package:win32/win32.dart';
+
+class Windows {
+  static void useAsWallpaper(File wallpaperFile) {
+    final hr = CoInitializeEx(
+        nullptr, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE);
+    if (FAILED(hr)) throw WindowsException(hr);
+
+    final wallpaper = DesktopWallpaper.createInstance();
+
+    final pathPtr = TEXT(wallpaperFile.path);
+    wallpaper.SetWallpaper(nullptr, pathPtr);
+    if (FAILED(hr)) throw WindowsException(hr);
+
+    calloc.free(pathPtr);
+    calloc.free(wallpaper.ptr);
+
+    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),