diff --git a/lib/ui/detail_page.dart b/lib/ui/detail_page.dart index e28cfca9e..dc5f25048 100644 --- a/lib/ui/detail_page.dart +++ b/lib/ui/detail_page.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:like_button/like_button.dart'; @@ -124,7 +126,9 @@ class _DetailPageState extends State { value: 1, child: Row( children: [ - Icon(Icons.share), + Icon(Platform.isAndroid + ? Icons.share_outlined + : CupertinoIcons.share), Padding( padding: EdgeInsets.all(8), ), @@ -136,7 +140,9 @@ class _DetailPageState extends State { value: 2, child: Row( children: [ - Icon(Icons.info), + Icon(Platform.isAndroid + ? Icons.info_outline + : CupertinoIcons.info), Padding( padding: EdgeInsets.all(8), ), @@ -148,7 +154,9 @@ class _DetailPageState extends State { value: 3, child: Row( children: [ - Icon(Icons.delete), + Icon(Platform.isAndroid + ? Icons.delete_outline + : CupertinoIcons.delete), Padding( padding: EdgeInsets.all(8), ), diff --git a/lib/ui/gallery_app_bar_widget.dart b/lib/ui/gallery_app_bar_widget.dart index 991d160c4..d4ea9a548 100644 --- a/lib/ui/gallery_app_bar_widget.dart +++ b/lib/ui/gallery_app_bar_widget.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:logging/logging.dart'; @@ -92,7 +93,7 @@ class _GalleryAppBarWidgetState extends State { return AppBar( leading: IconButton( - icon: Icon(Icons.close), + icon: Icon(Platform.isAndroid ? Icons.clear : CupertinoIcons.clear), onPressed: () { _clearSelectedFiles(); }, @@ -162,13 +163,14 @@ class _GalleryAppBarWidgetState extends State { List _getActions(BuildContext context) { List actions = List(); actions.add(IconButton( - icon: Icon(Icons.add), + icon: Icon(Platform.isAndroid ? Icons.add_outlined : CupertinoIcons.add), onPressed: () { _createAlbum(); }, )); actions.add(IconButton( - icon: Icon(Icons.share), + icon: Icon( + Platform.isAndroid ? Icons.share_outlined : CupertinoIcons.share), onPressed: () { _shareSelected(context); }, @@ -176,7 +178,8 @@ class _GalleryAppBarWidgetState extends State { if (widget.type == GalleryAppBarType.homepage || widget.type == GalleryAppBarType.local_folder) { actions.add(IconButton( - icon: Icon(Icons.delete), + icon: Icon( + Platform.isAndroid ? Icons.delete_outline : CupertinoIcons.delete), onPressed: () { _showDeleteSheet(context); }, @@ -189,7 +192,7 @@ class _GalleryAppBarWidgetState extends State { value: 1, child: Row( children: [ - Icon(Icons.remove_circle), + Icon(Icons.remove_circle_outline_rounded), Padding( padding: EdgeInsets.all(8), ), @@ -201,7 +204,9 @@ class _GalleryAppBarWidgetState extends State { value: 2, child: Row( children: [ - Icon(Icons.delete), + Icon(Platform.isAndroid + ? Icons.delete_outline + : CupertinoIcons.delete), Padding( padding: EdgeInsets.all(8), ), diff --git a/pubspec.lock b/pubspec.lock index 6c9cf2edf..e383c627a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -154,7 +154,7 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "1.0.0" device_info: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 6ea5c65f1..13d9f6476 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.0 photo_manager: path: thirdparty/flutter_photo_manager provider: ^3.1.0