Skip to content

Commit 56cc091

Browse files
committed
refactor: change homepage code
1 parent 9067443 commit 56cc091

File tree

8 files changed

+540
-531
lines changed

8 files changed

+540
-531
lines changed

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ app.*.map.json
4646
/android/app/debug
4747
/android/app/profile
4848
/android/app/release
49+
pubspec.lock

Diff for: lib/controller/theme_controller.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ class ThemeController extends GetxController {
77
late ThemeData apptheme;
88

99
@override
10-
void onReady() {
10+
void onInit() {
1111
super.onInit();
1212
onUpdate();
13-
update();
1413
}
1514

1615
void onUpdate() {
1716
apptheme = ThemeData(
1817
useMaterial3: true,
1918
colorSchemeSeed: ColorSeed.values[int.parse(user["color"] ?? "0")].color,
2019
);
20+
update();
2121
}
2222
}

Diff for: lib/main.dart

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import 'package:cookie_jar/cookie_jar.dart';
1818
import 'package:flutter/material.dart';
1919
import 'package:path_provider/path_provider.dart';
2020
import 'package:watermeter/controller/theme_controller.dart';
21-
import 'package:watermeter/page/widget.dart';
2221
import 'package:watermeter/repository/general.dart';
2322
import 'package:watermeter/model/user.dart';
2423
import 'package:watermeter/page/home.dart';

Diff for: lib/page/home.dart

+4-33
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:watermeter/page/homepage/homepage.dart';
33
import 'package:watermeter/page/setting/setting.dart';
4+
import 'package:watermeter/page/widget.dart';
45
import 'package:watermeter/page/xidian_directory/xidian_directory.dart';
56

67
class PageInformation {
@@ -61,9 +62,6 @@ class _HomePageState extends State<HomePage> {
6162
const SettingWindow(),
6263
];
6364

64-
bool _isPhone(context) => MediaQuery.of(context).size.width < 600;
65-
bool _isDesktop(context) => MediaQuery.of(context).size.width > 840;
66-
6765
Widget _buildPhone() => Scaffold(
6866
body: _page[_selectedIndex],
6967
bottomNavigationBar: NavigationBar(
@@ -107,31 +105,8 @@ class _HomePageState extends State<HomePage> {
107105
_selectedIndex = index;
108106
});
109107
},
110-
),
111-
Expanded(child: _page[_selectedIndex]),
112-
],
113-
),
114-
),
115-
);
116-
117-
Widget _buildDesktop() => Scaffold(
118-
body: SafeArea(
119-
child: Row(
120-
children: [
121-
NavigationDrawer(
122-
selectedIndex: _selectedIndex,
123-
onDestinationSelected: (int index) {
124-
setState(() {
125-
_selectedIndex = index;
126-
});
127-
},
128-
children: destinations
129-
.map((e) => NavigationDrawerDestination(
130-
label: Text(e.name),
131-
icon: Icon(e.icon),
132-
selectedIcon: Icon(e.iconChoice),
133-
))
134-
.toList(),
108+
leading: const Icon(Icons.person),
109+
extended: isDesktop(context),
135110
),
136111
Expanded(child: _page[_selectedIndex]),
137112
],
@@ -141,10 +116,6 @@ class _HomePageState extends State<HomePage> {
141116

142117
@override
143118
Widget build(BuildContext context) {
144-
return _isPhone(context)
145-
? _buildPhone()
146-
: _isDesktop(context)
147-
? _buildDesktop()
148-
: _buildPad();
119+
return isPhone(context) ? _buildPhone() : _buildPad();
149120
}
150121
}

0 commit comments

Comments
 (0)