Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed RTL direction for the dismissible using fromStart attribute #341

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+61 −55
Open

Fixed RTL direction for the dismissible using fromStart attribute #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe7afd8
fix(action_pane): fixed RTL direction using fromStart attribute
hassanannajjar May 17, 2022
666d482
commit primary and onSurface
hassanannajjar Sep 24, 2024
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
105 changes: 53 additions & 52 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,64 +15,65 @@ class MyApp extends StatelessWidget {
home: Scaffold(
body: ListView(
children: [
Slidable(
// Specify a key if the Slidable is dismissible.
key: const ValueKey(0),
Directionality(
textDirection: TextDirection.rtl,
child: Slidable(
// Specify a key if the Slidable is dismissible.
key: const ValueKey(0),

// The start action pane is the one at the left or the top side.
startActionPane: ActionPane(
// A motion is a widget used to control how the pane animates.
motion: const ScrollMotion(),
// The start action pane is the one at the left or the top side.
startActionPane: ActionPane(
// A motion is a widget used to control how the pane animates.
motion: const ScrollMotion(),

// A pane can dismiss the Slidable.
dismissible: DismissiblePane(onDismissed: () {}),
// A pane can dismiss the Slidable.
dismissible: DismissiblePane(onDismissed: () {}),

// All actions are defined in the children parameter.
children: const [
// A SlidableAction can have an icon and/or a label.
SlidableAction(
onPressed: doNothing,
backgroundColor: Color(0xFFFE4A49),
foregroundColor: Colors.white,
icon: Icons.delete,
label: 'Delete',
),
SlidableAction(
onPressed: doNothing,
backgroundColor: Color(0xFF21B7CA),
foregroundColor: Colors.white,
icon: Icons.share,
label: 'Share',
),
],
),
// All actions are defined in the children parameter.
children: const [
// A SlidableAction can have an icon and/or a label.
SlidableAction(
onPressed: doNothing,
backgroundColor: Color(0xFFFE4A49),
foregroundColor: Colors.white,
icon: Icons.delete,
label: 'Delete',
),
SlidableAction(
onPressed: doNothing,
backgroundColor: Color(0xFF21B7CA),
foregroundColor: Colors.white,
icon: Icons.share,
label: 'Share',
),
],
),

// The end action pane is the one at the right or the bottom side.
endActionPane: const ActionPane(
motion: ScrollMotion(),
children: [
SlidableAction(
// An action can be bigger than the others.
flex: 2,
onPressed: doNothing,
backgroundColor: Color(0xFF7BC043),
foregroundColor: Colors.white,
icon: Icons.archive,
label: 'Archive',
),
SlidableAction(
onPressed: doNothing,
backgroundColor: Color(0xFF0392CF),
foregroundColor: Colors.white,
icon: Icons.save,
label: 'Save',
// The end action pane is the one at the right or the bottom side.
endActionPane: ActionPane(
fromStart: true,
motion: const ScrollMotion(),
dismissible: DismissiblePane(
onDismissed: () {},
confirmDismiss: () => Future.value(false),
),
],
),
children: const [
SlidableAction(
// An action can be bigger than the others.
flex: 2,
onPressed: doNothing,
backgroundColor: Color(0xFF7BC043),
foregroundColor: Colors.white,
icon: Icons.archive,
label: 'Archive',
),
],
),

// The child of the Slidable is what the user sees when the
// component is not dragged.
child: const ListTile(title: Text('Slide me')),
// The child of the Slidable is what the user sees when the
// component is not dragged.
child: const ListTile(title: Text('Slide me')),
),
),
Slidable(
// Specify a key if the Slidable is dismissible.
Expand Down
6 changes: 5 additions & 1 deletion lib/src/action_pane.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class ActionPane extends StatefulWidget {
this.dragDismissible = true,
this.openThreshold,
this.closeThreshold,
this.fromStart,
required this.children,
}) : assert(extentRatio > 0 && extentRatio <= 1),
assert(
Expand Down Expand Up @@ -96,6 +97,9 @@ class ActionPane extends StatefulWidget {
/// The actions for this pane.
final List<Widget> children;

/// The actions for this pane.
final bool? fromStart;

@override
_ActionPaneState createState() => _ActionPaneState();

Expand Down Expand Up @@ -234,7 +238,7 @@ class _ActionPaneState extends State<ActionPane> implements RatioConfigurator {
actionPaneData: ActionPaneData(
alignment: config.alignment,
direction: config.direction,
fromStart: config.isStartActionPane,
fromStart: widget.fromStart ?? config.isStartActionPane,
extentRatio: widget.extentRatio,
children: widget.children,
),
Expand Down
5 changes: 3 additions & 2 deletions lib/src/actions.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ class CustomSlidableAction extends StatelessWidget {
onPressed: () => _handleTap(context),
style: OutlinedButton.styleFrom(
backgroundColor: backgroundColor,
primary: effectiveForegroundColor,
onSurface: effectiveForegroundColor,
// primary: effectiveForegroundColor,
// onSurface: effectiveForegroundColor,
shape: const RoundedRectangleBorder(),
side: BorderSide.none,
),

child: child,
),
),
Expand Down