Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hw4 check #5

Open
wants to merge 45 commits into
base: homework1
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
241c697
navigation page, welcome page, global theme in progress
medvalna Jun 19, 2023
93d6aa8
minor changes, start of adding bloc
medvalna Jun 20, 2023
04f5599
added bloc
medvalna Jun 20, 2023
3ace142
added counting of competed task
medvalna Jun 20, 2023
c21ed3f
start of adding persistence manager
medvalna Jun 22, 2023
addb9c5
try to add persistence
medvalna Jun 23, 2023
720dbfd
minor changes
medvalna Jun 23, 2023
13d6919
minor changes
medvalna Jun 23, 2023
48c0806
minor changes
medvalna Jun 23, 2023
a4f97d9
added persistence manager, logger
medvalna Jun 23, 2023
021bf07
fixed appbar size
medvalna Jun 23, 2023
6299bd0
fixed counter
medvalna Jun 23, 2023
9849b7e
added internationalization
medvalna Jun 24, 2023
0160f2f
adding apk 2.0
medvalna Jun 24, 2023
28f0ba8
Update README.md
medvalna Jun 24, 2023
30bbc3d
added calendar
medvalna Jul 1, 2023
5ffcf4f
added importance
medvalna Jul 2, 2023
26a7750
changed appbar
medvalna Jul 4, 2023
74a24d0
ignore app-debug.apk
medvalna Jul 4, 2023
f1e0ac0
changed readme
medvalna Jul 4, 2023
3fcbcee
added english version of importance
medvalna Jul 4, 2023
3483111
added some comments, minor changes
medvalna Jul 4, 2023
6a4833c
fixed bug with dismissible
medvalna Jul 4, 2023
cf01e97
changed project structure& added simple backend manager
medvalna Jul 4, 2023
6e27d13
fixed bug in choosing importance of task
medvalna Jul 5, 2023
aa79bb0
formatted code & fixed flutter lints errors
medvalna Jul 5, 2023
1bfd699
changed readmefile
medvalna Jul 5, 2023
4025efd
fixed bug with showing zero processed tasks
medvalna Jul 7, 2023
b43f88c
fixed bug with edditing task
medvalna Jul 7, 2023
5d817f0
work with backend
medvalna Jul 10, 2023
c154c67
removed debug button in ui
medvalna Jul 11, 2023
e2a3210
fixed bug with importance choice in editing page
medvalna Jul 11, 2023
8ae856c
splitted bloc on 2 parts
medvalna Jul 11, 2023
6c5acc0
splitted bloc on 2 parts
medvalna Jul 11, 2023
4abf90e
fixed bug in edditing page
medvalna Jul 11, 2023
6a82043
added icon and landscape feature
medvalna Jul 13, 2023
97c45af
added text layout
medvalna Jul 13, 2023
5cd1093
work with network
medvalna Jul 13, 2023
4736546
added remote config
medvalna Jul 14, 2023
091bdc9
dark theme and working app metrica
medvalna Jul 15, 2023
cde4824
formatted code
medvalna Jul 15, 2023
40ebfdc
resolving bug with remote config
medvalna Jul 16, 2023
f9bd759
minor changes
medvalna Jul 16, 2023
8d64310
prepare for checking
medvalna Jul 16, 2023
53d8bed
minor changes
medvalna Jul 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed bug with edditing task
medvalna committed Jul 7, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit b43f88cf98663337cb9cea9f6e588d9355444713
20 changes: 11 additions & 9 deletions lib/ui/pages/add_screen.dart
Original file line number Diff line number Diff line change
@@ -14,10 +14,6 @@ import '../../models/todo.dart';
*
* */

/*
* TODO: исправить баг с демонстрацией выбора важности в dropdown widget
*
* */
class AddScreen extends StatefulWidget {
const AddScreen({super.key, required this.editing, required this.item});

@@ -31,8 +27,14 @@ class AddScreen extends StatefulWidget {
class _AddScreenState extends State<AddScreen> {
final TextEditingController _controller = TextEditingController();
bool _getDate = false;
late String dropdownValue = AppLocalizations.of(context).no;
String date = "";
late String dropdownValue = !widget.editing
? AppLocalizations.of(context).no
: widget.item?.importance == 0
? AppLocalizations.of(context).no
: widget.item?.importance == 1
? AppLocalizations.of(context).low
: AppLocalizations.of(context).high;
late String? date = !widget.editing ? "" : widget.item?.date;
int importance = 0;

@override
@@ -118,15 +120,15 @@ class _AddScreenState extends State<AddScreen> {
context.read<TileListBloc>().add(ChangeTile(
item: widget.item!,
text: _controller.text,
date: date,
date: date!,
importance: importance)),
_onGoBack(),
}
else
{
context.read<TileListBloc>().add(AddTile(
text: _controller.text,
date: date,
date: date!,
importance: importance)),
_onGoBack(),
}
@@ -232,7 +234,7 @@ class _AddScreenState extends State<AddScreen> {
color: mainText, fontSize: body),
),
Text(
date,
date!,
style:
const TextStyle(color: add, fontSize: subhead),
),