From ec4f22ab8234ff9e4219829d4986be20309f3dbb Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Thu, 3 Oct 2019 10:01:54 +0800 Subject: [PATCH] chore: remove unused files --- lib/scaffolds/list_stateful.dart | 6 +- lib/scaffolds/refresh_stateful.dart | 4 +- lib/scaffolds/tab.dart | 6 +- lib/scaffolds/tab_stateful.dart | 2 +- lib/screens/trending_backup.dart | 101 ---------------------------- 5 files changed, 9 insertions(+), 110 deletions(-) delete mode 100644 lib/screens/trending_backup.dart diff --git a/lib/scaffolds/list_stateful.dart b/lib/scaffolds/list_stateful.dart index 2ef50a4..11efa97 100644 --- a/lib/scaffolds/list_stateful.dart +++ b/lib/scaffolds/list_stateful.dart @@ -20,7 +20,7 @@ class ListPayload { // This is a scaffold for infinite scroll screens class ListStatefulScaffold extends StatefulWidget { final Widget title; - final Widget Function() trailingBuiler; + final Widget Function() actionBuilder; final Widget Function(T payload) itemBuilder; final Future> Function() onRefresh; final Future> Function(K cursor) onLoadMore; @@ -30,7 +30,7 @@ class ListStatefulScaffold extends StatefulWidget { @required this.itemBuilder, @required this.onRefresh, @required this.onLoadMore, - this.trailingBuiler, + this.actionBuilder, }); @override @@ -210,7 +210,7 @@ class _ListStatefulScaffoldState return CommonScaffold( title: widget.title, body: _buildBody(), - action: widget.trailingBuiler == null ? null : widget.trailingBuiler(), + action: widget.actionBuilder == null ? null : widget.actionBuilder(), ); } } diff --git a/lib/scaffolds/refresh_stateful.dart b/lib/scaffolds/refresh_stateful.dart index c731967..5fec2f7 100644 --- a/lib/scaffolds/refresh_stateful.dart +++ b/lib/scaffolds/refresh_stateful.dart @@ -67,7 +67,7 @@ class _RefreshStatefulScaffoldState } } - Widget get _trailing { + Widget get _action { if (widget.actionBuilder == null) return null; return widget.actionBuilder(_payload); } @@ -86,7 +86,7 @@ class _RefreshStatefulScaffoldState reload: _refresh, ), ), - action: _trailing, + action: _action, ); } } diff --git a/lib/scaffolds/tab.dart b/lib/scaffolds/tab.dart index 72cd6c4..09be88f 100644 --- a/lib/scaffolds/tab.dart +++ b/lib/scaffolds/tab.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; class TabScaffold extends StatelessWidget { final Widget title; final Widget body; - final Widget trailing; + final Widget action; final void Function() onRefresh; final List tabs; final int activeTab; @@ -17,7 +17,7 @@ class TabScaffold extends StatelessWidget { TabScaffold({ @required this.title, @required this.body, - this.trailing, + this.action, @required this.onRefresh, @required this.tabs, @required this.activeTab, @@ -50,7 +50,7 @@ class TabScaffold extends StatelessWidget { final scaffold = CommonScaffold( title: _buildTitle(context), body: RefreshWrapper(body: body, onRefresh: onRefresh), - action: trailing, + action: action, bottom: TabBar( onTap: onTabSwitch, tabs: tabs.map((text) => Tab(text: text.toUpperCase())).toList(), diff --git a/lib/scaffolds/tab_stateful.dart b/lib/scaffolds/tab_stateful.dart index 006112d..6a6b82b 100644 --- a/lib/scaffolds/tab_stateful.dart +++ b/lib/scaffolds/tab_stateful.dart @@ -99,7 +99,7 @@ class _TabStatefulScaffoldState extends State> { Widget build(BuildContext context) { return TabScaffold( title: widget.title, - trailing: widget.actionBuilder == null + action: widget.actionBuilder == null ? null : widget.actionBuilder(_payload, _refresh), tabs: widget.tabs, diff --git a/lib/screens/trending_backup.dart b/lib/screens/trending_backup.dart deleted file mode 100644 index 2f08938..0000000 --- a/lib/screens/trending_backup.dart +++ /dev/null @@ -1,101 +0,0 @@ -import 'dart:convert'; -import 'package:flutter/material.dart'; -import 'package:git_touch/scaffolds/tab.dart'; -import 'package:git_touch/utils/utils.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; -import 'package:git_touch/widgets/user_item.dart'; -import 'package:http/http.dart' as http; -import 'package:git_touch/widgets/repository_item.dart'; - -class TrendingScreen extends StatefulWidget { - @override - _TrendingScreenState createState() => _TrendingScreenState(); -} - -class _TrendingScreenState extends State { - int _activeTab; - List _repoItems; - List _userItems; - - @override - void initState() { - super.initState(); - _refresh(); - } - - Uri get _uri => Uri.parse('https://github-trending-api.now.sh') - .resolve(_activeTab == 1 ? '/developers' : '/'); - - Iterable _buildItems() { - switch (_activeTab) { - case 0: - return _userItems?.map((item) => UserItem( - login: item['username'], - name: item['name'], - avatarUrl: item['avatar'], - bio: '', - )); - case 1: - default: - return _repoItems?.map((item) => RepositoryItem(item)); - } - } - - _refresh() async { - var res = await http.get(_uri); - var items = json.decode(res.body) as List; - setState(() { - switch (_activeTab) { - case 0: - _repoItems = items - .map((item) => { - 'owner': { - 'login': item['author'], - 'avatarUrl': item['avatar'] - }, - 'name': item['name'], - 'description': item['description'], - 'stargazers': { - 'totalCount': item['stars'], - }, - 'forks': { - 'totalCount': item['forks'], - }, - 'primaryLanguage': item['language'] == null - ? null - : { - 'name': item['language'], - 'color': item['languageColor'], - }, - 'isPrivate': false, - 'isFork': false // TODO: - }) - .toList(); - break; - case 1: - _userItems = items; - break; - default: - } - }); - } - - Widget build(BuildContext context) { - return TabScaffold( - title: AppBarTitle('Trending'), - tabs: ['Repositories', 'Users'], - onRefresh: _refresh, - body: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: join(CommonStyle.border, _buildItems()).toList(), - ), - activeTab: _activeTab, - onTabSwitch: (int index) { - setState(() { - _activeTab = index; - _refresh(); - }); - }, - ); - } -}