From b7dcf933a3e8216554242c3e53914895bb1b592b Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sun, 2 Oct 2022 13:13:28 +0800 Subject: [PATCH] style: unused local variable --- lib/home.dart | 2 -- lib/scaffolds/long_list.dart | 4 ---- lib/screens/bb_issue.dart | 2 -- lib/screens/bb_issue_comment.dart | 2 -- lib/screens/bb_issue_form.dart | 2 -- lib/screens/ge_commit.dart | 2 -- lib/screens/ge_contributors.dart | 2 -- lib/screens/ge_issue.dart | 3 --- lib/screens/ge_issue_comment.dart | 2 -- lib/screens/ge_issue_form.dart | 2 -- lib/screens/ge_pull.dart | 3 --- lib/screens/ge_search.dart | 3 --- lib/screens/gh_issue.dart | 3 --- lib/screens/gh_issue_form.dart | 3 --- lib/screens/gh_notification.dart | 2 -- lib/screens/gh_search.dart | 3 --- lib/screens/gh_trending.dart | 3 --- lib/screens/gh_user.dart | 3 --- lib/screens/gl_issue_form.dart | 2 -- lib/screens/gl_project_activity.dart | 2 -- lib/screens/gl_search.dart | 3 --- lib/screens/gl_todos.dart | 5 ----- lib/screens/gt_issue.dart | 3 --- lib/screens/gt_issue_comment.dart | 2 -- lib/screens/gt_issue_form.dart | 2 -- lib/screens/login.dart | 1 - lib/utils/utils.dart | 3 --- lib/widgets/action_entry.dart | 3 --- lib/widgets/border_view.dart | 4 ---- lib/widgets/comment_item.dart | 1 - lib/widgets/commit_item.dart | 3 --- lib/widgets/contributor_item.dart | 3 --- lib/widgets/entry_item.dart | 4 ---- lib/widgets/event_item.dart | 8 -------- lib/widgets/gists_item.dart | 3 --- lib/widgets/issue_item.dart | 4 ---- lib/widgets/language_bar.dart | 3 --- lib/widgets/link.dart | 4 ---- lib/widgets/list_group.dart | 4 ---- lib/widgets/markdown_view.dart | 3 --- lib/widgets/notification_item.dart | 3 --- lib/widgets/release_item.dart | 3 --- lib/widgets/repo_header.dart | 3 --- lib/widgets/text_field.dart | 4 ---- lib/widgets/timeline_item.dart | 6 ------ lib/widgets/user_header.dart | 3 --- lib/widgets/user_item.dart | 5 ----- lib/widgets/user_name.dart | 3 --- 48 files changed, 146 deletions(-) diff --git a/lib/home.dart b/lib/home.dart index 73034d1..7cb2ac7 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -143,7 +143,6 @@ class _HomeState extends State { } Widget _buildNotificationIcon(BuildContext context, IconData iconData) { - final theme = Provider.of(context); final count = Provider.of(context).count; if (count == 0) { return Icon(iconData); @@ -239,7 +238,6 @@ class _HomeState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); if (auth.activeAccount == null) { diff --git a/lib/scaffolds/long_list.dart b/lib/scaffolds/long_list.dart index 35f862b..fc5f412 100644 --- a/lib/scaffolds/long_list.dart +++ b/lib/scaffolds/long_list.dart @@ -1,11 +1,9 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/error_reload.dart'; import 'package:git_touch/widgets/link.dart'; import 'package:git_touch/widgets/loading.dart'; -import 'package:provider/provider.dart'; class LongListPayload { LongListPayload({ @@ -101,8 +99,6 @@ class _LongListStatefulScaffoldState } Widget _buildItem(BuildContext context, int index) { - final theme = Provider.of(context); - if (index % 2 == 1) { return CommonStyle.border; } diff --git a/lib/screens/bb_issue.dart b/lib/screens/bb_issue.dart index fba25cb..8fc5d1d 100644 --- a/lib/screens/bb_issue.dart +++ b/lib/screens/bb_issue.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/bitbucket.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_entry.dart'; @@ -45,7 +44,6 @@ class BbIssueScreen extends StatelessWidget { bodyBuilder: (data, _) { final issue = data.item1; final comments = data.item2; - final theme = context.read(); return Column(children: [ Container( padding: CommonStyle.padding, diff --git a/lib/screens/bb_issue_comment.dart b/lib/screens/bb_issue_comment.dart index c8cbfb9..83d71be 100644 --- a/lib/screens/bb_issue_comment.dart +++ b/lib/screens/bb_issue_comment.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -22,7 +21,6 @@ class _BbIssueCommentScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: const Text('New Comment'), diff --git a/lib/screens/bb_issue_form.dart b/lib/screens/bb_issue_form.dart index 56d95bd..38aacd3 100644 --- a/lib/screens/bb_issue_form.dart +++ b/lib/screens/bb_issue_form.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/bitbucket.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -23,7 +22,6 @@ class _BbIssueFormScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: Text(AppLocalizations.of(context)!.submitAnIssue), diff --git a/lib/screens/ge_commit.dart b/lib/screens/ge_commit.dart index dceec37..1df092f 100644 --- a/lib/screens/ge_commit.dart +++ b/lib/screens/ge_commit.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; @@ -19,7 +18,6 @@ class GeCommitScreen extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = context.watch(); return RefreshStatefulScaffold( title: Text('Commit: ${sha.substring(0, 7)}'), fetch: () async { diff --git a/lib/screens/ge_contributors.dart b/lib/screens/ge_contributors.dart index 07ec487..6960e17 100644 --- a/lib/screens/ge_contributors.dart +++ b/lib/screens/ge_contributors.dart @@ -4,7 +4,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:provider/provider.dart'; @@ -36,7 +35,6 @@ class GeContributorsScreen extends StatelessWidget { ); }, itemBuilder: (v) { - final theme = context.read(); return Container( padding: CommonStyle.padding, child: Row( diff --git a/lib/screens/ge_issue.dart b/lib/screens/ge_issue.dart index 6ba0105..466d6fe 100644 --- a/lib/screens/ge_issue.dart +++ b/lib/screens/ge_issue.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; @@ -24,7 +23,6 @@ class GeIssueScreen extends StatelessWidget { List _buildCommentActionItem( BuildContext context, GiteeComment comment) { final auth = context.read(); - final theme = context.read(); return [ ActionItem( text: 'Edit', @@ -72,7 +70,6 @@ class GeIssueScreen extends StatelessWidget { bodyBuilder: (data, _) { final issue = data.item1; final comments = data.item2; - final theme = context.read(); return Column(children: [ Container( padding: CommonStyle.padding, diff --git a/lib/screens/ge_issue_comment.dart b/lib/screens/ge_issue_comment.dart index 1e6e7f3..dd24607 100644 --- a/lib/screens/ge_issue_comment.dart +++ b/lib/screens/ge_issue_comment.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -36,7 +35,6 @@ class _GeIssueCommentScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: Text(isEdit ? 'Update Comment' : 'New Comment'), diff --git a/lib/screens/ge_issue_form.dart b/lib/screens/ge_issue_form.dart index 9ba3cbd..878408e 100644 --- a/lib/screens/ge_issue_form.dart +++ b/lib/screens/ge_issue_form.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -23,7 +22,6 @@ class _GeIssueFormScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: Text(AppLocalizations.of(context)!.submitAnIssue), diff --git a/lib/screens/ge_pull.dart b/lib/screens/ge_pull.dart index ba91c1a..d487d56 100644 --- a/lib/screens/ge_pull.dart +++ b/lib/screens/ge_pull.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/material.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; @@ -24,7 +23,6 @@ class GePullScreen extends StatelessWidget { List _buildCommentActionItem( BuildContext context, GiteeComment comment) { final auth = context.read(); - final theme = context.read(); return [ ActionItem( text: 'Edit', @@ -81,7 +79,6 @@ class GePullScreen extends StatelessWidget { final comments = data.item2; final files = data.item3; final commits = data.item4; - final theme = context.read(); var additions = 0; var deletions = 0; for (final file in files) { diff --git a/lib/screens/ge_search.dart b/lib/screens/ge_search.dart index 9808b36..eb3d497 100644 --- a/lib/screens/ge_search.dart +++ b/lib/screens/ge_search.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/issue_item.dart'; @@ -119,8 +118,6 @@ class _GeSearchScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return CommonScaffold( title: Container( color: AntTheme.of(context).colorBackground, diff --git a/lib/screens/gh_issue.dart b/lib/screens/gh_issue.dart index 55ed6e9..6ec26d1 100644 --- a/lib/screens/gh_issue.dart +++ b/lib/screens/gh_issue.dart @@ -1,7 +1,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/long_list.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; @@ -29,7 +28,6 @@ class GhIssueScreen extends StatelessWidget { required Widget body, Iterable extraWidgets = const [], }) { - final theme = Provider.of(context); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ @@ -134,7 +132,6 @@ class GhIssueScreen extends StatelessWidget { } }, headerBuilder: (p) { - final theme = Provider.of(context); if (p.issueOrPullRequest!.G__typename == 'Issue') { final issue = p.issueOrPullRequest as GIssueData_repository_issueOrPullRequest__asIssue; diff --git a/lib/screens/gh_issue_form.dart b/lib/screens/gh_issue_form.dart index 192a541..46f040a 100644 --- a/lib/screens/gh_issue_form.dart +++ b/lib/screens/gh_issue_form.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:github/github.dart'; @@ -23,8 +22,6 @@ class _GhIssueFormScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return CommonScaffold( title: Text(AppLocalizations.of(context)!.submitAnIssue), body: Column( diff --git a/lib/screens/gh_notification.dart b/lib/screens/gh_notification.dart index 6c2984f..674e0ba 100644 --- a/lib/screens/gh_notification.dart +++ b/lib/screens/gh_notification.dart @@ -5,7 +5,6 @@ import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/github.dart'; import 'package:git_touch/models/notification.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/tab_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; @@ -106,7 +105,6 @@ ${item.key}: pullRequest(number: ${item.subject!.number}) { MapEntry entry, Map groupMap, ) { - final theme = Provider.of(context); final group = entry.value; return ListGroup( title: Row( diff --git a/lib/screens/gh_search.dart b/lib/screens/gh_search.dart index 770a3aa..6aa8238 100644 --- a/lib/screens/gh_search.dart +++ b/lib/screens/gh_search.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/issue_item.dart'; @@ -179,8 +178,6 @@ class _GhSearchScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return CommonScaffold( title: Container( color: AntTheme.of(context).colorBackground, diff --git a/lib/screens/gh_trending.dart b/lib/screens/gh_trending.dart index e25a726..25bc577 100644 --- a/lib/screens/gh_trending.dart +++ b/lib/screens/gh_trending.dart @@ -1,7 +1,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/tab_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; @@ -9,7 +8,6 @@ import 'package:git_touch/widgets/link.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:github_trending/github_trending.dart'; -import 'package:provider/provider.dart'; class GhTrendingScreen extends StatelessWidget { static final trending = GithubTrending(prefix: 'https://gtrend.yapie.me'); @@ -30,7 +28,6 @@ class GhTrendingScreen extends StatelessWidget { } }, bodyBuilder: (payload, activeTab) { - final theme = Provider.of(context); return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: join( diff --git a/lib/screens/gh_user.dart b/lib/screens/gh_user.dart index 8e3d26f..b119652 100644 --- a/lib/screens/gh_user.dart +++ b/lib/screens/gh_user.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; @@ -60,8 +59,6 @@ class _User extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ diff --git a/lib/screens/gl_issue_form.dart b/lib/screens/gl_issue_form.dart index f483bca..3e3adad 100644 --- a/lib/screens/gl_issue_form.dart +++ b/lib/screens/gl_issue_form.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitlab.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -22,7 +21,6 @@ class _GlIssueFormScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: Text(AppLocalizations.of(context)!.submitAnIssue), diff --git a/lib/screens/gl_project_activity.dart b/lib/screens/gl_project_activity.dart index f77f106..863bc08 100644 --- a/lib/screens/gl_project_activity.dart +++ b/lib/screens/gl_project_activity.dart @@ -3,7 +3,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitlab.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/avatar.dart'; @@ -16,7 +15,6 @@ class GlProjectActivityScreen extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle(AppLocalizations.of(context)!.activity), fetch: (page) async { diff --git a/lib/screens/gl_search.dart b/lib/screens/gl_search.dart index d180f70..b53e1f2 100644 --- a/lib/screens/gl_search.dart +++ b/lib/screens/gl_search.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitlab.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/loading.dart'; @@ -95,8 +94,6 @@ class _GlSearchScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return CommonScaffold( title: Container( color: AntTheme.of(context).colorBackground, diff --git a/lib/screens/gl_todos.dart b/lib/screens/gl_todos.dart index 9fa47ee..02767dc 100644 --- a/lib/screens/gl_todos.dart +++ b/lib/screens/gl_todos.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitlab.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; @@ -11,7 +10,6 @@ import 'package:provider/provider.dart'; class GlTodosScreen extends StatelessWidget { InlineSpan _buildActor(BuildContext context, GitlabTodo p) { - final theme = Provider.of(context); return TextSpan( text: p.author!.name, style: TextStyle(color: AntTheme.of(context).colorPrimary), @@ -19,7 +17,6 @@ class GlTodosScreen extends StatelessWidget { } InlineSpan _buildIssue(BuildContext context, GitlabTodo p) { - final theme = Provider.of(context); return TextSpan( text: '${p.project!.pathWithNamespace}!${p.target!.iid}', style: TextStyle(color: AntTheme.of(context).colorPrimary), @@ -60,8 +57,6 @@ class GlTodosScreen extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return RefreshStatefulScaffold>( title: const Text('Todos'), fetch: () async { diff --git a/lib/screens/gt_issue.dart b/lib/screens/gt_issue.dart index 622ca78..f948551 100644 --- a/lib/screens/gt_issue.dart +++ b/lib/screens/gt_issue.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; @@ -24,7 +23,6 @@ class GtIssueScreen extends StatelessWidget { List _buildCommentActionItem( BuildContext context, GiteaComment comment) { final auth = context.read(); - final theme = context.read(); return [ ActionItem( text: 'Edit', @@ -72,7 +70,6 @@ class GtIssueScreen extends StatelessWidget { bodyBuilder: (data, _) { final issue = data.item1; final comments = data.item2; - final theme = context.read(); return Column(children: [ Container( padding: CommonStyle.padding, diff --git a/lib/screens/gt_issue_comment.dart b/lib/screens/gt_issue_comment.dart index 5bf8c9c..0edc3ab 100644 --- a/lib/screens/gt_issue_comment.dart +++ b/lib/screens/gt_issue_comment.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -36,7 +35,6 @@ class _GtIssueCommentScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: Text(isEdit ? 'Update Comment' : 'New Comment'), diff --git a/lib/screens/gt_issue_form.dart b/lib/screens/gt_issue_form.dart index 3844f69..ac61c64 100644 --- a/lib/screens/gt_issue_form.dart +++ b/lib/screens/gt_issue_form.dart @@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:provider/provider.dart'; @@ -23,7 +22,6 @@ class _GtIssueFormScreenState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final auth = Provider.of(context); return CommonScaffold( title: Text(AppLocalizations.of(context)!.submitAnIssue), diff --git a/lib/screens/login.dart b/lib/screens/login.dart index 9e9daa9..75a0ee5 100644 --- a/lib/screens/login.dart +++ b/lib/screens/login.dart @@ -86,7 +86,6 @@ class _LoginScreenState extends State { Widget _buildAddItem( {IconData? brand, required String text, Function? onTap}) { - final theme = Provider.of(context); return LinkWidget( onTap: onTap, child: Container( diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index 06228cc..50d1a25 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -1,12 +1,10 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/widgets/border_view.dart'; import 'package:go_router/go_router.dart'; import 'package:intl/intl.dart'; import 'package:primer/primer.dart'; -import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; import 'package:universal_io/io.dart'; import 'package:url_launcher/url_launcher.dart'; @@ -52,7 +50,6 @@ TextSpan createLinkSpan( String? text, String url, ) { - final theme = Provider.of(context); return TextSpan( text: text, style: TextStyle( diff --git a/lib/widgets/action_entry.dart b/lib/widgets/action_entry.dart index 54157bd..cefc2cb 100644 --- a/lib/widgets/action_entry.dart +++ b/lib/widgets/action_entry.dart @@ -1,7 +1,5 @@ import 'package:flutter/cupertino.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; -import 'package:provider/provider.dart'; class ActionEntry extends StatelessWidget { const ActionEntry({this.url, this.iconData, this.onTap}); @@ -11,7 +9,6 @@ class ActionEntry extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return CupertinoButton( minSize: 0, padding: EdgeInsets.zero, diff --git a/lib/widgets/border_view.dart b/lib/widgets/border_view.dart index 0bf1475..53517b5 100644 --- a/lib/widgets/border_view.dart +++ b/lib/widgets/border_view.dart @@ -1,7 +1,5 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; -import 'package:provider/provider.dart'; class BorderView extends StatelessWidget { const BorderView({ @@ -13,8 +11,6 @@ class BorderView extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - if (height == null) { // Physical pixel return Container( diff --git a/lib/widgets/comment_item.dart b/lib/widgets/comment_item.dart index d2ceba8..d5dc5d4 100644 --- a/lib/widgets/comment_item.dart +++ b/lib/widgets/comment_item.dart @@ -212,7 +212,6 @@ class CommentItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/widgets/commit_item.dart b/lib/widgets/commit_item.dart index a922599..cf1655e 100644 --- a/lib/widgets/commit_item.dart +++ b/lib/widgets/commit_item.dart @@ -1,9 +1,7 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; -import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; class CommitItem extends StatelessWidget { @@ -25,7 +23,6 @@ class CommitItem extends StatelessWidget { final List? widgets; @override Widget build(BuildContext context) { - final theme = Provider.of(context); return AntListItem( onClick: () { context.pushUrl(url!); diff --git a/lib/widgets/contributor_item.dart b/lib/widgets/contributor_item.dart index e12f13b..dacc791 100644 --- a/lib/widgets/contributor_item.dart +++ b/lib/widgets/contributor_item.dart @@ -1,9 +1,7 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; -import 'package:provider/provider.dart'; class ContributorItem extends StatelessWidget { const ContributorItem({ @@ -19,7 +17,6 @@ class ContributorItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return AntListItem( onClick: () { context.pushUrl(url); diff --git a/lib/widgets/entry_item.dart b/lib/widgets/entry_item.dart index 0f295e8..7092878 100644 --- a/lib/widgets/entry_item.dart +++ b/lib/widgets/entry_item.dart @@ -1,9 +1,7 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/link.dart'; -import 'package:provider/provider.dart'; class EntryItem extends StatelessWidget { const EntryItem({ @@ -17,8 +15,6 @@ class EntryItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return Expanded( child: LinkWidget( url: url, diff --git a/lib/widgets/event_item.dart b/lib/widgets/event_item.dart index 2990281..00f9a3c 100644 --- a/lib/widgets/event_item.dart +++ b/lib/widgets/event_item.dart @@ -4,13 +4,11 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/github.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/branch_name.dart'; import 'package:git_touch/widgets/issue_icon.dart'; import 'package:git_touch/widgets/link.dart'; -import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; class EventItem extends StatelessWidget { @@ -18,7 +16,6 @@ class EventItem extends StatelessWidget { final GithubEvent e; InlineSpan _buildLinkSpan(BuildContext context, String? text, String? url) { - final theme = Provider.of(context); return TextSpan( text: text, style: TextStyle(color: AntTheme.of(context).colorPrimary), @@ -45,7 +42,6 @@ class EventItem extends StatelessWidget { required List spans, Widget? card, }) { - final theme = Provider.of(context); return Container( padding: CommonStyle.padding, child: Column( @@ -97,7 +93,6 @@ class EventItem extends StatelessWidget { } Widget _buildDefaultItem(BuildContext context) { - final theme = Provider.of(context); return _buildItem( context: context, spans: [ @@ -112,7 +107,6 @@ class EventItem extends StatelessWidget { } Widget _buildCommitsCard(BuildContext context) { - final theme = Provider.of(context); return LinkWidget( url: '/github/${e.repoOwner}/${e.repoName}/compare/${e.payload!.before}/${e.payload!.head}', @@ -172,7 +166,6 @@ class EventItem extends StatelessWidget { // Todo: Add a screen for the url Widget _buildCommitCommentCard(BuildContext context) { - final theme = Provider.of(context); return LinkWidget( url: e.payload!.comment!.htmlUrl, child: Container( @@ -214,7 +207,6 @@ class EventItem extends StatelessWidget { Widget _buildIssueCard( BuildContext context, GithubEventIssue issue, String? body, {isPullRequest = false}) { - final theme = Provider.of(context); IssueIconState state; if (isPullRequest) { if (issue.merged == true) { diff --git a/lib/widgets/gists_item.dart b/lib/widgets/gists_item.dart index 53abcfb..8078440 100644 --- a/lib/widgets/gists_item.dart +++ b/lib/widgets/gists_item.dart @@ -1,12 +1,10 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:from_css_color/from_css_color.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/link.dart'; import 'package:github/github.dart' as github; -import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; class GistsItem extends StatelessWidget { @@ -29,7 +27,6 @@ class GistsItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return LinkWidget( url: '/github/$login/gists/$id', child: Container( diff --git a/lib/widgets/issue_item.dart b/lib/widgets/issue_item.dart index c1e2c19..48696bb 100644 --- a/lib/widgets/issue_item.dart +++ b/lib/widgets/issue_item.dart @@ -1,9 +1,7 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; -import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; const issueGqlChunk = ''' @@ -56,8 +54,6 @@ class IssueItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return AntListItem( arrow: null, onClick: () { diff --git a/lib/widgets/language_bar.dart b/lib/widgets/language_bar.dart index 199e132..d5c9c86 100644 --- a/lib/widgets/language_bar.dart +++ b/lib/widgets/language_bar.dart @@ -1,10 +1,8 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; import 'package:from_css_color/from_css_color.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:github/github.dart' as github; -import 'package:provider/provider.dart'; class LanguageBarItem { LanguageBarItem({ @@ -63,7 +61,6 @@ class LanguageBar extends StatelessWidget { } Widget _buildPopup(BuildContext context) { - final theme = Provider.of(context); return Container( color: AntTheme.of(context).colorBackground, padding: CommonStyle.padding, diff --git a/lib/widgets/link.dart b/lib/widgets/link.dart index ae833b3..e36199f 100644 --- a/lib/widgets/link.dart +++ b/lib/widgets/link.dart @@ -1,7 +1,5 @@ import 'package:flutter/cupertino.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; -import 'package:provider/provider.dart'; // TODO: class CupertinoLink extends StatefulWidget { @@ -60,8 +58,6 @@ class LinkWidget extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - Widget w = CupertinoButton( minSize: 0, padding: EdgeInsets.zero, diff --git a/lib/widgets/list_group.dart b/lib/widgets/list_group.dart index 990ea06..de11681 100644 --- a/lib/widgets/list_group.dart +++ b/lib/widgets/list_group.dart @@ -1,8 +1,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/widgets/empty.dart'; -import 'package:provider/provider.dart'; class ListGroup extends StatelessWidget { const ListGroup({ @@ -17,7 +15,6 @@ class ListGroup extends StatelessWidget { final EdgeInsetsGeometry padding; Widget _buildItem(BuildContext context, MapEntry entry) { - final theme = Provider.of(context); return Container( decoration: BoxDecoration( border: @@ -29,7 +26,6 @@ class ListGroup extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return Container( padding: padding, child: Container( diff --git a/lib/widgets/markdown_view.dart b/lib/widgets/markdown_view.dart index 7ba93cc..f63cb5b 100644 --- a/lib/widgets/markdown_view.dart +++ b/lib/widgets/markdown_view.dart @@ -99,7 +99,6 @@ class MarkdownFlutterView extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final code = Provider.of(context); final basicStyle = TextStyle( fontSize: 16, color: AntTheme.of(context).colorText, height: 1.5); @@ -123,8 +122,6 @@ class MarkdownFlutterView extends StatelessWidget { } }, onTapLink: (text, url, title) { - final theme = context.read(); - if (basePaths != null && !url!.startsWith('https://') && !url.startsWith('http://')) { diff --git a/lib/widgets/notification_item.dart b/lib/widgets/notification_item.dart index 50bfae1..c0bde2d 100644 --- a/lib/widgets/notification_item.dart +++ b/lib/widgets/notification_item.dart @@ -2,7 +2,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/github.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/issue_icon.dart'; import 'package:git_touch/widgets/link.dart'; @@ -64,7 +63,6 @@ class _NotificationItemState extends State { } Widget _buildCheckIcon() { - final theme = Provider.of(context); return Icon( payload.unread! ? Ionicons.checkmark : Octicons.dot_fill, color: loading @@ -115,7 +113,6 @@ class _NotificationItemState extends State { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return LinkWidget( url: _url, onTap: _markAsRead, diff --git a/lib/widgets/release_item.dart b/lib/widgets/release_item.dart index d08928c..298dc3d 100644 --- a/lib/widgets/release_item.dart +++ b/lib/widgets/release_item.dart @@ -1,12 +1,10 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/markdown_view.dart'; import 'package:gql_github/releases.data.gql.dart'; -import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; class ReleaseItem extends StatelessWidget { @@ -28,7 +26,6 @@ class ReleaseItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return Column( children: [ const SizedBox( diff --git a/lib/widgets/repo_header.dart b/lib/widgets/repo_header.dart index 2c2bcb7..755e552 100644 --- a/lib/widgets/repo_header.dart +++ b/lib/widgets/repo_header.dart @@ -1,10 +1,8 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/link.dart'; -import 'package:provider/provider.dart'; class RepoHeader extends StatelessWidget { const RepoHeader({ @@ -28,7 +26,6 @@ class RepoHeader extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return Container( padding: CommonStyle.padding, child: Column( diff --git a/lib/widgets/text_field.dart b/lib/widgets/text_field.dart index 410d3de..f562d5c 100644 --- a/lib/widgets/text_field.dart +++ b/lib/widgets/text_field.dart @@ -1,7 +1,5 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/cupertino.dart'; -import 'package:git_touch/models/theme.dart'; -import 'package:provider/provider.dart'; class MyTextField extends StatelessWidget { const MyTextField({required this.controller, this.placeholder}); @@ -10,8 +8,6 @@ class MyTextField extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return CupertinoTextField( controller: controller, placeholder: placeholder, diff --git a/lib/widgets/timeline_item.dart b/lib/widgets/timeline_item.dart index 0098b63..c5c374f 100644 --- a/lib/widgets/timeline_item.dart +++ b/lib/widgets/timeline_item.dart @@ -3,14 +3,12 @@ import 'dart:core'; import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/S.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/branch_name.dart'; import 'package:git_touch/widgets/comment_item.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:gql_github/issue.data.gql.dart'; import 'package:gql_github/schema.schema.gql.dart'; -import 'package:provider/provider.dart'; TextSpan createUserSpan(BuildContext context, String? login) { return createLinkSpan(context, login, '/github/$login'); @@ -30,8 +28,6 @@ class TimelineEventItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - return Row( children: [ const SizedBox(width: 6), @@ -73,8 +69,6 @@ class TimelineItem extends StatelessWidget { } Widget _buildByType(BuildContext context, String? type) { - final theme = Provider.of(context); - switch (type) { // common types case 'PullRequestCommit': diff --git a/lib/widgets/user_header.dart b/lib/widgets/user_header.dart index 872f8b1..fbe2f01 100644 --- a/lib/widgets/user_header.dart +++ b/lib/widgets/user_header.dart @@ -1,10 +1,8 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/mutation_button.dart'; -import 'package:provider/provider.dart'; class UserHeader extends StatelessWidget { const UserHeader({ @@ -27,7 +25,6 @@ class UserHeader extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); final right = isViewer ? [ MutationButton( diff --git a/lib/widgets/user_item.dart b/lib/widgets/user_item.dart index 04e3e66..8ddaf52 100644 --- a/lib/widgets/user_item.dart +++ b/lib/widgets/user_item.dart @@ -1,10 +1,8 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:gql_github/users.data.gql.dart'; -import 'package:provider/provider.dart'; const userGqlChunk = ''' login @@ -20,8 +18,6 @@ class GhBioWidget extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); - if (isNotNullOrEmpty(location)) { return Row( children: [ @@ -124,7 +120,6 @@ class UserItem extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return AntListItem( onClick: () { context.pushUrl(url); diff --git a/lib/widgets/user_name.dart b/lib/widgets/user_name.dart index 593697a..6451663 100644 --- a/lib/widgets/user_name.dart +++ b/lib/widgets/user_name.dart @@ -1,8 +1,6 @@ import 'package:antd_mobile/antd_mobile.dart'; import 'package:flutter/widgets.dart'; -import 'package:git_touch/models/theme.dart'; import 'package:git_touch/widgets/link.dart'; -import 'package:provider/provider.dart'; class UserName extends StatelessWidget { const UserName(this.login, this.prefix); @@ -11,7 +9,6 @@ class UserName extends StatelessWidget { @override Widget build(BuildContext context) { - final theme = Provider.of(context); return LinkWidget( url: '/$prefix/$login', child: Container(