diff --git a/Shared/Generated/Strings.swift b/Shared/Generated/Strings.swift index 3d7d1eb7..8b6fe26b 100644 --- a/Shared/Generated/Strings.swift +++ b/Shared/Generated/Strings.swift @@ -78,6 +78,8 @@ internal enum L10n { internal static var `continue`: String { return L10n.tr("Localizable", "continue") } /// Continue Watching internal static var continueWatching: String { return L10n.tr("Localizable", "continueWatching") } + /// Current Position + internal static var currentPosition: String { return L10n.tr("Localizable", "currentPosition") } /// Customize internal static var customize: String { return L10n.tr("Localizable", "customize") } /// Dark @@ -254,6 +256,8 @@ internal enum L10n { internal static var regular: String { return L10n.tr("Localizable", "regular") } /// Released internal static var released: String { return L10n.tr("Localizable", "released") } + /// Remaining Time + internal static var remainingTime: String { return L10n.tr("Localizable", "remainingTime") } /// Remove internal static var remove: String { return L10n.tr("Localizable", "remove") } /// Remove All Users diff --git a/Swiftfin/Views/ServerListView.swift b/Swiftfin/Views/ServerListView.swift index e561acd4..fc47f664 100644 --- a/Swiftfin/Views/ServerListView.swift +++ b/Swiftfin/Views/ServerListView.swift @@ -26,7 +26,6 @@ struct ServerListView: View { ZStack(alignment: Alignment.leading) { Rectangle() .foregroundColor(Color(UIColor.secondarySystemFill)) - .frame(height: 100) .cornerRadius(10) HStack(spacing: 10) { @@ -48,7 +47,7 @@ struct ServerListView: View { .font(.footnote) .foregroundColor(.primary) } - }.padding([.leading]) + }.padding() } .padding() } diff --git a/Swiftfin/Views/VideoPlayer/Overlays/VLCPlayerOverlayView.swift b/Swiftfin/Views/VideoPlayer/Overlays/VLCPlayerOverlayView.swift index 2925ea77..ce9979f0 100644 --- a/Swiftfin/Views/VideoPlayer/Overlays/VLCPlayerOverlayView.swift +++ b/Swiftfin/Views/VideoPlayer/Overlays/VLCPlayerOverlayView.swift @@ -340,6 +340,8 @@ struct VLCPlayerOverlayView: View { Text(viewModel.leftLabelText) .font(.system(size: 18, weight: .semibold, design: .default)) .frame(minWidth: 70, maxWidth: 70) + .accessibilityLabel(L10n.currentPosition) + .accessibilityValue(viewModel.leftLabelText) ValueSlider(value: $viewModel.sliderPercentage, onEditingChanged: { editing in viewModel.sliderIsScrubbing = editing @@ -358,6 +360,8 @@ struct VLCPlayerOverlayView: View { Text(viewModel.rightLabelText) .font(.system(size: 18, weight: .semibold, design: .default)) .frame(minWidth: 70, maxWidth: 70) + .accessibilityLabel(L10n.remainingTime) + .accessibilityValue(viewModel.rightLabelText) } .padding(.horizontal) .frame(maxWidth: UIDevice.current.userInterfaceIdiom == .pad ? 800 : nil) diff --git a/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift b/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift index bbefa2f9..a22a5212 100644 --- a/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift +++ b/Swiftfin/Views/VideoPlayer/VLCPlayerViewController.swift @@ -489,6 +489,8 @@ extension VLCPlayerViewController { } private func hideOverlay() { + guard !UIAccessibility.isVoiceOverRunning else { return } + guard let overlayHostingController = currentOverlayHostingController else { return } guard overlayHostingController.view.alpha != 0 else { return } diff --git a/Translations/en.lproj/Localizable.strings b/Translations/en.lproj/Localizable.strings index 7a7a17a8..48c1114e 100644 Binary files a/Translations/en.lproj/Localizable.strings and b/Translations/en.lproj/Localizable.strings differ