Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-01-06 12:56:43 +01:00
Code Issues Releases Wiki Activity

fix: use common push route method for span link

Browse Source
This commit is contained in:
Rongjian Zhang 2019-09-23 20:33:27 +08:00
parent 8bc2024e41
commit 200b250926
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/utils/utils.dart
View File

@ -3,10 +3,12 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/gestures.dart';
import 'package:git_touch/models/theme.dart';
import 'package:git_touch/screens/repository.dart';
import 'package:git_touch/screens/user.dart';
import 'package:intl/intl.dart';
import 'package:primer/primer.dart';
import 'package:provider/provider.dart';
export 'package:flutter_vector_icons/flutter_vector_icons.dart';
final monospaceFont = Platform.isIOS ? 'Menlo' : 'monospace'; // FIXME:
@ -47,31 +49,28 @@ void nextTick(Function callback, [int milliseconds = 0]) {
});
}
TextSpan createLinkSpan(BuildContext context, String text, Function handle) {
TextSpan createLinkSpan(
BuildContext context,
String text,
Widget Function(BuildContext) builder,
) {
return TextSpan(
text: text,
style: TextStyle(color: PrimerColors.blue500, fontWeight: FontWeight.w600),
recognizer: TapGestureRecognizer()
..onTap = () {
Navigator.of(context).push(
// FIXME: Material route
CupertinoPageRoute(
builder: (context) {
return handle();
},
),
);
Provider.of<ThemeModel>(context).pushRoute(context, builder);
},
);
}
TextSpan createUserSpan(BuildContext context, String login) {
return createLinkSpan(context, login, () => UserScreen(login));
return createLinkSpan(context, login, (_) => UserScreen(login));
}
TextSpan createRepoLinkSpan(BuildContext context, String owner, String name) {
return createLinkSpan(
context, '$owner/$name', () => RepositoryScreen(owner, name));
context, '$owner/$name', (_) => RepositoryScreen(owner, name));
}
class Palette {

12
lib/widgets/event_item.dart
View File

@ -43,13 +43,15 @@ class EventItem extends StatelessWidget {
// var resource = isPullRequest ? 'pull_request' : 'issue';
// int number = event.payload['issue']['number'];
return createLinkSpan(context, '#' + number.toString(), () {
return IssueScreen.fromFullName(
return createLinkSpan(
context,
'#' + number.toString(),
(_) => IssueScreen.fromFullName(
number: number,
fullName: event.repoFullName,
isPullRequest: isPullRequest,
);
});
),
);
}
Widget _buildItem({
@ -98,7 +100,7 @@ class EventItem extends StatelessWidget {
createLinkSpan(
context,
event.actorLogin,
() => UserScreen(event.actorLogin),
(_) => UserScreen(event.actorLogin),
),
...spans,
],