fix: keybarod on iOS

AugustDev · Feb 13, 2024 · 3b78a5f · 3b78a5f
1 parent 4082e75
commit 3b78a5f
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 14 deletions.
diff --git a/Enchanted.xcodeproj/project.pbxproj b/Enchanted.xcodeproj/project.pbxproj
@@ -56,6 +56,7 @@
 		FF9300DE2B782A28000859F4 /* UnreachableAPIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF9300DD2B782A28000859F4 /* UnreachableAPIView.swift */; };
 		FF9300E02B783945000859F4 /* InputFields_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF9300DF2B783945000859F4 /* InputFields_macOS.swift */; };
 		FFB0327D2B312F3D0066A9DB /* RecordingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFB0327C2B312F3D0066A9DB /* RecordingView.swift */; };
+		FFB21A872B7BD0BA00D148A4 /* KeyboardReadable+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFB21A862B7BD0BA00D148A4 /* KeyboardReadable+Extension.swift */; };
 		FFBBF4842B34881B008D611C /* SpeechRecogniser.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFBBF4832B34881B008D611C /* SpeechRecogniser.swift */; };
 		FFBBF4882B34F9C8008D611C /* View+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFBBF4872B34F9C8008D611C /* View+Extension.swift */; };
 		FFBBF48A2B350283008D611C /* SelectedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFBBF4892B350283008D611C /* SelectedImageView.swift */; };
@@ -112,6 +113,7 @@
 		FF9300DD2B782A28000859F4 /* UnreachableAPIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnreachableAPIView.swift; sourceTree = "<group>"; };
 		FF9300DF2B783945000859F4 /* InputFields_macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputFields_macOS.swift; sourceTree = "<group>"; };
 		FFB0327C2B312F3D0066A9DB /* RecordingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecordingView.swift; sourceTree = "<group>"; };
+		FFB21A862B7BD0BA00D148A4 /* KeyboardReadable+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyboardReadable+Extension.swift"; sourceTree = "<group>"; };
 		FFBBF4822B348345008D611C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		FFBBF4832B34881B008D611C /* SpeechRecogniser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeechRecogniser.swift; sourceTree = "<group>"; };
 		FFBBF4872B34F9C8008D611C /* View+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extension.swift"; sourceTree = "<group>"; };
@@ -336,6 +338,7 @@
 				FF1002512B2609970011A4DC /* ModelContext+Extension.swift */,
 				FFBBF48B2B35051D008D611C /* UIImage+Extension.swift */,
 				FFBBF4872B34F9C8008D611C /* View+Extension.swift */,
+				FFB21A862B7BD0BA00D148A4 /* KeyboardReadable+Extension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -484,6 +487,7 @@
 				FFBBF48C2B35051D008D611C /* UIImage+Extension.swift in Sources */,
 				FF1002302B2482BA0011A4DC /* ChatMessageView.swift in Sources */,
 				FF1002322B2483A20011A4DC /* Colours+Extension.swift in Sources */,
+				FFB21A872B7BD0BA00D148A4 /* KeyboardReadable+Extension.swift in Sources */,
 				FF66A51D2B76949A00FAAC1E /* Helpers.swift in Sources */,
 				FF10026A2B2731C60011A4DC /* ModelSelectorView.swift in Sources */,
 				FF38F84F2B7A7B6700546B56 /* MenuBarControlView_macOS.swift in Sources */,
@@ -657,7 +661,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = Enchanted/Enchanted.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Enchanted/Preview Content\"";
 				DEVELOPMENT_TEAM = JDDZ55DT74;
@@ -682,7 +686,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = subj.Enchanted;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;
@@ -702,7 +706,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = Enchanted/Enchanted.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Enchanted/Preview Content\"";
 				DEVELOPMENT_TEAM = JDDZ55DT74;
@@ -727,7 +731,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 14.0;
-				MARKETING_VERSION = 1.4.1;
+				MARKETING_VERSION = 1.4.4;
 				PRODUCT_BUNDLE_IDENTIFIER = subj.Enchanted;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = auto;

diff --git a/Enchanted/Extensions/KeyboardReadable+Extension.swift b/Enchanted/Extensions/KeyboardReadable+Extension.swift
@@ -0,0 +1,34 @@
+//
+//  KeyboardReadable+Extension.swift
+//  Enchanted
+//
+//  Created by Augustinas Malinauskas on 13/02/2024.
+//
+
+import SwiftUI
+import Combine
+
+#if os(iOS)
+/// Publisher to read keyboard changes.
+protocol KeyboardReadable {
+    var keyboardPublisher: AnyPublisher<Bool, Never> { get }
+}
+
+extension KeyboardReadable {
+    var keyboardPublisher: AnyPublisher<Bool, Never> {
+        Publishers.Merge(
+            NotificationCenter.default
+                .publisher(for: UIResponder.keyboardWillShowNotification)
+                .map { _ in true },
+
+            NotificationCenter.default
+                .publisher(for: UIResponder.keyboardWillHideNotification)
+                .map { _ in false }
+        )
+        .eraseToAnyPublisher()
+    }
+}
+#elseif os(macOS)
+/// Mock protocol
+protocol KeyboardReadable {}
+#endif
diff --git a/Enchanted/Services/SwiftDataService.swift b/Enchanted/Services/SwiftDataService.swift
@@ -26,7 +26,6 @@ actor SwiftDataService {
                 ConversationSD.self,
                 MessageSD.self,
             ])
