diff --git a/assets/images/Essen.png b/assets/images/Essen.png
new file mode 100644
index 0000000..d828dc1
Binary files /dev/null and b/assets/images/Essen.png differ
diff --git a/assets/images/Familie.png b/assets/images/Familie.png
new file mode 100644
index 0000000..48a0225
Binary files /dev/null and b/assets/images/Familie.png differ
diff --git a/assets/images/Filter Wann.png b/assets/images/Filter Wann.png
new file mode 100644
index 0000000..d9ea876
Binary files /dev/null and b/assets/images/Filter Wann.png differ
diff --git a/assets/images/Footer.png b/assets/images/Footer.png
new file mode 100644
index 0000000..eef162a
Binary files /dev/null and b/assets/images/Footer.png differ
diff --git a/assets/images/Frame-1.png b/assets/images/Frame-1.png
new file mode 100644
index 0000000..4560368
Binary files /dev/null and b/assets/images/Frame-1.png differ
diff --git a/assets/images/Frame-2.png b/assets/images/Frame-2.png
new file mode 100644
index 0000000..4560368
Binary files /dev/null and b/assets/images/Frame-2.png differ
diff --git a/assets/images/Frame-3.png b/assets/images/Frame-3.png
new file mode 100644
index 0000000..e1efe06
Binary files /dev/null and b/assets/images/Frame-3.png differ
diff --git a/assets/images/Frame.png b/assets/images/Frame.png
new file mode 100644
index 0000000..7c01c73
Binary files /dev/null and b/assets/images/Frame.png differ
diff --git a/assets/images/Gesundheit.png b/assets/images/Gesundheit.png
new file mode 100644
index 0000000..b065bde
Binary files /dev/null and b/assets/images/Gesundheit.png differ
diff --git a/assets/images/Header.png b/assets/images/Header.png
new file mode 100644
index 0000000..d0b4d0c
Binary files /dev/null and b/assets/images/Header.png differ
diff --git a/assets/images/Login.png b/assets/images/Login.png
new file mode 100644
index 0000000..7831ea9
Binary files /dev/null and b/assets/images/Login.png differ
diff --git a/assets/images/Musik.png b/assets/images/Musik.png
new file mode 100644
index 0000000..ff66b97
Binary files /dev/null and b/assets/images/Musik.png differ
diff --git a/assets/images/Nachtleben.png b/assets/images/Nachtleben.png
new file mode 100644
index 0000000..c05000b
Binary files /dev/null and b/assets/images/Nachtleben.png differ
diff --git a/assets/images/Soziales.png b/assets/images/Soziales.png
new file mode 100644
index 0000000..65941af
Binary files /dev/null and b/assets/images/Soziales.png differ
diff --git a/assets/images/Sport.png b/assets/images/Sport.png
new file mode 100644
index 0000000..b596034
Binary files /dev/null and b/assets/images/Sport.png differ
diff --git a/assets/images/logo.svg b/assets/images/logo.svg
deleted file mode 100644
index 6750fba..0000000
--- a/assets/images/logo.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index c249f92..b670c3a 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -14,9 +14,11 @@ class HomePage extends StatelessWidget {
padding: const EdgeInsets.all(8.0),
height: 96,
color: Colors.white,
- alignment: Alignment.center,
- child: Column(
+ alignment: Alignment.bottomLeft,
+ child: Row(
children: [
+ //height of button
+ //width of button
SizedBox(
height: 70, //height of button
//width of button
@@ -25,6 +27,46 @@ class HomePage extends StatelessWidget {
onPressed: () {},
),
),
+ SizedBox(
+ height: 60, //height of button
+ //width of button
+ width: 10,
+ ),
+ const SizedBox(
+ width: 100.0,
+ child: TextField(
+ decoration: InputDecoration(
+ hintStyle: TextStyle(color: Colors.blue),
+ hintText: "Ingolstadt")),
+ ),
+ SizedBox(
+ height: 60, //height of button
+ //width of button
+ width: 20,
+ ),
+ SizedBox(
+ height: 60, //height of button
+ //width of button
+ child: IconButton(
+ icon: Icon(Icons.search),
+ onPressed: () {},
+ ),
+ ),
+ const VerticalDivider(
+ width: 20,
+ thickness: 1,
+ indent: 20,
+ endIndent: 0,
+ color: Colors.grey,
+ ),
+ SizedBox(
+ height: 60, //height of button
+ //width of button
+ child: IconButton(
+ icon: Image.asset('assets/images/Login.png'),
+ onPressed: () {},
+ ),
+ ),
],
),
),
@@ -57,11 +99,11 @@ class HomePage extends StatelessWidget {
child: GridView.builder(
shrinkWrap: false,
itemCount: Data.recipes.length,
- gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+ gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2),
itemBuilder: (BuildContext context, int index) {
return Padding(
- padding: const EdgeInsets.all(8.0),
+ padding: const EdgeInsets.all(6.0),
child: InkWell(
onTap: () {
Navigator.push(
@@ -72,9 +114,16 @@ class HomePage extends StatelessWidget {
)));
},
child: Card(
- color: Color(0xff8DB646),
+ color: Color.fromARGB(255, 249, 171, 21),
+ //color: Color.fromARGB(255, 253, 73, 73), //FD4949 //Nachtleben
+ //color: Color.fromARGB(255, 80, 168, 250), //50A8FA//Kunst
+ //color: Color.fromARGB(255, 80, 240, 250), //50F0FA //Sport
+ //color: Color.fromARGB(255, 130, 73, 253), //8249FD //Gesundheit
+ //color: Color.fromARGB(255, 253, 73, 73), //FD4949//Essen
+ //color: Color.fromARGB(255, 255, 0, 199), //FF00C7//Soziales
+ //color: Color.fromARGB(255, 66, 255, 0), //42FF00//Familie
shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(8.0),
+ borderRadius: BorderRadius.circular(6.0),
),
child: Container(
width: MediaQuery.of(context).size.width / 2,
@@ -84,13 +133,13 @@ class HomePage extends StatelessWidget {
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.only(
- topLeft: Radius.circular(8.0),
- topRight: Radius.circular(8.0),
+ topLeft: Radius.circular(6.0),
+ topRight: Radius.circular(6.0),
),
child: Hero(
tag: Data.recipes[index].id,
child: FadeInImage(
- image: NetworkImage(
+ image: AssetImage(
Data.recipes[index].imageUrl),
fit: BoxFit.cover,
placeholder: AssetImage(
@@ -99,16 +148,16 @@ class HomePage extends StatelessWidget {
),
),
),
+ Text(
+ Data.recipes[index].title,
+ style: TextStyle(
+ color: Colors.white,
+ fontSize: 20,
+ fontWeight: FontWeight.bold),
+ ),
Padding(
- padding: const EdgeInsets.all(4.0),
- child: Text(
- Data.recipes[index].title,
- style: TextStyle(
- color: Theme.of(context).primaryColor,
- fontSize: 20,
- fontWeight: FontWeight.bold),
- ),
- )
+ padding: const EdgeInsets.all(2.0),
+ ),
],
),
),
@@ -131,72 +180,6 @@ class HomePage extends StatelessWidget {
),
);
- var body2 = Container(
- color: Color(0xff263341), //Theme.of(context).primaryColor,
- child: GridView.builder(
- shrinkWrap: false,
- itemCount: Data.recipes.length,
- gridDelegate:
- SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2),
- itemBuilder: (BuildContext context, int index) {
- return Padding(
- padding: const EdgeInsets.all(8.0),
- child: InkWell(
- onTap: () {
- Navigator.push(
- context,
- MaterialPageRoute(
- builder: (context) => DetailsPage(
- recipe: Data.recipes[index],
- )));
- },
- child: Card(
- color: Color(0xff8DB646),
- shape: RoundedRectangleBorder(
- borderRadius: BorderRadius.circular(8.0),
- ),
- child: Container(
- width: MediaQuery.of(context).size.width / 2,
- height: 50,
- child: Column(
- children: [
- Expanded(
- child: ClipRRect(
- borderRadius: BorderRadius.only(
- topLeft: Radius.circular(8.0),
- topRight: Radius.circular(8.0),
- ),
- child: Hero(
- tag: Data.recipes[index].id,
- child: FadeInImage(
- image:
- NetworkImage(Data.recipes[index].imageUrl),
- fit: BoxFit.cover,
- placeholder:
- AssetImage('assets/images/loading.gif'),
- ),
- ),
- ),
- ),
- Padding(
- padding: const EdgeInsets.all(4.0),
- child: Text(
- Data.recipes[index].title,
- style: TextStyle(
- color: Theme.of(context).primaryColor,
- fontSize: 20,
- fontWeight: FontWeight.bold),
- ),
- )
- ],
- ),
- ),
- ),
- ),
- );
- }),
- );
-
return Scaffold(
/* appBar: AppBar(
centerTitle: true,
diff --git a/lib/utils/data.dart b/lib/utils/data.dart
index ff960bf..5c06cbc 100644
--- a/lib/utils/data.dart
+++ b/lib/utils/data.dart
@@ -4,9 +4,8 @@ class Data {
static List recipes = [
Recipe(
id: '1',
- title: 'Mo:Mo',
- imageUrl:
- 'https://images.unsplash.com/photo-1496116218417-1a781b1c416c?ixlib=rb-1.2.1&auto=format&fit=crop&w=750&q=80',
+ title: 'Musik',
+ imageUrl: 'assets/images/Musik.png',
nutrients: [
Nutrients(name: 'Calories', weight: '200', percent: 0.7),
Nutrients(name: 'Protein', weight: '10gm', percent: 0.5),
@@ -25,9 +24,8 @@ class Data {
]),
Recipe(
id: '2',
- title: 'Cappuccino',
- imageUrl:
- 'https://images.unsplash.com/photo-1444418185997-1145401101e0?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1391&q=80',
+ title: 'Nachtleben',
+ imageUrl: 'assets/images/Nachtleben.png',
nutrients: [
Nutrients(name: 'Calories', weight: '200', percent: 0.7),
Nutrients(name: 'Protein', weight: '10gm', percent: 0.5),
@@ -46,9 +44,8 @@ class Data {
]),
Recipe(
id: '3',
- title: 'Spaghetti',
- imageUrl:
- 'https://images.unsplash.com/photo-1473093295043-cdd812d0e601?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=750&q=80',
+ title: 'Kunst & Kultur',
+ imageUrl: 'assets/images/Soziales.png',
nutrients: [
Nutrients(name: 'Calories', weight: '100', percent: 0.2),
Nutrients(name: 'Protein', weight: '10gm', percent: 0.7),
@@ -68,9 +65,8 @@ class Data {
]),
Recipe(
id: '4',
- title: 'Pizza',
- imageUrl:
- 'https://images.unsplash.com/photo-1506354666786-959d6d497f1a?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=750&q=80',
+ title: 'Sport & Verein',
+ imageUrl: 'assets/images/Sport.png',
nutrients: [
Nutrients(name: 'Calories', weight: '200', percent: 0.7),
Nutrients(name: 'Protein', weight: '10gm', percent: 0.5),