Skip to content

Commit b2cea03

Browse files
authored
Merge pull request #874 from MoRmdn/feature/fix_rtl
- Add devtools_options.yaml configuration files
2 parents c7665a3 + 8a92a7c commit b2cea03

File tree

7 files changed

+17
-10
lines changed

7 files changed

+17
-10
lines changed

devtools_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:

example/devtools_options.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:

example/ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Flutter
22
import UIKit
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

lib/src/cupertino/cupertino_controls.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class _CupertinoControlsState extends State<CupertinoControls>
460460
final position = _latestValue.duration - _latestValue.position;
461461

462462
return Padding(
463-
padding: const EdgeInsets.only(right: 12.0),
463+
padding: const EdgeInsets.symmetric(horizontal: 12.0),
464464
child: Text(
465465
'-${formatDuration(position)}',
466466
style: TextStyle(color: iconColor, fontSize: 12.0),

lib/src/helpers/adaptive_controls.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ class AdaptiveControls extends StatelessWidget {
2323
backgroundColor: Color.fromRGBO(41, 41, 41, 0.7),
2424
iconColor: Color.fromARGB(255, 200, 200, 200),
2525
);
26-
default:
27-
return const MaterialControls();
2826
}
2927
}
3028
}

lib/src/material/material_controls.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ class _MaterialControlsState extends State<MaterialControls>
260260
height: barHeight + (chewieController.isFullScreen ? 10.0 : 0),
261261
padding: EdgeInsets.only(
262262
left: 20,
263+
right: 20,
263264
bottom: !chewieController.isFullScreen ? 10.0 : 0,
264265
),
265266
child: SafeArea(
@@ -291,7 +292,7 @@ class _MaterialControlsState extends State<MaterialControls>
291292
if (!chewieController.isLive)
292293
Expanded(
293294
child: Container(
294-
padding: const EdgeInsets.only(right: 20),
295+
padding: const EdgeInsets.symmetric(horizontal: 20),
295296
child: Row(
296297
children: [
297298
_buildProgressBar(),
@@ -469,7 +470,7 @@ class _MaterialControlsState extends State<MaterialControls>
469470
text: '/ ${formatDuration(duration)}',
470471
style: TextStyle(
471472
fontSize: 14.0,
472-
color: Colors.white.withOpacity(.75),
473+
color: Colors.white.withValues(alpha: .75),
473474
fontWeight: FontWeight.normal,
474475
),
475476
)
@@ -681,8 +682,9 @@ class _MaterialControlsState extends State<MaterialControls>
681682
playedColor: Theme.of(context).colorScheme.secondary,
682683
handleColor: Theme.of(context).colorScheme.secondary,
683684
bufferedColor:
684-
Theme.of(context).colorScheme.surface.withOpacity(0.5),
685-
backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
685+
Theme.of(context).colorScheme.surface.withValues(alpha: 0.5),
686+
backgroundColor:
687+
Theme.of(context).disabledColor.withValues(alpha: .5),
686688
),
687689
draggableProgressBar: chewieController.draggableProgressBar,
688690
),

lib/src/material/material_desktop_controls.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,9 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
591591
playedColor: Theme.of(context).colorScheme.secondary,
592592
handleColor: Theme.of(context).colorScheme.secondary,
593593
bufferedColor:
594-
Theme.of(context).colorScheme.surface.withOpacity(0.5),
595-
backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
594+
Theme.of(context).colorScheme.surface.withValues(alpha: 0.5),
595+
backgroundColor:
596+
Theme.of(context).disabledColor.withValues(alpha: 0.5),
596597
),
597598
draggableProgressBar: chewieController.draggableProgressBar,
598599
),

0 commit comments

Comments
 (0)