Skip to content

Commit 484d08b

Browse files
committed
Refactor home, add app drawer & bottom nav
1 parent b5c675e commit 484d08b

11 files changed

Lines changed: 309 additions & 273 deletions

app/lib/apps/news/news_screen.dart

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ class NewsScreen extends StatefulWidget {
1515
State<NewsScreen> createState() => _NewsScreenState();
1616
}
1717

18-
class _NewsScreenState extends State<NewsScreen>
19-
with AutomaticKeepAliveClientMixin {
18+
class _NewsScreenState extends State<NewsScreen> {
2019
final Xml2Json xml2json = Xml2Json();
2120
static const int articlesPerPage = 20;
2221
final PagingController<int, Map<String, dynamic>> _pagingController =
@@ -60,7 +59,6 @@ class _NewsScreenState extends State<NewsScreen>
6059

6160
@override
6261
Widget build(BuildContext context) {
63-
super.build(context);
6462
return RefreshIndicator(
6563
onRefresh: () async => _pagingController.refresh(),
6664
child: PagedListView<int, Map<String, dynamic>>(
@@ -184,7 +182,4 @@ class _NewsScreenState extends State<NewsScreen>
184182
await launchUrl(uri);
185183
}
186184
}
187-
188-
@override
189-
bool get wantKeepAlive => true;
190185
}

app/lib/screens/council_screen.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class CouncilScreen extends StatefulWidget {
1010
State<CouncilScreen> createState() => _CouncilScreenState();
1111
}
1212

13-
class _CouncilScreenState extends State<CouncilScreen> with AutomaticKeepAliveClientMixin {
13+
class _CouncilScreenState extends State<CouncilScreen> {
1414
final urlController = TextEditingController();
1515
String? errorMessage;
1616
String? selectedNetwork = '';
@@ -56,7 +56,6 @@ class _CouncilScreenState extends State<CouncilScreen> with AutomaticKeepAliveCl
5656

5757
@override
5858
Widget build(BuildContext context) {
59-
super.build(context);
6059
final content = Padding(
6160
padding: const EdgeInsets.all(16.0),
6261
child: KeyboardVisibilityBuilder(builder: (context, isKeyboardVisible) {
@@ -159,7 +158,4 @@ class _CouncilScreenState extends State<CouncilScreen> with AutomaticKeepAliveCl
159158
}));
160159
return content;
161160
}
162-
163-
@override
164-
bool get wantKeepAlive => true;
165161
}

app/lib/screens/dao_screen.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class DaoPage extends StatefulWidget {
1111
State<DaoPage> createState() => _DaoPageState();
1212
}
1313

14-
class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
14+
class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin {
1515
final List<Proposal> activeList = [];
1616
final List<Proposal> inactiveList = [];
1717
bool loading = true;
@@ -66,7 +66,6 @@ class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin,
6666

6767
@override
6868
Widget build(BuildContext context) {
69-
super.build(context);
7069
Widget content;
7170
if (loading) {
7271
content = Center(
@@ -151,7 +150,4 @@ class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin,
151150
}
152151
return content;
153152
}
154-
155-
@override
156-
bool get wantKeepAlive => true;
157153
}

app/lib/screens/farm_screen.dart

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class FarmScreen extends ConsumerStatefulWidget {
2323
}
2424

2525
class _FarmScreenState extends ConsumerState<FarmScreen>
26-
with SingleTickerProviderStateMixin, AutomaticKeepAliveClientMixin {
26+
with SingleTickerProviderStateMixin {
2727
registrar.RegistrarClient? registrarClient;
2828
List<Farm> v3Farms = [];
2929
List<Farm> v4Farms = [];
@@ -32,9 +32,6 @@ class _FarmScreenState extends ConsumerState<FarmScreen>
3232
bool loading = true;
3333
late final TabController _tabController;
3434

35-
@override
36-
bool get wantKeepAlive => true;
37-
3835
@override
3936
void initState() {
4037
super.initState();
@@ -222,7 +219,6 @@ class _FarmScreenState extends ConsumerState<FarmScreen>
222219

223220
@override
224221
Widget build(BuildContext context) {
225-
super.build(context);
226222
Widget mainContent;
227223
if (loading) {
228224
mainContent = Center(

0 commit comments

Comments
 (0)