diff --git a/lib/screens/bb_commits.dart b/lib/screens/bb_commits.dart index d425e55..7e15bde 100644 --- a/lib/screens/bb_commits.dart +++ b/lib/screens/bb_commits.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:provider/provider.dart'; @@ -17,7 +16,7 @@ class BbCommitsScreen extends StatelessWidget { Widget build(BuildContext context) { final auth = Provider.of(context); return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: (nextUrl) async { final res = await context.read().fetchBbWithPage( nextUrl ?? '/repositories/$owner/$name/commits/$ref'); diff --git a/lib/screens/bb_explore.dart b/lib/screens/bb_explore.dart index 690b343..3fc062b 100644 --- a/lib/screens/bb_explore.dart +++ b/lib/screens/bb_explore.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:provider/provider.dart'; @@ -11,7 +10,7 @@ class BbExploreScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.explore), + title: Text(AppLocalizations.of(context)!.explore), fetch: (nextUrl) async { final res = await context.read().fetchBbWithPage( nextUrl ?? '/repositories?role=member&sort=-updated_on'); diff --git a/lib/screens/bb_issues.dart b/lib/screens/bb_issues.dart index 18e11a1..d31fc8f 100644 --- a/lib/screens/bb_issues.dart +++ b/lib/screens/bb_issues.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/bitbucket.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -17,7 +16,7 @@ class BbIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.issues), + title: Text(AppLocalizations.of(context)!.issues), actionBuilder: () { return ActionEntry( iconData: Octicons.plus, url: '/bitbucket/$owner/$name/issues/new'); diff --git a/lib/screens/bb_object.dart b/lib/screens/bb_object.dart index 54ead29..76aee5d 100644 --- a/lib/screens/bb_object.dart +++ b/lib/screens/bb_object.dart @@ -6,7 +6,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/bitbucket.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:path/path.dart' as p; @@ -25,7 +24,7 @@ class BbObjectScreen extends StatelessWidget { final auth = Provider.of(context); return ListStatefulScaffold( - title: AppBarTitle(path ?? 'Files'), + title: Text(path ?? 'Files'), fetch: (next) async { final res = await auth.fetchBb( next ?? '/repositories/$owner/$name/src/$ref/${path ?? ''}'); diff --git a/lib/screens/bb_pulls.dart b/lib/screens/bb_pulls.dart index be96574..9c0949c 100644 --- a/lib/screens/bb_pulls.dart +++ b/lib/screens/bb_pulls.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class BbPullsScreen extends StatelessWidget { Widget build(BuildContext context) { final auth = Provider.of(context); return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.pullRequests), + title: Text(AppLocalizations.of(context)!.pullRequests), fetch: (nextUrl) async { final res = await context.read().fetchBbWithPage( nextUrl ?? '/repositories/$owner/$name/pullrequests'); diff --git a/lib/screens/bb_repo.dart b/lib/screens/bb_repo.dart index 3b6ffbd..b1f8bb7 100644 --- a/lib/screens/bb_repo.dart +++ b/lib/screens/bb_repo.dart @@ -10,7 +10,6 @@ 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/app_bar_title.dart'; import 'package:git_touch/widgets/markdown_view.dart'; import 'package:git_touch/widgets/repo_header.dart'; import 'package:go_router/go_router.dart'; @@ -26,7 +25,7 @@ class BbRepoScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold>>( - title: AppBarTitle(AppLocalizations.of(context)!.repository), + title: Text(AppLocalizations.of(context)!.repository), fetch: () async { final auth = context.read(); final r = await auth.fetchBbJson('/repositories/$owner/$name'); diff --git a/lib/screens/bb_teams.dart b/lib/screens/bb_teams.dart index 0f5976b..e4ff3cd 100644 --- a/lib/screens/bb_teams.dart +++ b/lib/screens/bb_teams.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -12,7 +11,7 @@ class BbTeamsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.teams), + title: Text(AppLocalizations.of(context)!.teams), fetch: (nextUrl) async { final res = await context .read() diff --git a/lib/screens/code_theme.dart b/lib/screens/code_theme.dart index 9121700..284c4ae 100644 --- a/lib/screens/code_theme.dart +++ b/lib/screens/code_theme.dart @@ -8,7 +8,6 @@ import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/single.dart'; import 'package:git_touch/utils/utils.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:provider/provider.dart'; class CodeThemeScreen extends StatelessWidget { @@ -39,7 +38,7 @@ class MyApp extends StatelessWidget { final theme = Provider.of(context); return SingleScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.codeTheme), + title: Text(AppLocalizations.of(context)!.codeTheme), body: Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ diff --git a/lib/screens/ge_blob.dart b/lib/screens/ge_blob.dart index 81af9cb..2b88811 100644 --- a/lib/screens/ge_blob.dart +++ b/lib/screens/ge_blob.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GeBlobScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.file), + title: Text(AppLocalizations.of(context)!.file), fetch: () async { final auth = context.read(); final res = await auth.fetchGitee('/repos/$owner/$name/git/blobs/$sha'); diff --git a/lib/screens/ge_commits.dart b/lib/screens/ge_commits.dart index dd35a88..ad75029 100644 --- a/lib/screens/ge_commits.dart +++ b/lib/screens/ge_commits.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GeCommitsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: (page) async { final res = await context.read().fetchGiteeWithPage( '/repos/$owner/$name/commits?sha=$branch', diff --git a/lib/screens/ge_contributors.dart b/lib/screens/ge_contributors.dart index 6960e17..a88f0f4 100644 --- a/lib/screens/ge_contributors.dart +++ b/lib/screens/ge_contributors.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/gitee.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:provider/provider.dart'; class GeContributorsScreen extends StatelessWidget { @@ -16,7 +15,7 @@ class GeContributorsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.contributors), + title: Text(AppLocalizations.of(context)!.contributors), fetch: (page) async { page = page ?? 1; final res = await context diff --git a/lib/screens/ge_files.dart b/lib/screens/ge_files.dart index 1c14daa..00e2c3b 100644 --- a/lib/screens/ge_files.dart +++ b/lib/screens/ge_files.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_button.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/files_item.dart'; import 'package:provider/provider.dart'; @@ -18,7 +17,7 @@ class GeFilesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.files), + title: Text(AppLocalizations.of(context)!.files), actionBuilder: () { return ActionButton( title: 'Actions', diff --git a/lib/screens/ge_issues.dart b/lib/screens/ge_issues.dart index 9acccc6..5717794 100644 --- a/lib/screens/ge_issues.dart +++ b/lib/screens/ge_issues.dart @@ -4,7 +4,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -18,7 +17,7 @@ class GeIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(isPr ? 'Pull Requests' : 'Issues'), + title: Text(isPr ? 'Pull Requests' : 'Issues'), fetch: (page) async { final res = await context .read() diff --git a/lib/screens/ge_pulls.dart b/lib/screens/ge_pulls.dart index ff7fc92..d78b409 100644 --- a/lib/screens/ge_pulls.dart +++ b/lib/screens/ge_pulls.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GePullsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(isPr ? 'Pull Requests' : 'Issues'), + title: Text(isPr ? 'Pull Requests' : 'Issues'), fetch: (page) async { final res = await context .read() diff --git a/lib/screens/ge_repo.dart b/lib/screens/ge_repo.dart index cf7a1ab..bba277b 100644 --- a/lib/screens/ge_repo.dart +++ b/lib/screens/ge_repo.dart @@ -10,7 +10,6 @@ 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/app_bar_title.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/markdown_view.dart'; import 'package:git_touch/widgets/mutation_button.dart'; @@ -36,7 +35,7 @@ class GeRepoScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold< Tuple4, StatusPayload>>( - title: AppBarTitle(AppLocalizations.of(context)!.repository), + title: Text(AppLocalizations.of(context)!.repository), fetch: () async { final auth = context.read(); final repo = await auth.fetchGitee('/repos/$owner/$name').then((v) { diff --git a/lib/screens/ge_repos.dart b/lib/screens/ge_repos.dart index 0702a2b..949b3b7 100644 --- a/lib/screens/ge_repos.dart +++ b/lib/screens/ge_repos.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -23,7 +22,7 @@ class GeReposScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(title), + title: Text(title), fetch: (page) async { final res = await context.read().fetchGiteeWithPage(api, page: page); diff --git a/lib/screens/ge_tree.dart b/lib/screens/ge_tree.dart index 3ac1286..a0f81a4 100644 --- a/lib/screens/ge_tree.dart +++ b/lib/screens/ge_tree.dart @@ -6,7 +6,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GeTreeScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold>( - title: AppBarTitle(AppLocalizations.of(context)!.files), + title: Text(AppLocalizations.of(context)!.files), fetch: () async { final res = await context .read() diff --git a/lib/screens/ge_user.dart b/lib/screens/ge_user.dart index 899122a..8ec56e8 100644 --- a/lib/screens/ge_user.dart +++ b/lib/screens/ge_user.dart @@ -7,7 +7,6 @@ import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:git_touch/widgets/user_header.dart'; @@ -34,7 +33,7 @@ class GeUserScreen extends StatelessWidget { [for (var v in res[1]) GiteeRepo.fromJson(v)], ); }, - title: AppBarTitle(isViewer ? 'Me' : login), + title: Text(isViewer ? 'Me' : login), action: isViewer ? const ActionEntry( iconData: Ionicons.cog, diff --git a/lib/screens/ge_users.dart b/lib/screens/ge_users.dart index ce88e90..2c9ef30 100644 --- a/lib/screens/ge_users.dart +++ b/lib/screens/ge_users.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitee.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; @@ -28,7 +27,7 @@ class GeUsersScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(title), + title: Text(title), fetch: (page) async { final res = await context.read().fetchGiteeWithPage(api, page: page); diff --git a/lib/screens/gh_commits.dart b/lib/screens/gh_commits.dart index 7c92517..de8955b 100644 --- a/lib/screens/gh_commits.dart +++ b/lib/screens/gh_commits.dart @@ -3,7 +3,6 @@ import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:gql_github/commits.data.gql.dart'; import 'package:gql_github/commits.req.gql.dart'; @@ -32,7 +31,7 @@ class GhCommits extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: (cursor) async { final req = GCommitsReq((b) { b.vars.owner = owner; diff --git a/lib/screens/gh_compare.dart b/lib/screens/gh_compare.dart index c93b38b..c39aa43 100644 --- a/lib/screens/gh_compare.dart +++ b/lib/screens/gh_compare.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/github.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/widgets/action_button.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/files_item.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GhComparisonScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.files), + title: Text(AppLocalizations.of(context)!.files), fetch: () async { final res = await context.read().ghClient.getJSON( '/repos/$owner/$name/compare/$before...$head', diff --git a/lib/screens/gh_contributors.dart b/lib/screens/gh_contributors.dart index b9d899d..d1a5b26 100644 --- a/lib/screens/gh_contributors.dart +++ b/lib/screens/gh_contributors.dart @@ -4,7 +4,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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/contributor_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GhContributorsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.contributors), + title: Text(AppLocalizations.of(context)!.contributors), fetch: (page) async { page = page ?? 1; final res = await context diff --git a/lib/screens/gh_events.dart b/lib/screens/gh_events.dart index 77ab261..8a6f8ff 100644 --- a/lib/screens/gh_events.dart +++ b/lib/screens/gh_events.dart @@ -4,7 +4,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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/event_item.dart'; import 'package:provider/provider.dart'; @@ -15,7 +14,7 @@ class GhEventsScreen extends StatelessWidget { @override Widget build(context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.events), + title: Text(AppLocalizations.of(context)!.events), itemBuilder: (payload) => EventItem(payload), fetch: (page) async { page = page ?? 1; diff --git a/lib/screens/gh_files.dart b/lib/screens/gh_files.dart index 8fb001e..b65ce61 100644 --- a/lib/screens/gh_files.dart +++ b/lib/screens/gh_files.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/github.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_button.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/files_item.dart'; import 'package:provider/provider.dart'; @@ -18,7 +17,7 @@ class GhFilesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.files), + title: Text(AppLocalizations.of(context)!.files), actionBuilder: () { return ActionButton( title: 'Actions', diff --git a/lib/screens/gh_gist_object.dart b/lib/screens/gh_gist_object.dart index a98ecd2..a4a0332 100644 --- a/lib/screens/gh_gist_object.dart +++ b/lib/screens/gh_gist_object.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:git_touch/scaffolds/common.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; class GistObjectScreen extends StatelessWidget { @@ -17,7 +16,7 @@ class GistObjectScreen extends StatelessWidget { @override Widget build(BuildContext context) { return CommonScaffold( - title: AppBarTitle(file), + title: Text(file), action: const ActionEntry( iconData: Ionicons.cog, url: '/choose-code-theme', diff --git a/lib/screens/gh_gists.dart b/lib/screens/gh_gists.dart index 2faa660..c50751b 100644 --- a/lib/screens/gh_gists.dart +++ b/lib/screens/gh_gists.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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/gists_item.dart'; import 'package:gql_github/gists.data.gql.dart'; import 'package:gql_github/gists.req.gql.dart'; @@ -16,7 +15,7 @@ class GhGistsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.gists), + title: Text(AppLocalizations.of(context)!.gists), fetch: (page) async { final req = GGistsReq((b) => b ..vars.login = login diff --git a/lib/screens/gh_gists_files.dart b/lib/screens/gh_gists_files.dart index 343d5fd..46131f3 100644 --- a/lib/screens/gh_gists_files.dart +++ b/lib/screens/gh_gists_files.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/scaffolds/refresh_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:gql_github/gist.data.gql.dart'; import 'package:gql_github/gist.req.gql.dart'; @@ -18,7 +17,7 @@ class GhGistsFilesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.files), + title: Text(AppLocalizations.of(context)!.files), fetch: () async { final req = GGistReq((b) => b ..vars.login = login diff --git a/lib/screens/gh_issues.dart b/lib/screens/gh_issues.dart index cf2c4ea..0377cc0 100644 --- a/lib/screens/gh_issues.dart +++ b/lib/screens/gh_issues.dart @@ -4,7 +4,6 @@ import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:gql_github/issues.data.gql.dart'; @@ -19,7 +18,7 @@ class GhIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.issues), + title: Text(AppLocalizations.of(context)!.issues), actionBuilder: () => ActionEntry( iconData: Octicons.plus, url: '/github/$owner/$name/issues/new', diff --git a/lib/screens/gh_news.dart b/lib/screens/gh_news.dart index f2526cf..bcea6aa 100644 --- a/lib/screens/gh_news.dart +++ b/lib/screens/gh_news.dart @@ -5,7 +5,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/event_item.dart'; import 'package:provider/provider.dart'; @@ -35,7 +34,7 @@ class GhNewsScreenState extends State { @override Widget build(context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.news), + title: Text(AppLocalizations.of(context)!.news), itemBuilder: (payload) => EventItem(payload), fetch: (page) async { page = page ?? 1; diff --git a/lib/screens/gh_notification.dart b/lib/screens/gh_notification.dart index 01e81c6..2ebe25a 100644 --- a/lib/screens/gh_notification.dart +++ b/lib/screens/gh_notification.dart @@ -7,7 +7,6 @@ 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/scaffolds/tab_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/empty.dart'; import 'package:git_touch/widgets/list_group.dart'; import 'package:git_touch/widgets/notification_item.dart'; @@ -155,7 +154,7 @@ ${item.key}: pullRequest(number: ${item.subject!.number}) { @override Widget build(context) { return TabStatefulScaffold>( - title: AppBarTitle(AppLocalizations.of(context)!.notification), + title: Text(AppLocalizations.of(context)!.notification), tabs: [ AppLocalizations.of(context)!.unread, AppLocalizations.of(context)!.participating, diff --git a/lib/screens/gh_object.dart b/lib/screens/gh_object.dart index a056f72..38d4ae1 100644 --- a/lib/screens/gh_object.dart +++ b/lib/screens/gh_object.dart @@ -6,7 +6,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:github/github.dart'; @@ -24,7 +23,7 @@ class GhObjectScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold( // canRefresh: !_isImage, // TODO: - title: AppBarTitle(path ?? 'Files'), + title: Text(path ?? 'Files'), fetch: () async { // Do not request again for images if (path != null && diff --git a/lib/screens/gh_pulls.dart b/lib/screens/gh_pulls.dart index a149474..4b9fe34 100644 --- a/lib/screens/gh_pulls.dart +++ b/lib/screens/gh_pulls.dart @@ -2,7 +2,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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:gql_github/issues.data.gql.dart'; @@ -18,7 +17,7 @@ class GhPullsScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.pullRequests), + title: Text(AppLocalizations.of(context)!.pullRequests), fetch: (cursor) async { final req = GPullsReq((b) { b.vars.owner = owner; diff --git a/lib/screens/gh_releases.dart b/lib/screens/gh_releases.dart index 96e45bd..1f40012 100644 --- a/lib/screens/gh_releases.dart +++ b/lib/screens/gh_releases.dart @@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/release_item.dart'; import 'package:gql_github/releases.data.gql.dart'; import 'package:gql_github/releases.req.gql.dart'; @@ -17,7 +16,7 @@ class GhReleasesScreen extends StatelessWidget { Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Releases'), + title: const Text('Releases'), fetch: (page) async { final req = GReleasesReq((b) => b ..vars.owner = owner diff --git a/lib/screens/gh_repo.dart b/lib/screens/gh_repo.dart index 1f03095..4078c55 100644 --- a/lib/screens/gh_repo.dart +++ b/lib/screens/gh_repo.dart @@ -9,7 +9,6 @@ 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'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/language_bar.dart'; import 'package:git_touch/widgets/markdown_view.dart'; @@ -49,7 +48,7 @@ class GhRepoScreen extends StatelessWidget { final theme = Provider.of(context); return RefreshStatefulScaffold< Tuple3, MarkdownViewData>>( - title: AppBarTitle(AppLocalizations.of(context)!.repository), + title: Text(AppLocalizations.of(context)!.repository), fetch: () async { final req = GRepoReq((b) => b ..vars.owner = owner diff --git a/lib/screens/gh_repos.dart b/lib/screens/gh_repos.dart index 5ec10e8..2bbdd19 100644 --- a/lib/screens/gh_repos.dart +++ b/lib/screens/gh_repos.dart @@ -1,7 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:gql_github/repos.data.gql.dart'; import 'package:gql_github/repos.req.gql.dart'; @@ -15,7 +14,7 @@ class GhRepos extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Repositories'), + title: const Text('Repositories'), fetch: (cursor) async { final auth = context.read(); final req = GReposReq((b) { @@ -44,7 +43,7 @@ class GhStars extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Stars'), + title: const Text('Stars'), fetch: (cursor) async { final auth = context.read(); final req = GStarsReq((b) { diff --git a/lib/screens/gh_trending.dart b/lib/screens/gh_trending.dart index 1eb2aa1..12879f3 100644 --- a/lib/screens/gh_trending.dart +++ b/lib/screens/gh_trending.dart @@ -4,7 +4,6 @@ import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.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'; import 'package:git_touch/widgets/link.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:git_touch/widgets/user_item.dart'; @@ -16,7 +15,7 @@ class GhTrendingScreen extends StatelessWidget { @override Widget build(BuildContext context) { return TabStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.trending), + title: Text(AppLocalizations.of(context)!.trending), tabs: [ AppLocalizations.of(context)!.repositories, AppLocalizations.of(context)!.developers diff --git a/lib/screens/gh_user.dart b/lib/screens/gh_user.dart index ebfd285..020ba43 100644 --- a/lib/screens/gh_user.dart +++ b/lib/screens/gh_user.dart @@ -8,7 +8,6 @@ import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/contribution.dart'; import 'package:git_touch/widgets/entry_item.dart'; @@ -291,7 +290,7 @@ class GhViewerScreen extends StatelessWidget { final res = await auth.ghGqlClient.request(req).first; return res.data?.viewer; }, - title: AppBarTitle(AppLocalizations.of(context)!.me), + title: Text(AppLocalizations.of(context)!.me), action: const ActionEntry( iconData: Ionicons.cog, url: '/settings', @@ -317,7 +316,7 @@ class GhUserScreen extends StatelessWidget { final res = await auth.ghGqlClient.request(req).first; return res.data; }, - title: AppBarTitle(login), + title: Text(login), actionBuilder: (payload, _) { final url = payload?.user?.url ?? payload?.organization?.url; if (url == null) return null; diff --git a/lib/screens/gh_users.dart b/lib/screens/gh_users.dart index 87511f9..0d06e05 100644 --- a/lib/screens/gh_users.dart +++ b/lib/screens/gh_users.dart @@ -1,7 +1,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:gql_github/users.data.gql.dart'; import 'package:gql_github/users.req.gql.dart'; @@ -14,7 +13,7 @@ class GhFollowers extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Followers'), + title: const Text('Followers'), fetch: (cursor) async { final auth = context.read(); final req = GFollowersReq((b) { @@ -43,7 +42,7 @@ class GhFollowing extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Following'), + title: const Text('Following'), fetch: (cursor) async { final auth = context.read(); final req = GFollowingReq((b) { @@ -72,7 +71,7 @@ class GhOrgs extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Organizations'), + title: const Text('Organizations'), fetch: (cursor) async { final auth = context.read(); final req = GOrgsReq((b) { @@ -101,7 +100,7 @@ class GhMembers extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Members'), + title: const Text('Members'), fetch: (cursor) async { final auth = context.read(); final req = GMembersReq((b) { @@ -131,7 +130,7 @@ class GhWatchers extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Watchers'), + title: const Text('Watchers'), fetch: (cursor) async { final auth = context.read(); final req = GWatchersReq((b) { @@ -162,7 +161,7 @@ class GhStargazers extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: const AppBarTitle('Stargazers'), + title: const Text('Stargazers'), fetch: (cursor) async { final auth = context.read(); final req = GStargazersReq((b) { diff --git a/lib/screens/gl_blob.dart b/lib/screens/gl_blob.dart index 1cd56be..65fa984 100644 --- a/lib/screens/gl_blob.dart +++ b/lib/screens/gl_blob.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/gitlab.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:provider/provider.dart'; @@ -18,7 +17,7 @@ class GlBlobScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold( - title: AppBarTitle(path ?? ''), + title: Text(path ?? ''), fetch: () async { final auth = context.read(); final res = await auth.fetchGitlab( diff --git a/lib/screens/gl_commit.dart b/lib/screens/gl_commit.dart index c85192d..6fd29a9 100644 --- a/lib/screens/gl_commit.dart +++ b/lib/screens/gl_commit.dart @@ -9,7 +9,6 @@ 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/app_bar_title.dart'; import 'package:provider/provider.dart'; // TODO: @@ -31,7 +30,7 @@ class GlCommitScreen extends StatelessWidget { final theme = Provider.of(context); return RefreshStatefulScaffold>( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: () => _query(context), bodyBuilder: (items, _) { return Column( diff --git a/lib/screens/gl_commits.dart b/lib/screens/gl_commits.dart index 9889b9c..219d7d2 100644 --- a/lib/screens/gl_commits.dart +++ b/lib/screens/gl_commits.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GlCommitsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: (page) async { page = page ?? 1; final auth = context.read(); diff --git a/lib/screens/gl_explore.dart b/lib/screens/gl_explore.dart index e220401..fac8b41 100644 --- a/lib/screens/gl_explore.dart +++ b/lib/screens/gl_explore.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -12,7 +11,7 @@ class GlExploreScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.explore), + title: Text(AppLocalizations.of(context)!.explore), fetch: (page) async { page = page ?? 1; final auth = context.read(); diff --git a/lib/screens/gl_groups.dart b/lib/screens/gl_groups.dart index d7db77c..97b35fe 100644 --- a/lib/screens/gl_groups.dart +++ b/lib/screens/gl_groups.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; @@ -11,7 +10,7 @@ class GlGroupsScreenn extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.groups), + title: Text(AppLocalizations.of(context)!.groups), fetch: (page) async { page = page ?? 1; final auth = context.read(); diff --git a/lib/screens/gl_issues.dart b/lib/screens/gl_issues.dart index 4b8a841..b827d4a 100644 --- a/lib/screens/gl_issues.dart +++ b/lib/screens/gl_issues.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitlab.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -18,7 +17,7 @@ class GlIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.issues), + title: Text(AppLocalizations.of(context)!.issues), fetch: (page) async { page = page ?? 1; final auth = context.read(); diff --git a/lib/screens/gl_members.dart b/lib/screens/gl_members.dart index 0452f83..0f16fa3 100644 --- a/lib/screens/gl_members.dart +++ b/lib/screens/gl_members.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; @@ -24,7 +23,7 @@ class GlMembersScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.members), + title: Text(AppLocalizations.of(context)!.members), fetch: (page) async { page = page ?? 1; final auth = context.read(); diff --git a/lib/screens/gl_merge_requests.dart b/lib/screens/gl_merge_requests.dart index d008fb7..f07fb0c 100644 --- a/lib/screens/gl_merge_requests.dart +++ b/lib/screens/gl_merge_requests.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GlMergeRequestsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.mergeRequests), + title: Text(AppLocalizations.of(context)!.mergeRequests), fetch: (page) async { page = page ?? 1; final res = await context.read().fetchGitlabWithPage( diff --git a/lib/screens/gl_project.dart b/lib/screens/gl_project.dart index 0d7fa0f..0ec347b 100644 --- a/lib/screens/gl_project.dart +++ b/lib/screens/gl_project.dart @@ -10,7 +10,6 @@ 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'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/language_bar.dart'; import 'package:git_touch/widgets/markdown_view.dart'; @@ -29,7 +28,7 @@ class GlProjectScreen extends StatelessWidget { return RefreshStatefulScaffold< Tuple5>, Future, MarkdownViewData?, List>>( - title: AppBarTitle(AppLocalizations.of(context)!.project), + title: Text(AppLocalizations.of(context)!.project), fetch: () async { final auth = context.read(); final p = diff --git a/lib/screens/gl_project_activity.dart b/lib/screens/gl_project_activity.dart index 863bc08..2f8c6be 100644 --- a/lib/screens/gl_project_activity.dart +++ b/lib/screens/gl_project_activity.dart @@ -4,7 +4,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/link.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GlProjectActivityScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.activity), + title: Text(AppLocalizations.of(context)!.activity), fetch: (page) async { page = page ?? 1; final auth = context.read(); diff --git a/lib/screens/gl_starrers.dart b/lib/screens/gl_starrers.dart index 2ad152c..684960e 100644 --- a/lib/screens/gl_starrers.dart +++ b/lib/screens/gl_starrers.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -15,7 +14,7 @@ class GlStarrersScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.members), + title: Text(AppLocalizations.of(context)!.members), fetch: (page) async { page = page ?? 1; final res = await context diff --git a/lib/screens/gl_tree.dart b/lib/screens/gl_tree.dart index fd52a9d..7320a01 100644 --- a/lib/screens/gl_tree.dart +++ b/lib/screens/gl_tree.dart @@ -4,7 +4,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GlTreeScreen extends StatelessWidget { final auth = Provider.of(context); return ListStatefulScaffold( - title: AppBarTitle(path ?? AppLocalizations.of(context)!.files), + title: Text(path ?? AppLocalizations.of(context)!.files), fetch: (page) async { final uri = Uri( path: '/projects/$id/repository/tree', diff --git a/lib/screens/go_commits.dart b/lib/screens/go_commits.dart index bcfcb2c..83977a3 100644 --- a/lib/screens/go_commits.dart +++ b/lib/screens/go_commits.dart @@ -3,7 +3,6 @@ import 'package:flutter_gen/gen_l10n/S.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gogs.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:provider/provider.dart'; @@ -17,7 +16,7 @@ class GoCommitsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: (page) async { final res = await context.read().fetchGogsWithPage( '/repos/$owner/$name/commits/$branch', diff --git a/lib/screens/go_issues.dart b/lib/screens/go_issues.dart index 8cb1c6e..73d7197 100644 --- a/lib/screens/go_issues.dart +++ b/lib/screens/go_issues.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gogs.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GoIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(isPr + title: Text(isPr ? AppLocalizations.of(context)!.pullRequests : AppLocalizations.of(context)!.issues), fetch: (page) async { diff --git a/lib/screens/go_object.dart b/lib/screens/go_object.dart index e16c4b5..2d6bc6d 100644 --- a/lib/screens/go_object.dart +++ b/lib/screens/go_object.dart @@ -7,7 +7,6 @@ import 'package:git_touch/models/gogs.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:provider/provider.dart'; @@ -22,7 +21,7 @@ class GoObjectScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold( - title: AppBarTitle(path ?? AppLocalizations.of(context)!.files), + title: Text(path ?? AppLocalizations.of(context)!.files), fetch: () async { final suffix = path == null ? '' : '/$path'; final res = await context diff --git a/lib/screens/go_orgs.dart b/lib/screens/go_orgs.dart index 4d3a853..b77fbc2 100644 --- a/lib/screens/go_orgs.dart +++ b/lib/screens/go_orgs.dart @@ -4,7 +4,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gogs.dart'; import 'package:git_touch/scaffolds/refresh_stateful.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:provider/provider.dart'; @@ -18,7 +17,7 @@ class GoOrgsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold>( - title: AppBarTitle(AppLocalizations.of(context)!.organizations), + title: Text(AppLocalizations.of(context)!.organizations), fetch: () async { final res = await context.read().fetchGogs(api); return [for (var v in res) GogsOrg.fromJson(v)]; diff --git a/lib/screens/go_repo.dart b/lib/screens/go_repo.dart index 1a16453..1644f13 100644 --- a/lib/screens/go_repo.dart +++ b/lib/screens/go_repo.dart @@ -9,7 +9,6 @@ import 'package:git_touch/models/gogs.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/app_bar_title.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/markdown_view.dart'; import 'package:git_touch/widgets/repo_header.dart'; @@ -28,7 +27,7 @@ class GoRepoScreen extends StatelessWidget { Widget build(BuildContext context) { return RefreshStatefulScaffold< Tuple3>>( - title: AppBarTitle(AppLocalizations.of(context)!.repository), + title: Text(AppLocalizations.of(context)!.repository), fetch: () async { final auth = context.read(); final repo = await auth.fetchGogs('/repos/$owner/$name').then((v) { diff --git a/lib/screens/go_repos.dart b/lib/screens/go_repos.dart index 3fdea63..cd1da2e 100644 --- a/lib/screens/go_repos.dart +++ b/lib/screens/go_repos.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gogs.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:provider/provider.dart'; @@ -21,7 +20,7 @@ class GoReposScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(title), + title: Text(title), fetch: (page) async { final res = await context.read().fetchGogsWithPage(api, page: page); diff --git a/lib/screens/go_users.dart b/lib/screens/go_users.dart index 859001a..f6e3cd5 100644 --- a/lib/screens/go_users.dart +++ b/lib/screens/go_users.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gogs.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GoUsersScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(title), + title: Text(title), fetch: (page) async { final res = await context.read().fetchGogsWithPage(api, page: page); diff --git a/lib/screens/gt_commits.dart b/lib/screens/gt_commits.dart index d777b56..71f5eef 100644 --- a/lib/screens/gt_commits.dart +++ b/lib/screens/gt_commits.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/commit_item.dart'; import 'package:provider/provider.dart'; @@ -16,7 +15,7 @@ class GtCommitsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.commits), + title: Text(AppLocalizations.of(context)!.commits), fetch: (page) async { final res = await context .read() diff --git a/lib/screens/gt_issues.dart b/lib/screens/gt_issues.dart index fb3741d..766ccd9 100644 --- a/lib/screens/gt_issues.dart +++ b/lib/screens/gt_issues.dart @@ -5,7 +5,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/hex_color_tag.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -19,7 +18,7 @@ class GtIssuesScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(isPr + title: Text(isPr ? AppLocalizations.of(context)!.pullRequests : AppLocalizations.of(context)!.issues), fetch: (page) async { diff --git a/lib/screens/gt_object.dart b/lib/screens/gt_object.dart index 9aec0b4..e48cb2c 100644 --- a/lib/screens/gt_object.dart +++ b/lib/screens/gt_object.dart @@ -7,7 +7,6 @@ import 'package:git_touch/models/gitea.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_entry.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/blob_view.dart'; import 'package:git_touch/widgets/object_tree.dart'; import 'package:provider/provider.dart'; @@ -21,7 +20,7 @@ class GtObjectScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold( - title: AppBarTitle(path ?? AppLocalizations.of(context)!.files), + title: Text(path ?? AppLocalizations.of(context)!.files), fetch: () async { final suffix = path == null ? '' : '/$path'; final res = await context diff --git a/lib/screens/gt_orgs.dart b/lib/screens/gt_orgs.dart index 1ab3add..e5d652c 100644 --- a/lib/screens/gt_orgs.dart +++ b/lib/screens/gt_orgs.dart @@ -3,7 +3,6 @@ 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/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; @@ -15,7 +14,7 @@ class GtOrgsScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.organizations), + title: Text(AppLocalizations.of(context)!.organizations), fetch: (page) async { final res = await context.read().fetchGiteaWithPage(api, page: page); diff --git a/lib/screens/gt_repo.dart b/lib/screens/gt_repo.dart index 4f70718..dedbdd5 100644 --- a/lib/screens/gt_repo.dart +++ b/lib/screens/gt_repo.dart @@ -9,7 +9,6 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; import 'package:git_touch/scaffolds/refresh_stateful.dart'; import 'package:git_touch/utils/utils.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/markdown_view.dart'; import 'package:git_touch/widgets/repo_header.dart'; @@ -26,7 +25,7 @@ class GtRepoScreen extends StatelessWidget { @override Widget build(BuildContext context) { return RefreshStatefulScaffold>( - title: AppBarTitle(AppLocalizations.of(context)!.repository), + title: Text(AppLocalizations.of(context)!.repository), fetch: () async { final auth = context.read(); final repo = await auth.fetchGitea('/repos/$owner/$name').then((v) { diff --git a/lib/screens/gt_repos.dart b/lib/screens/gt_repos.dart index cb7578a..b62d4bd 100644 --- a/lib/screens/gt_repos.dart +++ b/lib/screens/gt_repos.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repo_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -26,7 +25,7 @@ class GtReposScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(title), + title: Text(title), fetch: (page) async { final res = await context.read().fetchGiteaWithPage(api, page: page); diff --git a/lib/screens/gt_users.dart b/lib/screens/gt_users.dart index 8e72749..5d84cf4 100644 --- a/lib/screens/gt_users.dart +++ b/lib/screens/gt_users.dart @@ -2,7 +2,6 @@ import 'package:flutter/widgets.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/gitea.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/user_item.dart'; import 'package:provider/provider.dart'; import 'package:timeago/timeago.dart' as timeago; @@ -29,7 +28,7 @@ class GtUsersScreen extends StatelessWidget { @override Widget build(BuildContext context) { return ListStatefulScaffold( - title: AppBarTitle(title), + title: Text(title), fetch: (page) async { final res = await context.read().fetchGiteaWithPage(api, page: page); diff --git a/lib/screens/login.dart b/lib/screens/login.dart index c86b7db..42b6a64 100644 --- a/lib/screens/login.dart +++ b/lib/screens/login.dart @@ -9,7 +9,6 @@ import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/single.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/loading.dart'; import 'package:git_touch/widgets/text_field.dart'; @@ -112,7 +111,7 @@ class _LoginScreenState extends State { final auth = Provider.of(context); final theme = Provider.of(context); return SingleScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.selectAccount), + title: Text(AppLocalizations.of(context)!.selectAccount), body: auth.loading ? const Center(child: Loading()) : Column( diff --git a/lib/screens/settings.dart b/lib/screens/settings.dart index 487bacb..68b7966 100644 --- a/lib/screens/settings.dart +++ b/lib/screens/settings.dart @@ -10,7 +10,6 @@ import 'package:git_touch/scaffolds/single.dart'; import 'package:git_touch/utils/locale.dart'; import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/action_button.dart'; -import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:go_router/go_router.dart'; import 'package:launch_review/launch_review.dart'; import 'package:package_info_plus/package_info_plus.dart'; @@ -24,7 +23,7 @@ class SettingsScreen extends StatelessWidget { final auth = Provider.of(context); final code = Provider.of(context); return SingleScaffold( - title: AppBarTitle(AppLocalizations.of(context)!.settings), + title: Text(AppLocalizations.of(context)!.settings), body: Column( children: [ CommonStyle.verticalGap, diff --git a/lib/widgets/app_bar_title.dart b/lib/widgets/app_bar_title.dart deleted file mode 100644 index e123ff6..0000000 --- a/lib/widgets/app_bar_title.dart +++ /dev/null @@ -1,11 +0,0 @@ -import 'package:flutter/widgets.dart'; - -class AppBarTitle extends StatelessWidget { - const AppBarTitle(this.text); - final String? text; - - @override - Widget build(BuildContext context) { - return Text(text!, overflow: TextOverflow.ellipsis); - } -}