This commit is contained in:
陈连辰
2023-04-17 23:06:40 +08:00
parent 80a3a158c5
commit 5bcde83a08
3 changed files with 23 additions and 22 deletions

View File

@@ -644,7 +644,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1.5;
MARKETING_VERSION = 1.1.6;
PRODUCT_BUNDLE_IDENTIFIER = MustangYM.OSXChatGPT.OSXChatGPT;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -672,7 +672,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.1.5;
MARKETING_VERSION = 1.1.6;
PRODUCT_BUNDLE_IDENTIFIER = MustangYM.OSXChatGPT.OSXChatGPT;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;

View File

@@ -165,10 +165,11 @@ struct AIPromptView: View {
}
}
.background(Color.clear)
.padding(.leading, 16)
.padding(.trailing, 16)
}
.padding(.leading, 16)
.padding(.trailing, 16)
.frame(width: geometry.size.width, height: geometry.size.height - 50)
.frame(width: geometry.size.width, height: geometry.size.height)
.onAppear {

View File

@@ -66,8 +66,8 @@ struct ChatRoomView: View {
self.scrollView = scrollView
}
}
.frame(maxHeight: geometry.size.height) // 便
.background(Color.clear)
.frame(maxHeight: geometry.size.height - inputViewHeight) // 便
Divider()
GeometryReader { toolBarGeometry in
Spacer()
@@ -160,21 +160,21 @@ struct ChatRoomCellView: View {
}
}
VStack {
Image("User")
.resizable()
.frame(width: 30, height: 30)
.padding(0)
Spacer()
}
// VStack {
// Image("User")
// .resizable()
// .frame(width: 30, height: 30)
// .padding(0)
// Spacer()
// }
} else {
VStack {
Image("openAI_icon")
.resizable()
.frame(width: 30, height: 30)
.padding(0)
Spacer()
}
// VStack {
// Image("openAI_icon")
// .resizable()
// .frame(width: 30, height: 30)
// .padding(0)
// Spacer()
// }
if message.msgType == .waitingReply {
//chatGPT
ThinkingAnimationView()
@@ -222,8 +222,8 @@ struct ChatRoomCellView: View {
Spacer()
}
}
.padding(.trailing, (message.role == ChatGPTManager.shared.gptRoleString) ? 70 : 0)
.padding(.leading, (message.role != ChatGPTManager.shared.gptRoleString) ? 70 : 0)
.padding(.trailing, (message.role == ChatGPTManager.shared.gptRoleString) ? 30 : 0)
.padding(.leading, (message.role != ChatGPTManager.shared.gptRoleString) ? 30 : 0)
}
}