mirror of
https://gitlab.com/famedly/fluffychat.git
synced 2024-12-25 23:12:37 +01:00
Merge branch 'krille/adapitveelements' into 'main'
design: Use more adaptive elements See merge request famedly/fluffychat!633
This commit is contained in:
commit
6552f50f72
@ -173,7 +173,7 @@ class _AudioPlayerState extends State<AudioPlayerWidget> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Slider(
|
child: Slider.adaptive(
|
||||||
activeColor: Theme.of(context).colorScheme.secondaryVariant,
|
activeColor: Theme.of(context).colorScheme.secondaryVariant,
|
||||||
inactiveColor: widget.color.withAlpha(64),
|
inactiveColor: widget.color.withAlpha(64),
|
||||||
value: currentPosition,
|
value: currentPosition,
|
||||||
|
@ -66,7 +66,7 @@ class ChatDetailsView extends StatelessWidget {
|
|||||||
if (room.canonicalAlias?.isNotEmpty ?? false)
|
if (room.canonicalAlias?.isNotEmpty ?? false)
|
||||||
IconButton(
|
IconButton(
|
||||||
tooltip: L10n.of(context).share,
|
tooltip: L10n.of(context).share,
|
||||||
icon: const Icon(Icons.share_outlined),
|
icon: Icon(Icons.adaptive.share_outlined),
|
||||||
onPressed: () => FluffyShare.share(
|
onPressed: () => FluffyShare.share(
|
||||||
AppConfig.inviteLinkPrefix + room.canonicalAlias,
|
AppConfig.inviteLinkPrefix + room.canonicalAlias,
|
||||||
context),
|
context),
|
||||||
|
@ -140,7 +140,7 @@ class SettingsStyleView extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Slider(
|
Slider.adaptive(
|
||||||
min: 0.5,
|
min: 0.5,
|
||||||
max: 2.5,
|
max: 2.5,
|
||||||
divisions: 20,
|
divisions: 20,
|
||||||
|
@ -119,7 +119,7 @@ class UserBottomSheetView extends StatelessWidget {
|
|||||||
ListTile(
|
ListTile(
|
||||||
title: Text(L10n.of(context).username),
|
title: Text(L10n.of(context).username),
|
||||||
subtitle: Text(user.id),
|
subtitle: Text(user.id),
|
||||||
trailing: const Icon(Icons.share_outlined),
|
trailing: Icon(Icons.adaptive.share_outlined),
|
||||||
onTap: () => FluffyShare.share(
|
onTap: () => FluffyShare.share(
|
||||||
user.id, controller.widget.outerContext),
|
user.id, controller.widget.outerContext),
|
||||||
),
|
),
|
||||||
|
@ -39,19 +39,6 @@ class _PermissionSliderDialogState extends State<PermissionSliderDialog> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
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(
|
final title = Text(
|
||||||
L10n.of(context).setPermissionsLevel,
|
L10n.of(context).setPermissionsLevel,
|
||||||
textAlign: TextAlign.center,
|
textAlign: TextAlign.center,
|
||||||
@ -67,7 +54,12 @@ class _PermissionSliderDialogState extends State<PermissionSliderDialog> {
|
|||||||
: _permission.toString())),
|
: _permission.toString())),
|
||||||
SizedBox(
|
SizedBox(
|
||||||
height: 56,
|
height: 56,
|
||||||
child: slider,
|
child: Slider.adaptive(
|
||||||
|
value: _permission.toDouble(),
|
||||||
|
onChanged: (d) => setState(() => _permission = d.round()),
|
||||||
|
max: 100.0,
|
||||||
|
min: 0.0,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user