injectlib/OSXChatGpt
1
0
Fork 0
mirror of https://github.com/MustangYM/OSXChatGpt.git synced 2025-11-25 03:15:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

bar

Browse Source
This commit is contained in:
MustangYM
2023-03-11 22:26:58 +08:00
parent 136aad5f29
commit ee16081857
3 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OSXChatGPT/OSXChatGPT/WindowView/MainContentView.swift
View File

@@ -14,6 +14,17 @@ struct MainContentView: View {
NavigationView {
SessionsView()
UserInitializeView()
}.toolbar {
ToolbarItem(placement: .navigation) {
Button {
NSApp.keyWindow?.firstResponder?.tryToPerform(
#selector(NSSplitViewController.toggleSidebar(_:)),
with: nil
)
} label: {
Label("Toggle Sidebar", systemImage: "sidebar.leading")
}
}
}
}
}

93
OSXChatGPT/OSXChatGPT/WindowView/SessionsView.swift
View File

@@ -18,24 +18,65 @@ struct SessionsView: View {
ColorfulView(colors: [.accentColor], colorCount: 4)
.ignoresSafeArea()
VStack {
HStack {
// HStack {
// SearchBar(text: $searchText)
// .frame(minWidth: 100, idealWidth: 200, maxWidth: 200, minHeight: 40, idealHeight: 40, maxHeight: 40)
// .padding(.init(top: 10, leading: 10, bottom: 0, trailing: 0))
// NavigationLink(destination: ChatRoomView(sesstionId: viewModel.createSesstionId()).environmentObject(viewModel), isActive: $shouldNavigate) {
// Button {
// self.shouldNavigate = true
// } label: {
// Text("New")
// .padding(5)
// Spacer()
// }.background(Color.clear)
//
//
// }.frame(minWidth: 30, idealWidth: 30, maxWidth: 30, minHeight: 30, idealHeight: 30, maxHeight: 30)
// .padding(.init(top: 10, leading: 0, bottom: 0, trailing: 10))
//
// }.frame(minHeight: 40, idealHeight: 40, maxHeight: 50)
VStack(spacing: 0) {
HStack(spacing: 20, content: {
NavigationLink(destination: ChatRoomView(sesstionId: viewModel.createSesstionId()).environmentObject(viewModel), isActive: $shouldNavigate) {
Button(action: {
// 点击 New Chat 按钮的操作
self.shouldNavigate = true
}) {
HStack(spacing: 10) {
Image(systemName: "plus.bubble")
Text("New Chat")
}
.padding(10)
.foregroundColor(.white)
.background(Color.blue)
.cornerRadius(5)
}
.buttonStyle(BorderlessButtonStyle())
}.buttonStyle(BorderlessButtonStyle())
.padding(.leading,0)
Button(action: {
// 点击右边按钮的操作
}) {
Image(systemName: "gear")
.padding(10)
.foregroundColor(.white)
.background(Color.gray)
.cornerRadius(5)
}
.buttonStyle(BorderlessButtonStyle())
})
.frame(height: 30)
.padding(.init(top: 10, leading: 0, bottom: 0, trailing: 0))
SearchBar(text: $searchText)
.frame(minWidth: 100, idealWidth: 200, maxWidth: 200, minHeight: 40, idealHeight: 40, maxHeight: 40)
.padding(.init(top: 10, leading: 10, bottom: 0, trailing: 0))
NavigationLink(destination: ChatRoomView(sesstionId: viewModel.createSesstionId()).environmentObject(viewModel), isActive: $shouldNavigate) {
Button {
self.shouldNavigate = true
} label: {
Text("New")
.padding(5)
Spacer()
}.background(Color.clear)
}.frame(minWidth: 30, idealWidth: 30, maxWidth: 30, minHeight: 30, idealHeight: 30, maxHeight: 30)
.padding(.init(top: 10, leading: 0, bottom: 0, trailing: 10))
}.frame(minHeight: 40, idealHeight: 40, maxHeight: 50)
.padding(.init(top: 10, leading: 0, bottom: 0, trailing: 0))
}
.frame(width: 300, height: 90)
Divider()
List(viewModel.conversations.filter({ searchText.isEmpty ? true : $0.sesstionId.localizedCaseInsensitiveContains(searchText) })) { chat in
NavigationLink(destination: ChatRoomView(sesstionId: chat.sesstionId).environmentObject(viewModel)) {
@@ -43,7 +84,7 @@ struct SessionsView: View {
}
}
.listStyle(SidebarListStyle())
.padding(.top, 1)
.padding(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
Spacer()
}
@@ -58,23 +99,13 @@ struct SearchBar: View {
var body: some View {
HStack {
TextField("搜索", text: $text)
TextField("Search Chats...", text: $text)
.padding(.vertical, 5)
.padding(.horizontal, 8)
.padding(.leading, 15)
.padding(.horizontal, 0)
.padding(.leading, 0)
.background(.clear)
.padding(.horizontal, 0)
.cornerRadius(5)
.overlay(
HStack {
Image(systemName: "magnifyingglass")
.foregroundColor(.white)
.padding(.leading, 5)
.cornerRadius(5)
Spacer()
}.background(.clear)
)
.padding(.horizontal, 4)
}
}
}

4
OSXChatGPT/OSXChatGPT/WindowView/UserInitializeView.swift
View File

@@ -57,7 +57,7 @@ struct UserInitializeView: View {
}
}
Text("A Better macOS application For ChatGPT")
Text("A Better macOS application for ChatGPT")
.font(.system(.body, design: .rounded))
// 添加API密钥按钮
@@ -82,7 +82,7 @@ struct UserInitializeView: View {
}
// .padding(.top,100)
.padding(.bottom,200)
.padding(.bottom,150)
// .padding(.leading,200)
// .padding(.trailing,200)