fix chaos lmao

retromp3 · Nov 28, 2022 · f768752 · f768752
1 parent 913daf3
commit f768752
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/lib/alt_menu/alt_menu_item.dart b/lib/alt_menu/alt_menu_item.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:retro/alt_menu/alt_sub_menu.dart';
-import 'package:retro/ipod_menu_widget/ipod_sub_menu.dart';
 
 class AltMenuItem {
   final String text;

diff --git a/lib/alt_menu/alt_sub_menu.dart b/lib/alt_menu/alt_sub_menu.dart
@@ -6,7 +6,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:retro/alt_menu/alt_menu_item.dart';
-import 'package:retro/ipod_menu_widget/ipod_menu_item.dart';
 
 typedef AltMenuItemBuilder = List<AltMenuItem> Function();
 

diff --git a/lib/core.dart b/lib/core.dart
@@ -67,7 +67,7 @@ class IPodState extends State<IPod> {
   void initState() {
     mainViewMode = MainViewMode.menu;
     menu = getIPodMenu();
-    altMenu = getAltMenu();
+    altMenu = getAltMenu(context);
     widgetSize = 300.0;
     halfSize = widgetSize / 2;
     cartesianStartX = 1;
@@ -356,9 +356,11 @@ class IPodState extends State<IPod> {
                   breakoutGame.currentState?.restart();
                 }
               }
+              else if(popUp == true) {
+                altMenuKey?.currentState?.select();
+              }
               else {
                 menuKey?.currentState?.select();
-                altMenuKey?.currentState?.select();
               }
               HapticFeedback.mediumImpact();
               SystemSound.play(SystemSoundType.click);
@@ -370,21 +372,25 @@ class IPodState extends State<IPod> {
     );
   }
 
-  AltSubMenu getAltMenu() {
+  AltSubMenu getAltMenu(context) {
     return AltSubMenu(
       items: [
         AltMenuItem(
           text: 'Spotify',
           onTap: () {
-              //BlocProvider.of<SongListBloc>(context).add(SpotifyConnected());
+              BlocProvider.of<SongListBloc>(context).add(SpotifyConnected());
           }
         ),
         AltMenuItem(
           text: 'Apple Music',
         ),
         AltMenuItem(
           text: 'Cancel',
+          onTap:() => setState(() {
+                popUp = false;
+          }),
         ),
+
       ],
     );
   }