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
cfddacbb
Commit
cfddacbb
authored
Oct 19, 2016
by
Ian Hickson
Committed by
GitHub
Oct 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Platform selector in gallery. (#6390)
parent
1f1d7285
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
125 additions
and
10 deletions
+125
-10
app.dart
examples/flutter_gallery/lib/gallery/app.dart
+8
-1
drawer.dart
examples/flutter_gallery/lib/gallery/drawer.dart
+43
-3
home.dart
examples/flutter_gallery/lib/gallery/home.dart
+6
-2
platform.dart
packages/flutter/lib/src/foundation/platform.dart
+3
-1
theme_data.dart
packages/flutter/lib/src/material/theme_data.dart
+65
-3
No files found.
examples/flutter_gallery/lib/gallery/app.dart
View file @
cfddacbb
...
...
@@ -43,6 +43,8 @@ class GalleryAppState extends State<GalleryApp> {
bool
_useLightTheme
=
true
;
bool
_showPerformanceOverlay
=
false
;
TargetPlatform
platform
=
defaultTargetPlatform
;
@override
Widget
build
(
BuildContext
context
)
{
Widget
home
=
new
GalleryHome
(
...
...
@@ -58,6 +60,11 @@ class GalleryAppState extends State<GalleryApp> {
_showPerformanceOverlay
=
value
;
});
}
:
null
,
onPlatformChanged:
(
TargetPlatform
value
)
{
setState
(()
{
platform
=
value
;
});
},
timeDilation:
timeDilation
,
onTimeDilationChanged:
(
double
value
)
{
setState
(()
{
...
...
@@ -76,7 +83,7 @@ class GalleryAppState extends State<GalleryApp> {
return
new
MaterialApp
(
title:
'Flutter Gallery'
,
color:
Colors
.
grey
[
500
],
theme:
_useLightTheme
?
_kGalleryLightTheme
:
_kGalleryDarkTheme
,
theme:
(
_useLightTheme
?
_kGalleryLightTheme
:
_kGalleryDarkTheme
).
copyWith
(
platform:
platform
)
,
showPerformanceOverlay:
_showPerformanceOverlay
,
routes:
_kRoutes
,
home:
home
,
...
...
examples/flutter_gallery/lib/gallery/drawer.dart
View file @
cfddacbb
...
...
@@ -92,7 +92,8 @@ class GalleryDrawer extends StatelessWidget {
this
.
timeDilation
,
this
.
onTimeDilationChanged
,
this
.
showPerformanceOverlay
,
this
.
onShowPerformanceOverlayChanged
this
.
onShowPerformanceOverlayChanged
,
this
.
onPlatformChanged
,
})
:
super
(
key:
key
)
{
assert
(
onThemeChanged
!=
null
);
assert
(
onTimeDilationChanged
!=
null
);
...
...
@@ -107,6 +108,8 @@ class GalleryDrawer extends StatelessWidget {
final
bool
showPerformanceOverlay
;
final
ValueChanged
<
bool
>
onShowPerformanceOverlayChanged
;
final
ValueChanged
<
TargetPlatform
>
onPlatformChanged
;
@override
Widget
build
(
BuildContext
context
)
{
final
ThemeData
themeData
=
Theme
.
of
(
context
);
...
...
@@ -145,6 +148,40 @@ class GalleryDrawer extends StatelessWidget {
)
);
final
Widget
mountainViewItem
=
new
DrawerItem
(
// on iOS, we don't want to show an Android phone icon
icon:
new
Icon
(
defaultTargetPlatform
==
TargetPlatform
.
iOS
?
Icons
.
star
:
Icons
.
phone_android
),
onPressed:
()
{
onPlatformChanged
(
TargetPlatform
.
android
);
},
selected:
Theme
.
of
(
context
).
platform
==
TargetPlatform
.
android
,
child:
new
Row
(
children:
<
Widget
>[
new
Flexible
(
child:
new
Text
(
'Android'
)),
new
Radio
<
TargetPlatform
>(
value:
TargetPlatform
.
android
,
groupValue:
Theme
.
of
(
context
).
platform
,
onChanged:
onPlatformChanged
,
)
]
)
);
final
Widget
cupertinoItem
=
new
DrawerItem
(
// on iOS, we don't want to show the iPhone icon
icon:
new
Icon
(
defaultTargetPlatform
==
TargetPlatform
.
iOS
?
Icons
.
star_border
:
Icons
.
phone_iphone
),
onPressed:
()
{
onPlatformChanged
(
TargetPlatform
.
iOS
);
},
selected:
Theme
.
of
(
context
).
platform
==
TargetPlatform
.
iOS
,
child:
new
Row
(
children:
<
Widget
>[
new
Flexible
(
child:
new
Text
(
'iOS'
)),
new
Radio
<
TargetPlatform
>(
value:
TargetPlatform
.
iOS
,
groupValue:
Theme
.
of
(
context
).
platform
,
onChanged:
onPlatformChanged
,
)
]
)
);
final
Widget
animateSlowlyItem
=
new
DrawerItem
(
icon:
new
Icon
(
Icons
.
hourglass_empty
),
selected:
timeDilation
!=
1.0
,
...
...
@@ -216,14 +253,17 @@ class GalleryDrawer extends StatelessWidget {
lightThemeItem
,
darkThemeItem
,
new
Divider
(),
mountainViewItem
,
cupertinoItem
,
new
Divider
(),
animateSlowlyItem
,
// index
5
, optional: Performance Overlay
// index
8
, optional: Performance Overlay
fileAnIssueItem
,
aboutItem
];
if
(
onShowPerformanceOverlayChanged
!=
null
)
{
allDrawerItems
.
insert
(
5
,
new
DrawerItem
(
allDrawerItems
.
insert
(
8
,
new
DrawerItem
(
icon:
new
Icon
(
Icons
.
assessment
),
onPressed:
()
{
onShowPerformanceOverlayChanged
(!
showPerformanceOverlay
);
},
selected:
showPerformanceOverlay
,
...
...
examples/flutter_gallery/lib/gallery/home.dart
View file @
cfddacbb
...
...
@@ -76,7 +76,8 @@ class GalleryHome extends StatefulWidget {
this
.
timeDilation
,
this
.
onTimeDilationChanged
,
this
.
showPerformanceOverlay
,
this
.
onShowPerformanceOverlayChanged
this
.
onShowPerformanceOverlayChanged
,
this
.
onPlatformChanged
,
})
:
super
(
key:
key
)
{
assert
(
onThemeChanged
!=
null
);
assert
(
onTimeDilationChanged
!=
null
);
...
...
@@ -91,6 +92,8 @@ class GalleryHome extends StatefulWidget {
final
bool
showPerformanceOverlay
;
final
ValueChanged
<
bool
>
onShowPerformanceOverlayChanged
;
final
ValueChanged
<
TargetPlatform
>
onPlatformChanged
;
@override
GalleryHomeState
createState
()
=>
new
GalleryHomeState
();
}
...
...
@@ -153,7 +156,8 @@ class GalleryHomeState extends State<GalleryHome> with SingleTickerProviderState
timeDilation:
config
.
timeDilation
,
onTimeDilationChanged:
config
.
onTimeDilationChanged
,
showPerformanceOverlay:
config
.
showPerformanceOverlay
,
onShowPerformanceOverlayChanged:
config
.
onShowPerformanceOverlayChanged
onShowPerformanceOverlayChanged:
config
.
onShowPerformanceOverlayChanged
,
onPlatformChanged:
config
.
onPlatformChanged
,
),
appBar:
new
AppBar
(
expandedHeight:
_kFlexibleSpaceMaxHeight
,
...
...
packages/flutter/lib/src/foundation/platform.dart
View file @
cfddacbb
...
...
@@ -7,6 +7,8 @@ import 'dart:io' show Platform;
import
'assertions.dart'
;
/// The platform that user interaction should adapt to target.
///
/// The [defaultTargetPlatform] getter returns the current platform.
enum
TargetPlatform
{
/// Android: <https://www.android.com/>
android
,
...
...
@@ -25,7 +27,7 @@ enum TargetPlatform {
/// regardless of the host platform. (Android was chosen because the tests were
/// originally written assuming Android-like behavior, and we added platform
/// adaptations for iOS later). Tests can check iOS behavior by using the
/// platform override APIs (
like in
[ThemeData.platform] in the material
/// platform override APIs (
such as
[ThemeData.platform] in the material
/// library).
TargetPlatform
get
defaultTargetPlatform
{
TargetPlatform
result
;
...
...
packages/flutter/lib/src/material/theme_data.dart
View file @
cfddacbb
...
...
@@ -332,6 +332,66 @@ class ThemeData {
/// Defaults to the current platform.
final
TargetPlatform
platform
;
/// Creates a copy of this theme but with the given fields replaced with the new values.
ThemeData
copyWith
({
Brightness
brightness
,
Map
<
int
,
Color
>
primarySwatch
,
Color
primaryColor
,
Brightness
primaryColorBrightness
,
Color
accentColor
,
Brightness
accentColorBrightness
,
Color
canvasColor
,
Color
cardColor
,
Color
dividerColor
,
Color
highlightColor
,
Color
splashColor
,
Color
selectedRowColor
,
Color
unselectedWidgetColor
,
Color
disabledColor
,
Color
buttonColor
,
Color
secondaryHeaderColor
,
Color
textSelectionColor
,
Color
textSelectionHandleColor
,
Color
backgroundColor
,
Color
indicatorColor
,
Color
hintColor
,
Color
errorColor
,
TextTheme
textTheme
,
TextTheme
primaryTextTheme
,
IconThemeData
iconTheme
,
IconThemeData
primaryIconTheme
,
TargetPlatform
platform
,
})
{
return
new
ThemeData
(
brightness:
brightness
??
this
.
brightness
,
primaryColor:
primaryColor
??
this
.
primaryColor
,
primaryColorBrightness:
primaryColorBrightness
??
this
.
primaryColorBrightness
,
accentColor:
accentColor
??
this
.
accentColor
,
accentColorBrightness:
accentColorBrightness
??
this
.
accentColorBrightness
,
canvasColor:
canvasColor
??
this
.
canvasColor
,
cardColor:
cardColor
??
this
.
cardColor
,
dividerColor:
dividerColor
??
this
.
dividerColor
,
highlightColor:
highlightColor
??
this
.
highlightColor
,
splashColor:
splashColor
??
this
.
splashColor
,
selectedRowColor:
selectedRowColor
??
this
.
selectedRowColor
,
unselectedWidgetColor:
unselectedWidgetColor
??
this
.
unselectedWidgetColor
,
disabledColor:
disabledColor
??
this
.
disabledColor
,
buttonColor:
buttonColor
??
this
.
buttonColor
,
secondaryHeaderColor:
secondaryHeaderColor
??
this
.
secondaryHeaderColor
,
textSelectionColor:
textSelectionColor
??
this
.
textSelectionColor
,
textSelectionHandleColor:
textSelectionHandleColor
??
this
.
textSelectionHandleColor
,
backgroundColor:
backgroundColor
??
this
.
backgroundColor
,
indicatorColor:
indicatorColor
??
this
.
indicatorColor
,
hintColor:
hintColor
??
this
.
hintColor
,
errorColor:
errorColor
??
this
.
errorColor
,
textTheme:
textTheme
??
this
.
textTheme
,
primaryTextTheme:
primaryTextTheme
??
this
.
primaryTextTheme
,
iconTheme:
iconTheme
??
this
.
iconTheme
,
primaryIconTheme:
primaryIconTheme
??
this
.
primaryIconTheme
,
platform:
platform
??
this
.
platform
,
);
}
/// Linearly interpolate between two themes.
static
ThemeData
lerp
(
ThemeData
begin
,
ThemeData
end
,
double
t
)
{
return
new
ThemeData
.
raw
(
...
...
@@ -393,7 +453,8 @@ class ThemeData {
(
otherData
.
textTheme
==
textTheme
)
&&
(
otherData
.
primaryTextTheme
==
primaryTextTheme
)
&&
(
otherData
.
iconTheme
==
iconTheme
)
&&
(
otherData
.
primaryIconTheme
==
primaryIconTheme
);
(
otherData
.
primaryIconTheme
==
primaryIconTheme
)
&&
(
otherData
.
platform
==
platform
);
}
@override
...
...
@@ -417,14 +478,15 @@ class ThemeData {
backgroundColor
,
accentColor
,
accentColorBrightness
,
indicatorColor
,
hashValues
(
// Too many values.
indicatorColor
,
hintColor
,
errorColor
,
textTheme
,
primaryTextTheme
,
iconTheme
,
primaryIconTheme
primaryIconTheme
,
platform
,
)
);
}
...
...
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