Remove code

lcarvajal · May 6, 2024 · 4ec4ba9 · 4ec4ba9
1 parent cc28e6e
commit 4ec4ba9
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 17 deletions.
diff --git a/JokingPanda.xcodeproj/project.pbxproj b/JokingPanda.xcodeproj/project.pbxproj
@@ -703,14 +703,17 @@
 			path = Helper;
 			sourceTree = "<group>";
 		};
-		8D0DDFFE2B0CC68B00A3A8F8 /* AudioAndSpeech */ = {
+		8D0DDFFE2B0CC68B00A3A8F8 /* Conversation */ = {
 			isa = PBXGroup;
 			children = (
 				8D0DDFEA2B0BE2B700A3A8F8 /* Audio.swift */,
+				8DC97D952AE92CB0002CEA1E /* Conversation.swift */,
+				8D0DE0042B0E4CD900A3A8F8 /* Conversations.swift */,
+				8D0DDFFA2B0CADDF00A3A8F8 /* ConversationManager.swift */,
 				8D0DDFFC2B0CB4E000A3A8F8 /* SpeakAndListen.swift */,
 				8D0DDFEC2B0BE90900A3A8F8 /* SpeechRecognizer.swift */,
 			);
-			path = AudioAndSpeech;
+			path = Conversation;
 			sourceTree = "<group>";
 		};
 		8D0DE0032B0CD4C500A3A8F8 /* Button */ = {
@@ -806,11 +809,8 @@
 		8DC97D8A2AE673C0002CEA1E /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				8D0DDFFE2B0CC68B00A3A8F8 /* AudioAndSpeech */,
+				8D0DDFFE2B0CC68B00A3A8F8 /* Conversation */,
 				8D4CB9EB2AED1F7F00B7A00F /* Animation.swift */,
-				8DC97D952AE92CB0002CEA1E /* Conversation.swift */,
-				8D0DE0042B0E4CD900A3A8F8 /* Conversations.swift */,
-				8D0DDFFA2B0CADDF00A3A8F8 /* ConversationManager.swift */,
 				8DC97D932AE80486002CEA1E /* Person.swift */,
 			);
 			path = Model;

diff --git a/JokingPanda/Model/AudioAndSpeech/Audio.swift → JokingPanda/Model/Conversation/Audio.swift b/JokingPanda/Model/AudioAndSpeech/Audio.swift → JokingPanda/Model/Conversation/Audio.swift
diff --git a/JokingPanda/Model/Conversation.swift → ...nda/Model/Conversation/Conversation.swift b/JokingPanda/Model/Conversation.swift → ...nda/Model/Conversation/Conversation.swift
diff --git a/JokingPanda/Model/ConversationManager.swift → ...el/Conversation/ConversationManager.swift b/JokingPanda/Model/ConversationManager.swift → ...el/Conversation/ConversationManager.swift
@@ -30,7 +30,6 @@ class ConversationManager: NSObject, ObservableObject {
 
     internal func startConversation(type: ConversationType? = nil) {
         if let type = type {
-            print("Update selected type to: \(type)")
             selectedType = type
         }
 

diff --git a/JokingPanda/Model/Conversations.swift → ...da/Model/Conversation/Conversations.swift b/JokingPanda/Model/Conversations.swift → ...da/Model/Conversation/Conversations.swift
diff --git a/...Model/AudioAndSpeech/SpeakAndListen.swift → ...a/Model/Conversation/SpeakAndListen.swift b/...Model/AudioAndSpeech/SpeakAndListen.swift → ...a/Model/Conversation/SpeakAndListen.swift
diff --git a/...del/AudioAndSpeech/SpeechRecognizer.swift → ...Model/Conversation/SpeechRecognizer.swift b/...del/AudioAndSpeech/SpeechRecognizer.swift → ...Model/Conversation/SpeechRecognizer.swift
diff --git a/JokingPanda/View/MainView.swift b/JokingPanda/View/MainView.swift
@@ -20,7 +20,7 @@ struct MainView: View {
             GeometryReader { geometry in
                 ZStack {
                     AnimationView(geometry: .constant(geometry), character: $speakAndListen.animationCharacter, status: $speakAndListen.animationStatus)
-                    .background(getBackgroundColor())
+                    .background(Color.background)
                     .onTapGesture {
                         handleTapOnBot()
                     }
@@ -79,15 +79,6 @@ struct MainView: View {
         .background(Color.background)
     }
 
-    private func getBackgroundColor() -> Color {
-        switch speakAndListen.conversationManager.selectedType {
-        case .deciding, .joking, .dancing:
-            return Color.tappableArea
-        default:
-            return Color.background
-        }
-    }
-
     private func handleTapOnBot() {
         if speakAndListen.conversationManager.isConversing {
             speakAndListen.stopConversation()