mirror of
https://github.com/yattee/yattee.git
synced 2024-12-22 13:33:42 +00:00
Lint
This commit is contained in:
parent
ae365e814c
commit
b3d471c8a0
@ -53,7 +53,7 @@ final class InstancesModel: ObservableObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static func remove(_ instance: Instance) {
|
static func remove(_ instance: Instance) {
|
||||||
let accounts = InstancesModel.accounts(instance.id)
|
let accounts = Self.accounts(instance.id)
|
||||||
if let index = Defaults[.instances].firstIndex(where: { $0.id == instance.id }) {
|
if let index = Defaults[.instances].firstIndex(where: { $0.id == instance.id }) {
|
||||||
Defaults[.instances].remove(at: index)
|
Defaults[.instances].remove(at: index)
|
||||||
accounts.forEach { AccountsModel.remove($0) }
|
accounts.forEach { AccountsModel.remove($0) }
|
||||||
|
@ -160,11 +160,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func pathPattern(_ path: String) -> String {
|
private func pathPattern(_ path: String) -> String {
|
||||||
"**\(InvidiousAPI.basePath)/\(path)"
|
"**\(Self.basePath)/\(path)"
|
||||||
}
|
}
|
||||||
|
|
||||||
private func basePathAppending(_ path: String) -> String {
|
private func basePathAppending(_ path: String) -> String {
|
||||||
"\(InvidiousAPI.basePath)/\(path)"
|
"\(Self.basePath)/\(path)"
|
||||||
}
|
}
|
||||||
|
|
||||||
private var cookieHeader: String {
|
private var cookieHeader: String {
|
||||||
@ -172,11 +172,11 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var popular: Resource? {
|
var popular: Resource? {
|
||||||
resource(baseURL: account.url, path: "\(InvidiousAPI.basePath)/popular")
|
resource(baseURL: account.url, path: "\(Self.basePath)/popular")
|
||||||
}
|
}
|
||||||
|
|
||||||
func trending(country: Country, category: TrendingCategory?) -> Resource {
|
func trending(country: Country, category: TrendingCategory?) -> Resource {
|
||||||
resource(baseURL: account.url, path: "\(InvidiousAPI.basePath)/trending")
|
resource(baseURL: account.url, path: "\(Self.basePath)/trending")
|
||||||
.withParam("type", category?.name)
|
.withParam("type", category?.name)
|
||||||
.withParam("region", country.rawValue)
|
.withParam("region", country.rawValue)
|
||||||
}
|
}
|
||||||
@ -186,7 +186,7 @@ final class InvidiousAPI: Service, ObservableObject, VideosAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var feed: Resource? {
|
var feed: Resource? {
|
||||||
resource(baseURL: account.url, path: "\(InvidiousAPI.basePath)/auth/feed")
|
resource(baseURL: account.url, path: "\(Self.basePath)/auth/feed")
|
||||||
}
|
}
|
||||||
|
|
||||||
var subscriptions: Resource? {
|
var subscriptions: Resource? {
|
||||||
|
@ -13,7 +13,7 @@ final class SponsorBlockAPI: ObservableObject {
|
|||||||
@Published var segments = [Segment]()
|
@Published var segments = [Segment]()
|
||||||
|
|
||||||
static func categoryDescription(_ name: String) -> String? {
|
static func categoryDescription(_ name: String) -> String? {
|
||||||
guard SponsorBlockAPI.categories.contains(name) else {
|
guard Self.categories.contains(name) else {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -30,7 +30,7 @@ final class SponsorBlockAPI: ObservableObject {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static func categoryDetails(_ name: String) -> String? {
|
static func categoryDetails(_ name: String) -> String? {
|
||||||
guard SponsorBlockAPI.categories.contains(name) else {
|
guard Self.categories.contains(name) else {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ struct VideoDetailsPaddingModifier: ViewModifier {
|
|||||||
self.geometry = geometry
|
self.geometry = geometry
|
||||||
self.aspectRatio = aspectRatio ?? VideoPlayerView.defaultAspectRatio
|
self.aspectRatio = aspectRatio ?? VideoPlayerView.defaultAspectRatio
|
||||||
self.minimumHeightLeft = minimumHeightLeft ?? VideoPlayerView.defaultMinimumHeightLeft
|
self.minimumHeightLeft = minimumHeightLeft ?? VideoPlayerView.defaultMinimumHeightLeft
|
||||||
self.additionalPadding = additionalPadding ?? VideoDetailsPaddingModifier.defaultAdditionalDetailsPadding
|
self.additionalPadding = additionalPadding ?? Self.defaultAdditionalDetailsPadding
|
||||||
self.fullScreen = fullScreen
|
self.fullScreen = fullScreen
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -274,7 +274,7 @@ struct VideoPlayerView: View {
|
|||||||
Spacer()
|
Spacer()
|
||||||
}
|
}
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / VideoPlayerView.defaultAspectRatio)
|
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / Self.defaultAspectRatio)
|
||||||
}
|
}
|
||||||
|
|
||||||
func pictureInPicturePlaceholder(geometry: GeometryProxy) -> some View {
|
func pictureInPicturePlaceholder(geometry: GeometryProxy) -> some View {
|
||||||
@ -303,7 +303,7 @@ struct VideoPlayerView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / VideoPlayerView.defaultAspectRatio)
|
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 0, maxHeight: geometry.size.width / Self.defaultAspectRatio)
|
||||||
}
|
}
|
||||||
|
|
||||||
var sidebarQueue: Bool {
|
var sidebarQueue: Bool {
|
||||||
|
@ -17,9 +17,9 @@ struct TrendingCountry: View {
|
|||||||
#if !os(tvOS)
|
#if !os(tvOS)
|
||||||
HStack {
|
HStack {
|
||||||
if #available(iOS 15.0, macOS 12.0, *) {
|
if #available(iOS 15.0, macOS 12.0, *) {
|
||||||
TextField("Country", text: $query, prompt: Text(TrendingCountry.prompt))
|
TextField("Country", text: $query, prompt: Text(Self.prompt))
|
||||||
} else {
|
} else {
|
||||||
TextField(TrendingCountry.prompt, text: $query)
|
TextField(Self.prompt, text: $query)
|
||||||
}
|
}
|
||||||
|
|
||||||
Button("Done") { selectCountryAndDismiss() }
|
Button("Done") { selectCountryAndDismiss() }
|
||||||
|
@ -11,7 +11,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { // swiftlint:disable:this discouraged_optional_collection
|
func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool { // swiftlint:disable:this discouraged_optional_collection
|
||||||
AppDelegate.instance = self
|
Self.instance = self
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user