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
4e3f4bb6
Unverified
Commit
4e3f4bb6
authored
Oct 15, 2020
by
Darren Austin
Committed by
GitHub
Oct 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrated the Slider widget and tests to null safety. (#68232)
parent
5aef988a
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
133 additions
and
132 deletions
+133
-132
range_slider.dart
packages/flutter/lib/src/material/range_slider.dart
+5
-1
slider.dart
packages/flutter/lib/src/material/slider.dart
+4
-1
slider_theme.dart
packages/flutter/lib/src/material/slider_theme.dart
+63
-63
slider_test.dart
packages/flutter/test/material/slider_test.dart
+61
-67
No files found.
packages/flutter/lib/src/material/range_slider.dart
View file @
4e3f4bb6
...
...
@@ -1317,6 +1317,7 @@ class _RenderRangeSlider extends RenderBox with RelayoutWhenSystemFontsChangeMix
final
bool
startThumbSelected
=
_lastThumbSelection
==
Thumb
.
start
;
final
bool
endThumbSelected
=
_lastThumbSelection
==
Thumb
.
end
;
final
Size
resolvedscreenSize
=
screenSize
.
isEmpty
?
size
:
screenSize
;
if
(!
_overlayAnimation
.
isDismissed
)
{
if
(
startThumbSelected
)
{
...
...
@@ -1331,6 +1332,8 @@ class _RenderRangeSlider extends RenderBox with RelayoutWhenSystemFontsChangeMix
sliderTheme:
_sliderTheme
,
textDirection:
_textDirection
,
value:
startValue
,
textScaleFactor:
_textScaleFactor
,
sizeWithOverflow:
resolvedscreenSize
,
);
}
if
(
endThumbSelected
)
{
...
...
@@ -1345,6 +1348,8 @@ class _RenderRangeSlider extends RenderBox with RelayoutWhenSystemFontsChangeMix
sliderTheme:
_sliderTheme
,
textDirection:
_textDirection
,
value:
endValue
,
textScaleFactor:
_textScaleFactor
,
sizeWithOverflow:
resolvedscreenSize
,
);
}
}
...
...
@@ -1392,7 +1397,6 @@ class _RenderRangeSlider extends RenderBox with RelayoutWhenSystemFontsChangeMix
final
double
bottomValue
=
isLastThumbStart
?
endValue
:
startValue
;
final
double
topValue
=
isLastThumbStart
?
startValue
:
endValue
;
final
bool
shouldPaintValueIndicators
=
isEnabled
&&
labels
!=
null
&&
!
_valueIndicatorAnimation
.
isDismissed
&&
showValueIndicator
;
final
Size
resolvedscreenSize
=
screenSize
.
isEmpty
?
size
:
screenSize
;
if
(
shouldPaintValueIndicators
)
{
_state
.
paintBottomValueIndicator
=
(
PaintingContext
context
,
Offset
offset
)
{
...
...
packages/flutter/lib/src/material/slider.dart
View file @
4e3f4bb6
...
...
@@ -1385,6 +1385,8 @@ class _RenderSlider extends RenderBox with RelayoutWhenSystemFontsChangeMixin {
sliderTheme:
_sliderTheme
,
textDirection:
_textDirection
,
value:
_value
,
textScaleFactor:
_textScaleFactor
,
sizeWithOverflow:
screenSize
.
isEmpty
?
size
:
screenSize
,
);
}
...
...
@@ -1451,8 +1453,9 @@ class _RenderSlider extends RenderBox with RelayoutWhenSystemFontsChangeMixin {
parentBox:
this
,
sliderTheme:
_sliderTheme
,
textDirection:
_textDirection
,
sizeWithOverflow:
screenSize
.
isEmpty
?
size
:
screenSize
,
value:
_value
,
textScaleFactor:
textScaleFactor
,
sizeWithOverflow:
screenSize
.
isEmpty
?
size
:
screenSize
,
);
}
...
...
packages/flutter/lib/src/material/slider_theme.dart
View file @
4e3f4bb6
...
...
@@ -870,14 +870,14 @@ abstract class SliderComponentShape {
Offset
center
,
{
required
Animation
<
double
>
activationAnimation
,
required
Animation
<
double
>
enableAnimation
,
bool
isDiscrete
,
required
bool
isDiscrete
,
required
TextPainter
labelPainter
,
required
RenderBox
parentBox
,
required
SliderThemeData
sliderTheme
,
required
TextDirection
textDirection
,
required
double
value
,
double
textScaleFactor
,
Size
sizeWithOverflow
,
required
double
textScaleFactor
,
required
Size
sizeWithOverflow
,
});
/// Special instance of [SliderComponentShape] to skip the thumb drawing.
...
...
@@ -927,7 +927,7 @@ abstract class SliderTickMarkShape {
/// {@endtemplate}
Size
getPreferredSize
({
required
SliderThemeData
sliderTheme
,
bool
isEnabled
,
required
bool
isEnabled
,
});
/// Paints the slider track.
...
...
@@ -958,7 +958,7 @@ abstract class SliderTickMarkShape {
required
SliderThemeData
sliderTheme
,
required
Animation
<
double
>
enableAnimation
,
required
Offset
thumbCenter
,
bool
isEnabled
,
required
bool
isEnabled
,
required
TextDirection
textDirection
,
});
...
...
@@ -2012,7 +2012,7 @@ class RoundSliderTickMarkShape extends SliderTickMarkShape {
@override
Size
getPreferredSize
({
required
SliderThemeData
sliderTheme
,
bool
isEnabled
=
false
,
required
bool
isEnabled
,
})
{
assert
(
sliderTheme
!=
null
);
assert
(
sliderTheme
.
trackHeight
!=
null
);
...
...
@@ -2032,7 +2032,7 @@ class RoundSliderTickMarkShape extends SliderTickMarkShape {
required
Animation
<
double
>
enableAnimation
,
required
TextDirection
textDirection
,
required
Offset
thumbCenter
,
bool
isEnabled
=
false
,
required
bool
isEnabled
,
})
{
assert
(
context
!=
null
);
assert
(
center
!=
null
);
...
...
@@ -2178,8 +2178,8 @@ class RoundRangeSliderTickMarkShape extends RangeSliderTickMarkShape {
class
_EmptySliderTickMarkShape
extends
SliderTickMarkShape
{
@override
Size
getPreferredSize
({
SliderThemeData
?
sliderTheme
,
bool
?
isEnabled
,
required
SliderThemeData
sliderTheme
,
required
bool
isEnabled
,
})
{
return
Size
.
zero
;
}
...
...
@@ -2192,7 +2192,7 @@ class _EmptySliderTickMarkShape extends SliderTickMarkShape {
required
SliderThemeData
sliderTheme
,
required
Animation
<
double
>
enableAnimation
,
required
Offset
thumbCenter
,
bool
?
isEnabled
,
required
bool
isEnabled
,
required
TextDirection
textDirection
,
})
{
// no-op.
...
...
@@ -2216,16 +2216,16 @@ class _EmptySliderComponentShape extends SliderComponentShape {
void
paint
(
PaintingContext
context
,
Offset
center
,
{
Animation
<
double
>?
activationAnimation
,
Animation
<
double
>?
enableAnimation
,
bool
?
isDiscrete
,
TextPainter
?
labelPainter
,
RenderBox
?
parentBox
,
SliderThemeData
?
sliderTheme
,
TextDirection
?
textDirection
,
double
?
value
,
double
?
textScaleFactor
,
Size
?
sizeWithOverflow
,
required
Animation
<
double
>
activationAnimation
,
required
Animation
<
double
>
enableAnimation
,
required
bool
isDiscrete
,
required
TextPainter
labelPainter
,
required
RenderBox
parentBox
,
required
SliderThemeData
sliderTheme
,
required
TextDirection
textDirection
,
required
double
value
,
required
double
textScaleFactor
,
required
Size
sizeWithOverflow
,
})
{
// no-op.
}
...
...
@@ -2290,16 +2290,16 @@ class RoundSliderThumbShape extends SliderComponentShape {
void
paint
(
PaintingContext
context
,
Offset
center
,
{
Animation
<
double
>?
activationAnimation
,
required
Animation
<
double
>
activationAnimation
,
required
Animation
<
double
>
enableAnimation
,
bool
?
isDiscrete
,
TextPainter
?
labelPainter
,
RenderBox
?
parentBox
,
required
bool
isDiscrete
,
required
TextPainter
labelPainter
,
required
RenderBox
parentBox
,
required
SliderThemeData
sliderTheme
,
TextDirection
?
textDirection
,
double
?
value
,
double
?
textScaleFactor
,
Size
?
sizeWithOverflow
,
required
TextDirection
textDirection
,
required
double
value
,
required
double
textScaleFactor
,
required
Size
sizeWithOverflow
,
})
{
assert
(
context
!=
null
);
assert
(
center
!=
null
);
...
...
@@ -2326,7 +2326,7 @@ class RoundSliderThumbShape extends SliderComponentShape {
end:
pressedElevation
,
);
final
double
evaluatedElevation
=
elevationTween
.
evaluate
(
activationAnimation
!
);
final
double
evaluatedElevation
=
elevationTween
.
evaluate
(
activationAnimation
);
final
Path
path
=
Path
()
..
addArc
(
Rect
.
fromCenter
(
center:
center
,
width:
2
*
radius
,
height:
2
*
radius
),
0
,
math
.
pi
*
2
);
canvas
.
drawShadow
(
path
,
Colors
.
black
,
evaluatedElevation
,
true
);
...
...
@@ -2484,14 +2484,14 @@ class RoundSliderOverlayShape extends SliderComponentShape {
Offset
center
,
{
required
Animation
<
double
>
activationAnimation
,
required
Animation
<
double
>
enableAnimation
,
bool
isDiscrete
=
fals
e
,
required
bool
isDiscret
e
,
required
TextPainter
labelPainter
,
required
RenderBox
parentBox
,
required
SliderThemeData
sliderTheme
,
required
TextDirection
textDirection
,
required
double
value
,
double
?
textScaleFactor
,
Size
?
sizeWithOverflow
,
required
double
textScaleFactor
,
required
Size
sizeWithOverflow
,
})
{
assert
(
context
!=
null
);
assert
(
center
!=
null
);
...
...
@@ -2549,28 +2549,28 @@ class RectangularSliderValueIndicatorShape extends SliderComponentShape {
void
paint
(
PaintingContext
context
,
Offset
center
,
{
Animation
<
double
>?
activationAnimation
,
Animation
<
double
>?
enableAnimation
,
bool
?
isDiscrete
,
TextPainter
?
labelPainter
,
required
Animation
<
double
>
activationAnimation
,
required
Animation
<
double
>
enableAnimation
,
required
bool
isDiscrete
,
required
TextPainter
labelPainter
,
required
RenderBox
parentBox
,
SliderThemeData
?
sliderTheme
,
TextDirection
?
textDirection
,
double
?
value
,
double
?
textScaleFactor
,
Size
?
sizeWithOverflow
,
required
SliderThemeData
sliderTheme
,
required
TextDirection
textDirection
,
required
double
value
,
required
double
textScaleFactor
,
required
Size
sizeWithOverflow
,
})
{
final
Canvas
canvas
=
context
.
canvas
;
final
double
scale
=
activationAnimation
!
.
value
;
final
double
scale
=
activationAnimation
.
value
;
_pathPainter
.
paint
(
parentBox:
parentBox
,
canvas:
canvas
,
center:
center
,
scale:
scale
,
labelPainter:
labelPainter
!
,
textScaleFactor:
textScaleFactor
!
,
sizeWithOverflow:
sizeWithOverflow
!
,
backgroundPaintColor:
sliderTheme
!
.
valueIndicatorColor
!);
labelPainter:
labelPainter
,
textScaleFactor:
textScaleFactor
,
sizeWithOverflow:
sizeWithOverflow
,
backgroundPaintColor:
sliderTheme
.
valueIndicatorColor
!);
}
}
...
...
@@ -2815,16 +2815,16 @@ class PaddleSliderValueIndicatorShape extends SliderComponentShape {
void
paint
(
PaintingContext
context
,
Offset
center
,
{
Animation
<
double
>?
activationAnimation
,
Animation
<
double
>?
enableAnimation
,
bool
?
isDiscrete
,
TextPainter
?
labelPainter
,
RenderBox
?
parentBox
,
SliderThemeData
?
sliderTheme
,
TextDirection
?
textDirection
,
double
?
value
,
double
?
textScaleFactor
,
Size
?
sizeWithOverflow
,
required
Animation
<
double
>
activationAnimation
,
required
Animation
<
double
>
enableAnimation
,
required
bool
isDiscrete
,
required
TextPainter
labelPainter
,
required
RenderBox
parentBox
,
required
SliderThemeData
sliderTheme
,
required
TextDirection
textDirection
,
required
double
value
,
required
double
textScaleFactor
,
required
Size
sizeWithOverflow
,
})
{
assert
(
context
!=
null
);
assert
(
center
!=
null
);
...
...
@@ -2833,19 +2833,19 @@ class PaddleSliderValueIndicatorShape extends SliderComponentShape {
assert
(
labelPainter
!=
null
);
assert
(
parentBox
!=
null
);
assert
(
sliderTheme
!=
null
);
assert
(!
sizeWithOverflow
!
.
isEmpty
);
assert
(!
sizeWithOverflow
.
isEmpty
);
final
ColorTween
enableColor
=
ColorTween
(
begin:
sliderTheme
!
.
disabledThumbColor
,
begin:
sliderTheme
.
disabledThumbColor
,
end:
sliderTheme
.
valueIndicatorColor
,
);
_pathPainter
.
paint
(
context
.
canvas
,
center
,
Paint
()..
color
=
enableColor
.
evaluate
(
enableAnimation
!
)!,
activationAnimation
!
.
value
,
labelPainter
!
,
textScaleFactor
!
,
sizeWithOverflow
!
,
Paint
()..
color
=
enableColor
.
evaluate
(
enableAnimation
)!,
activationAnimation
.
value
,
labelPainter
,
textScaleFactor
,
sizeWithOverflow
,
null
,
);
}
...
...
packages/flutter/test/material/slider_test.dart
View file @
4e3f4bb6
This diff is collapsed.
Click to expand it.
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