Skip to content

update styling #1035

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

update styling #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/lib/screens/dao_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class _DaoPageState extends State<DaoPage> with SingleTickerProviderStateMixin {
indicatorColor: Theme.of(context).colorScheme.primary,
unselectedLabelColor: Theme.of(context).colorScheme.onSurface,
dividerColor: Theme.of(context).scaffoldBackgroundColor,
labelStyle: Theme.of(context).textTheme.titleLarge,
labelStyle: Theme.of(context).textTheme.titleMedium,
unselectedLabelStyle: Theme.of(context).textTheme.titleMedium,
tabs: const [
Tab(text: 'Active'),
Expand Down
5 changes: 3 additions & 2 deletions app/lib/screens/farm_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ class _FarmScreenState extends ConsumerState<FarmScreen>

_handleSuccess();
} on TimeoutException catch (e) {
_handleFailure('Loading farms timed out. Please check your network.', error: e);
_handleFailure('Loading farms timed out. Please check your network.',
error: e);
} on Exception catch (e) {
_handleFailure('Failed to load farms due to an unexpected error.',
error: e);
Expand Down Expand Up @@ -303,7 +304,7 @@ class _FarmScreenState extends ConsumerState<FarmScreen>
indicatorColor: Theme.of(context).colorScheme.primary,
unselectedLabelColor: Theme.of(context).colorScheme.onSurface,
dividerColor: Theme.of(context).scaffoldBackgroundColor,
labelStyle: Theme.of(context).textTheme.titleLarge,
labelStyle: Theme.of(context).textTheme.titleMedium,
unselectedLabelStyle: Theme.of(context).textTheme.titleMedium,
tabs: const [
Tab(text: 'V3'),
Expand Down
10 changes: 5 additions & 5 deletions app/lib/screens/registered_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,22 +93,22 @@ class _RegisteredScreenState extends State<RegisteredScreen>
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
HomeCardWidget(
name: 'Market',
icon: Icons.show_chart_sharp,
pageNumber: 6),
HomeCardWidget(
name: 'Dao',
icon: Icons.how_to_vote_outlined,
pageNumber: 4),
HomeCardWidget(
name: 'Sign', icon: Icons.draw_sharp, pageNumber: 9),
],
),
const Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
HomeCardWidget(
name: 'Market',
icon: Icons.show_chart_sharp,
pageNumber: 6),
name: 'Sign', icon: Icons.draw_sharp, pageNumber: 9),
HomeCardWidget(
name: 'News', icon: Icons.article, pageNumber: 1),
],
Expand Down
28 changes: 14 additions & 14 deletions app/lib/widgets/layout_drawer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,6 @@ class _LayoutDrawerState extends State<LayoutDrawer> {
globals.tabController.animateTo(0);
},
),
ListTile(
minLeadingWidth: 10,
leading: const Padding(
padding: EdgeInsets.only(left: 10),
child: Icon(Icons.article, size: 18)),
title: const Text('News'),
onTap: () {
Navigator.pop(context);
globals.tabController.animateTo(1);
},
),
ListTile(
minLeadingWidth: 10,
leading: const Padding(
Expand All @@ -142,6 +131,17 @@ class _LayoutDrawerState extends State<LayoutDrawer> {
)
else
Container(),
ListTile(
minLeadingWidth: 10,
leading: const Padding(
padding: EdgeInsets.only(left: 10),
child: Icon(Icons.show_chart_sharp, size: 18)),
title: const Text('Market'),
onTap: () {
Navigator.pop(context);
globals.tabController.animateTo(6);
},
),
ListTile(
minLeadingWidth: 10,
leading: const Padding(
Expand All @@ -168,11 +168,11 @@ class _LayoutDrawerState extends State<LayoutDrawer> {
minLeadingWidth: 10,
leading: const Padding(
padding: EdgeInsets.only(left: 10),
child: Icon(Icons.show_chart_sharp, size: 18)),
title: const Text('Market'),
child: Icon(Icons.article, size: 18)),
title: const Text('News'),
onTap: () {
Navigator.pop(context);
globals.tabController.animateTo(6);
globals.tabController.animateTo(1);
},
),
ListTile(
Expand Down