Merge branch 'main' into 'LogIn_Page_Layout'

# Conflicts: # lib/home.dart
2023-05-16 06:50:49 +00:00
parent 2ee134e283 dbec2c6244
commit 32670219d3
6 changed files with 489 additions and 95 deletions
@@ -34,21 +34,6 @@ class _MyHomePageState extends State<MyHomePage> {
      body: Center(
        child: widgetOptions.elementAt(_selectedIndex),
      ),
-      floatingActionButton: _selectedIndex == 3
-          ? null
-          : FloatingActionButton(
-              onPressed: () {
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) =>
-                        AddScreen(initialIndex: _selectedIndex),
-                  ),
-                );
-              },
-              tooltip: 'Add',
-              child: const Icon(Icons.add),
-            ),
      bottomNavigationBar: BottomNavigationBar(
        items: const <BottomNavigationBarItem>[
          BottomNavigationBarItem(