Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Composer: Fix to account switcher + display full acct name close #906

This commit is contained in:
Thomas Ricouard 2023-02-17 08:09:26 +01:00
parent c1205036a2
commit ea702e1101
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
View File

@ -105,7 +105,7 @@ public struct AppAccountsSelectorView: View {
} }
} }
if UIDevice.current.userInterfaceIdiom == .phone { if UIDevice.current.userInterfaceIdiom == .phone && accountCreationEnabled {
Divider() Divider()
Button { Button {
HapticManager.shared.fireHaptic(of: .buttonPress) HapticManager.shared.fireHaptic(of: .buttonPress)

10
Packages/Status/Sources/Status/Editor/StatusEditorView.swift
View File

@ -12,6 +12,7 @@ import UIKit
import StoreKit import StoreKit
public struct StatusEditorView: View { public struct StatusEditorView: View {
@EnvironmentObject private var appAccounnt: AppAccountsManager
@EnvironmentObject private var preferences: UserPreferences @EnvironmentObject private var preferences: UserPreferences
@EnvironmentObject private var theme: Theme @EnvironmentObject private var theme: Theme
@EnvironmentObject private var client: Client @EnvironmentObject private var client: Client
@ -159,7 +160,12 @@ public struct StatusEditorView: View {
} }
} }
} }
.interactiveDismissDisabled(!viewModel.statusText.string.isEmpty) .interactiveDismissDisabled(!viewModel.shouldDisplayDismissWarning)
.onChange(of: appAccounnt.currentClient) { newClient in
if viewModel.mode.isInShareExtension {
currentAccount.setClient(client: newClient)
}
}
} }
@ViewBuilder @ViewBuilder
@ -228,7 +234,7 @@ public struct StatusEditorView: View {
avatarSize: .status) avatarSize: .status)
VStack(alignment: .leading, spacing: 4) { VStack(alignment: .leading, spacing: 4) {
privacyMenu privacyMenu
Text("@\(account.acct)") Text("@\(account.acct)@\(client.server)")
.font(.scaledFootnote) .font(.scaledFootnote)
.foregroundColor(.gray) .foregroundColor(.gray)
} }

1
Packages/Status/Sources/Status/Row/StatusMediaPreviewView.swift
View File

@ -163,6 +163,7 @@ public struct StatusMediaPreviewView: View {
.frame(width: newSize.width, height: newSize.height) .frame(width: newSize.width, height: newSize.height)
} }
} }
.frame(width: newSize.width, height: newSize.height)
case .gifv, .video, .audio: case .gifv, .video, .audio:
if let url = attachment.url { if let url = attachment.url {