Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions devtools_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
description: This file stores settings for Dart & Flutter DevTools.
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
extensions:
3 changes: 3 additions & 0 deletions example/devtools_options.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
description: This file stores settings for Dart & Flutter DevTools.
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
extensions:
2 changes: 1 addition & 1 deletion example/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Flutter
import UIKit

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
2 changes: 1 addition & 1 deletion lib/src/cupertino/cupertino_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ class _CupertinoControlsState extends State<CupertinoControls>
final position = _latestValue.duration - _latestValue.position;

return Padding(
padding: const EdgeInsets.only(right: 12.0),
padding: const EdgeInsets.symmetric(horizontal: 12.0),
child: Text(
'-${formatDuration(position)}',
style: TextStyle(color: iconColor, fontSize: 12.0),
Expand Down
2 changes: 0 additions & 2 deletions lib/src/helpers/adaptive_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ class AdaptiveControls extends StatelessWidget {
backgroundColor: Color.fromRGBO(41, 41, 41, 0.7),
iconColor: Color.fromARGB(255, 200, 200, 200),
);
default:
return const MaterialControls();
}
}
}
10 changes: 6 additions & 4 deletions lib/src/material/material_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ class _MaterialControlsState extends State<MaterialControls>
height: barHeight + (chewieController.isFullScreen ? 10.0 : 0),
padding: EdgeInsets.only(
left: 20,
right: 20,
bottom: !chewieController.isFullScreen ? 10.0 : 0,
),
child: SafeArea(
Expand Down Expand Up @@ -291,7 +292,7 @@ class _MaterialControlsState extends State<MaterialControls>
if (!chewieController.isLive)
Expanded(
child: Container(
padding: const EdgeInsets.only(right: 20),
padding: const EdgeInsets.symmetric(horizontal: 20),
child: Row(
children: [
_buildProgressBar(),
Expand Down Expand Up @@ -469,7 +470,7 @@ class _MaterialControlsState extends State<MaterialControls>
text: '/ ${formatDuration(duration)}',
style: TextStyle(
fontSize: 14.0,
color: Colors.white.withOpacity(.75),
color: Colors.white.withValues(alpha: .75),
fontWeight: FontWeight.normal,
),
)
Expand Down Expand Up @@ -681,8 +682,9 @@ class _MaterialControlsState extends State<MaterialControls>
playedColor: Theme.of(context).colorScheme.secondary,
handleColor: Theme.of(context).colorScheme.secondary,
bufferedColor:
Theme.of(context).colorScheme.surface.withOpacity(0.5),
backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
Theme.of(context).colorScheme.surface.withValues(alpha: 0.5),
backgroundColor:
Theme.of(context).disabledColor.withValues(alpha: .5),
),
draggableProgressBar: chewieController.draggableProgressBar,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/src/material/material_desktop_controls.dart
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,9 @@ class _MaterialDesktopControlsState extends State<MaterialDesktopControls>
playedColor: Theme.of(context).colorScheme.secondary,
handleColor: Theme.of(context).colorScheme.secondary,
bufferedColor:
Theme.of(context).colorScheme.surface.withOpacity(0.5),
backgroundColor: Theme.of(context).disabledColor.withOpacity(.5),
Theme.of(context).colorScheme.surface.withValues(alpha: 0.5),
backgroundColor:
Theme.of(context).disabledColor.withValues(alpha: 0.5),
),
draggableProgressBar: chewieController.draggableProgressBar,
),
Expand Down
Loading