mirror of
https://github.com/cranci1/Sora.git
synced 2026-04-19 07:32:08 +00:00
Some fixes from IBH list (not all) (#146)
* Minor changes * more minor changes * MORE MINOR CHANGES * Fixed one singular bug * Update SettingsViewGeneral.swift * fuck conflicts * fuck you and your credits * buh buh * Update SettingsViewAbout.swift * What's that? What's a properly working code without unnecessary issues? * Type shit maybe? * Create ios.yml * smol * type shi shi * end * Fixed system theme bug * (hopefully) fixed sliding items in search + recent searches spam * Fixed open keyboard in media view * Fixed searchviewdata + fixed toggle color being too light * fixed episode slider sensitivity * new recent searches, not fully done but wtv WHO CARES 💯 * Add module screen fix * Delete .github/workflows/ios.yml * UI modifications * Scroll to close keyboard * Text change * Downloadview transition * Search cards text fixed * Reduced header spacing + moved down a to match library * Text change * Small tab bar tweak for search view * added gradient to player buttons * reduced summary size * IBH special 💯 * Fixed different height text? * Removed seperator * Some more fixes start watching button * MediaInfoView modifications * Fixed settingsviewdata * Changed x mark and fixed episode swipe for 4 items * Delete Package.resolved * fix * fix * Update Package.resolved * Removed version lalel type shi * Who thought this view existed? 😭 * Less wide tab bar * Actions button for movies + resetting watch progress * Disabled switching back from search to other views for 0.5 seconds (no other fix available rn) * Added divider (IBH) * Hide tab bar in module lib --------- Co-authored-by: cranci <100066266+cranci1@users.noreply.github.com>
This commit is contained in:
parent
4f0c705660
commit
9237324fcf
3 changed files with 24 additions and 10 deletions
|
|
@ -15,6 +15,7 @@ private struct ModuleLink: Identifiable {
|
|||
|
||||
struct CommunityLibraryView: View {
|
||||
@EnvironmentObject var moduleManager: ModuleManager
|
||||
@EnvironmentObject var tabBarController: TabBarController
|
||||
|
||||
@AppStorage("lastCommunityURL") private var inputURL: String = ""
|
||||
@State private var webURL: URL?
|
||||
|
|
@ -30,7 +31,6 @@ struct CommunityLibraryView: View {
|
|||
}
|
||||
|
||||
WebView(url: webURL) { linkURL in
|
||||
|
||||
if let comps = URLComponents(url: linkURL, resolvingAgainstBaseURL: false),
|
||||
let m = comps.queryItems?.first(where: { $0.name == "url" })?.value {
|
||||
moduleLinkToAdd = ModuleLink(url: m)
|
||||
|
|
@ -38,7 +38,13 @@ struct CommunityLibraryView: View {
|
|||
}
|
||||
.ignoresSafeArea(edges: .top)
|
||||
}
|
||||
.onAppear(perform: loadURL)
|
||||
.onAppear {
|
||||
loadURL()
|
||||
tabBarController.hideTabBar()
|
||||
}
|
||||
.onDisappear {
|
||||
tabBarController.showTabBar()
|
||||
}
|
||||
.sheet(item: $moduleLinkToAdd) { link in
|
||||
ModuleAdditionSettingsView(moduleUrl: link.url)
|
||||
.environmentObject(moduleManager)
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ struct TabBar: View {
|
|||
@Binding var selectedTab: Int
|
||||
@Binding var lastTab: Int
|
||||
@State var showSearch: Bool = false
|
||||
@State var searchLocked: Bool = false
|
||||
@FocusState var keyboardFocus: Bool
|
||||
@State var keyboardHidden: Bool = true
|
||||
@Binding var searchQuery: String
|
||||
|
|
@ -101,7 +102,7 @@ struct TabBar: View {
|
|||
.matchedGeometryEffect(id: "background_circle", in: animation)
|
||||
)
|
||||
}
|
||||
.disabled(!keyboardHidden)
|
||||
.disabled(!keyboardHidden || searchLocked)
|
||||
}
|
||||
|
||||
HStack {
|
||||
|
|
@ -174,7 +175,6 @@ struct TabBar: View {
|
|||
.padding(.horizontal, 20)
|
||||
.padding(.bottom, 20)
|
||||
.background {
|
||||
// Move the blur background here and animate it
|
||||
ProgressiveBlurView()
|
||||
.blur(radius: 10)
|
||||
.padding(.horizontal, -20)
|
||||
|
|
@ -207,18 +207,23 @@ struct TabBar: View {
|
|||
private func tabButton(for tab: TabItem, index: Int) -> some View {
|
||||
Button(action: {
|
||||
if index == tabs.count - 1 {
|
||||
searchLocked = true
|
||||
|
||||
withAnimation(.bouncy(duration: 0.3)) {
|
||||
lastTab = selectedTab
|
||||
selectedTab = index
|
||||
showSearch = true
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
|
||||
keyboardFocus = true
|
||||
}
|
||||
}
|
||||
|
||||
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
|
||||
searchLocked = false
|
||||
}
|
||||
} else {
|
||||
withAnimation(.bouncy(duration: 0.3)) {
|
||||
lastTab = selectedTab
|
||||
selectedTab = index
|
||||
if !searchLocked {
|
||||
withAnimation(.bouncy(duration: 0.3)) {
|
||||
lastTab = selectedTab
|
||||
selectedTab = index
|
||||
}
|
||||
}
|
||||
}
|
||||
}) {
|
||||
|
|
|
|||
|
|
@ -157,6 +157,9 @@ struct SearchContent: View {
|
|||
showDivider: index < searchHistory.count - 1
|
||||
)
|
||||
}
|
||||
Divider()
|
||||
.padding(.horizontal, 16)
|
||||
Spacer()
|
||||
HStack {
|
||||
Button(action: onClearHistory) {
|
||||
Text("Clear")
|
||||
|
|
|
|||
Loading…
Reference in a new issue