Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-02-07 15:18:47 +01:00
Code Issues Releases Wiki Activity

refactor(gitee): render readme with webview

Browse Source
This commit is contained in:
Rongjian Zhang 2020-11-01 23:43:51 +08:00
parent ac1b2055a8
commit fcd416debe
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/screens/ge_repo.dart
View File

@ -1,16 +1,18 @@
import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/auth.dart';
import 'package:git_touch/models/gitee.dart'; 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/scaffolds/refresh_stateful.dart';
import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/utils/utils.dart';
import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/app_bar_title.dart';
import 'package:git_touch/widgets/entry_item.dart'; import 'package:git_touch/widgets/entry_item.dart';
import 'package:git_touch/widgets/markdown_view.dart'; import 'package:git_touch/widgets/html_view.dart';
import 'package:git_touch/widgets/repo_header.dart'; import 'package:git_touch/widgets/repo_header.dart';
import 'package:git_touch/widgets/table_view.dart'; import 'package:git_touch/widgets/table_view.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import 'package:http/http.dart' as http;
class GeRepoScreen extends StatelessWidget { class GeRepoScreen extends StatelessWidget {
final String owner; final String owner;
@ -27,13 +29,17 @@ class GeRepoScreen extends StatelessWidget {
auth.fetchGitee('/repos/$owner/$name'), auth.fetchGitee('/repos/$owner/$name'),
auth.fetchGitee('/repos/$owner/$name/readme'), auth.fetchGitee('/repos/$owner/$name/readme'),
]); ]);
return Tuple2( final md = (res[1]['content'] as String)?.base64ToUtf8;
GiteeRepo.fromJson(res[0]),
(res[1]['content'] as String)?.base64ToUtf8, final html = await http.post(
); '${auth.activeAccount.domain}/api/v5/markdown',
headers: {'Authorization': 'token ${auth.token}'},
body: {'text': md},
).then((res) => utf8.decode(res.bodyBytes));
return Tuple2(GiteeRepo.fromJson(res[0]), html.normalizedHtml);
}, },
bodyBuilder: (t, setState) { bodyBuilder: (t, setState) {
final theme = Provider.of<ThemeModel>(context);
final p = t.item1; final p = t.item1;
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
@ -95,13 +101,7 @@ class GeRepoScreen extends StatelessWidget {
], ],
), ),
CommonStyle.verticalGap, CommonStyle.verticalGap,
if (t.item2 != null) if (t.item2 != null) MarkdownHtmlView(t.item2)
Container(
padding: CommonStyle.padding,
color: theme.palette.background,
child: MarkdownView(t.item2),
),
CommonStyle.verticalGap,
], ],
); );
}, },

2
lib/screens/gl_project.dart
View File

@ -46,7 +46,7 @@ class GlProjectScreen extends StatelessWidget {
'gfm': true, 'gfm': true,
'project': '${p.namespace.name}/${p.name}' 'project': '${p.namespace.name}/${p.name}'
}); });
readme = '<div class="markdown-body">' + res['html'] + '</div>'; readme = (res['html'] as String).normalizedHtml;
} }
return Tuple5( return Tuple5(
p, p,

4
lib/utils/extensions.dart
View File

@ -18,4 +18,8 @@ extension MyString<T extends String> on String {
if (dotext.isEmpty) return null; if (dotext.isEmpty) return null;
return dotext.substring(1); return dotext.substring(1);
} }
String get normalizedHtml {
return '<div class="markdown-body">' + this + '</div>';
}
} }