nekoya/app
nekoya/app
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity

Fix conflict

Browse source
This commit is contained in:
Moe Poi ~ 2022-04-26 17:28:45 +07:00
parent 037c0d357e
commit c567a09ca1
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/components/menu.dart
View file

@ -3,13 +3,9 @@ import 'dart:math' as math;
import 'package:nekoya_flutter/screens/products.dart'; import 'package:nekoya_flutter/screens/products.dart';
import 'package:nekoya_flutter/screens/register.dart'; import 'package:nekoya_flutter/screens/register.dart';
import 'package:nekoya_flutter/screens/checkout.dart';
<<<<<<< HEAD
import 'package:nekoya_flutter/screens/payment.dart'; import 'package:nekoya_flutter/screens/payment.dart';
=======
import 'package:nekoya_flutter/screens/cart.dart'; import 'package:nekoya_flutter/screens/cart.dart';
import 'package:nekoya_flutter/screens/login.dart'; import 'package:nekoya_flutter/screens/login.dart';
>>>>>>> 620e01fe7abd27cb77fbd0cb8586a12722911a08
class Menu extends StatefulWidget { class Menu extends StatefulWidget {
const Menu({Key? key}) : super(key: key); const Menu({Key? key}) : super(key: key);
@ -53,11 +49,7 @@ class _MenuState extends State<Menu> {
if (index == 0) { if (index == 0) {
_selectedWidget = const Login(); _selectedWidget = const Login();
} else if (index == 1) { } else if (index == 1) {
<<<<<<< HEAD
_selectedWidget = const Payment(); _selectedWidget = const Payment();
=======
_selectedWidget = const Checkout();
>>>>>>> 620e01fe7abd27cb77fbd0cb8586a12722911a08
} else if (index == 2) { } else if (index == 2) {
_selectedWidget = const Products(); _selectedWidget = const Products();
} else if (index == 3) { } else if (index == 3) {