From 1ee49105ef04ddd172147e10d47a6f3277d438f0 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Fri, 7 Feb 2020 22:20:06 +0800 Subject: [PATCH] refactor(gt): gitea -> gt --- lib/home.dart | 8 ++--- lib/router.dart | 30 +++++++++---------- .../{gitea_commits.dart => gt_commits.dart} | 4 +-- .../{gitea_issues.dart => gt_issues.dart} | 4 +-- .../{gitea_object.dart => gt_object.dart} | 4 +-- lib/screens/{gitea_org.dart => gt_org.dart} | 4 +-- lib/screens/{gitea_orgs.dart => gt_orgs.dart} | 2 +- lib/screens/{gitea_repo.dart => gt_repo.dart} | 4 +-- lib/screens/{gitea_user.dart => gt_user.dart} | 4 +-- 9 files changed, 31 insertions(+), 33 deletions(-) rename lib/screens/{gitea_commits.dart => gt_commits.dart} (93%) rename lib/screens/{gitea_issues.dart => gt_issues.dart} (92%) rename lib/screens/{gitea_object.dart => gt_object.dart} (94%) rename lib/screens/{gitea_org.dart => gt_org.dart} (96%) rename lib/screens/{gitea_orgs.dart => gt_orgs.dart} (96%) rename lib/screens/{gitea_repo.dart => gt_repo.dart} (97%) rename lib/screens/{gitea_user.dart => gt_user.dart} (96%) diff --git a/lib/home.dart b/lib/home.dart index fa4e925..8273fc4 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -6,8 +6,8 @@ import 'package:git_touch/models/theme.dart'; import 'package:git_touch/screens/bb_explore.dart'; import 'package:git_touch/screens/bb_teams.dart'; import 'package:git_touch/screens/bb_user.dart'; -import 'package:git_touch/screens/gitea_orgs.dart'; -import 'package:git_touch/screens/gitea_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'; @@ -76,9 +76,9 @@ class _HomeState extends State { case PlatformType.gitea: switch (index) { case 0: - return GiteaOrgsScreen(); + return GtOrgsScreen(); case 1: - return GiteaUserScreen(null); + return GtUserScreen(null); } break; } diff --git a/lib/router.dart b/lib/router.dart index 6b6109f..aff66f6 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -5,12 +5,12 @@ import 'package:git_touch/screens/bb_repo.dart'; import 'package:git_touch/screens/bb_user.dart'; import 'package:git_touch/screens/code_theme.dart'; import 'package:git_touch/screens/gh_commits.dart'; -import 'package:git_touch/screens/gitea_commits.dart'; -import 'package:git_touch/screens/gitea_issues.dart'; -import 'package:git_touch/screens/gitea_object.dart'; -import 'package:git_touch/screens/gitea_org.dart'; -import 'package:git_touch/screens/gitea_repo.dart'; -import 'package:git_touch/screens/gitea_user.dart'; +import 'package:git_touch/screens/gt_commits.dart'; +import 'package:git_touch/screens/gt_issues.dart'; +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'; @@ -211,30 +211,28 @@ class GiteaRouter { static final user = RouterScreen( '/:login', (context, params) => params['org'].first == '1' - ? GiteaOrgScreen(params['login'].first) - : GiteaUserScreen(params['login'].first), + ? GtOrgScreen(params['login'].first) + : GtUserScreen(params['login'].first), ); static final repo = RouterScreen( '/:owner/:name', (context, params) => - GiteaRepoScreen(params['owner'].first, params['name'].first), + GtRepoScreen(params['owner'].first, params['name'].first), ); static final object = RouterScreen( '/:owner/:name/blob', - (context, params) => GiteaObjectScreen( + (context, params) => GtObjectScreen( params['owner'].first, params['name'].first, path: params['path']?.first, ), ); static final commits = RouterScreen('/:owner/:name/commits', - (_, p) => GiteaCommitsScreen(p['owner'].first, p['name'].first)); + (_, p) => GtCommitsScreen(p['owner'].first, p['name'].first)); static final issues = RouterScreen('/:owner/:name/issues', - (_, p) => GiteaIssuesScreen(p['owner'].first, p['name'].first)); - static final pulls = RouterScreen( - '/:owner/:name/pulls', - (_, p) => - GiteaIssuesScreen(p['owner'].first, p['name'].first, isPr: true)); + (_, p) => GtIssuesScreen(p['owner'].first, p['name'].first)); + static final pulls = RouterScreen('/:owner/:name/pulls', + (_, p) => GtIssuesScreen(p['owner'].first, p['name'].first, isPr: true)); } class BitbucketRouter { diff --git a/lib/screens/gitea_commits.dart b/lib/screens/gt_commits.dart similarity index 93% rename from lib/screens/gitea_commits.dart rename to lib/screens/gt_commits.dart index 034d256..9c117b3 100644 --- a/lib/screens/gitea_commits.dart +++ b/lib/screens/gt_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 GiteaCommitsScreen extends StatelessWidget { +class GtCommitsScreen extends StatelessWidget { final String owner; final String name; // final String branch; // TODO: - GiteaCommitsScreen(this.owner, this.name); + GtCommitsScreen(this.owner, this.name); Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitea_issues.dart b/lib/screens/gt_issues.dart similarity index 92% rename from lib/screens/gitea_issues.dart rename to lib/screens/gt_issues.dart index fc870c4..71c0e5d 100644 --- a/lib/screens/gitea_issues.dart +++ b/lib/screens/gt_issues.dart @@ -6,11 +6,11 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; -class GiteaIssuesScreen extends StatelessWidget { +class GtIssuesScreen extends StatelessWidget { final String owner; final String name; final bool isPr; - GiteaIssuesScreen(this.owner, this.name, {this.isPr = false}); + GtIssuesScreen(this.owner, this.name, {this.isPr = false}); Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitea_object.dart b/lib/screens/gt_object.dart similarity index 94% rename from lib/screens/gitea_object.dart rename to lib/screens/gt_object.dart index be29689..92f523c 100644 --- a/lib/screens/gitea_object.dart +++ b/lib/screens/gt_object.dart @@ -9,11 +9,11 @@ import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:provider/provider.dart'; -class GiteaObjectScreen extends StatelessWidget { +class GtObjectScreen extends StatelessWidget { final String owner; final String name; final String path; - GiteaObjectScreen(this.owner, this.name, {this.path}); + GtObjectScreen(this.owner, this.name, {this.path}); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitea_org.dart b/lib/screens/gt_org.dart similarity index 96% rename from lib/screens/gitea_org.dart rename to lib/screens/gt_org.dart index 5f5b027..c2db548 100644 --- a/lib/screens/gitea_org.dart +++ b/lib/screens/gt_org.dart @@ -10,9 +10,9 @@ import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; import 'package:timeago/timeago.dart' as timeago; -class GiteaOrgScreen extends StatelessWidget { +class GtOrgScreen extends StatelessWidget { final String login; - GiteaOrgScreen(this.login); + GtOrgScreen(this.login); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitea_orgs.dart b/lib/screens/gt_orgs.dart similarity index 96% rename from lib/screens/gitea_orgs.dart rename to lib/screens/gt_orgs.dart index d7e3ccb..99853c5 100644 --- a/lib/screens/gitea_orgs.dart +++ b/lib/screens/gt_orgs.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 GiteaOrgsScreen extends StatelessWidget { +class GtOrgsScreen extends StatelessWidget { // final String branch; // TODO: Future> _query(BuildContext context, [int page = 1]) async { diff --git a/lib/screens/gitea_repo.dart b/lib/screens/gt_repo.dart similarity index 97% rename from lib/screens/gitea_repo.dart rename to lib/screens/gt_repo.dart index 0761b77..e9adbf0 100644 --- a/lib/screens/gitea_repo.dart +++ b/lib/screens/gt_repo.dart @@ -13,10 +13,10 @@ import 'package:git_touch/widgets/table_view.dart'; import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; -class GiteaRepoScreen extends StatelessWidget { +class GtRepoScreen extends StatelessWidget { final String owner; final String name; - GiteaRepoScreen(this.owner, this.name); + GtRepoScreen(this.owner, this.name); @override Widget build(BuildContext context) { diff --git a/lib/screens/gitea_user.dart b/lib/screens/gt_user.dart similarity index 96% rename from lib/screens/gitea_user.dart rename to lib/screens/gt_user.dart index 4844f1e..ca92d0a 100644 --- a/lib/screens/gitea_user.dart +++ b/lib/screens/gt_user.dart @@ -11,9 +11,9 @@ import 'package:provider/provider.dart'; import 'package:tuple/tuple.dart'; import 'package:timeago/timeago.dart' as timeago; -class GiteaUserScreen extends StatelessWidget { +class GtUserScreen extends StatelessWidget { final String login; - GiteaUserScreen(this.login); + GtUserScreen(this.login); bool get isViewer => login == null; @override