Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-01-31 08:04:51 +01:00
Code Issues Releases Wiki Activity

fix: branch selection

Browse Source
This commit is contained in:
Rongjian Zhang 2019-09-23 18:13:21 +08:00
parent 4fb32fa818
commit ac4fe0b2ed
3 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/models/theme.dart
View File

@ -50,26 +50,36 @@ class ThemeModel with ChangeNotifier {
notifyListeners();
}
void pushRoute({
@required BuildContext context,
@required WidgetBuilder builder,
pushRoute(
BuildContext context,
WidgetBuilder builder, {
bool fullscreenDialog = false,
}) {
switch (theme) {
case AppThemeType.cupertino:
Navigator.of(context).push(CupertinoPageRoute(
return Navigator.of(context).push(CupertinoPageRoute(
builder: builder,
fullscreenDialog: fullscreenDialog,
));
break;
default:
Navigator.of(context).push(MaterialPageRoute(
return Navigator.of(context).push(MaterialPageRoute(
builder: builder,
fullscreenDialog: fullscreenDialog,
));
}
}
pushReplacementRoute(BuildContext context, WidgetBuilder builder) {
switch (theme) {
case AppThemeType.cupertino:
return Navigator.of(context)
.pushReplacement(CupertinoPageRoute(builder: builder));
default:
return Navigator.of(context)
.pushReplacement(MaterialPageRoute(builder: builder));
}
}
Future<bool> showConfirm(BuildContext context, String text) {
switch (theme) {
case AppThemeType.cupertino:

39
lib/screens/repo.dart
View File

@ -35,7 +35,7 @@ class RepoScreen extends StatelessWidget {
get _branchQueryChunk =>
branch == null ? 'defaultBranchRef' : 'ref(qualifiedName: "$branch")';
get _readmeChunk => (branch ?? 'master') + ':README.md';
get _branchName => branch ?? 'master';
get branchInfoKey => branch == null ? 'defaultBranchRef' : 'ref';
Future queryRepo(BuildContext context) async {
@ -102,7 +102,7 @@ class RepoScreen extends StatelessWidget {
name
}
}
object(expression: "$_readmeChunk") {
object(expression: "$_branchName:README.md") {
... on Blob {
text
}
@ -138,8 +138,7 @@ class RepoScreen extends StatelessWidget {
break;
}
Provider.of<ThemeModel>(context)
.pushRoute(context: context, builder: builder);
Provider.of<ThemeModel>(context).pushRoute(context, builder);
},
),
MyAction(
@ -281,21 +280,25 @@ class RepoScreen extends StatelessWidget {
TableViewItem(
leftIconData: Octicons.git_branch,
text: Text('Branches'),
rightWidget: Text(
rightWidget: Text(_branchName +
' • ' +
numberFormat.format(payload['refs']['totalCount'])),
// onTap: () {
// Provider.of<ThemeModel>(context).showPicker(
// context,
// PickerGroupItem(
// items: (payload['refs']['nodes'] as List).map((b) =>
// PickerItem(b['name'] as String, text: b['name'])),
// onChange: (v) {
// // FIXME:
// queryRepo(context);
// },
// ),
// );
// },
onTap: () async {
var result = await Provider.of<ThemeModel>(context)
.showDialogOptions(
context,
(payload['refs']['nodes'] as List)
.map((b) => DialogOption(
value: b['name'] as String,
widget: Text(b['name'] as String)))
.toList());
if (result != null) {
Provider.of<ThemeModel>(context).pushReplacementRoute(
context,
(_) => RepoScreen(owner, name, branch: result));
}
},
),
TableViewItem(
leftIconData: Octicons.law,

4
lib/widgets/link.dart
View File

@ -32,9 +32,7 @@ class Link extends StatelessWidget {
}
if (screenBuilder != null) {
Provider.of<ThemeModel>(context).pushRoute(
context: context,
builder: screenBuilder,
Provider.of<ThemeModel>(context).pushRoute(context, screenBuilder,
fullscreenDialog: fullscreenDialog);
}