Skip to content

Commit 928b6f1

Browse files
devout-coderdevout-coder
authored
Merge pull request #17 from devout-coder/rest
Rest
2 parents c29aff1 + df2dd70 commit 928b6f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1329
-845
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
.history
1010
.svn/
1111
migrate_working_dir/
12+
lib/ip.dart
1213

1314
# IntelliJ related
1415
*.iml

‎android/app/src/main/kotlin/com/example/doneify/KotlinMethodCalls.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ fun handleMethodCalls(context: Context, call: MethodCall?, result: MethodChannel
218218
} else if (call.method == "createTodo" || call.method == "updateTodo") {
219219
// methodChannel!!.invokeMethod("callBack", "data1")
220220
val id: String = call.argument<String>("id")!!
221-
Log.d("debugging", "kotlin side: tryna ${call.method}, $id")
221+
// Log.d("debugging", "kotlin side: tryna ${call.method}, $id")
222222
// Log.d("debugging", "in method call receiver: id = $id")
223223
val taskName: String = call.argument<String>("taskName")!!
224224
val taskDesc: String = call.argument<String>("taskDesc")!!
@@ -253,7 +253,7 @@ fun handleMethodCalls(context: Context, call: MethodCall?, result: MethodChannel
253253
}.start()
254254
} else if (call.method == "deleteTodo") {
255255
val id: String = call.argument<String>("id")!!
256-
Log.d("debugging", "kotlin side: tryna ${call.method}, $id")
256+
// Log.d("debugging", "kotlin side: tryna ${call.method}, $id")
257257
var reqTodo: Todo?
258258
Thread {
259259
val fetchedTodos: List<Todo> = todoDAO!!.getById(id)

‎android/app/src/main/kotlin/com/example/doneify/WidgetProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class WidgetProvider : HomeWidgetProvider() {
134134
R.id.each_todo_container_checkbox,
135135
todo.finished
136136
)
137-
Log.d("debugging", "task name is ${todo.taskName}")
137+
// Log.d("debugging", "task name is ${todo.taskName}")
138138

139139
val extras = Bundle().apply {
140140
putString("todoId", todo.id)

‎lib/components/AddOrEditLabelDialog.dart renamed to ‎lib/components/add_or_edit_label_dialog.dart

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import 'package:doneify/components/NewColorDialog.dart';
1+
import 'package:doneify/components/new_color_dialog.dart';
2+
import 'package:doneify/impClasses.dart';
3+
import 'package:doneify/pages/input_modal.dart';
24
import 'package:doneify/states/labelDAO.dart';
35
import 'package:flutter/material.dart';
46

@@ -8,11 +10,13 @@ import 'package:shared_preferences/shared_preferences.dart';
810

911
class AddOrEditLabelDialog extends StatefulWidget {
1012
final double curve;
13+
int? labelId;
1114
int? labelIndex;
1215

1316
AddOrEditLabelDialog({
1417
Key? key,
1518
required this.curve,
19+
this.labelId,
1620
this.labelIndex,
1721
}) : super(key: key);
1822

@@ -80,11 +84,15 @@ class _AddOrEditLabelDialogState extends State<AddOrEditLabelDialog> {
8084

8185
void saveLabel() {
8286
if (!labelPresent(tagName.text, selectedColor!)) {
83-
if (widget.labelIndex != null) {
87+
if (widget.labelId != null) {
8488
debugPrint("label has been edited");
85-
labelsDB.editLabel(tagName.text, selectedColor!, labelIndex!);
89+
labelsDB.editLabel(
90+
Label(widget.labelId!, tagName.text, selectedColor!.toString()),
91+
false);
8692
} else {
87-
labelsDB.addLabel(tagName.text, selectedColor!);
93+
labelsDB.addLabel(
94+
Label(getRandInt(10), tagName.text, selectedColor!.toString()),
95+
false);
8896
}
8997
Navigator.pop(context);
9098
} else {

‎lib/components/BlacklistedAppsDialog.dart renamed to ‎lib/components/blacklisted_apps_dialog.dart

File renamed without changes.

‎lib/components/BottomButtons.dart renamed to ‎lib/components/bottom_buttons.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:animations/animations.dart';
2-
import 'package:doneify/components/FiltersDialog.dart';
2+
import 'package:doneify/components/filters_dialog.dart';
33
import 'package:doneify/globalColors.dart';
4-
import 'package:doneify/pages/InputModal.dart';
4+
import 'package:doneify/pages/input_modal.dart';
55
import 'package:flutter/material.dart';
66

77
class BottomButtons extends StatefulWidget {

‎lib/components/EachDayCell.dart renamed to ‎lib/components/each_day_cell.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import 'package:doneify/components/EachWeekCell.dart';
1+
import 'package:doneify/components/each_week_cell.dart';
22
import 'package:doneify/globalColors.dart';
3-
import 'package:doneify/pages/Day.dart';
4-
import 'package:doneify/pages/Week.dart';
3+
import 'package:doneify/pages/day.dart';
4+
import 'package:doneify/pages/week.dart';
55
import 'package:flutter/material.dart';
66
import 'package:intl/intl.dart';
77
import 'package:syncfusion_flutter_datepicker/datepicker.dart';

‎lib/components/EachMonthCell.dart renamed to ‎lib/components/each_month_cell.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import 'package:doneify/components/EachWeekCell.dart';
1+
import 'package:doneify/components/each_week_cell.dart';
22
import 'package:doneify/globalColors.dart';
3-
import 'package:doneify/pages/Day.dart';
4-
import 'package:doneify/pages/Month.dart';
5-
import 'package:doneify/pages/Week.dart';
3+
import 'package:doneify/pages/day.dart';
4+
import 'package:doneify/pages/month.dart';
5+
import 'package:doneify/pages/week.dart';
66
import 'package:flutter/material.dart';
77
import 'package:intl/intl.dart';
88
import 'package:syncfusion_flutter_datepicker/datepicker.dart';

‎lib/components/EachTodo.dart renamed to ‎lib/components/each_todo.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import 'dart:convert';
22

33
import 'package:animations/animations.dart';
4-
import 'package:doneify/components/AddOrEditLabelDialog.dart';
4+
import 'package:doneify/components/add_or_edit_label_dialog.dart';
55
import 'package:doneify/impClasses.dart';
66
import 'package:doneify/navigatorKeys.dart';
7-
import 'package:doneify/pages/Day.dart';
8-
import 'package:doneify/pages/InputModal.dart';
9-
import 'package:doneify/pages/Month.dart';
10-
import 'package:doneify/pages/Todos.dart';
11-
import 'package:doneify/pages/Week.dart';
12-
import 'package:doneify/pages/Year.dart';
7+
import 'package:doneify/pages/day.dart';
8+
import 'package:doneify/pages/input_modal.dart';
9+
import 'package:doneify/pages/month.dart';
10+
import 'package:doneify/pages/todos.dart';
11+
import 'package:doneify/pages/week.dart';
12+
import 'package:doneify/pages/year.dart';
1313
import 'package:doneify/states/alarmDAO.dart';
1414
import 'package:doneify/states/labelDAO.dart';
1515
import 'package:flutter/material.dart';

‎lib/components/EachWeekCell.dart renamed to ‎lib/components/each_week_cell.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import 'package:doneify/components/SelectTimeDialog.dart';
1+
import 'package:doneify/components/select_time_dialog.dart';
22
import 'package:doneify/globalColors.dart';
3-
import 'package:doneify/pages/Week.dart';
3+
import 'package:doneify/pages/week.dart';
44
import 'package:flutter/material.dart';
55
import 'package:intl/intl.dart';
66
import 'package:syncfusion_flutter_datepicker/datepicker.dart';

0 commit comments

Comments
 (0)