@@ -16,26 +16,31 @@ void main() {
1616 runApp (MyApp ());
1717}
1818
19+ typedef PageContentBuilder = Widget Function (
20+ [SIPUAHelper helper, Object arguments]);
21+
1922class MyApp extends StatelessWidget {
2023 final SIPUAHelper _helper = SIPUAHelper ();
21- var routes = {
22- '/' : (helper) => DialPadWidget (helper),
23- '/register' : (helper) => RegisterWidget (helper),
24- '/callscreen' : (helper, {arguments}) => CallScreenWidget (helper, arguments),
25- '/about' : (helper) => AboutWidget (),
24+ Map <String , PageContentBuilder > routes = {
25+ '/' : ([SIPUAHelper helper, Object arguments]) => DialPadWidget (helper),
26+ '/register' : ([SIPUAHelper helper, Object arguments]) =>
27+ RegisterWidget (helper),
28+ '/callscreen' : ([SIPUAHelper helper, Object arguments]) =>
29+ CallScreenWidget (helper, arguments as Call ),
30+ '/about' : ([SIPUAHelper helper, Object arguments]) => AboutWidget (),
2631 };
2732
2833 Route <dynamic > _onGenerateRoute (RouteSettings settings) {
2934 final String name = settings.name;
30- final Function pageContentBuilder = routes[name];
35+ final PageContentBuilder pageContentBuilder = routes[name];
3136 if (pageContentBuilder != null ) {
3237 if (settings.arguments != null ) {
33- final Route route = MaterialPageRoute (
38+ final Route route = MaterialPageRoute < Widget > (
3439 builder: (context) =>
35- pageContentBuilder (_helper, arguments : settings.arguments));
40+ pageContentBuilder (_helper, settings.arguments));
3641 return route;
3742 } else {
38- final Route route = MaterialPageRoute (
43+ final Route route = MaterialPageRoute < Widget > (
3944 builder: (context) => pageContentBuilder (_helper));
4045 return route;
4146 }
0 commit comments