From 4cd6d017db93d8460b4522471a4fc29b106033dd Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Fri, 7 Feb 2020 22:26:37 +0800 Subject: [PATCH] refactor(gl): short name --- lib/home.dart | 18 ++++---- lib/router.dart | 46 +++++++++---------- .../{gitlab_blob.dart => gl_blob.dart} | 4 +- .../{gitlab_commits.dart => gl_commits.dart} | 4 +- .../{gitlab_explore.dart => gl_explore.dart} | 2 +- .../{gitlab_group.dart => gl_group.dart} | 4 +- .../{gitlab_groups.dart => gl_groups.dart} | 2 +- .../{gitlab_issue.dart => gl_issue.dart} | 4 +- .../{gitlab_issues.dart => gl_issues.dart} | 4 +- .../{gitlab_members.dart => gl_members.dart} | 4 +- ...e_requests.dart => gl_merge_requests.dart} | 4 +- .../{gitlab_project.dart => gl_project.dart} | 4 +- ...activity.dart => gl_project_activity.dart} | 4 +- .../{gitlab_todos.dart => gl_todos.dart} | 2 +- .../{gitlab_tree.dart => gl_tree.dart} | 4 +- .../{gitlab_user.dart => gl_user.dart} | 4 +- 16 files changed, 57 insertions(+), 57 deletions(-) rename lib/screens/{gitlab_blob.dart => gl_blob.dart} (91%) rename lib/screens/{gitlab_commits.dart => gl_commits.dart} (93%) rename lib/screens/{gitlab_explore.dart => gl_explore.dart} (96%) rename lib/screens/{gitlab_group.dart => gl_group.dart} (96%) rename lib/screens/{gitlab_groups.dart => gl_groups.dart} (96%) rename lib/screens/{gitlab_issue.dart => gl_issue.dart} (96%) rename lib/screens/{gitlab_issues.dart => gl_issues.dart} (94%) rename lib/screens/{gitlab_members.dart => gl_members.dart} (94%) rename lib/screens/{gitlab_merge_requests.dart => gl_merge_requests.dart} (93%) rename lib/screens/{gitlab_project.dart => gl_project.dart} (98%) rename lib/screens/{gitlab_project_activity.dart => gl_project_activity.dart} (96%) rename lib/screens/{gitlab_todos.dart => gl_todos.dart} (98%) rename lib/screens/{gitlab_tree.dart => gl_tree.dart} (94%) rename lib/screens/{gitlab_user.dart => gl_user.dart} (96%) diff --git a/lib/home.dart b/lib/home.dart index 8273fc4..6859543 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -8,11 +8,11 @@ import 'package:git_touch/screens/bb_teams.dart'; import 'package:git_touch/screens/bb_user.dart'; import 'package:git_touch/screens/gt_orgs.dart'; import 'package:git_touch/screens/gt_user.dart'; -import 'package:git_touch/screens/gitlab_explore.dart'; -import 'package:git_touch/screens/gitlab_groups.dart'; -import 'package:git_touch/screens/gitlab_project.dart'; -import 'package:git_touch/screens/gitlab_todos.dart'; -import 'package:git_touch/screens/gitlab_user.dart'; +import 'package:git_touch/screens/gl_explore.dart'; +import 'package:git_touch/screens/gl_groups.dart'; +import 'package:git_touch/screens/gl_project.dart'; +import 'package:git_touch/screens/gl_todos.dart'; +import 'package:git_touch/screens/gl_user.dart'; import 'package:git_touch/screens/login.dart'; import 'package:git_touch/screens/gh_notification.dart'; import 'package:git_touch/screens/gh_user.dart'; @@ -31,7 +31,7 @@ class _HomeState extends State { int active = 0; _buildScreen(int index) { - // return GitlabProjectScreen(32221); + // return GlProjectScreen(32221); // return IssuesScreen('flutter', 'flutter', isPullRequest: true); // return IssueScreen('reactjs', 'rfcs', 29); // return IssueScreen('reactjs', 'rfcs', 68, isPullRequest: true); @@ -56,11 +56,11 @@ class _HomeState extends State { case PlatformType.gitlab: switch (index) { case 0: - return GitlabExplore(); + return GlExploreScreen(); case 1: - return GitlabGroups(); + return GlGroupsScreenn(); case 2: - return GitlabUserScreen(null); + return GlUserScreen(null); } break; case PlatformType.bitbucket: diff --git a/lib/router.dart b/lib/router.dart index aff66f6..e48db90 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -11,16 +11,16 @@ import 'package:git_touch/screens/gt_object.dart'; import 'package:git_touch/screens/gt_org.dart'; import 'package:git_touch/screens/gt_repo.dart'; import 'package:git_touch/screens/gt_user.dart'; -import 'package:git_touch/screens/gitlab_blob.dart'; -import 'package:git_touch/screens/gitlab_commits.dart'; -import 'package:git_touch/screens/gitlab_group.dart'; -import 'package:git_touch/screens/gitlab_issue.dart'; -import 'package:git_touch/screens/gitlab_issues.dart'; -import 'package:git_touch/screens/gitlab_members.dart'; -import 'package:git_touch/screens/gitlab_merge_requests.dart'; -import 'package:git_touch/screens/gitlab_project.dart'; -import 'package:git_touch/screens/gitlab_tree.dart'; -import 'package:git_touch/screens/gitlab_user.dart'; +import 'package:git_touch/screens/gl_blob.dart'; +import 'package:git_touch/screens/gl_commits.dart'; +import 'package:git_touch/screens/gl_group.dart'; +import 'package:git_touch/screens/gl_issue.dart'; +import 'package:git_touch/screens/gl_issues.dart'; +import 'package:git_touch/screens/gl_members.dart'; +import 'package:git_touch/screens/gl_merge_requests.dart'; +import 'package:git_touch/screens/gl_project.dart'; +import 'package:git_touch/screens/gl_tree.dart'; +import 'package:git_touch/screens/gl_user.dart'; import 'package:git_touch/screens/gh_issue.dart'; import 'package:git_touch/screens/gh_issue_form.dart'; import 'package:git_touch/screens/gh_issues.dart'; @@ -148,49 +148,49 @@ class GitlabRouter { GitlabRouter.issue, ]; static final user = RouterScreen( - '/user/:id', (context, p) => GitlabUserScreen(int.parse(p['id'].first))); - static final group = RouterScreen('/group/:id', - (context, p) => GitlabGroupScreen(int.parse(p['id'].first))); + '/user/:id', (context, p) => GlUserScreen(int.parse(p['id'].first))); + static final group = RouterScreen( + '/group/:id', (context, p) => GlGroupScreen(int.parse(p['id'].first))); static final blob = RouterScreen( '/projects/:id/blob/:ref', - (context, params) => GitlabBlobScreen( + (context, params) => GlBlobScreen( int.parse(params['id'].first), params['ref'].first, path: params['path']?.first)); static final tree = RouterScreen( '/projects/:id/tree/:ref', - (context, params) => GitlabTreeScreen( + (context, params) => GlTreeScreen( int.parse(params['id'].first), params['ref'].first, path: params['path']?.first)); static final project = RouterScreen('/projects/:id', - (context, params) => GitlabProjectScreen(int.parse(params['id'].first))); + (context, params) => GlProjectScreen(int.parse(params['id'].first))); static final issues = RouterScreen( '/projects/:id/issues', - (context, params) => GitlabIssuesScreen( + (context, params) => GlIssuesScreen( params['id'].first, prefix: params['prefix'].first, )); static final mergeRequests = RouterScreen( '/projects/:id/merge_requests', - (context, params) => GitlabMergeRequestsScreen( + (context, params) => GlMergeRequestsScreen( params['id'].first, prefix: params['prefix'].first, )); static final commits = RouterScreen( '/projects/:id/commits', - (context, params) => GitlabCommitsScreen(params['id'].first, - prefix: params['prefix'].first)); + (context, params) => + GlCommitsScreen(params['id'].first, prefix: params['prefix'].first)); static final projectMembers = RouterScreen( '/projects/:id/members', (context, parameters) => - GitlabMembers(int.parse(parameters['id'].first), 'projects')); + GlMembersScreen(int.parse(parameters['id'].first), 'projects')); static final groupMembers = RouterScreen( '/groups/:id/members', (context, parameters) => - GitlabMembers(int.parse(parameters['id'].first), 'groups')); + GlMembersScreen(int.parse(parameters['id'].first), 'groups')); static final issue = RouterScreen( '/gitlab/projects/:id/issues/:iid', (context, params) { - return GitlabIssueScreen( + return GlIssueScreen( int.parse(params['id'].first), int.parse(params['iid'].first), ); diff --git a/lib/screens/gitlab_blob.dart b/lib/screens/gl_blob.dart similarity index 91% rename from lib/screens/gitlab_blob.dart rename to lib/screens/gl_blob.dart index 23330bd..36b627b 100644 --- a/lib/screens/gitlab_blob.dart +++ b/lib/screens/gl_blob.dart @@ -8,11 +8,11 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:provider/provider.dart'; -class GitlabBlobScreen extends StatelessWidget { +class GlBlobScreen extends StatelessWidget { final int id; final String ref; final String path; - GitlabBlobScreen(this.id, this.ref, {this.path}); + GlBlobScreen(this.id, this.ref, {this.path}); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitlab_commits.dart b/lib/screens/gl_commits.dart similarity index 93% rename from lib/screens/gitlab_commits.dart rename to lib/screens/gl_commits.dart index 9b35a95..0f90327 100644 --- a/lib/screens/gitlab_commits.dart +++ b/lib/screens/gl_commits.dart @@ -6,11 +6,11 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:provider/provider.dart'; -class GitlabCommitsScreen extends StatelessWidget { +class GlCommitsScreen extends StatelessWidget { final String id; final String prefix; // final String branch; // TODO: - GitlabCommitsScreen(this.id, {this.prefix}); + GlCommitsScreen(this.id, {this.prefix}); Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitlab_explore.dart b/lib/screens/gl_explore.dart similarity index 96% rename from lib/screens/gitlab_explore.dart rename to lib/screens/gl_explore.dart index 65e27a9..cd037d0 100644 --- a/lib/screens/gitlab_explore.dart +++ b/lib/screens/gl_explore.dart @@ -7,7 +7,7 @@ import 'package:git_touch/widgets/repository_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; -class GitlabExplore extends StatelessWidget { +class GlExploreScreen extends StatelessWidget { Future> _query(BuildContext context, [int page = 1]) async { final auth = Provider.of(context); diff --git a/lib/screens/gitlab_group.dart b/lib/screens/gl_group.dart similarity index 96% rename from lib/screens/gitlab_group.dart rename to lib/screens/gl_group.dart index d34d2ae..ddaad6c 100644 --- a/lib/screens/gitlab_group.dart +++ b/lib/screens/gl_group.dart @@ -11,9 +11,9 @@ import 'package:tuple/tuple.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:timeago/timeago.dart' as timeago; -class GitlabGroupScreen extends StatelessWidget { +class GlGroupScreen extends StatelessWidget { final int id; - GitlabGroupScreen(this.id); + GlGroupScreen(this.id); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitlab_groups.dart b/lib/screens/gl_groups.dart similarity index 96% rename from lib/screens/gitlab_groups.dart rename to lib/screens/gl_groups.dart index 30c3d32..aec76d2 100644 --- a/lib/screens/gitlab_groups.dart +++ b/lib/screens/gl_groups.dart @@ -6,7 +6,7 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; -class GitlabGroups extends StatelessWidget { +class GlGroupsScreenn extends StatelessWidget { Future> _query(BuildContext context, [int page = 1]) async { final auth = Provider.of(context); diff --git a/lib/screens/gitlab_issue.dart b/lib/screens/gl_issue.dart similarity index 96% rename from lib/screens/gitlab_issue.dart rename to lib/screens/gl_issue.dart index e784a94..57e2889 100644 --- a/lib/screens/gitlab_issue.dart +++ b/lib/screens/gl_issue.dart @@ -10,12 +10,12 @@ import 'package:git_touch/models/auth.dart'; import 'package:timeago/timeago.dart' as timeago; import 'package:tuple/tuple.dart'; -class GitlabIssueScreen extends StatelessWidget { +class GlIssueScreen extends StatelessWidget { final int projectId; final int iid; final bool isMr; - GitlabIssueScreen(this.projectId, this.iid, {this.isMr = false}); + GlIssueScreen(this.projectId, this.iid, {this.isMr = false}); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitlab_issues.dart b/lib/screens/gl_issues.dart similarity index 94% rename from lib/screens/gitlab_issues.dart rename to lib/screens/gl_issues.dart index 9806d07..dffb1b9 100644 --- a/lib/screens/gitlab_issues.dart +++ b/lib/screens/gl_issues.dart @@ -7,10 +7,10 @@ import 'package:git_touch/widgets/issue_item.dart'; import 'package:git_touch/widgets/label.dart'; import 'package:provider/provider.dart'; -class GitlabIssuesScreen extends StatelessWidget { +class GlIssuesScreen extends StatelessWidget { final String id; final String prefix; - GitlabIssuesScreen(this.id, {this.prefix}); + GlIssuesScreen(this.id, {this.prefix}); Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitlab_members.dart b/lib/screens/gl_members.dart similarity index 94% rename from lib/screens/gitlab_members.dart rename to lib/screens/gl_members.dart index b6f4eb6..65af1ae 100644 --- a/lib/screens/gitlab_members.dart +++ b/lib/screens/gl_members.dart @@ -6,10 +6,10 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; -class GitlabMembers extends StatelessWidget { +class GlMembersScreen extends StatelessWidget { final int id; final String type; - GitlabMembers(this.id, this.type); + GlMembersScreen(this.id, this.type); Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitlab_merge_requests.dart b/lib/screens/gl_merge_requests.dart similarity index 93% rename from lib/screens/gitlab_merge_requests.dart rename to lib/screens/gl_merge_requests.dart index 9fa542c..bf23aa4 100644 --- a/lib/screens/gitlab_merge_requests.dart +++ b/lib/screens/gl_merge_requests.dart @@ -7,10 +7,10 @@ import 'package:git_touch/widgets/issue_item.dart'; import 'package:git_touch/widgets/label.dart'; import 'package:provider/provider.dart'; -class GitlabMergeRequestsScreen extends StatelessWidget { +class GlMergeRequestsScreen extends StatelessWidget { final String id; final String prefix; - GitlabMergeRequestsScreen(this.id, {this.prefix}); + GlMergeRequestsScreen(this.id, {this.prefix}); Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitlab_project.dart b/lib/screens/gl_project.dart similarity index 98% rename from lib/screens/gitlab_project.dart rename to lib/screens/gl_project.dart index 85a9ad0..d574321 100644 --- a/lib/screens/gitlab_project.dart +++ b/lib/screens/gl_project.dart @@ -16,9 +16,9 @@ import 'package:git_touch/models/theme.dart'; import 'package:git_touch/widgets/action_button.dart'; import 'package:tuple/tuple.dart'; -class GitlabProjectScreen extends StatelessWidget { +class GlProjectScreen extends StatelessWidget { final int id; - GitlabProjectScreen(this.id); + GlProjectScreen(this.id); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitlab_project_activity.dart b/lib/screens/gl_project_activity.dart similarity index 96% rename from lib/screens/gitlab_project_activity.dart rename to lib/screens/gl_project_activity.dart index 536f1c3..429f086 100644 --- a/lib/screens/gitlab_project_activity.dart +++ b/lib/screens/gl_project_activity.dart @@ -9,10 +9,10 @@ import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/link.dart'; import 'package:provider/provider.dart'; -class GitlabProjectActivity extends StatelessWidget { +class GlProjectActivityScreen extends StatelessWidget { final int id; - GitlabProjectActivity(this.id); + GlProjectActivityScreen(this.id); Future> _query(BuildContext context, [int page]) async { diff --git a/lib/screens/gitlab_todos.dart b/lib/screens/gl_todos.dart similarity index 98% rename from lib/screens/gitlab_todos.dart rename to lib/screens/gl_todos.dart index b7d6f3d..51362c3 100644 --- a/lib/screens/gitlab_todos.dart +++ b/lib/screens/gl_todos.dart @@ -8,7 +8,7 @@ import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/link.dart'; import 'package:provider/provider.dart'; -class GitlabTodosScreen extends StatelessWidget { +class GlTodosScreen extends StatelessWidget { InlineSpan _buildActor(BuildContext context, GitlabTodo p) { final theme = Provider.of(context); return TextSpan( diff --git a/lib/screens/gitlab_tree.dart b/lib/screens/gl_tree.dart similarity index 94% rename from lib/screens/gitlab_tree.dart rename to lib/screens/gl_tree.dart index 06bb8f5..f77ef61 100644 --- a/lib/screens/gitlab_tree.dart +++ b/lib/screens/gl_tree.dart @@ -8,11 +8,11 @@ import 'package:git_touch/models/auth.dart'; import 'package:provider/provider.dart'; import 'package:git_touch/utils/utils.dart'; -class GitlabTreeScreen extends StatelessWidget { +class GlTreeScreen extends StatelessWidget { final int id; final String ref; final String path; - GitlabTreeScreen(this.id, this.ref, {this.path}); + GlTreeScreen(this.id, this.ref, {this.path}); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitlab_user.dart b/lib/screens/gl_user.dart similarity index 96% rename from lib/screens/gitlab_user.dart rename to lib/screens/gl_user.dart index d0e9efb..cceaf08 100644 --- a/lib/screens/gitlab_user.dart +++ b/lib/screens/gl_user.dart @@ -11,9 +11,9 @@ import 'package:tuple/tuple.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:timeago/timeago.dart' as timeago; -class GitlabUserScreen extends StatelessWidget { +class GlUserScreen extends StatelessWidget { final int id; - GitlabUserScreen(this.id); + GlUserScreen(this.id); bool get isViewer => id == null; @override