mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2025-06-04 21:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'iOS-18' + fixes

Browse source
This commit is contained in:
Thomas Ricouard 2024-08-07 21:13:58 +02:00
parent f02b4888bb
commit 57a6e36c76
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Packages/Account/Sources/Account/AccountDetailViewModel.swift
View file

@ -327,7 +327,7 @@ extension AccountDetailViewModel {
private func fetchPremiumAccount(fromAccount: Account, client: Client) async throws { private func fetchPremiumAccount(fromAccount: Account, client: Client) async throws {
if fromAccount.isLinkedToPremiumAccount, let acct = fromAccount.premiumAcct { if fromAccount.isLinkedToPremiumAccount, let acct = fromAccount.premiumAcct {
let results: SearchResults? = try await client.get(endpoint: Search.search(query: acct, let results: SearchResults? = try await client.get(endpoint: Search.search(query: acct,
type: "accounts", type: .accounts,
offset: nil, offset: nil,
following: nil), following: nil),
forceVersion: .v2) forceVersion: .v2)

21
Packages/Account/Sources/Account/Tip/PremiumAcccountSubsciptionSheetView.swift
View file

@ -95,21 +95,20 @@ struct PremiumAcccountSubsciptionSheetView: View {
Spacer() Spacer()
if isSubscibeSelected { if isSubscibeSelected {
HStack(alignment: .top) { Button {
Text("Subscribe")
.font(.headline)
.fontWeight(.bold)
}
.transition(.push(from: .bottom))
.frame(height: 50)
.frame(maxWidth: .infinity)
.background(theme.tintColor.opacity(0.5))
.onTapGesture {
withAnimation { withAnimation {
state = .preparing state = .preparing
} }
} label: {
Text("Subscribe")
.font(.headline)
.fontWeight(.bold)
.frame(maxWidth: .infinity)
.frame(height: 40)
} }
.ignoresSafeArea() .buttonStyle(.borderedProminent)
.padding(.horizontal, 16)
.padding(.bottom, 38)
} }
} }