Skip to content

Commit bb2eb9b

Browse files
committed
card design kinda done?
1 parent 95da3e0 commit bb2eb9b

File tree

5 files changed

+57
-12
lines changed

5 files changed

+57
-12
lines changed

assets/images/dummy-national-park.jpg

2.64 MB
Loading

lib/main.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class _MyAppState extends State<MyApp> {
4242
title: "Harmony",
4343
theme: ThemeData(
4444
fontFamily: "Montserrat",
45-
primaryColor: const Color(0xff00CA9D)
45+
primaryColor: const Color(0xff00CA9D),
46+
colorScheme: ColorScheme.fromSwatch().copyWith(secondary: const Color(0xff00CA9D))
4647
),
4748
debugShowCheckedModeBanner: false,
4849
initialRoute: initialRoute,

lib/views/discover/discover_page.dart

+15-2
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,21 @@ class DiscoverPageState extends State<DiscoverPage> {
129129
onTap: () {},
130130
child: Column(
131131
children: [
132-
Image.asset('assets/card-sample-image.jpg'),
133-
const Text('Great place for a picnic!'),
132+
Image.asset('assets/images/dummy-national-park.jpg'),
133+
const Align(
134+
alignment: Alignment.centerLeft,
135+
child: Padding(
136+
padding: EdgeInsets.only(top: 10, bottom: 5, left: 10),
137+
child: Text('Great place for a picnic!', style: TextStyle(fontSize: 20)),
138+
),
139+
),
140+
const Align(
141+
alignment: Alignment.centerLeft,
142+
child: Padding(
143+
padding: EdgeInsets.only(bottom: 5, left: 10),
144+
child: Text('4.2/5.0 • 1.3KM Nearby', style: TextStyle(fontSize: 14)),
145+
),
146+
)
134147
],
135148
),
136149
),

lib/widgets/general_use/harmony_bottom_navigation_bar.dart

+39-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
3-
import 'package:harmony/utilites/constants.dart';
43
import 'package:harmony/utilites/page_enum.dart';
54
import 'package:harmony/views/account/account_page.dart';
65
import 'package:harmony/views/add_place/add_place.dart';
@@ -18,19 +17,50 @@ class HarmonyBottomNavigationBar extends StatelessWidget {
1817
return Row(
1918
mainAxisAlignment: MainAxisAlignment.spaceAround,
2019
children: [
21-
Icon(
22-
FontAwesomeIcons.compass,
20+
IconButton(
21+
icon: Icon(
22+
FontAwesomeIcons.compass,
2323
color: currPage == PAGE_ENUM.DISCOVER_PAGE ? _activeColor : _inactiveColor,
24+
25+
),
26+
onPressed: () => Navigator.pushReplacement(
27+
28+
context,
29+
PageRouteBuilder(
30+
pageBuilder: (context, animation1, animation2) => DiscoverPage(),
31+
transitionDuration: Duration(seconds: 1),
32+
),
33+
),
2434
),
25-
Icon(
26-
Icons.add_box_outlined,
27-
color: currPage == PAGE_ENUM.NEARBY_PAGE ? _activeColor : _inactiveColor,
35+
IconButton(
36+
icon: Icon(
37+
Icons.add_box_outlined,
38+
color: currPage == PAGE_ENUM.NEARBY_PAGE ? _activeColor : _inactiveColor,
39+
),
40+
onPressed: () => Navigator.pushReplacement(
41+
42+
context,
43+
PageRouteBuilder(
44+
pageBuilder: (context, animation1, animation2) => AddPlace(), //TODO ACTUALLY NEARBY!!!
45+
transitionDuration: Duration(seconds: 1),
46+
),
47+
)
2848
),
29-
Icon(
30-
FontAwesomeIcons.user,
49+
IconButton(
50+
icon: Icon(
51+
FontAwesomeIcons.user,
3152
color: currPage == PAGE_ENUM.ACCOUNT_PAGE ? _activeColor : _inactiveColor,
53+
),
54+
onPressed: () => Navigator.pushReplacement(
55+
56+
context,
57+
PageRouteBuilder(
58+
pageBuilder: (context, animation1, animation2) => AccountPage(),
59+
transitionDuration: Duration(seconds: 1),
60+
),
61+
),//Navigator.pushReplacementNamed(context, routeName),
3262
)
3363
],
3464
);
3565
}
36-
}
66+
}

pubspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ flutter:
3333
assets:
3434
- assets/images/harmony.png
3535
- assets/images/dummy-profile-pic.png
36+
- assets/images/dummy-national-park.jpg
3637

3738
fonts:
3839
- family: Montserrat

0 commit comments

Comments
 (0)