Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/integration_tests/android_views/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:flutter_driver/driver_extension.dart';
import 'motion_events_page.dart';
import 'page.dart';

final List<Page> _allPages = <Page>[
final List<PageWidget> _allPages = <PageWidget>[
const MotionEventsPage(),
];

Expand All @@ -31,7 +31,7 @@ class Home extends StatelessWidget {
);
}

void _pushPage(BuildContext context, Page page) {
void _pushPage(BuildContext context, PageWidget page) {
Navigator.of(context).push(MaterialPageRoute<void>(
builder: (_) => Scaffold(
body: page,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ MethodChannel channel = const MethodChannel('android_views_integration');

const String kEventsFileName = 'touchEvents';

class MotionEventsPage extends Page {
class MotionEventsPage extends PageWidget {
const MotionEventsPage()
: super('Motion Event Tests', const ValueKey<String>('MotionEventsListTile'));

Expand Down
4 changes: 2 additions & 2 deletions dev/integration_tests/android_views/lib/page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
/// The base class of all the testing pages
//
/// A testing page has to override this in order to be put as one of the items in the main page.
abstract class Page extends StatelessWidget {
const Page(this.title, this.tileKey);
abstract class PageWidget extends StatelessWidget {
const PageWidget(this.title, this.tileKey);

/// The title of the testing page
///
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import './page.dart';

/// The page that shows an image.
class ImagePage extends Page {
class ImagePage extends PageWidget {

/// Constructs the ImagePage object.
const ImagePage()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:device_info/device_info.dart';
import './image_page.dart';
import './page.dart';

final List<Page> _allPages = <Page>[
final List<PageWidget> _allPages = <PageWidget>[
const ImagePage(),
];

Expand Down Expand Up @@ -62,7 +62,7 @@ class _MyHomePageState extends State<_MyHomePage> {
);
}

void _pushPage(BuildContext context, Page page) {
void _pushPage(BuildContext context, PageWidget page) {
Navigator.of(context).push(MaterialPageRoute<void>(
builder: (_) => page,
));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import 'package:flutter/material.dart';

/// The base class for all the pages in this test.
abstract class Page extends StatelessWidget {
abstract class PageWidget extends StatelessWidget {

/// Constructs a `Page` object.
const Page({@required this.title, @required Key key}):super(key: key);
const PageWidget({@required this.title, @required Key key}):super(key: key);

/// The text that shows on the list item on the main page as well as the navigation bar on the sub page.
final String title;
Expand Down