From a059eef095b2287de92448569cb8616cf80fc0d9 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Thu, 23 Dec 2021 13:34:04 +0100 Subject: [PATCH] design: Use more adaptive elements This uses iOS styled Sliders and share icons on iOS. --- lib/pages/chat/events/audio_player.dart | 2 +- lib/pages/chat_details/chat_details_view.dart | 2 +- .../settings_style/settings_style_view.dart | 2 +- .../user_bottom_sheet_view.dart | 2 +- lib/widgets/permission_slider_dialog.dart | 20 ++++++------------- 5 files changed, 10 insertions(+), 18 deletions(-) diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart index 9cfa9354..cb2f07d3 100644 --- a/lib/pages/chat/events/audio_player.dart +++ b/lib/pages/chat/events/audio_player.dart @@ -173,7 +173,7 @@ class _AudioPlayerState extends State { ), ), Expanded( - child: Slider( + child: Slider.adaptive( activeColor: Theme.of(context).colorScheme.secondaryVariant, inactiveColor: widget.color.withAlpha(64), value: currentPosition, diff --git a/lib/pages/chat_details/chat_details_view.dart b/lib/pages/chat_details/chat_details_view.dart index f165d0bf..ca15a4f7 100644 --- a/lib/pages/chat_details/chat_details_view.dart +++ b/lib/pages/chat_details/chat_details_view.dart @@ -66,7 +66,7 @@ class ChatDetailsView extends StatelessWidget { if (room.canonicalAlias?.isNotEmpty ?? false) IconButton( tooltip: L10n.of(context).share, - icon: const Icon(Icons.share_outlined), + icon: Icon(Icons.adaptive.share_outlined), onPressed: () => FluffyShare.share( AppConfig.inviteLinkPrefix + room.canonicalAlias, context), diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart index f250925c..8dd36e65 100644 --- a/lib/pages/settings_style/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -140,7 +140,7 @@ class SettingsStyleView extends StatelessWidget { ), ), ), - Slider( + Slider.adaptive( min: 0.5, max: 2.5, divisions: 20, diff --git a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart index 00adb73d..1a8f234d 100644 --- a/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart +++ b/lib/pages/user_bottom_sheet/user_bottom_sheet_view.dart @@ -119,7 +119,7 @@ class UserBottomSheetView extends StatelessWidget { ListTile( title: Text(L10n.of(context).username), subtitle: Text(user.id), - trailing: const Icon(Icons.share_outlined), + trailing: Icon(Icons.adaptive.share_outlined), onTap: () => FluffyShare.share( user.id, controller.widget.outerContext), ), diff --git a/lib/widgets/permission_slider_dialog.dart b/lib/widgets/permission_slider_dialog.dart index 04fa2efb..b4b0f52f 100644 --- a/lib/widgets/permission_slider_dialog.dart +++ b/lib/widgets/permission_slider_dialog.dart @@ -39,19 +39,6 @@ class _PermissionSliderDialogState extends State { @override Widget build(BuildContext context) { - final slider = PlatformInfos.isCupertinoStyle - ? CupertinoSlider( - value: _permission.toDouble(), - onChanged: (d) => setState(() => _permission = d.round()), - max: 100.0, - min: 0.0, - ) - : Slider( - value: _permission.toDouble(), - onChanged: (d) => setState(() => _permission = d.round()), - max: 100.0, - min: 0.0, - ); final title = Text( L10n.of(context).setPermissionsLevel, textAlign: TextAlign.center, @@ -67,7 +54,12 @@ class _PermissionSliderDialogState extends State { : _permission.toString())), SizedBox( height: 56, - child: slider, + child: Slider.adaptive( + value: _permission.toDouble(), + onChanged: (d) => setState(() => _permission = d.round()), + max: 100.0, + min: 0.0, + ), ), ], );