-            print("init bruv")
             let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
 
             do {

diff --git a/Enchanted/Stores/ConversationStore.swift b/Enchanted/Stores/ConversationStore.swift
@@ -45,7 +45,7 @@ final class ConversationStore {
                 messages = []
             }
             selectedConversation = nil
-            try? await swiftDataService.deleteEverything()
+            try? await swiftDataService.deleteConversations()
             try? await loadConversations()
         }
     }

diff --git a/Enchanted/UI/Shared/ApplicationEntry.swift b/Enchanted/UI/Shared/ApplicationEntry.swift
@@ -17,6 +17,12 @@ struct ApplicationEntry: View {
     var body: some View {
         Chat(languageModelStore: languageModelStore, conversationStore: conversationStore, appStore: appStore)
             .task {
+                if let build = Bundle.main.object(forInfoDictionaryKey: "CFBundleVersion") as? String {
+                    print("CFBundleVersion: \(build)")
+                }
+                if let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String {
+                    print("CFBundleShortVersionString: \(version)")
+                }
                 Task.detached {
                     async let loadModels: () = languageModelStore.loadModels()
                     async let loadConversations: () = conversationStore.loadConversations()

diff --git a/Enchanted/UI/Shared/Chat/Components/EmptyConversaitonView.swift b/Enchanted/UI/Shared/Chat/Components/EmptyConversaitonView.swift
@@ -7,10 +7,13 @@
 
 import SwiftUI
 
-struct EmptyConversaitonView: View {
-    @State var showPrompts = false
+struct EmptyConversaitonView: View, KeyboardReadable {
+    @State var showPromptsAnimation = false
     @State var prompts: [SamplePrompts] = []
     var sendPrompt: (String) -> ()
+#if os(iOS)
+    @State var isKeyboardVisible = false
+#endif
 
 #if os(macOS)
     var columns = Array.init(repeating: GridItem(.flexible(), spacing: 15), count: 4)
@@ -55,24 +58,36 @@ struct EmptyConversaitonView: View {
                             .padding(15)
                             .background(Color.gray5Custom)
                             .clipShape(RoundedRectangle(cornerRadius: 10))
-
+                            
                         }
                         .transition(.slide)
-                        .showIf(showPrompts)
+                        .showIf(showPromptsAnimation)
                         .buttonStyle(.plain)
                     }
                 }
                 .frame(maxWidth: 700)
                 .padding()
+                .transition(AnyTransition(.opacity).combined(with: .slide))
+#if os(iOS)
+                .showIf(!isKeyboardVisible)
+#endif
             }
             Spacer()
         }
         .onAppear {
             withAnimation {
                 prompts = SamplePrompts.samples.shuffled()
-                showPrompts = true
+                showPromptsAnimation = true
             }
         }
+#if os(iOS)
+        .onReceive(keyboardPublisher) { newIsKeyboardVisible in
+            withAnimation {
+                isKeyboardVisible = newIsKeyboardVisible
+            }
+        }
+#endif
+
     }
 }
 

diff --git a/Enchanted/UI/Shared/Settings/Settings.swift b/Enchanted/UI/Shared/Settings/Settings.swift
@@ -43,6 +43,10 @@ struct Settings: View {
         }
     }
 
+    private func deleteAll() {
+        conversationStore.deleteAllConversations()
+    }
+
     @State var ollamaStatus: Bool?
     var body: some View {
         SettingsView(

diff --git a/Enchanted/UI/macOS/Chat/ChatView_macOS.swift b/Enchanted/UI/macOS/Chat/ChatView_macOS.swift
@@ -64,7 +64,8 @@ struct ChatView: View {
                     conversationState: conversationState,
                     onStopGenerateTap: onStopGenerateTap,
                     selectedModel: selectedModel,
-                    onSendMessageTap: onSendMessageTap
+                    onSendMessageTap: onSendMessageTap, 
+                    editMessage: $editMessage
                 )
                 .padding()
                 .frame(maxWidth: 800)
@@ -78,6 +79,12 @@ struct ChatView: View {
                 onNewConversationTap: onNewConversationTap
             )
         }
+        .onChange(of: editMessage, initial: false) { _, newMessage in
+            if let newMessage = newMessage {
+                message = newMessage.content
+                isFocusedInput = true
+            }
+        }
     }
 }
 

diff --git a/Enchanted/UI/macOS/Chat/Components/InputFields_macOS.swift b/Enchanted/UI/macOS/Chat/Components/InputFields_macOS.swift
@@ -14,9 +14,9 @@ struct InputFieldsView: View {
     var onStopGenerateTap: @MainActor () -> Void
     var selectedModel: LanguageModelSD?
     var onSendMessageTap: @MainActor (_ prompt: String, _ model: LanguageModelSD, _ image: Image?, _ trimmingMessageId: String?) -> ()
+    @Binding var editMessage: MessageSD?
 
     @State private var selectedImage: Image?
-    @State private var editMessage: MessageSD?
     @FocusState private var isFocusedInput: Bool
 
     @MainActor private func sendMessage() {
@@ -97,7 +97,8 @@ struct InputFieldsView: View {
         message: .constant(""),
         conversationState: .completed,
         onStopGenerateTap: {},
-        onSendMessageTap: {_, _, _, _  in}
+        onSendMessageTap: {_, _, _, _  in},
+        editMessage: .constant(nil)
     )
 }
 #endif