Skip to content

Commit b5666ce

Browse files
author
storm265
committed
set statusbar/renaming appbar
1 parent 17713c1 commit b5666ce

File tree

6 files changed

+53
-50
lines changed

6 files changed

+53
-50
lines changed
0 Bytes
Binary file not shown.

android/local.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
sdk.dir=/Users/ladmin/Library/Android/sdk
22
flutter.sdk=/Users/ladmin/Documents/flutter
33
flutter.buildMode=debug
4-
flutter.versionName=1.1.7
4+
flutter.versionName=1.1.8
55
flutter.versionCode=1

lib/main.dart

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,26 @@
11
import 'package:flutter/material.dart';
2+
import 'package:flutter/services.dart';
23
import 'package:todo/services/common/default_category_provider.dart';
34
import 'package:todo/data/database/local_storage_initializer.dart';
45
import 'package:todo/services/locator_service.dart';
56
import 'package:todo/services/route_service/route_service.dart';
67

78
void main() async {
89
WidgetsFlutterBinding.ensureInitialized();
10+
SystemChrome.setSystemUIOverlayStyle(
11+
const SystemUiOverlayStyle(
12+
statusBarColor: Colors.transparent,
13+
14+
/// for android
15+
statusBarIconBrightness: Brightness.dark,
16+
17+
/// for ios
18+
statusBarBrightness: Brightness.dark,
19+
),
20+
);
921
await LocalStorageInitializer.registerAdapters();
1022
await LocalStorageInitializer.openAllBoxes();
23+
1124
initDependencies();
1225

1326
await DefaultCategoryProvider.fillDefaultCategory();

lib/screens/task_list/task_list_page.dart

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:auto_route/auto_route.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:flutter/services.dart';
43
import 'package:todo/data/model/archieve/archieve_db.dart';
54
import 'package:todo/data/model/category/category_model.dart';
65
import 'package:todo/data/model/tasks/task_model.dart';
@@ -12,7 +11,7 @@ import 'package:todo/screens/widgets/drawer_widget.dart';
1211
import 'package:todo/screens/task_list/widgets/current_date_widget.dart';
1312
import 'package:todo/screens/task_list/widgets/day_line_widget.dart';
1413
import 'package:todo/screens/task_list/widgets/task_body/body/gradient_boxes.dart';
15-
import 'package:todo/screens/task_list/widgets/schedule_appbar_widget.dart';
14+
import 'package:todo/screens/task_list/widgets/schedule_top_widget.dart';
1615
import 'package:todo/screens/task_list/widgets/task_body/dialogs/task_list_options_dialog.dart';
1716
import 'package:todo/screens/task_list/widgets/tasks_list.dart';
1817
import 'package:todo/services/common/category_index_provider.dart';
@@ -44,49 +43,44 @@ class _TaskListPageState extends State<TaskListPage> {
4443

4544
@override
4645
Widget build(BuildContext context) {
47-
return AnnotatedRegion(
48-
value: SystemUiOverlayStyle.light,
49-
child: SafeArea(
46+
return Scaffold(
47+
floatingActionButton: FloatingActionButton(
48+
onPressed: () async => await TaskListOptionsDialog.showOptionsDialog(
49+
buildContext: context,
50+
taskListController: _taskListController,
51+
),
52+
child: const Icon(Icons.add),
53+
),
54+
drawer: const CustomDrawerWidget(),
55+
body: SafeArea(
5056
left: false,
5157
right: false,
52-
bottom: false,
53-
child: Scaffold(
54-
floatingActionButton: FloatingActionButton(
55-
onPressed: () async =>
56-
await TaskListOptionsDialog.showOptionsDialog(
57-
buildContext: context,
58+
child: Column(
59+
children: [
60+
Container(
61+
decoration: BodyColors.schreduleBody,
62+
child: Column(
63+
children: <Widget>[
64+
const ScheduleTopWidget(),
65+
CurrentDateWidget(
66+
selectedDay: _taskListController.selectedDate.value,
67+
),
68+
DayLineWidget(
69+
taskListController: _taskListController,
70+
changeDay: (value) {
71+
setState(() {
72+
_taskListController.selectedDate.value = value;
73+
});
74+
},
75+
),
76+
],
77+
),
78+
),
79+
TaskList(
5880
taskListController: _taskListController,
81+
selectedDate: _taskListController.selectedDate.value,
5982
),
60-
child: const Icon(Icons.add),
61-
),
62-
drawer: const CustomDrawerWidget(),
63-
body: Column(
64-
children: [
65-
Container(
66-
decoration: BodyColors.schreduleBody,
67-
child: Column(
68-
children: <Widget>[
69-
const ScheduleAppBarWidget(),
70-
CurrentDateWidget(
71-
selectedDay: _taskListController.selectedDate.value,
72-
),
73-
DayLineWidget(
74-
taskListController: _taskListController,
75-
changeDay: (value) {
76-
setState(() {
77-
_taskListController.selectedDate.value = value;
78-
});
79-
},
80-
),
81-
],
82-
),
83-
),
84-
TaskList(
85-
taskListController: _taskListController,
86-
selectedDate: _taskListController.selectedDate.value,
87-
),
88-
],
89-
),
83+
],
9084
),
9185
),
9286
);

lib/screens/task_list/widgets/schedule_appbar_widget.dart renamed to lib/screens/task_list/widgets/schedule_top_widget.dart

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22

3-
class ScheduleAppBarWidget extends StatelessWidget {
4-
const ScheduleAppBarWidget({super.key});
3+
class ScheduleTopWidget extends StatelessWidget {
4+
const ScheduleTopWidget({super.key});
55

66
@override
77
Widget build(BuildContext context) {
@@ -20,11 +20,7 @@ class ScheduleAppBarWidget extends StatelessWidget {
2020
color: Colors.white,
2121
),
2222
),
23-
IconButton(
24-
icon: const Icon(Icons.menu),
25-
color: Colors.transparent,
26-
onPressed: () {},
27-
),
23+
const SizedBox(),
2824
],
2925
);
3026
}

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: todo
22
description: A new Flutter project.
33
publish_to: 'none'
4-
version: 1.1.7+1
4+
version: 1.1.8+1
55

66
environment:
77
sdk: ">=2.18.0 <4.0.0"

0 commit comments

Comments
 (0)