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
5e595d12
Commit
5e595d12
authored
Oct 10, 2017
by
amirh
Committed by
GitHub
Oct 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow specifying and a11y label for Icon widget (#12475)
* Allow specifying and a11y label for Icon widget
parent
c38b8434
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
77 additions
and
16 deletions
+77
-16
icon.dart
packages/flutter/lib/src/widgets/icon.dart
+38
-16
icon_test.dart
packages/flutter/test/widgets/icon_test.dart
+39
-0
No files found.
packages/flutter/lib/src/widgets/icon.dart
View file @
5e595d12
...
@@ -35,7 +35,8 @@ class Icon extends StatelessWidget {
...
@@ -35,7 +35,8 @@ class Icon extends StatelessWidget {
const
Icon
(
this
.
icon
,
{
const
Icon
(
this
.
icon
,
{
Key
key
,
Key
key
,
this
.
size
,
this
.
size
,
this
.
color
this
.
color
,
this
.
semanticLabel
,
})
:
super
(
key:
key
);
})
:
super
(
key:
key
);
/// The icon to display. The available icons are described in [Icons].
/// The icon to display. The available icons are described in [Icons].
...
@@ -83,6 +84,14 @@ class Icon extends StatelessWidget {
...
@@ -83,6 +84,14 @@ class Icon extends StatelessWidget {
/// ```
/// ```
final
Color
color
;
final
Color
color
;
/// Semantic label for the icon.
///
/// This would be read out in accessibility modes (e.g TalkBack/VoiceOver).
/// This label does not show in the UI.
///
/// See [Semantics.label];
final
String
semanticLabel
;
@override
@override
Widget
build
(
BuildContext
context
)
{
Widget
build
(
BuildContext
context
)
{
assert
(
debugCheckHasDirectionality
(
context
));
assert
(
debugCheckHasDirectionality
(
context
));
...
@@ -93,14 +102,15 @@ class Icon extends StatelessWidget {
...
@@ -93,14 +102,15 @@ class Icon extends StatelessWidget {
final
double
iconSize
=
size
??
iconTheme
.
size
;
final
double
iconSize
=
size
??
iconTheme
.
size
;
if
(
icon
==
null
)
if
(
icon
==
null
)
return
new
SizedBox
(
width:
iconSize
,
height:
iconSize
);
return
_wrapWithSemantics
(
new
SizedBox
(
width:
iconSize
,
height:
iconSize
)
);
final
double
iconOpacity
=
iconTheme
.
opacity
;
final
double
iconOpacity
=
iconTheme
.
opacity
;
Color
iconColor
=
color
??
iconTheme
.
color
;
Color
iconColor
=
color
??
iconTheme
.
color
;
if
(
iconOpacity
!=
1.0
)
if
(
iconOpacity
!=
1.0
)
iconColor
=
iconColor
.
withOpacity
(
iconColor
.
opacity
*
iconOpacity
);
iconColor
=
iconColor
.
withOpacity
(
iconColor
.
opacity
*
iconOpacity
);
return
new
ExcludeSemantics
(
return
_wrapWithSemantics
(
new
ExcludeSemantics
(
child:
new
SizedBox
(
child:
new
SizedBox
(
width:
iconSize
,
width:
iconSize
,
height:
iconSize
,
height:
iconSize
,
...
@@ -119,6 +129,18 @@ class Icon extends StatelessWidget {
...
@@ -119,6 +129,18 @@ class Icon extends StatelessWidget {
),
),
),
),
),
),
),
);
}
/// Wraps the widget with a Semantics widget if [semanticLabel] is set.
Widget
_wrapWithSemantics
(
Widget
widget
)
{
if
(
semanticLabel
==
null
)
return
widget
;
return
new
Semantics
(
child:
widget
,
label:
semanticLabel
,
);
);
}
}
...
...
packages/flutter/test/widgets/icon_test.dart
View file @
5e595d12
...
@@ -2,9 +2,12 @@
...
@@ -2,9 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// found in the LICENSE file.
import
'package:flutter/material.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'package:flutter/widgets.dart'
;
import
'package:flutter/widgets.dart'
;
import
'semantics_tester.dart'
;
void
main
(
)
{
void
main
(
)
{
testWidgets
(
'Can set opacity for an Icon'
,
(
WidgetTester
tester
)
async
{
testWidgets
(
'Can set opacity for an Icon'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
await
tester
.
pumpWidget
(
...
@@ -122,4 +125,40 @@ void main() {
...
@@ -122,4 +125,40 @@ void main() {
final
RichText
richText
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
final
RichText
richText
=
tester
.
firstWidget
(
find
.
byType
(
RichText
));
expect
(
richText
.
text
.
style
.
fontFamily
,
equals
(
'Roboto'
));
expect
(
richText
.
text
.
style
.
fontFamily
,
equals
(
'Roboto'
));
});
});
testWidgets
(
'Icon with semantic label'
,
(
WidgetTester
tester
)
async
{
final
SemanticsTester
semantics
=
new
SemanticsTester
(
tester
);
await
tester
.
pumpWidget
(
const
Directionality
(
textDirection:
TextDirection
.
ltr
,
child:
const
Center
(
child:
const
Icon
(
Icons
.
title
,
semanticLabel:
'a label'
,
),
),
),
);
expect
(
semantics
,
hasSemantics
(
new
TestSemantics
.
root
(
label:
'a label'
)));
});
testWidgets
(
'Null icon with semantic label'
,
(
WidgetTester
tester
)
async
{
final
SemanticsTester
semantics
=
new
SemanticsTester
(
tester
);
await
tester
.
pumpWidget
(
const
Directionality
(
textDirection:
TextDirection
.
ltr
,
child:
const
Center
(
child:
const
Icon
(
null
,
semanticLabel:
'a label'
,
),
),
),
);
expect
(
semantics
,
hasSemantics
(
new
TestSemantics
.
root
(
label:
'a label'
)));
});
}
}
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