diff --git a/assets/images/FooterFooter.png b/assets/images/FooterFooter.png index 96e6dd6..f673d6f 100644 Binary files a/assets/images/FooterFooter.png and b/assets/images/FooterFooter.png differ diff --git a/lib/main.dart b/lib/main.dart index c72a4af..25ead22 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:learn_project/screens/home.dart'; +import 'package:Emma_home/screens/home.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; import 'screens/MainScreen.dart'; //import 'package:learn_project/screens/account_page.dart'; diff --git a/lib/screens/account_page.dart b/lib/screens/account_page.dart index 192d117..93e9fea 100644 --- a/lib/screens/account_page.dart +++ b/lib/screens/account_page.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -import 'package:learn_project/screens/avatar.dart'; -import 'package:learn_project/main.dart'; +import 'package:Emma_home/screens/avatar.dart'; +import 'package:Emma_home/main.dart'; class AccountPage extends StatefulWidget { const AccountPage({super.key}); diff --git a/lib/screens/avatar.dart b/lib/screens/avatar.dart index 9c2d6b0..039fb20 100644 --- a/lib/screens/avatar.dart +++ b/lib/screens/avatar.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -import 'package:learn_project/main.dart'; +import 'package:Emma_home/main.dart'; class Avatar extends StatefulWidget { const Avatar({ diff --git a/lib/screens/detail_widget.dart b/lib/screens/detail_widget.dart index 7370403..b2698bd 100644 --- a/lib/screens/detail_widget.dart +++ b/lib/screens/detail_widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:learn_project/screens/subheader_Datepicker.dart'; +import 'package:Emma_home/screens/subheader_Datepicker.dart'; //import 'package:learn_project/main.dart'; import 'package:intl/intl.dart'; //import 'package:supabase_flutter/supabase_flutter.dart'; diff --git a/lib/screens/home copy.dart b/lib/screens/home copy.dart index 032b2a6..33bba2a 100644 --- a/lib/screens/home copy.dart +++ b/lib/screens/home copy.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:learn_project/screens/details_db.dart'; -import 'package:learn_project/utils/data.dart'; -import 'package:learn_project/screens/subheader_Datepicker.dart'; +import 'package:Emma_home/screens/details_db.dart'; +import 'package:Emma_home/utils/data.dart'; +import 'package:Emma_home/screens/subheader_Datepicker.dart'; class HomePage extends StatelessWidget { const HomePage({super.key}); diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 8f3a43f..a653fb2 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; -import 'package:learn_project/screens/details_db.dart'; -import 'package:learn_project/utils/data.dart'; -import 'package:learn_project/screens/subheader_Datepicker.dart'; -import 'package:learn_project/screens/detail_widget.dart'; +import 'package:Emma_home/screens/details_db.dart'; +import 'package:Emma_home/utils/data.dart'; +import 'package:Emma_home/screens/subheader_Datepicker.dart'; +import 'package:Emma_home/screens/detail_widget.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -import 'package:learn_project/main.dart'; +import 'package:Emma_home/main.dart'; class HomePage extends StatelessWidget { const HomePage({super.key}); @@ -86,7 +86,7 @@ class HomePage extends StatelessWidget { var size = MediaQuery.of(context).size; /*24 is for notification bar on Android*/ - final double itemHeight = (size.height - kToolbarHeight - 100) / 6; + final double itemHeight = (size.height - kToolbarHeight - 140) / 5; final double itemWidth = size.width / 2.3; var appBar = AppBar( @@ -209,7 +209,7 @@ class HomePage extends StatelessWidget { child: Container( width: itemWidth, - height: 130, + height: itemHeight, child: Stack( children: [ Positioned( @@ -217,7 +217,7 @@ class HomePage extends StatelessWidget { top: 0, child: Container( width: itemWidth, - height: 130, + height: itemHeight, decoration: ShapeDecoration( image: DecorationImage( image: @@ -274,8 +274,8 @@ class HomePage extends StatelessWidget { ), Positioned( - left:145, - top:9, + right:20, + top:10, child: Container( width: 32, @@ -347,9 +347,11 @@ class HomePage extends StatelessWidget { ); }, ), + Container( + height: 20,), Image.asset( 'assets/images/FooterFooter.png', // Pfad zum Bild - height: 127, // Höhe des Bildes + //height: 120, // Höhe des Bildes width: 390, // Breite des Bildes ), ], diff --git a/lib/screens/login_page.dart b/lib/screens/login_page.dart index 23e01c0..b76e68c 100644 --- a/lib/screens/login_page.dart +++ b/lib/screens/login_page.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; -import 'package:learn_project/main.dart'; +import 'package:Emma_home/main.dart'; class LoginPage extends StatefulWidget { const LoginPage({super.key}); diff --git a/lib/screens/splash_page.dart b/lib/screens/splash_page.dart index 2bfffdf..aaea450 100644 --- a/lib/screens/splash_page.dart +++ b/lib/screens/splash_page.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:learn_project/main.dart'; +import 'package:Emma_home/main.dart'; class SplashPage extends StatefulWidget { const SplashPage({super.key}); diff --git a/lib/screens/subheader_Datepicker.dart b/lib/screens/subheader_Datepicker.dart index cd95731..912082a 100644 --- a/lib/screens/subheader_Datepicker.dart +++ b/lib/screens/subheader_Datepicker.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:learn_project/utils/helper_functions.dart'; +import 'package:Emma_home/utils/helper_functions.dart'; class TimeButtonSection extends StatefulWidget { const TimeButtonSection(); diff --git a/lib/utils/data.dart b/lib/utils/data.dart index 2aee178..d4ba072 100644 --- a/lib/utils/data.dart +++ b/lib/utils/data.dart @@ -1,9 +1,9 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:learn_project/utils/class.dart'; +import 'package:Emma_home/utils/class.dart'; //import 'dart:convert'; -import 'package:learn_project/main.dart'; +import 'package:Emma_home/main.dart'; import 'package:intl/intl.dart' as intl; import 'package:supabase_flutter/supabase_flutter.dart'; const Duration fakeAPIDuration = Duration(milliseconds: 50); diff --git a/lib/utils/widgets.dart b/lib/utils/widgets.dart index 0082166..dfa1e48 100644 --- a/lib/utils/widgets.dart +++ b/lib/utils/widgets.dart @@ -1,6 +1,6 @@ import 'dart:math'; import 'package:flutter/material.dart'; -import 'package:learn_project/utils/class.dart'; +import 'package:Emma_home/utils/class.dart'; class CircleIndicator extends StatefulWidget { final double percent; diff --git a/pubspec.yaml b/pubspec.yaml index 1047120..30d4b3b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,5 +1,5 @@ -name: learn_project -description: "A new Flutter project." +name: Emma_home +description: "The MVP of EMMA" # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev