sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add pickup and fix term

Browse Source
This commit is contained in:
phyothandar
2021-09-13 17:36:52 +06:30
parent c955b9811d
commit bd8da77376
11 changed files with 858 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
lib/pages/term/term_edit.dart
View File

@@ -10,12 +10,13 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_icons_null_safety/flutter_icons_null_safety.dart';
import 'package:provider/provider.dart';
import 'package:zefyrka/zefyrka.dart';
// import 'package:zefyr/zefyr.dart';
typedef void ProfileCallback();
class TermEdit extends StatefulWidget {
final Term term;
final Term? term;
TermEdit({required this.term});
@override
_TermEditState createState() => _TermEditState();
@@ -23,12 +24,12 @@ class TermEdit extends StatefulWidget {
class _TermEditState extends State<TermEdit> {
/// Allows to control the editor and the document.
// ZefyrController _controllerEng;
// ZefyrController _controllerMm;
late ZefyrController _controllerEng;
late ZefyrController _controllerMm;
/// Zefyr editor like any other input field requires a focus node.
// FocusNode _focusNodeEng;
// FocusNode _focusNodeMm;
late FocusNode _focusNodeEng;
late FocusNode _focusNodeMm;
bool _isLoading = false;
@override
@@ -37,23 +38,23 @@ class _TermEditState extends State<TermEdit> {
_isLoading = false;
// Here we must load the document and pass it to Zefyr controller.
// _controllerEng = ZefyrController(_loadDocument(widget.term.termEng));
// _controllerMm = ZefyrController(_loadDocument(widget.term.termMm));
// _focusNodeEng = FocusNode();
// _focusNodeMm = FocusNode();
_controllerEng = ZefyrController(_loadDocument(widget.term!.termEng ?? ""));
_controllerMm = ZefyrController(_loadDocument(widget.term!.termMm ?? ""));
_focusNodeEng = FocusNode();
_focusNodeMm = FocusNode();
}
/// Loads the document to be edited in Zefyr.
// NotusDocument _loadDocument(String data) {
// NotusDocument doc;
// try {
// doc = NotusDocument.fromJson(jsonDecode(data));
// } catch (e) {}
// if (doc == null) {
// doc = NotusDocument();
// }
// return doc;
// }
NotusDocument _loadDocument(String data) {
late NotusDocument doc;
try {
doc = NotusDocument.fromJson(jsonDecode(data));
} catch (e) {}
if (doc == null) {
doc = NotusDocument();
}
return doc;
}
@override
Widget build(BuildContext context) {
@@ -116,8 +117,8 @@ class _TermEditState extends State<TermEdit> {
height: MediaQuery.of(context).size.height - 200,
child: TabBarView(
children: [
// textEditor(_controllerEng, _focusNodeEng),
// textEditor(_controllerMm, _focusNodeMm),
textEditor(_controllerEng, _focusNodeEng),
textEditor(_controllerMm, _focusNodeMm),
],
),
),
@@ -129,35 +130,24 @@ class _TermEditState extends State<TermEdit> {
);
}
// Widget textEditor(ZefyrController controller, FocusNode focusNode) {
// return ListView(
// children: [
// Container(
// height: MediaQuery.of(context).size.height - 200,
// child: ZefyrScaffold(
// child: ZefyrTheme(
// data: ZefyrThemeData().copyWith(
// defaultLineTheme: LineTheme(
// padding: EdgeInsets.all(0),
// textStyle: TextStyle(fontFamily: "Myanmar3"),
// ),
// ),
// child: ZefyrEditor(
// autofocus: false,
// padding: EdgeInsets.all(16),
// controller: controller,
// focusNode: focusNode,
// ),
// ),
// ),
// ),
// // savebtn,
// SizedBox(
// height: 10,
// )
// ],
// );
// }
Widget textEditor(ZefyrController controller, FocusNode focusNode) {
return ListView(
children: [
Container(
height: MediaQuery.of(context).size.height - 200,
child: ZefyrEditor(
autofocus: false,
padding: EdgeInsets.all(16),
controller: controller,
focusNode: focusNode,
),
),
SizedBox(
height: 10,
)
],
);
}
_unfocus() {
FocusScope.of(context).unfocus();
@@ -168,11 +158,11 @@ class _TermEditState extends State<TermEdit> {
_isLoading = true;
});
try {
// final contentsEng = jsonEncode(_controllerEng.document);
// final contentsMm = jsonEncode(_controllerMm.document);
final contentsEng = jsonEncode(_controllerEng.document);
final contentsMm = jsonEncode(_controllerMm.document);
// print('contents => $contentsEng');
// TermModel termModel = Provider.of<TermModel>(context, listen: false);
// await termModel.saveTerm(Term(termEng: contentsEng, termMm: contentsMm));
TermModel termModel = Provider.of<TermModel>(context, listen: false);
await termModel.saveTerm(Term(termEng: contentsEng, termMm: contentsMm));
} catch (e) {
showMsgDialog(context, "Error", e.toString());
} finally {

60
lib/pages/term/term_page.dart
View File

@@ -10,7 +10,7 @@ import 'package:fcs/pages/widgets/local_text.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
// import 'package:zefyr/zefyr.dart';
import 'package:zefyrka/zefyrka.dart';
typedef void ProfileCallback();
@@ -23,29 +23,29 @@ class TermPage extends StatefulWidget {
}
class _TermPageState extends State<TermPage> {
// ZefyrController _controller;
// FocusNode _focusNode;
// NotusDocument document = new NotusDocument();
late ZefyrController _controller;
late FocusNode _focusNode;
late NotusDocument document = new NotusDocument();
bool isLoading = false;
@override
void initState() {
super.initState();
// _focusNode = FocusNode();
_focusNode = FocusNode();
}
// NotusDocument _loadDocument(Setting setting) {
// bool isEng = Provider.of<LanguageModel>(context).isEng;
// String term = isEng ? setting.termsEng : setting.termsMm;
// NotusDocument doc;
// try {
// doc = NotusDocument.fromJson(jsonDecode(term));
// } catch (e) {}
// if (doc == null) {
// doc = NotusDocument();
// }
// return doc;
// }
NotusDocument _loadDocument(Setting? setting) {
bool isEng = Provider.of<LanguageModel>(context).isEng;
String? term = isEng ? (setting!.termsEng ?? "") : (setting!.termsMm ?? "");
late NotusDocument doc;
try {
doc = NotusDocument.fromJson(jsonDecode(term));
} catch (e) {}
if (doc == null) {
doc = NotusDocument();
}
return doc;
}
@override
Widget build(BuildContext context) {
@@ -79,31 +79,17 @@ class _TermPageState extends State<TermPage> {
TermEdit(term: Term.fromSetting(setting!)),
)),
icon: Icon(
CupertinoIcons.pen,
Icons.edit,
color: primaryColor,
))
]
: [],
),
// body: ZefyrTheme(
// data: ZefyrThemeData().copyWith(
// defaultLineTheme: LineTheme(
// padding: EdgeInsets.all(0),
// textStyle: TextStyle(fontFamily: "Myanmar3"),
// ),
// ),
// // data: ZefyrThemeData().copyWith(
// // defaultLineTheme: LineTheme(
// // textStyle: TextStyle(color: Colors.black),
// // padding: EdgeInsets.all(0))),
// child: ZefyrScaffold(
// child: ZefyrEditor(
// mode: ZefyrMode.view,
// padding: EdgeInsets.all(16),
// controller: ZefyrController(_loadDocument(setting)),
// focusNode: _focusNode,
// ),
// )),
body: ZefyrEditor(
padding: EdgeInsets.all(16),
controller: ZefyrController(_loadDocument(setting)),
focusNode: _focusNode,
),
);
}
}