Fixes for composer and DM

This commit is contained in:
Thomas Ricouard 2023-02-21 19:38:35 +01:00
parent bf49a4558c
commit ed9b2a37a7
2 changed files with 16 additions and 17 deletions

View file

@ -30,24 +30,23 @@ public struct ConversationDetailView: View {
public var body: some View { public var body: some View {
ScrollViewReader { proxy in ScrollViewReader { proxy in
ZStack(alignment: .bottom) { ScrollView {
ScrollView { LazyVStack {
LazyVStack { if viewModel.isLoadingMessages {
if viewModel.isLoadingMessages { loadingView
loadingView
}
ForEach(viewModel.messages) { message in
ConversationMessageView(message: message,
conversation: viewModel.conversation)
.padding(.vertical, 4)
.id(message.id)
}
bottomAnchorView
} }
.padding(.horizontal, .layoutPadding) ForEach(viewModel.messages) { message in
.padding(.bottom, 30) ConversationMessageView(message: message,
conversation: viewModel.conversation)
.padding(.vertical, 4)
.id(message.id)
}
bottomAnchorView
} }
.scrollDismissesKeyboard(.interactively) .padding(.horizontal, .layoutPadding)
}
.scrollDismissesKeyboard(.interactively)
.safeAreaInset(edge: .bottom) {
inputTextView inputTextView
} }
.onAppear { .onAppear {

View file

@ -202,7 +202,7 @@ public struct StatusEditorView: View {
dismiss() dismiss()
NotificationCenter.default.post(name: NotificationsName.shareSheetClose, NotificationCenter.default.post(name: NotificationsName.shareSheetClose,
object: nil) object: nil)
if !viewModel.mode.isInShareExtension && !preferences.requestedReview { if !viewModel.mode.isInShareExtension, !preferences.requestedReview, !ProcessInfo.processInfo.isiOSAppOnMac {
if let scene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene { if let scene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
SKStoreReviewController.requestReview(in: scene) SKStoreReviewController.requestReview(in: scene)
} }