diff --git a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift index 442b8273..2d23506e 100644 --- a/IceCubesApp/App/Tabs/Settings/SettingsTab.swift +++ b/IceCubesApp/App/Tabs/Settings/SettingsTab.swift @@ -136,6 +136,9 @@ struct SettingsTabs: View { Toggle(isOn: $preferences.isSocialKeyboardEnabled) { Label("settings.other.social-keyboard", systemImage: "keyboard") } + Toggle(isOn: $preferences.autoPlayVideo) { + Label("settings.other.autoplay-video", systemImage: "play.square.stack") + } } .listRowBackground(theme.primaryBackgroundColor) } diff --git a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings index fa2083a1..5a9446b6 100644 --- a/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ca.lproj/Localizable.strings @@ -127,6 +127,7 @@ "settings.push.duplicate.title" = "Solucionador de notificacions duplicades"; "settings.push.duplicate.footer" = "Rebeu les notificacions duplicades? Proveu aquest botó màgic per a solucionar-ho"; "settings.push.duplicate.button.fix" = "🪄 Soluciona-ho"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Explora"; diff --git a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings index cc7b8988..5ad9e517 100644 --- a/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/de.lproj/Localizable.strings @@ -125,6 +125,7 @@ "settings.push.duplicate.title" = "Doppelte-Benachrichtigungen-Korrigierer"; "settings.push.duplicate.footer" = "Bekommst du doppelte Benachrichtigungen? Probier diesen magischen Knopf aus"; "settings.push.duplicate.button.fix" = "🪄 Beheben"; +"settings.other.autoplay-video" = "Auto Play Videos"; "enum.expand-media.show" = "Alle zeigen"; "enum.expand-media.hide" = "Alle verstecken"; diff --git a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings index 080d5e33..ba7f29ce 100644 --- a/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/en.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "Duplicate notifications fixer"; "settings.push.duplicate.footer" = "Receiving duplicate notifications? Try this magic button in order to fix it"; "settings.push.duplicate.button.fix" = "🪄 Fix it"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Explore"; diff --git a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings index 969e3c87..a2a5fb3f 100644 --- a/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/es.lproj/Localizable.strings @@ -125,6 +125,8 @@ "settings.push.duplicate.title" = "Arreglar notificaciones duplicadas"; "settings.push.duplicate.footer" = "¿Recibes notificaciones por duplicado? Usa este botón mágico para arreglarlo"; "settings.push.duplicate.button.fix" = "🪄 Arréglalo"; +"settings.other.autoplay-video" = "Auto Play Videos"; + "enum.expand-media.show" = "Siempre"; "enum.expand-media.hide" = "Nunca"; "enum.expand-media.hide-sensitive" = "Ocultar contenido sensible"; diff --git a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings index d2f71583..0df5178b 100644 --- a/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/fr.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "Correcteur de notifications en double"; "settings.push.duplicate.footer" = "Recevez-vous des notifications en double ? Essayez ce bouton magique pour résoudre le problème"; "settings.push.duplicate.button.fix" = "🪄 Résoudre"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Explorer"; diff --git a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings index 734c060c..0b56b7dc 100644 --- a/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/it.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "Sistema le notifiche duplicate"; "settings.push.duplicate.footer" = "Ricevi notifiche duplicate? Prova questo bottone magico per aggiustarle"; "settings.push.duplicate.button.fix" = "🪄 Aggiusta"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Esplora"; diff --git a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings index ebbd3b17..94d01b86 100644 --- a/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ja.lproj/Localizable.strings @@ -111,6 +111,7 @@ "settings.push.duplicate.title" = "重複通知修正ツール"; "settings.push.duplicate.footer" = "重複して通知を受け取っていませんか？それを修正するためにこの魔法のボタンを試してみて"; "settings.push.duplicate.button.fix" = "🪄 修正する"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "エクスプローラー"; diff --git a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings index c315a3dd..cc036783 100644 --- a/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/ko.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "중복 알림 해결사"; "settings.push.duplicate.footer" = "같은 알림이 여러 번 오나요? 여기 있는 버튼을 누르면 마법처럼 해결될 거에요."; "settings.push.duplicate.button.fix" = "🪄 고치기"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "둘러보기"; diff --git a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings index f0ba94fe..4e6e4f32 100644 --- a/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nb.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "Reparasjon av dupliserte varslinger"; "settings.push.duplicate.footer" = "Får du dupliserte varsler? Prøv denne magiske knappen for å fikse det."; "settings.push.duplicate.button.fix" = "🪄 Fiks det"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Utforsk"; diff --git a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings index 6d9aff82..9fdbf485 100644 --- a/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/nl.lproj/Localizable.strings @@ -125,6 +125,7 @@ "settings.push.duplicate.title" = "Dubbele meldingen"; "settings.push.duplicate.footer" = "Ontvang je dubbele meldingen? Gebruik deze magische knop om dit probleem te verhelpen"; "settings.push.duplicate.button.fix" = "🪄 Los op"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Ontdekken"; diff --git a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings index 04171a0d..a03044ee 100644 --- a/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pl.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "Korektor duplikatów powiadomień"; "settings.push.duplicate.footer" = "Otrzymujesz zduplikowane powiadomienia? Spróbuj tego magicznego przycisku, aby to naprawić"; "settings.push.duplicate.button.fix" = "🪄 Napraw to"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Odkrywaj"; diff --git a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings index b2969df8..824a046d 100644 --- a/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/pt-BR.lproj/Localizable.strings @@ -128,6 +128,7 @@ "settings.push.duplicate.title" = "Corretor de notificações duplicadas"; "settings.push.duplicate.footer" = "Recebendo notificações duplicadas? Tente este botão mágico para tentar corrigir"; "settings.push.duplicate.button.fix" = "🪄 Corrigir"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Explorar"; diff --git a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings index c206da98..7efbb5ae 100644 --- a/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/tr.lproj/Localizable.strings @@ -114,6 +114,7 @@ "settings.push.duplicate.title" = "Duplicate notifications fixer"; "settings.push.duplicate.footer" = "Receiving duplicate notifications? Try this magic button in order to fix it"; "settings.push.duplicate.button.fix" = "🪄 Fix it"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "Keşfet"; diff --git a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings index e9f163ea..d8c0f862 100644 --- a/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings +++ b/IceCubesApp/Resources/Localization/zh-Hans.lproj/Localizable.strings @@ -127,6 +127,7 @@ "settings.push.duplicate.title" = "重复推送通知修复器"; "settings.push.duplicate.footer" = "有收到重复的推送通知？试试用这个魔法按钮去修复吧"; "settings.push.duplicate.button.fix" = "🪄 修复"; +"settings.other.autoplay-video" = "Auto Play Videos"; // MARK: Tabs "tab.explore" = "探索"; diff --git a/Packages/Env/Sources/Env/UserPreferences.swift b/Packages/Env/Sources/Env/UserPreferences.swift index 230422bd..0217003e 100644 --- a/Packages/Env/Sources/Env/UserPreferences.swift +++ b/Packages/Env/Sources/Env/UserPreferences.swift @@ -25,6 +25,7 @@ public class UserPreferences: ObservableObject { @AppStorage("app_auto_expand_media") public var appAutoExpandMedia: ServerPreferences.AutoExpandMedia = .hideSensitive @AppStorage("app_default_post_visibility") public var appDefaultPostVisibility: Models.Visibility = .pub @AppStorage("app_default_posts_sensitive") public var appDefaultPostsSensitive = false + @AppStorage("autoplay_video") public var autoPlayVideo = true public var postVisibility: Models.Visibility { if useInstanceContentSettings { diff --git a/Packages/Status/Sources/Status/Media/VideoPlayerView.swift b/Packages/Status/Sources/Status/Media/VideoPlayerView.swift index 5e0faf27..39602ef1 100644 --- a/Packages/Status/Sources/Status/Media/VideoPlayerView.swift +++ b/Packages/Status/Sources/Status/Media/VideoPlayerView.swift @@ -1,5 +1,6 @@ import AVKit import SwiftUI +import Env class VideoPlayerViewModel: ObservableObject { @Published var player: AVPlayer? @@ -9,10 +10,12 @@ class VideoPlayerViewModel: ObservableObject { self.url = url } - func preparePlayer() { + func preparePlayer(autoPlay: Bool) { player = .init(url: url) player?.isMuted = true - player?.play() + if autoPlay { + player?.play() + } guard let player else { return } NotificationCenter.default.addObserver(forName: .AVPlayerItemDidPlayToEndTime, object: player.currentItem, queue: .main) { [weak self] _ in @@ -36,13 +39,15 @@ class VideoPlayerViewModel: ObservableObject { struct VideoPlayerView: View { @Environment(\.scenePhase) private var scenePhase + @EnvironmentObject private var preferences: UserPreferences + @StateObject var viewModel: VideoPlayerViewModel var body: some View { VStack { VideoPlayer(player: viewModel.player) }.onAppear { - viewModel.preparePlayer() + viewModel.preparePlayer(autoPlay: preferences.autoPlayVideo) } .onChange(of: scenePhase, perform: { scenePhase in switch scenePhase {