From 20c55b0585189cd627a88bd8a0d99eabb9ae38f1 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Fri, 8 Feb 2019 14:06:48 +0800 Subject: [PATCH] refactor: move scaffolds to seperated folder --- lib/{widgets/list_scaffold.dart => scaffolds/list.dart} | 3 ++- .../long_list_scaffold.dart => scaffolds/long_list.dart} | 4 ++-- lib/{widgets/refresh_scaffold.dart => scaffolds/refresh.dart} | 4 +++- lib/screens/issue.dart | 2 +- lib/screens/news.dart | 2 +- lib/screens/notifications.dart | 2 +- lib/screens/pull_request.dart | 2 +- lib/screens/repo.dart | 2 +- lib/screens/user.dart | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) rename lib/{widgets/list_scaffold.dart => scaffolds/list.dart} (98%) rename lib/{widgets/long_list_scaffold.dart => scaffolds/long_list.dart} (98%) rename lib/{widgets/refresh_scaffold.dart => scaffolds/refresh.dart} (94%) diff --git a/lib/widgets/list_scaffold.dart b/lib/scaffolds/list.dart similarity index 98% rename from lib/widgets/list_scaffold.dart rename to lib/scaffolds/list.dart index eb59481..b784369 100644 --- a/lib/widgets/list_scaffold.dart +++ b/lib/scaffolds/list.dart @@ -3,10 +3,11 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/widgets.dart'; import '../providers/settings.dart'; import '../widgets/link.dart'; -import 'loading.dart'; +import '../widgets/loading.dart'; typedef RefreshCallback = Future Function(); +// This is a scaffold for infinite scroll screens class ListScaffold extends StatefulWidget { final Widget title; final IconData trailingIconData; diff --git a/lib/widgets/long_list_scaffold.dart b/lib/scaffolds/long_list.dart similarity index 98% rename from lib/widgets/long_list_scaffold.dart rename to lib/scaffolds/long_list.dart index fa97c2f..e3d9822 100644 --- a/lib/widgets/long_list_scaffold.dart +++ b/lib/scaffolds/long_list.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/widgets.dart'; import '../providers/settings.dart'; -import 'loading.dart'; -import 'link.dart'; +import '../widgets/loading.dart'; +import '../widgets/link.dart'; class LongListPayload { T header; diff --git a/lib/widgets/refresh_scaffold.dart b/lib/scaffolds/refresh.dart similarity index 94% rename from lib/widgets/refresh_scaffold.dart rename to lib/scaffolds/refresh.dart index 60cc14c..719ece3 100644 --- a/lib/widgets/refresh_scaffold.dart +++ b/lib/scaffolds/refresh.dart @@ -2,11 +2,13 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/widgets.dart'; import '../providers/settings.dart'; -import 'loading.dart'; +import '../widgets/loading.dart'; typedef RefreshCallback = Future Function(); typedef WidgetBuilder = Widget Function(); +// This is a scaffold for normal screens +// Users can pull to refresh class RefreshScaffold extends StatelessWidget { final Widget title; final WidgetBuilder bodyBuilder; diff --git a/lib/screens/issue.dart b/lib/screens/issue.dart index 5dd97cc..0b0e086 100644 --- a/lib/screens/issue.dart +++ b/lib/screens/issue.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import '../utils/utils.dart'; -import '../widgets/long_list_scaffold.dart'; +import '../scaffolds/long_list.dart'; import '../widgets/timeline_item.dart'; import '../widgets/comment_item.dart'; import '../providers/settings.dart'; diff --git a/lib/screens/news.dart b/lib/screens/news.dart index 8f012ff..8d659bb 100644 --- a/lib/screens/news.dart +++ b/lib/screens/news.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import '../widgets/list_scaffold.dart'; +import '../scaffolds/list.dart'; import '../widgets/event_item.dart'; import '../providers/settings.dart'; import '../utils/utils.dart'; diff --git a/lib/screens/notifications.dart b/lib/screens/notifications.dart index 2d7189c..83df062 100644 --- a/lib/screens/notifications.dart +++ b/lib/screens/notifications.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; -import '../widgets/refresh_scaffold.dart'; +import '../scaffolds/refresh.dart'; import '../providers/notification.dart'; import '../providers/settings.dart'; import '../widgets/notification_item.dart'; diff --git a/lib/screens/pull_request.dart b/lib/screens/pull_request.dart index 82cef41..886f2d5 100644 --- a/lib/screens/pull_request.dart +++ b/lib/screens/pull_request.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import '../providers/settings.dart'; import '../utils/utils.dart'; -import '../widgets/long_list_scaffold.dart'; +import '../scaffolds/long_list.dart'; import '../widgets/timeline_item.dart'; import '../widgets/comment_item.dart'; diff --git a/lib/screens/repo.dart b/lib/screens/repo.dart index 7639017..8b5f110 100644 --- a/lib/screens/repo.dart +++ b/lib/screens/repo.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_markdown/flutter_markdown.dart'; import '../providers/settings.dart'; -import '../widgets/refresh_scaffold.dart'; +import '../scaffolds/refresh.dart'; import '../widgets/repo_item.dart'; import '../widgets/entry_item.dart'; import '../screens/issues.dart'; diff --git a/lib/screens/user.dart b/lib/screens/user.dart index 85f7fa4..2b8ae4c 100644 --- a/lib/screens/user.dart +++ b/lib/screens/user.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; import '../providers/settings.dart'; -import '../widgets/refresh_scaffold.dart'; +import '../scaffolds/refresh.dart'; import '../widgets/avatar.dart'; import '../widgets/entry_item.dart'; import '../widgets/list_group.dart';