Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
10152dbb
Unverified
Commit
10152dbb
authored
Jul 28, 2021
by
James
Committed by
GitHub
Jul 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add thumb color customization to CupertinoSwitch (#86775)
parent
fca95838
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
78 additions
and
1 deletion
+78
-1
switch.dart
packages/flutter/lib/src/cupertino/switch.dart
+24
-1
switch_test.dart
packages/flutter/test/cupertino/switch_test.dart
+54
-0
No files found.
packages/flutter/lib/src/cupertino/switch.dart
View file @
10152dbb
...
@@ -61,6 +61,7 @@ class CupertinoSwitch extends StatefulWidget {
...
@@ -61,6 +61,7 @@ class CupertinoSwitch extends StatefulWidget {
required
this
.
onChanged
,
required
this
.
onChanged
,
this
.
activeColor
,
this
.
activeColor
,
this
.
trackColor
,
this
.
trackColor
,
this
.
thumbColor
,
this
.
dragStartBehavior
=
DragStartBehavior
.
start
,
this
.
dragStartBehavior
=
DragStartBehavior
.
start
,
})
:
assert
(
value
!=
null
),
})
:
assert
(
value
!=
null
),
assert
(
dragStartBehavior
!=
null
),
assert
(
dragStartBehavior
!=
null
),
...
@@ -106,6 +107,11 @@ class CupertinoSwitch extends StatefulWidget {
...
@@ -106,6 +107,11 @@ class CupertinoSwitch extends StatefulWidget {
/// Defaults to [CupertinoColors.secondarySystemFill] when null.
/// Defaults to [CupertinoColors.secondarySystemFill] when null.
final
Color
?
trackColor
;
final
Color
?
trackColor
;
/// The color to use for the thumb of the switch.
///
/// Defaults to [CupertinoColors.white] when null.
final
Color
?
thumbColor
;
/// {@template flutter.cupertino.CupertinoSwitch.dragStartBehavior}
/// {@template flutter.cupertino.CupertinoSwitch.dragStartBehavior}
/// Determines the way that drag start behavior is handled.
/// Determines the way that drag start behavior is handled.
///
///
...
@@ -301,6 +307,7 @@ class _CupertinoSwitchState extends State<CupertinoSwitch> with TickerProviderSt
...
@@ -301,6 +307,7 @@ class _CupertinoSwitchState extends State<CupertinoSwitch> with TickerProviderSt
context
,
context
,
),
),
trackColor:
CupertinoDynamicColor
.
resolve
(
widget
.
trackColor
??
CupertinoColors
.
secondarySystemFill
,
context
),
trackColor:
CupertinoDynamicColor
.
resolve
(
widget
.
trackColor
??
CupertinoColors
.
secondarySystemFill
,
context
),
thumbColor:
CupertinoDynamicColor
.
resolve
(
widget
.
thumbColor
??
CupertinoColors
.
white
,
context
),
onChanged:
widget
.
onChanged
,
onChanged:
widget
.
onChanged
,
textDirection:
Directionality
.
of
(
context
),
textDirection:
Directionality
.
of
(
context
),
state:
this
,
state:
this
,
...
@@ -325,6 +332,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
...
@@ -325,6 +332,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
required
this
.
value
,
required
this
.
value
,
required
this
.
activeColor
,
required
this
.
activeColor
,
required
this
.
trackColor
,
required
this
.
trackColor
,
required
this
.
thumbColor
,
required
this
.
onChanged
,
required
this
.
onChanged
,
required
this
.
textDirection
,
required
this
.
textDirection
,
required
this
.
state
,
required
this
.
state
,
...
@@ -333,6 +341,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
...
@@ -333,6 +341,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
final
bool
value
;
final
bool
value
;
final
Color
activeColor
;
final
Color
activeColor
;
final
Color
trackColor
;
final
Color
trackColor
;
final
Color
thumbColor
;
final
ValueChanged
<
bool
>?
onChanged
;
final
ValueChanged
<
bool
>?
onChanged
;
final
_CupertinoSwitchState
state
;
final
_CupertinoSwitchState
state
;
final
TextDirection
textDirection
;
final
TextDirection
textDirection
;
...
@@ -343,6 +352,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
...
@@ -343,6 +352,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
value:
value
,
value:
value
,
activeColor:
activeColor
,
activeColor:
activeColor
,
trackColor:
trackColor
,
trackColor:
trackColor
,
thumbColor:
thumbColor
,
onChanged:
onChanged
,
onChanged:
onChanged
,
textDirection:
textDirection
,
textDirection:
textDirection
,
state:
state
,
state:
state
,
...
@@ -355,6 +365,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
...
@@ -355,6 +365,7 @@ class _CupertinoSwitchRenderObjectWidget extends LeafRenderObjectWidget {
..
value
=
value
..
value
=
value
..
activeColor
=
activeColor
..
activeColor
=
activeColor
..
trackColor
=
trackColor
..
trackColor
=
trackColor
..
thumbColor
=
thumbColor
..
onChanged
=
onChanged
..
onChanged
=
onChanged
..
textDirection
=
textDirection
;
..
textDirection
=
textDirection
;
}
}
...
@@ -379,6 +390,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
...
@@ -379,6 +390,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
required
bool
value
,
required
bool
value
,
required
Color
activeColor
,
required
Color
activeColor
,
required
Color
trackColor
,
required
Color
trackColor
,
required
Color
thumbColor
,
ValueChanged
<
bool
>?
onChanged
,
ValueChanged
<
bool
>?
onChanged
,
required
TextDirection
textDirection
,
required
TextDirection
textDirection
,
required
_CupertinoSwitchState
state
,
required
_CupertinoSwitchState
state
,
...
@@ -388,6 +400,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
...
@@ -388,6 +400,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
_value
=
value
,
_value
=
value
,
_activeColor
=
activeColor
,
_activeColor
=
activeColor
,
_trackColor
=
trackColor
,
_trackColor
=
trackColor
,
_thumbPainter
=
CupertinoThumbPainter
.
switchThumb
(
color:
thumbColor
),
_onChanged
=
onChanged
,
_onChanged
=
onChanged
,
_textDirection
=
textDirection
,
_textDirection
=
textDirection
,
_state
=
state
,
_state
=
state
,
...
@@ -428,6 +441,16 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
...
@@ -428,6 +441,16 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
markNeedsPaint
();
markNeedsPaint
();
}
}
Color
get
thumbColor
=>
_thumbPainter
.
color
;
CupertinoThumbPainter
_thumbPainter
;
set
thumbColor
(
Color
value
)
{
assert
(
value
!=
null
);
if
(
value
==
thumbColor
)
return
;
_thumbPainter
=
CupertinoThumbPainter
.
switchThumb
(
color:
value
);
markNeedsPaint
();
}
ValueChanged
<
bool
>?
get
onChanged
=>
_onChanged
;
ValueChanged
<
bool
>?
get
onChanged
=>
_onChanged
;
ValueChanged
<
bool
>?
_onChanged
;
ValueChanged
<
bool
>?
_onChanged
;
set
onChanged
(
ValueChanged
<
bool
>?
value
)
{
set
onChanged
(
ValueChanged
<
bool
>?
value
)
{
...
@@ -525,7 +548,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
...
@@ -525,7 +548,7 @@ class _RenderCupertinoSwitch extends RenderConstrainedBox {
);
);
_clipRRectLayer
.
layer
=
context
.
pushClipRRect
(
needsCompositing
,
Offset
.
zero
,
thumbBounds
,
trackRRect
,
(
PaintingContext
innerContext
,
Offset
offset
)
{
_clipRRectLayer
.
layer
=
context
.
pushClipRRect
(
needsCompositing
,
Offset
.
zero
,
thumbBounds
,
trackRRect
,
(
PaintingContext
innerContext
,
Offset
offset
)
{
const
CupertinoThumbPainter
.
switchThumb
()
.
paint
(
innerContext
.
canvas
,
thumbBounds
);
_thumbPainter
.
paint
(
innerContext
.
canvas
,
thumbBounds
);
},
oldLayer:
_clipRRectLayer
.
layer
);
},
oldLayer:
_clipRRectLayer
.
layer
);
}
}
...
...
packages/flutter/test/cupertino/switch_test.dart
View file @
10152dbb
...
@@ -526,6 +526,60 @@ void main() {
...
@@ -526,6 +526,60 @@ void main() {
expect
(
find
.
byType
(
CupertinoSwitch
),
paints
..
rrect
(
color:
trackColor
));
expect
(
find
.
byType
(
CupertinoSwitch
),
paints
..
rrect
(
color:
trackColor
));
});
});
testWidgets
(
'Switch is using default thumb color'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
const
Directionality
(
textDirection:
TextDirection
.
ltr
,
child:
Center
(
child:
CupertinoSwitch
(
value:
false
,
onChanged:
null
,
),
),
),
);
expect
(
find
.
byType
(
CupertinoSwitch
),
findsOneWidget
);
expect
(
tester
.
widget
<
CupertinoSwitch
>(
find
.
byType
(
CupertinoSwitch
)).
thumbColor
,
null
);
expect
(
find
.
byType
(
CupertinoSwitch
),
paints
..
rrect
()
..
rrect
()
..
rrect
()
..
rrect
()
..
rrect
(
color:
CupertinoColors
.
white
),
);
});
testWidgets
(
'Switch is using thumb color when set'
,
(
WidgetTester
tester
)
async
{
const
Color
thumbColor
=
Color
(
0xFF000000
);
await
tester
.
pumpWidget
(
const
Directionality
(
textDirection:
TextDirection
.
ltr
,
child:
Center
(
child:
CupertinoSwitch
(
value:
false
,
thumbColor:
thumbColor
,
onChanged:
null
,
),
),
),
);
expect
(
find
.
byType
(
CupertinoSwitch
),
findsOneWidget
);
expect
(
tester
.
widget
<
CupertinoSwitch
>(
find
.
byType
(
CupertinoSwitch
)).
thumbColor
,
thumbColor
);
expect
(
find
.
byType
(
CupertinoSwitch
),
paints
..
rrect
()
..
rrect
()
..
rrect
()
..
rrect
()
..
rrect
(
color:
thumbColor
),
);
});
testWidgets
(
'Switch is opaque when enabled'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Switch is opaque when enabled'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
Directionality
(
Directionality
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment