Gitea
/
git-touch-android-ios-app
mirror of https://github.com/git-touch/git-touch
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: app bar title

This commit is contained in:
Rongjian Zhang 2022-10-08 01:06:03 +08:00
parent fbb524a7de
commit 3d21b6c226
67 changed files with 73 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/screens/bb_commits.dart
View File

@ -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<AuthModel>(context);
return ListStatefulScaffold<BbCommit, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: (nextUrl) async {
final res = await context.read<AuthModel>().fetchBbWithPage(
nextUrl ?? '/repositories/$owner/$name/commits/$ref');

3
lib/screens/bb_explore.dart
View File

@ -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<BbRepo, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.explore),
title: Text(AppLocalizations.of(context)!.explore),
fetch: (nextUrl) async {
final res = await context.read<AuthModel>().fetchBbWithPage(
nextUrl ?? '/repositories?role=member&sort=-updated_on');

3
lib/screens/bb_issues.dart
View File

@ -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<BbIssues, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.issues),
title: Text(AppLocalizations.of(context)!.issues),
actionBuilder: () {
return ActionEntry(
iconData: Octicons.plus, url: '/bitbucket/$owner/$name/issues/new');

3
lib/screens/bb_object.dart
View File

@ -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<AuthModel>(context);
return ListStatefulScaffold<dynamic, String?>(
title: AppBarTitle(path ?? 'Files'),
title: Text(path ?? 'Files'),
fetch: (next) async {
final res = await auth.fetchBb(
next ?? '/repositories/$owner/$name/src/$ref/${path ?? ''}');

3
lib/screens/bb_pulls.dart
View File

@ -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<AuthModel>(context);
return ListStatefulScaffold<BbPulls, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.pullRequests),
title: Text(AppLocalizations.of(context)!.pullRequests),
fetch: (nextUrl) async {
final res = await context.read<AuthModel>().fetchBbWithPage(
nextUrl ?? '/repositories/$owner/$name/pullrequests');

3
lib/screens/bb_repo.dart
View File

@ -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<Tuple3<BbRepo, String?, List<BbBranch>>>(
title: AppBarTitle(AppLocalizations.of(context)!.repository),
title: Text(AppLocalizations.of(context)!.repository),
fetch: () async {
final auth = context.read<AuthModel>();
final r = await auth.fetchBbJson('/repositories/$owner/$name');

3
lib/screens/bb_teams.dart
View File

@ -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<BbUser, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.teams),
title: Text(AppLocalizations.of(context)!.teams),
fetch: (nextUrl) async {
final res = await context
.read<AuthModel>()

3
lib/screens/code_theme.dart
View File

@ -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<ThemeModel>(context);
return SingleScaffold(
title: AppBarTitle(AppLocalizations.of(context)!.codeTheme),
title: Text(AppLocalizations.of(context)!.codeTheme),
body: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[

3
lib/screens/ge_blob.dart
View File

@ -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<String?>(
title: AppBarTitle(AppLocalizations.of(context)!.file),
title: Text(AppLocalizations.of(context)!.file),
fetch: () async {
final auth = context.read<AuthModel>();
final res = await auth.fetchGitee('/repos/$owner/$name/git/blobs/$sha');

3
lib/screens/ge_commits.dart
View File

@ -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<GiteeCommit, int>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: (page) async {
final res = await context.read<AuthModel>().fetchGiteeWithPage(
'/repos/$owner/$name/commits?sha=$branch',

3
lib/screens/ge_contributors.dart
View File

@ -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<GiteeContributor, int>(
title: AppBarTitle(AppLocalizations.of(context)!.contributors),
title: Text(AppLocalizations.of(context)!.contributors),
fetch: (page) async {
page = page ?? 1;
final res = await context

3
lib/screens/ge_files.dart
View File

@ -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<GiteePullFile, int>(
title: AppBarTitle(AppLocalizations.of(context)!.files),
title: Text(AppLocalizations.of(context)!.files),
actionBuilder: () {
return ActionButton(
title: 'Actions',

3
lib/screens/ge_issues.dart
View File

@ -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<GiteeIssue, int>(
title: AppBarTitle(isPr ? 'Pull Requests' : 'Issues'),
title: Text(isPr ? 'Pull Requests' : 'Issues'),
fetch: (page) async {
final res = await context
.read<AuthModel>()

3
lib/screens/ge_pulls.dart
View File

@ -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<GiteePull, int>(
title: AppBarTitle(isPr ? 'Pull Requests' : 'Issues'),
title: Text(isPr ? 'Pull Requests' : 'Issues'),
fetch: (page) async {
final res = await context
.read<AuthModel>()

3
lib/screens/ge_repo.dart
View File

@ -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<GiteeRepo, MarkdownViewData, List<GiteeBranch>, StatusPayload>>(
title: AppBarTitle(AppLocalizations.of(context)!.repository),
title: Text(AppLocalizations.of(context)!.repository),
fetch: () async {
final auth = context.read<AuthModel>();
final repo = await auth.fetchGitee('/repos/$owner/$name').then((v) {

3
lib/screens/ge_repos.dart
View File

@ -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<GiteeRepo, int>(
title: AppBarTitle(title),
title: Text(title),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteeWithPage(api, page: page);

3
lib/screens/ge_tree.dart
View File

@ -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<List<GiteeTreeItem>>(
title: AppBarTitle(AppLocalizations.of(context)!.files),
title: Text(AppLocalizations.of(context)!.files),
fetch: () async {
final res = await context
.read<AuthModel>()

3
lib/screens/ge_user.dart
View File

@ -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,

3
lib/screens/ge_users.dart
View File

@ -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<GiteeListUser, int>(
title: AppBarTitle(title),
title: Text(title),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteeWithPage(api, page: page);

3
lib/screens/gh_commits.dart
View File

@ -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<GCommitsRefCommit_history_nodes, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: (cursor) async {
final req = GCommitsReq((b) {
b.vars.owner = owner;

3
lib/screens/gh_compare.dart
View File

@ -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<AuthModel>().ghClient.getJSON(
'/repos/$owner/$name/compare/$before...$head',

3
lib/screens/gh_contributors.dart
View File

@ -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<GithubContributorItem, int>(
title: AppBarTitle(AppLocalizations.of(context)!.contributors),
title: Text(AppLocalizations.of(context)!.contributors),
fetch: (page) async {
page = page ?? 1;
final res = await context

3
lib/screens/gh_events.dart
View File

@ -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<GithubEvent, int>(
title: AppBarTitle(AppLocalizations.of(context)!.events),
title: Text(AppLocalizations.of(context)!.events),
itemBuilder: (payload) => EventItem(payload),
fetch: (page) async {
page = page ?? 1;

3
lib/screens/gh_files.dart
View File

@ -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<GithubFilesItem, int>(
title: AppBarTitle(AppLocalizations.of(context)!.files),
title: Text(AppLocalizations.of(context)!.files),
actionBuilder: () {
return ActionButton(
title: 'Actions',

3
lib/screens/gh_gist_object.dart
View File

@ -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',

3
lib/screens/gh_gists.dart
View File

@ -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<GGistsData_user_gists_nodes, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.gists),
title: Text(AppLocalizations.of(context)!.gists),
fetch: (page) async {
final req = GGistsReq((b) => b
..vars.login = login

3
lib/screens/gh_gists_files.dart
View File

@ -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<GGistData_user_gist?>(
title: AppBarTitle(AppLocalizations.of(context)!.files),
title: Text(AppLocalizations.of(context)!.files),
fetch: () async {
final req = GGistReq((b) => b
..vars.login = login

3
lib/screens/gh_issues.dart
View File

@ -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<GIssuesData_repository_issues_nodes, String?>(
title: AppBarTitle(AppLocalizations.of(context)!.issues),
title: Text(AppLocalizations.of(context)!.issues),
actionBuilder: () => ActionEntry(
iconData: Octicons.plus,
url: '/github/$owner/$name/issues/new',

3
lib/screens/gh_news.dart
View File

@ -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<GhNewsScreen> {
@override
Widget build(context) {
return ListStatefulScaffold<GithubEvent, int>(
title: AppBarTitle(AppLocalizations.of(context)!.news),
title: Text(AppLocalizations.of(context)!.news),
itemBuilder: (payload) => EventItem(payload),
fetch: (page) async {
page = page ?? 1;

3
lib/screens/gh_notification.dart
View File

@ -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<Map<String, NotificationGroup>>(
title: AppBarTitle(AppLocalizations.of(context)!.notification),
title: Text(AppLocalizations.of(context)!.notification),
tabs: [
AppLocalizations.of(context)!.unread,
AppLocalizations.of(context)!.participating,

3
lib/screens/gh_object.dart
View File

@ -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<RepositoryContents>(
// canRefresh: !_isImage, // TODO:
title: AppBarTitle(path ?? 'Files'),
title: Text(path ?? 'Files'),
fetch: () async {
// Do not request again for images
if (path != null &&

3
lib/screens/gh_pulls.dart
View File

@ -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<GPullsData_repository_pullRequests_nodes,
String?>(
title: AppBarTitle(AppLocalizations.of(context)!.pullRequests),
title: Text(AppLocalizations.of(context)!.pullRequests),
fetch: (cursor) async {
final req = GPullsReq((b) {
b.vars.owner = owner;

3
lib/screens/gh_releases.dart
View File

@ -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<GReleasesData_repository_releases_nodes,
String?>(
title: const AppBarTitle('Releases'),
title: const Text('Releases'),
fetch: (page) async {
final req = GReleasesReq((b) => b
..vars.owner = owner

3
lib/screens/gh_repo.dart
View File

@ -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<ThemeModel>(context);
return RefreshStatefulScaffold<
Tuple3<GRepoData_repository?, Future<int>, MarkdownViewData>>(
title: AppBarTitle(AppLocalizations.of(context)!.repository),
title: Text(AppLocalizations.of(context)!.repository),
fetch: () async {
final req = GRepoReq((b) => b
..vars.owner = owner

5
lib/screens/gh_repos.dart
View File

@ -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<GRepoParts, String?>(
title: const AppBarTitle('Repositories'),
title: const Text('Repositories'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GReposReq((b) {
@ -44,7 +43,7 @@ class GhStars extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListStatefulScaffold<GRepoParts, String?>(
title: const AppBarTitle('Stars'),
title: const Text('Stars'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GStarsReq((b) {

3
lib/screens/gh_trending.dart
View File

@ -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<List>(
title: AppBarTitle(AppLocalizations.of(context)!.trending),
title: Text(AppLocalizations.of(context)!.trending),
tabs: [
AppLocalizations.of(context)!.repositories,
AppLocalizations.of(context)!.developers

5
lib/screens/gh_user.dart
View File

@ -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;

13
lib/screens/gh_users.dart
View File

@ -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<GUserParts, String?>(
title: const AppBarTitle('Followers'),
title: const Text('Followers'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GFollowersReq((b) {
@ -43,7 +42,7 @@ class GhFollowing extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListStatefulScaffold<GUserParts, String?>(
title: const AppBarTitle('Following'),
title: const Text('Following'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GFollowingReq((b) {
@ -72,7 +71,7 @@ class GhOrgs extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListStatefulScaffold<GOrgParts, String?>(
title: const AppBarTitle('Organizations'),
title: const Text('Organizations'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GOrgsReq((b) {
@ -101,7 +100,7 @@ class GhMembers extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListStatefulScaffold<GUserParts, String?>(
title: const AppBarTitle('Members'),
title: const Text('Members'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GMembersReq((b) {
@ -131,7 +130,7 @@ class GhWatchers extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListStatefulScaffold<GUserParts, String?>(
title: const AppBarTitle('Watchers'),
title: const Text('Watchers'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GWatchersReq((b) {
@ -162,7 +161,7 @@ class GhStargazers extends StatelessWidget {
@override
Widget build(BuildContext context) {
return ListStatefulScaffold<GUserParts, String?>(
title: const AppBarTitle('Stargazers'),
title: const Text('Stargazers'),
fetch: (cursor) async {
final auth = context.read<AuthModel>();
final req = GStargazersReq((b) {

3
lib/screens/gl_blob.dart
View File

@ -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<GitlabBlob>(
title: AppBarTitle(path ?? ''),
title: Text(path ?? ''),
fetch: () async {
final auth = context.read<AuthModel>();
final res = await auth.fetchGitlab(

3
lib/screens/gl_commit.dart
View File

@ -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<ThemeModel>(context);
return RefreshStatefulScaffold<List<GitlabDiff>>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: () => _query(context),
bodyBuilder: (items, _) {
return Column(

3
lib/screens/gl_commits.dart
View File

@ -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<GitlabCommit, int>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();

3
lib/screens/gl_explore.dart
View File

@ -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<GitlabProject, int>(
title: AppBarTitle(AppLocalizations.of(context)!.explore),
title: Text(AppLocalizations.of(context)!.explore),
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();

3
lib/screens/gl_groups.dart
View File

@ -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<GitlabGroup, int>(
title: AppBarTitle(AppLocalizations.of(context)!.groups),
title: Text(AppLocalizations.of(context)!.groups),
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();

3
lib/screens/gl_issues.dart
View File

@ -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<GitlabIssue, int>(
title: AppBarTitle(AppLocalizations.of(context)!.issues),
title: Text(AppLocalizations.of(context)!.issues),
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();

3
lib/screens/gl_members.dart
View File

@ -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<GitlabUser, int>(
title: AppBarTitle(AppLocalizations.of(context)!.members),
title: Text(AppLocalizations.of(context)!.members),
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();

3
lib/screens/gl_merge_requests.dart
View File

@ -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<GitlabIssue, int>(
title: AppBarTitle(AppLocalizations.of(context)!.mergeRequests),
title: Text(AppLocalizations.of(context)!.mergeRequests),
fetch: (page) async {
page = page ?? 1;
final res = await context.read<AuthModel>().fetchGitlabWithPage(

3
lib/screens/gl_project.dart
View File

@ -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<GitlabProject, Future<Map<String, double>>, Future<int>,
MarkdownViewData?, List<GitlabBranch>>>(
title: AppBarTitle(AppLocalizations.of(context)!.project),
title: Text(AppLocalizations.of(context)!.project),
fetch: () async {
final auth = context.read<AuthModel>();
final p =

3
lib/screens/gl_project_activity.dart
View File

@ -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<GitlabEvent, int>(
title: AppBarTitle(AppLocalizations.of(context)!.activity),
title: Text(AppLocalizations.of(context)!.activity),
fetch: (page) async {
page = page ?? 1;
final auth = context.read<AuthModel>();

3
lib/screens/gl_starrers.dart
View File

@ -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<GitlabStarrer, int>(
title: AppBarTitle(AppLocalizations.of(context)!.members),
title: Text(AppLocalizations.of(context)!.members),
fetch: (page) async {
page = page ?? 1;
final res = await context

3
lib/screens/gl_tree.dart
View File

@ -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<AuthModel>(context);
return ListStatefulScaffold<GitlabTreeItem, int>(
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',

3
lib/screens/go_commits.dart
View File

@ -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<GogsCommit, int>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: (page) async {
final res = await context.read<AuthModel>().fetchGogsWithPage(
'/repos/$owner/$name/commits/$branch',

3
lib/screens/go_issues.dart
View File

@ -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<GogsIssue, int>(
title: AppBarTitle(isPr
title: Text(isPr
? AppLocalizations.of(context)!.pullRequests
: AppLocalizations.of(context)!.issues),
fetch: (page) async {

3
lib/screens/go_object.dart
View File

@ -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

3
lib/screens/go_orgs.dart
View File

@ -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<List<GogsOrg>>(
title: AppBarTitle(AppLocalizations.of(context)!.organizations),
title: Text(AppLocalizations.of(context)!.organizations),
fetch: () async {
final res = await context.read<AuthModel>().fetchGogs(api);
return [for (var v in res) GogsOrg.fromJson(v)];

3
lib/screens/go_repo.dart
View File

@ -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<GogsRepository, MarkdownViewData, List<GogsBranch>>>(
title: AppBarTitle(AppLocalizations.of(context)!.repository),
title: Text(AppLocalizations.of(context)!.repository),
fetch: () async {
final auth = context.read<AuthModel>();
final repo = await auth.fetchGogs('/repos/$owner/$name').then((v) {

3
lib/screens/go_repos.dart
View File

@ -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<GogsRepository, int>(
title: AppBarTitle(title),
title: Text(title),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGogsWithPage(api, page: page);

3
lib/screens/go_users.dart
View File

@ -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<GogsUser, int>(
title: AppBarTitle(title),
title: Text(title),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGogsWithPage(api, page: page);

3
lib/screens/gt_commits.dart
View File

@ -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<GiteaCommit, int>(
title: AppBarTitle(AppLocalizations.of(context)!.commits),
title: Text(AppLocalizations.of(context)!.commits),
fetch: (page) async {
final res = await context
.read<AuthModel>()

3
lib/screens/gt_issues.dart
View File

@ -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<GiteaIssue, int>(
title: AppBarTitle(isPr
title: Text(isPr
? AppLocalizations.of(context)!.pullRequests
: AppLocalizations.of(context)!.issues),
fetch: (page) async {

3
lib/screens/gt_object.dart
View File

@ -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

3
lib/screens/gt_orgs.dart
View File

@ -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<GiteaOrg, int>(
title: AppBarTitle(AppLocalizations.of(context)!.organizations),
title: Text(AppLocalizations.of(context)!.organizations),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteaWithPage(api, page: page);

3
lib/screens/gt_repo.dart
View File

@ -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<Tuple2<GiteaRepository, MarkdownViewData>>(
title: AppBarTitle(AppLocalizations.of(context)!.repository),
title: Text(AppLocalizations.of(context)!.repository),
fetch: () async {
final auth = context.read<AuthModel>();
final repo = await auth.fetchGitea('/repos/$owner/$name').then((v) {

3
lib/screens/gt_repos.dart
View File

@ -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<GiteaRepository, int>(
title: AppBarTitle(title),
title: Text(title),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteaWithPage(api, page: page);

3
lib/screens/gt_users.dart
View File

@ -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<GiteaUser, int>(
title: AppBarTitle(title),
title: Text(title),
fetch: (page) async {
final res =
await context.read<AuthModel>().fetchGiteaWithPage(api, page: page);

3
lib/screens/login.dart
View File

@ -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<LoginScreen> {
final auth = Provider.of<AuthModel>(context);
final theme = Provider.of<ThemeModel>(context);
return SingleScaffold(
title: AppBarTitle(AppLocalizations.of(context)!.selectAccount),
title: Text(AppLocalizations.of(context)!.selectAccount),
body: auth.loading
? const Center(child: Loading())
: Column(

3
lib/screens/settings.dart
View File

@ -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<AuthModel>(context);
final code = Provider.of<CodeModel>(context);
return SingleScaffold(
title: AppBarTitle(AppLocalizations.of(context)!.settings),
title: Text(AppLocalizations.of(context)!.settings),
body: Column(
children: <Widget>[
CommonStyle.verticalGap,

11
lib/widgets/app_bar_title.dart
View File

@ -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);
}
}