From 004e4be4d36c833572bf27c363bf5d9c5c36501f Mon Sep 17 00:00:00 2001
From: quonverbat <quonverbat@gmail.com>
Date: Wed, 2 Apr 2025 00:32:10 +0300
Subject: [PATCH 01/46] Added Turkish Translations

---
 app/src/main/res/values-tr/strings.xml | 1059 ++++++++++++++++++++++++
 1 file changed, 1059 insertions(+)
 create mode 100644 app/src/main/res/values-tr/strings.xml

diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000..bb0d98a5
--- /dev/null
+++ b/app/src/main/res/values-tr/strings.xml
@@ -0,0 +1,1059 @@
+<resources>
+    <string name="cast">Yayınla</string>
+    <string name="search">Ara</string>
+    <string name="add_to_query">Sorguya Ekle</string>
+    <string name="thumbnail">Thumbnail</string>
+    <string name="channel_image">Kanal Resmi</string>
+    <string name="add_to">Ekle</string>
+    <string name="lorem_ipsum" translatable="false">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
+    <string name="add_to_queue">Sıraya Ekle</string>
+    <string name="add_to_history">Geçmişe Ekle</string>
+    <string name="general">Genel</string>
+    <string name="channel">Kanal</string>
+    <string name="home">Ana Sayfa</string>
+    <string name="progress_bar">İlerleme Çubuğu</string>
+    <string name="progress_bar_description">Tarihsel bir ilerleme çubuğu gösterilecekse</string>
+    <string name="hide_hidden_from_search">Aramada, ana sayfada gizlenmişleri gizle</string>
+    <string name="hide_hidden_from_search_description">Ana sayfada gizlenmiş içerik üreticilerini ve videoları arama sonuçlarında da gizle</string>
+    <string name="recommendations">Önerilenler</string>
+    <string name="more">Daha Fazla</string>
+    <string name="playlists">Oynatma Listeleri</string>
+    <string name="subscriptions">Abonelikler</string>
+    <string name="loading">Yükleniyor</string>
+    <string name="retry">Yeniden Dene</string>
+    <string name="cancel">İptal et</string>
+    <string name="failed_to_retrieve_data_are_you_connected">Veri alınamadı, internete bağlı mısınız?</string>
+    <string name="settings">Ayarlar</string>
+    <string name="history">Geçmiş</string>
+    <string name="sources">Kaynaklar</string>
+    <string name="buy">Satın Al</string>
+    <string name="faq">SSS</string>
+    <string name="privacy_mode">Gizlilik Modu</string>
+    <string name="the_top_source_will_be_considered_primary">En üstteki kaynak birincil olarak kabul edilecektir</string>
+    <string name="defaults">Varsayılanlar</string>
+    <string name="home_screen">Ana Sayfa</string>
+    <string name="preferred_quality">Tercih Edilen Kalite</string>
+    <string name="preferred_quality_description">Bir videoyu izlemek için varsayılan kalite</string>
+    <string name="update">Güncelle</string>
+    <string name="close">Kapat</string>
+    <string name="never">Asla</string>
+    <string name="import_options">İçe aktarma seçeneklerinden birini seçin.</string>
+    <string name="there_is_an_update_available_do_you_wish_to_update">Bir güncelleme mevcut, uygulamayı güncellemek ister misiniz?</string>
+    <string name="downloading_update">Güncelleme indiriliyor…</string>
+    <string name="installing_update">Güncelleme kuruluyor…</string>
+    <string name="done">Tamamlandı</string>
+    <string name="getHome" translatable="false">getHome</string>
+    <string name="success">Başarılı</string>
+    <string name="failed_to_update_with_error">Paketi güncellenemedi hata></string>
+    <string name="general_failure">İşlem genel bir şekilde başarısız oldu</string>
+    <string name="aborted">İşlem aktif olarak iptal edildiği için başarısız oldu</string>
+    <string name="blocked">İşlem bloklandığı için başarısız oldu</string>
+    <string name="conflict">İşlem, cihazda zaten yüklü olan başka bir paketle çakıştığı için başarısız oldu</string>
+    <string name="incompatible">İşlem cihazla temel olarak uyumlu olmadığı için başarısız oldu</string>
+    <string name="invalid">İşlem bir ya da daha fazla APK geçersiz olduğundan başarısız oldu</string>
+    <string name="not_enough_storage">İşlem depolama sorunları yüzünden başarısız oldu</string>
+    <string name="live_capitalized">CANLI</string>
+    <string name="live">Canlı</string>
+    <string name="click_to_read_more">Daha fazla okumak için dokunun</string>
+    <string name="click_to_hide">Gizlemek için dokunun</string>
+    <string name="version">Versiyon</string>
+    <string name="sort_by">Göre sırala</string>
+    <string name="subscribe">Abone ol</string>
+    <string name="unsubscribe">Abonelikten çık</string>
+    <string name="background">Arka Plan</string>
+    <string name="background_revert">Video</string>
+    <string name="add">Ekle</string>
+    <string name="download">İndir</string>
+    <string name="share">Paylaş</string>
+    <string name="view_all">Hepsini görüntüle</string>
+    <string name="creators">Üreticiler</string>
+    <string name="enabled">Etkin</string>
+    <string name="keep_screen_on">Ekranı açık tut</string>
+    <string name="keep_screen_on_while_casting">Yayın sırasında ekranı açık tut</string>
+    <string name="always_proxy_requests">Her zaman proxy istekleri</string>
+    <string name="always_proxy_requests_description">Cihaz üzerinden veri yayınlarken her zaman proxy istekleri.</string>
+    <string name="discover">Keşfet</string>
+    <string name="find_new_video_sources_to_add">Eklemek için yeni video kaynakları bulun</string>
+    <string name="these_sources_have_been_disabled">Bu kaynaklar devre dışı bırakılmıştır</string>
+    <string name="these_creators_in_group">Bunlar bu grup için görünür olan üreticilerdir</string>
+    <string name="these_creators_not_in_group">Bu üreticiler bu grupta değiller</string>
+    <string name="disabled">Devre dışı</string>
+    <string name="watch_later">Daha sonra izle</string>
+    <string name="create">Oluştur</string>
+    <string name="ok">Tamam</string>
+    <string name="yes">Evet</string>
+    <string name="no">Hayır</string>
+    <string name="confirm">Onayla</string>
+    <string name="do_not_ask_again">Tekrar sorma</string>
+    <string name="confirm_delete_playlist">Bu oynatma listesini silmek istediğinizden emin misiniz?</string>
+    <string name="confirm_delete_subscription">Bu aboneliği kaldırmak istediğinizden emın misiniz?</string>
+    <string name="confirm_remove_source">Bu kaynağın kaldırılması aboneliklerinizin bazılarının çözümlenmemesine neden olacaktır.</string>
+    <string name="shuffle">Karıştır</string>
+    <string name="play_all">Hepsini oynat</string>
+    <string name="search_history">Arama geçmişi</string>
+    <string name="app_error">Uygulama Hatası</string>
+    <string name="developer">Geliştirici</string>
+    <string name="remove_historical_suggestion">Geçmiş önerisini kaldır</string>
+    <string name="comments">Yorumlar</string>
+    <string name="comments_description">İçeriğin altındaki yorum bölümü</string>
+    <string name="merchandise">Alışveriş</string>
+    <string name="reached_the_end_of_the_playlist">Oynatma listesinin sonuna ulaşıldı</string>
+    <string name="the_playlist_will_restart_after_the_video_is_finished">Oynatma listesi video sona erdikten sonra yeniden başlatılacak</string>
+    <string name="restart_now">Şimdi yeniden başlat</string>
+    <string name="end_of_queue_reached">Sıranın sonuna ulaşıldı</string>
+    <string name="end_of_playlist_reached">Oynatma listesinin sonuna ulaşıldı</string>
+    <string name="end_of_watch_later_reached">Daha Sonra İzle\'nin sonuna ulaşıldı</string>
+    <string name="reached_the_end_of_the_queue">Sıranın sonuna ulaşıldı</string>
+    <string name="the_queue_will_restart_after_the_video_is_finished">Sıra video sona erdikten sonra yeniden başlatılacak</string>
+    <string name="up_next">Sonraki</string>
+    <string name="queue">Sıra</string>
+    <string name="clear">Temizle</string>
+    <string name="last_hour">Son saat</string>
+    <string name="last_24_hours">Son 24 saat</string>
+    <string name="last_week">Son hafta</string>
+    <string name="last_30_days">Son 30 gün</string>
+    <string name="last_year">Son yıl</string>
+    <string name="all_time">Tüm zamanlar</string>
+    <string name="are_you_sure_delete_historical">Bu geçmiş girdileri kaldırmak istediğinizden emin misiniz?</string>
+    <string name="removed">kaldırıldı</string>
+    <string name="add_source">Kaynak ekle</string>
+    <string name="platform_url">Platform URL</string>
+    <string name="repository_url">Repository URL</string>
+    <string name="script_url">Kod URL</string>
+    <string name="config_url">Konfigürasyon URL</string>
+    <string name="source_permissions_explanation">Bunlar eklentinin çalışabilmesi için gereken izinlerdir</string>
+    <string name="source_explain_eval_access">Eklenti değerlendirme kapasitesine erişebilecek</string>
+    <string name="source_explain_script_url">Eklenti şu domainlere erişim sahibi olacak</string>
+    <string name="scan_qr">QR Kodu Okut</string>
+    <string name="scan_qr_explain">İndirmek için bir QR kodu okutun</string>
+    <string name="enter_url_explain">Eklentinin konfigürasyonunu yüklemek için bir URL girin</string>
+    <string name="enter_url">URL gir</string>
+    <string name="install">Kur</string>
+    <string name="no_devices_found_it_may_take_a_while_for_your_device_to_show_up_please_be_patient">Hiçbir cihaz bulunamadı. Cihazınızın görünmesi biraz zaman alabilir, lütfen sabırlı olun</string>
+    <string name="not_ready">Hazır değil</string>
+    <string name="connect">Bağlan</string>
+    <string name="stop">Dur</string>
+    <string name="start">Başlat</string>
+    <string name="storage_space">Depolama Alanı</string>
+    <string name="downloads">İndirmeler</string>
+    <string name="deselect_all">Hepsinin seçimini kaldır</string>
+    <string name="select_all">Hepsini seç</string>
+    <string name="add_casting_device">Yayınlama cihazı ekle</string>
+    <string name="new_activity">Yeni aktivite</string>
+    <string name="creator_is_on_neopass">Üretici NeoPass\'te</string>
+    <string name="options">Seçenekler</string>
+    <string name="export">Dışa aktar</string>
+    <string name="delete">Kaldır</string>
+    <string name="loading_update">Güncelleme yükleniyor…</string>
+    <string name="polycentric_explanation">Çevrimiçi videolara göz atarken ve yorum bırakmak istediğinizde, çevrimiçi varlığınızı yönetmenin hem kolay hem de ihtiyaçlarınıza odaklanmış yeni bir yolu olan Polycentric\'i deneyin. İşte bir Polycentric profili oluşturmanın harika bir seçim olmasının nedenleri:\n\n 1. Kontrol Sizde: Polycentric ile verileriniz tek bir şirket tarafından kontrol edilen tek bir yerde saklanmaz. Bunun yerine, birden fazla konuma yayılır ve çevrimiçi varlığınız üzerinde daha fazla kontrol sahibi olursunuz. Verilerinizin nerede saklanacağına siz karar verirsiniz ve sağlayıcılar arasında kolayca geçiş yapabilir veya yeni sağlayıcılar ekleyebilirsiniz.\n\n 2. Gizlilik ve Güvenlik: Polycentric, gelişmiş güvenlik teknikleri kullanarak bilgilerinizi güvende tutar. Kişisel bilgilerinizin iyi korunduğundan ve yalnızca bunları paylaşmayı seçtiğiniz kişiler tarafından erişilebilir olduğundan emin olabilirsiniz.\n\n 3. Sorunsuz Ağ Oluşturma: Polycentric, tek bir platforma bağlı kalmadan başkalarıyla bağlantı kurmanızı ve içerikleriyle etkileşim kurmanızı sağlar. Bir sağlayıcı güvenilmez hale gelirse veya erişimi engellemeye çalışırsa, Polycentric istemciniz otomatik olarak diğer kaynaklardan bilgi bularak sizi bağlı tutar.\n\n 4. Akıllı Arama ve Öneriler: Polycentric, arama ve öneriler için birden fazla kaynak kullanır ve size en üst düzey performansı sunarken hiçbir sağlayıcının gördüğünüz sonuçlar üzerinde fazla etkisi olmamasını sağlar.\n\n 5. Uyumlu ve Açık: Polycentric, kullanıcılarının ihtiyaçlarına uyum sağlayan sürekli iyileştirmeler ve yeni özellikler sunarak esnek ve yeni gelişmelere açık olacak şekilde tasarlanmıştır.\n\n 6. Bir Polycentric profili oluşturarak çevrimiçi videolara yorum bırakabilir ve daha kişiselleştirilmiş bir çevrimiçi deneyimin keyfini çıkarabilirsiniz. Bu kullanıcı dostu çözümün dijital hayatınızın kontrolünü nasıl size verdiğini kendiniz görün. Bugün Polycentric\'e kaydolun!</string>
+    <string name="publish">Yayınla</string>
+    <string name="usage">Kullanım</string>
+    <string name="enable_in_home">Ana sayfada etkinleştir</string>
+    <string name="enable_in_search">Aramada etkinleştir</string>
+    <string name="check">Kontrol et</string>
+    <string name="buy_text">Grayjay yapımı ve bakımı kolay ya da ucuz bir uygulama değildir. Uygulamada ve diğer sistemlerde tam zamanlı çalışan mühendislerimiz var. Ve parasını yakın zamanda -belki hiç- kazanamayacağız.\n\nFUTO\'nun misyonu, açık kaynaklı yazılım ve kötü amaçlı olmayan yazılım iş uygulamalarının projeler ve geliştiricileri için sürdürülebilir bir gelir kaynağı haline gelmesidir. Bu nedenle kullanıcıların yazılım için gerçekten ödeme yapmasından yanayız.\n\nBu yüzden Grayjay, yazılım için ödeme yapmanızı istiyor.</string>
+    <string name="an_uncaught_exception_was_thrown_we_re_sorry_for_the_inconvenience">Bir hata oluştu, rahatsızlıktan dolayı özür dileriz.</string>
+    <string name="to_help_us_solve_this_please_share_the_below_crash_report_with_us_and_perhaps_adds_some_context_on_what_you_were_doing">Bunu çözmemize yardım etmek için, lütfen çökme raporunu aşağıda bizimle paylaşın, ve sorunu ne yaparken yaşadığınız hakkında bilgi verin.</string>
+    <string name="new_profile">Yeni Profil</string>
+    <string name="import_existing_profile">Varolan Profili İçe Aktar</string>
+    <string name="generate_a_new_identity">Yeni bir kişilik oluşturun</string>
+    <string name="use_an_existing_identity">Varolan kişiliği kullanın</string>
+    <string name="permissions">İzinler</string>
+    <string name="security_warnings">Güvenlik Uyarıları</string>
+    <string name="these_are_warnings_of_plugin_behavior_and_implementation">Bunlar eklenti davranışına dair uyarılardır</string>
+    <string name="please_enter_the_captcha_and_close_when_finished">Lütfen CAPTCHA\'yı girin ve sona erdiğinde kapatın</string>
+    <string name="close_capitalized">KAPAT</string>
+    <string name="submit">Gönder</string>
+    <string name="restart">Yeniden Başlat</string>
+    <string name="manage_tabs">Sekmeleri Düzenle</string>
+    <string name="scan_to_import">İçe aktarmak için okutun</string>
+    <string name="send_your_identity_to_another_app">Kişiliğini başka bir uygulamaya gönder</string>
+    <string name="copy">Kopyala</string>
+    <string name="copy_your_identity_to_clipboard">Kişiğini panoya kopyala</string>
+    <string name="polycentric">Polycentric</string>
+    <string name="profile_name">Profil İsmi</string>
+    <string name="this_will_be_visible_to_other_users">Bu diğer kullanıcılara görünecek</string>
+    <string name="create_profile">Profil Oluştur</string>
+    <string name="or_capitalized">YA DA</string>
+    <string name="paste_profile_here_polycentric">Profilinizi buraya yapıştırın polycentric://…</string>
+    <string name="import_profile">Profili içe aktar</string>
+    <string name="you_re_apparantly_a_developer">Görünüşe göre bir geliştiricisiniz</string>
+    <string name="developer_settings">Geliştirici Ayarları</string>
+    <string name="migration">Migrasyon</string>
+    <string name="set_a_password_for_your_daily_backup">Günlük yedeklemeniz için bir şifre koyun</string>
+    <string name="set_a_password_used_to_encrypt_your_daily_backup_that_is_written_to_external_storage">Harici depolamaya yazılmış günlük yedeklemenizi şifrelemek için bir şifre koyun</string>
+    <string name="backup_password">Yedek Şifre</string>
+    <string name="repeat_password">Şifre Tekrar</string>
+    <string name="restore_from_automatic_backup">Otomatik yedeklemeden restore edin</string>
+    <string name="it_appears_an_automatic_backup_exists_on_your_device_if_you_would_like_to_restore_enter_your_backup_password">Görünüşe göre cihazınızda bir otomatik yedekleme var, eğer restore etmek isterseniz, yedek şifrenizi girin.</string>
+    <string name="restore">Restore Edin</string>
+    <string name="error_message_here">Hata Mesajı</string>
+    <string name="name">İsim</string>
+    <string name="ip">IP</string>
+    <string name="port">Port</string>
+    <string name="discovered_devices">Keşfedilmiş Cihazlar</string>
+    <string name="remembered_devices">Hatırlanan Cihazlar</string>
+    <string name="there_are_no_remembered_devices">Hatırlanan cihaz yok</string>
+    <string name="connected_to">Şuna bağlan</string>
+    <string name="volume">Ses</string>
+    <string name="changelog">Değişiklikler</string>
+    <string name="changelog_plugin_description">Bu versiyon ve önceki versiyonlar için var olan değişiklikleri gösterir</string>
+    <string name="some_example_changelog">Örnek bir değişiklik.</string>
+    <string name="previous">Önceki</string>
+    <string name="next">Sonraki</string>
+    <string name="comment">Yorum Yap</string>
+    <string name="not_empty_close">Yorum boş değil, yine de kapatmak ister misiniz?</string>
+    <string name="str_import">İçe aktar</string>
+    <string name="my_playlist_name">Benim oynatma listesi adım</string>
+    <string name="do_you_want_to_import_this_store">Bu belleği içe aktarmak ister misiniz?</string>
+    <string name="sources_required_need_to_be_enabled">Etkinleştirilmesi gereken kaynaklar</string>
+    <string name="items_require_migration_or_are_corrupted_would_you_like_to_restore_them_from_backup_now">Ögelerin taşınması gerekiyor veya bozulmuşlar, bunları şimdi yedekten geri yüklemek ister misiniz?</string>
+    <string name="if_ignored_you_will_be_asked_again_next_startup">Yok sayılırsa bir sonraki başlatmada tekrar sorulacaktır.</string>
+    <string name="ignore">Yok say</string>
+    <string name="view_changelog">Değişiklikleri görüntüle</string>
+    <string name="i_already_paid">Zaten ödedim</string>
+    <string name="memberships">Üyelikler</string>
+    <string name="a_monthly_recurring_payment_with_often">Sık sık tekrarlanan aylık ödeme</string>
+    <string name="additional_perks">ek avantajlar</string>
+    <string name="a_one_time_payment_to_support_the_creator">Üreticiye destek olmak için tek seferlik ödeme</string>
+    <string name="a_store_by_the_creator">Üreticinin mağazası</string>
+    <string name="donation">Bağış</string>
+    <string name="promotions">Promosyonlar</string>
+    <string name="current_promotions_by_this_creator">Bu yaratıcının güncel promosyonları</string>
+    <string name="downloading">İndiriliyor</string>
+    <string name="videos">Videolar</string>
+    <string name="clear_history">Geçmişi temizle</string>
+    <string name="nothing_to_import">İçe aktarılacak bir şey yok</string>
+    <string name="no_sources_installed">Herhangi bir kaynak indirmediniz, lütfen uygulamayı amaçlandığı şekilde kullanmak için kaynak ekleyin.</string>
+    <string name="enabling_lots_of_sources_can_reduce_the_loading_speed_of_your_application">Birçok kaynak eklemek uygulamanızın yüklenme hızını yavaşlatabilir.</string>
+    <string name="support">Destek</string>
+    <string name="membership">Üyelik</string>
+    <string name="store">Mağaza</string>
+    <string name="live_chat">Canlı Sohbet</string>
+    <string name="remove">Kaldır</string>
+    <string name="space_videos">Videolar</string>
+    <string name="playlist">Oynatma listesi</string>
+    <string name="neopass_channel">Polycentric kanal</string>
+    <string name="enable">Etkinleştir</string>
+    <string name="under_construction">Yapım aşamasında</string>
+    <string name="under">ALTINDA</string>
+    <string name="construction">YAPIM</string>
+    <string name="disable">Devre dışı bırak</string>
+    <string name="the_following_content_cannot_be_opened_in_grayjay_due_to_a_missing_plugin">Eksik eklenti yüzünden bu içerik Grayjay\'de oynatılamaz.</string>
+    <string name="locked_content_description">Bu içerik kilitli</string>
+    <string name="unknown">Bilinmeyen</string>
+    <string name="tap_to_open_in_browser">Tarayıcıda açmak için dokunun</string>
+    <string name="missing_plugin">Eksik Eklenti</string>
+    <string name="viewers_are_raiding">İzleyiciler baskın yapıyor</string>
+    <string name="go_now">Şimdi git</string>
+    <string name="prevent">Engel ol</string>
+    <string name="recently_used_playlist">Son Zamanlarda Kullanılan Oynatma Listesi</string>
+    <string name="license_email">Lisans e-postası</string>
+    <string name="required_to_send_the_license_key">Lisans anahtarını göndermek için gerekli</string>
+    <string name="receipt_email_user_domain_com">Makbuz e-postası (kullanıcı@domain.com)</string>
+    <string name="payment_using">Şu şekilde ödeme</string>
+    <string name="country">Ülke</string>
+    <string name="postal_code">Posta Kodu</string>
+    <string name="grayjay">Grayjay</string>
+    <string name="sales_tax">Satış Vergisi (</string>
+    <string name="total">Toplam</string>
+    <string name="pay">Ödeme</string>
+    <string name="standard_payment_methods">Standard ödeme yolları</string>
+    <string name="stripe_is_a_secure_online_payment_service_that_accepts_major_credit_cards_debit_cards_and_various_localized_payment_methods">Stripe, başlıca kredi kartlarını, banka kartlarını ve çeşitli yerelleştirilmiş ödeme yöntemlerini kabul eden güvenli bir çevrimiçi ödeme hizmetidir.</string>
+    <string name="add_a_comment">Bir yorum ekle…</string>
+    <string name="dismiss">İlgilenmiyorum</string>
+    <string name="scan_a_qr_code_to_install">Yüklemek için QR kodu okutun</string>
+    <string name="toggle_fullscreen">Tam ekrana geç</string>
+    <string name="by">Tarafından</string>
+    <string name="signature">İmza</string>
+    <string name="valid">Geçerli</string>
+    <string name="repeat">Tekrar et</string>
+    <string name="view">Görüntüle</string>
+    <string name="install_by_qr">QR kod ile indirin</string>
+    <string name="install_a_plugin_by_scanning_a_qr_code">QR kodu okutarak bir eklenti indirin</string>
+    <string name="logout">Çıkış Yap</string>
+    <string name="video">Video</string>
+    <string name="view_a_more_in_depth_video">Daha detaylı bir video görüntüleyin</string>
+    <string name="technical_documentation">Teknik Dokümantasyon</string>
+    <string name="view_the_technical_documentation">Teknik dokümantasyonu görüntüleyin</string>
+    <string name="visit_my_store">Mağazamı ziyaret edin</string>
+    <string name="make_a_backup_of_your_identity">Kişiliğinizin bir yedeklemesini oluşturun</string>
+    <string name="sign_out_of_this_identity">Bu kişilikten çıkış yap</string>
+    <string name="delete_this_profile">Bu profili sil</string>
+    <string name="install_by_url">URL ile yükleyin</string>
+    <string name="cache_to_quickly_load_previously_fetched_videos">Önceden yüklenmiş videoları daha hızlı yüklemek için önbelleğe alın</string>
+    <string name="a_list_of_user_reported_and_self_reported_issues">Kullanıcılar tarafından ve kendi bildirilen raporların bir listesi</string>
+    <string name="also_removes_any_data_related_plugin_like_login_or_settings">Ayrıca oturum açma veya ayarlar gibi verilerle ilgili tüm eklentileri kaldırır</string>
+    <string name="announcement">Duyuru</string>
+    <string name="notifications">Bildirimler</string>
+    <string name="check_disabled_plugin_updates">Güncellemeler için devre dışı bırakılmış eklentileri kontrol edin</string>
+    <string name="check_disabled_plugin_updates_description">Güncellemeler için devre dışı bırakılmış eklentileri kontrol edin</string>
+    <string name="planned_content_notifications">Planlanmış İçerik Bildirimleri</string>
+    <string name="planned_content_notifications_description">Keşfedilen planlanmış içerikleri bildirim olarak zamanlar, bu sayede bu içerik için daha doğru bildirimler verir.</string>
+    <string name="attempt_to_utilize_byte_ranges">Bayt aralıklarını kullanmaya çalışın</string>
+    <string name="auto_update">Otomatik Güncelleme</string>
+    <string name="always_allow_reverse_landscape_auto_rotate">Ters yatay otomatik döndürmeye her zaman izin ver</string>
+    <string name="always_allow_reverse_landscape_auto_rotate_description">Sistem ayarlarından otomatik döndürmeyi devre dışı bıraksanız bile, tam ekran modunda iki yatay yön arasında her zaman otomatik döndürme olacaktır.</string>
+    <string name="simplify_sources">Kaynakları basitleştir</string>
+    <string name="simplify_sources_description">Çözünürlük yoluyla kaynaklar çoğaltılır, böylece yalnızca alakalı kaynaklar görünür.</string>
+    <string name="automatic_backup">Otomatik Yedekleme</string>
+    <string name="background_behavior">Arka Plan Davranışı</string>
+    <string name="background_update">Arka Plan Güncellemesi</string>
+    <string name="background_download">Arka Plan İndirmesi</string>
+    <string name="backup">Yedekleme</string>
+    <string name="browsing">Göz Atma</string>
+    <string name="byte_range_concurrency">ByteRange Concurrency</string>
+    <string name="byte_range_download">ByteRange İndirmesi</string>
+    <string name="casting">Yayınlama</string>
+    <string name="change_behavior_of_the_player">Oynatıcının davranışını değiştir</string>
+    <string name="change_external_downloads_directory">Harici indirilenler klasörünü değiştir</string>
+    <string name="clear_external_downloads_directory">Harici indirilenler klasörünü temizle</string>
+    <string name="change_external_general_directory">Harici genel klasörünü değiştir</string>
+    <string name="change_tabs_visible_on_the_home_screen">Ana sayfada görünen sekmeleri değiştir</string>
+    <string name="link_handling">Link Kontrolü</string>
+    <string name="allow_grayjay_to_handle_links">Grayjay\'in linkleri yönetmesine izin ver</string>
+    <string name="change_the_external_directory_for_general_files">Genel dosyalar için harici klasörü değiştir</string>
+    <string name="clear_the_external_storage_for_download_files">İndirilen dosyalar için harici depolama alanını temizle</string>
+    <string name="change_the_external_storage_for_download_files">İndirilen dosyalar için harici depolama alanını değiştir</string>
+    <string name="clear_cookies">Çerezleri Temizle</string>
+    <string name="clear_cookies_on_logout">Çıkışta Çerezleri Temizle</string>
+    <string name="test_background_worker">Arka Plan İşlerini Test Et</string>
+    <string name="test_background_worker_description"></string>
+    <string name="clear_payment">Ödemeyi Temizle</string>
+    <string name="clears_cookies_when_you_log_out">Çıkış yaptığınızda çerezleri temizler</string>
+    <string name="clears_in_app_browser_cookies">Uygulama-içi tarayıcı çerezlerini temizler</string>
+    <string name="configure_browsing_behavior">Göz atma davranışını özelleştir</string>
+    <string name="time_bar">Zaman çubuğu</string>
+    <string name="configure_if_historical_time_bar_should_be_shown">Tarihsel zaman çubuklarının gösterimini özelleştir</string>
+    <string name="configure_casting">Yayınlamayı özelleştir</string>
+    <string name="configure_daily_backup_in_case_of_catastrophic_failure">Felaket niteliğinde bir arıza durumunda günlük yedeklemeyi özelleştir</string>
+    <string name="configure_downloading_of_videos">Videoların indirilmesini özelleştir</string>
+    <string name="configure_how_your_home_tab_works_and_feels">Ana sayfa sekmenizin nasıl çalışacağını ve görüneceğini özelleştirin</string>
+    <string name="configure_how_your_subscriptions_works_and_feels">Abonelikler sekmenizin nasıl çalışacağını ve görüneceğini özelleştirin</string>
+    <string name="configure_if_background_download_should_be_used">Arka planda indirmenin kullanılıp kullanılmayacağını özelleştirin</string>
+    <string name="configure_the_auto_updater">Otomatik güncelleştiriciyi özelleştirin</string>
+    <string name="configure_when_updates_should_be_downloaded">Güncellemelerin ne zaman indirileceğini özelleştirin</string>
+    <string name="configure_when_videos_should_be_downloaded">Videoların ne zaman indirileceğini özelleştirin</string>
+    <string name="creates_a_zip_file_with_your_data_which_can_be_imported_by_opening_it_with_grayjay">Grayjay ile açarak içe aktarabileceğiniz verilerinizi içeren bir zip dosyası oluşturur</string>
+    <string name="default_audio_quality">Varsayılan Ses Kalitesi</string>
+    <string name="default_playback_speed">Varsayılan Oynatma Hızı</string>
+    <string name="default_video_quality">Varsayılan Video Kalitesi</string>
+    <string name="deletes_license_keys_from_app">Uygulamadan lisans anahtarlarını sil</string>
+    <string name="download_when">Ne zaman indir</string>
+    <string name="enable_video_cache">Video Önbelleğini Etkinleştir</string>
+    <string name="enable_casting">Yayınlamayı etkinleştir</string>
+    <string name="experimental_background_update_for_subscriptions_cache">Abonelik önbelleği için deneysel arka plan güncellemesi</string>
+    <string name="export_data">Veriyi Dışa Aktar</string>
+    <string name="import_data">Veriyi İçe Aktar</string>
+    <string name="import_data_description">İçe aktarmak için bir dosya seçin, çeşitli dosyaları destekler (doğrudan açmak yerine)</string>
+    <string name="external_storage">Harici Depolama</string>
+    <string name="feed_style">Feed Stili</string>
+    <string name="language">Dil</string>
+    <string name="app_language">Uygulama Dili</string>
+    <string name="may_require_restart">Yeniden başlatma gerektirebilir</string>
+    <string name="fetch_on_app_boot">Uygulama başlatıldığında al</string>
+    <string name="fetch_on_tab_opened">Sekme açıldığında al</string>
+    <string name="fetch_on_tab_opened_description">Sekme açıldığında yeni sonuçlar alın (henüz sonuç yoksa ve sorun yaşamıyorsanız, devre dışı bırakılması önerilmez)</string>
+    <string name="always_reload_from_cache">Her zaman önbellekten yeniden yükle</string>
+    <string name="always_reload_from_cache_description">Bu önerilmez, ama bazı sorunlar için geçici bir çözümdür.</string>
+    <string name="peek_channel_contents">Kanal İçeriklerine Göz At</string>
+    <string name="peek_channel_contents_description">Eğer eklenti tarafından destekleniyorsa, kanal içeriğini önizleyin. Oran sınırlı çağrılar nedeniyle, bu işlem abonelik yenileme süresini artırabilir.</string>
+    <string name="get_answers_to_common_questions">Çok sorulan sorulara cevap al</string>
+    <string name="give_feedback_on_the_application">Uygulamaya geri bildirimde bulunun</string>
+    <string name="info">Bilgi</string>
+    <string name="networking">Ağ</string>
+    <string name="synchronization">Senkronizasyon</string>
+    <string name="enabled_description">Özelliği etkinleştir</string>
+    <string name="broadcast">Yayın</string>
+    <string name="broadcast_description">Cihazın varlığını yayınlamasına izin ver</string>
+    <string name="connect_discovered">Keşfedilenlere bağlan</string>
+    <string name="connect_discovered_description">Cihazın bilinen eşleştirilmiş cihazları aramasına ve onlarla bağlantı başlatmasına izin ver</string>
+    <string name="connect_last">Son bağlanılana bağlan</string>
+    <string name="connect_last_description">Cihazın son bilinen cihaza otomatik olarak bağlanmasına izin ver</string>
+    <string name="gesture_controls">Hareket Kontrolleri</string>
+    <string name="volume_slider">Ses çubuğu</string>
+    <string name="volume_slider_descr">Kaydırma hareketinin sesi değiştirmesine izin ver</string>
+    <string name="brightness_slider">Parlaklık çubuğu</string>
+    <string name="brightness_slider_descr">Kayrdırma hareketinin parlaklığı değiştirmesine izin ver</string>
+    <string name="toggle_full_screen">Tam ekrana geç</string>
+    <string name="toggle_full_screen_descr">Kaydırma hareketinin tam ekrana geçmesine izin ver</string>
+    <string name="system_brightness">Sistem parlaklığı</string>
+    <string name="system_brightness_descr">Hareket kontrolleri sistem parlaklığını değiştirir</string>
+    <string name="restore_system_brightness">Sistem parlaklığını eski haline getir</string>
+    <string name="restore_system_brightness_descr">Sistem parlaklığını tam ekrandan çıkarken eski haline getir</string>
+    <string name="zoom_option">Yakınlaştırmayı etkinleştir</string>
+    <string name="zoom_option_descr">İki parmak kaydırma hareketi ile yakınlaştırmayı etkinleştir</string>
+    <string name="pan_option">Görüntüyü kaydırmayı etkinleştir</string>
+    <string name="pan_option_descr">İki parmak kaydırma hareketi ile görüntüyü dikey ve yatay olarak kaydırmayı etkinleştir</string>
+    <string name="system_volume">Sistem sesi</string>
+    <string name="system_volume_descr">Hareket kontrolleri sistem sesini değiştirir</string>
+    <string name="live_chat_webview">Canlı Chat Web Görüntüsü</string>
+    <string name="full_screen_portrait">Tam Ekran Portre</string>
+    <string name="reverse_portrait">Ters portreye izin ver</string>
+    <string name="reverse_portrait_description">Uygulamanın ters portreye dönmesine izin ver</string>
+    <string name="rotation_zone">Döndürme bölgesi</string>
+    <string name="rotation_zone_description">Döndürme bölgelerinin hassasiyetini belirleyin (daha az hassas yapmak için azaltın)</string>
+    <string name="stability_threshold_time">Stabilite eşik süresi</string>
+    <string name="stability_threshold_time_description">Bir dönüşü tetiklemek için yönelimin aynı olması gereken süreyi belirtin</string>
+    <string name="prefer_webm">Webm Video Kodeklerini Tercih Edin</string>
+    <string name="prefer_webm_description">Eğer oynatıcı mp4 kodeklerini (h264/AAC), Webm kodeklerine (vp9/opus) tercih ederse daha kötü bir uyumluluğa yol açabilir.</string>
+    <string name="full_autorotate_lock">Tam otomatik döndürme kilidi</string>
+    <string name="full_autorotate_lock_description">Döndürme kilidi açıksa herhangi bir döndürmeye engel olur (yatay ve yatay ters arasında geçişte bile).</string>
+    <string name="prefer_webm_audio">Webm Audio Kodeklerini Tercih Et</string>
+    <string name="prefer_webm_audio_description">Eğer oynatıcı mp4 kodeklerini (AAC), Webm kodeklerine (opus) tercih ederse daha kötü bir uyumluluğa yol açabilir.</string>
+    <string name="allow_under_cutout">Çerçeve altında videoya izin ver</string>
+    <string name="allow_under_cutout_description">Videonun tam ekranda ekran çerçevesinin altına gitmesine izin ver.\nYeniden başlatma gerektirebilir</string>
+    <string name="autoplay">Otomatik olarak sonraki videoyu oynat</string>
+    <string name="autoplay_description">Bir videoyu izlerken sonraki videoyu otomatik olarak oynatma varsayılan olacaktır</string>
+    <string name="allow_full_screen_portrait">Yatay videolar izlerken tam ekran portreye izin ver</string>
+    <string name="delete_watchlist_on_finish">İzlendikten sonra Daha Sonra İzle\'den kaldır</string>
+    <string name="delete_watchlist_on_finish_description">Büyük bir çoğunluğunu izlediğiniz bir videoyu Daha Sonra İzle\'de bırakırsanız, Daha Sonra İzle\'den kaldırılacaktır.</string>
+    <string name="background_switch_audio">Arka planda sese değiştir</string>
+    <string name="background_switch_audio_description">Mümkünse arka planda yalnızca ses akışına geçerek bant genişliği kullanımını optimize edin, bu takılmalara neden olabilir</string>
+    <string name="subscription_group_menu">Gruplar</string>
+    <string name="show_subscription_group">Abonelik Gruplarını Göster</string>
+    <string name="show_subscription_group_description">Abonelik gruplarının filtrelemek için aboneliklerinizin üzerinde gösterilmesi gerekiyorsa</string>
+    <string name="preview_feed_items">Feed Ögelerini Önizle</string>
+    <string name="preview_feed_items_description">Önizleme feed stili kullanıldığında, ögelerin üzerinden kaydırırken otomatik olarak önizlenir.</string>
+    <string name="log_level">Log Seviyesi</string>
+    <string name="logging">Loglama</string>
+    <string name="sync_grayjay">Grayjay\'i Senkronize Et</string>
+    <string name="sync_grayjay_description">Verilerinizi birden fazla cihaz arasında senkronize edin</string>
+    <string name="manage_polycentric_identity">Polycentric kişiliği düzenle</string>
+    <string name="manage_your_polycentric_identity">Polycentric kişiliğinizi düzenleyin</string>
+    <string name="manual_check">Manuel kontrol</string>
+    <string name="manually_check_for_updates">Güncellemeleri manuel olarak kontrol edin</string>
+    <string name="number_of_concurrent_threads_to_multiply_download_speeds_from_throttled_sources">Hız sınırlandırılmış kaynaklardan indirme hızlarını artırmak için eşzamanlı thread sayısı.</string>
+    <string name="payment">Ödeme</string>
+    <string name="payment_status">Ödeme Durumu</string>
+    <string name="bypass_rotation_prevention">Döndürme Engelini Baypas Et</string>
+    <string name="playlist_delete_confirmation">Oynatma Listesi Silme Onayı</string>
+    <string name="playlist_delete_confirmation_description">Bir oynatma listesinden bir medya silerken onay diyaloğu göster</string>
+    <string name="playlist_allow_dups">Kopya oynatma listesi videolarına izin ver</string>
+    <string name="playlist_allow_dups_description">Bir videonun oynatma listelerine birçok kere eklenmesine izin ver</string>
+    <string name="enable_polycentric">Polycentric\'i Etkinleştir</string>
+    <string name="polycentric_local_cache">Polycentric Lokal Önbelleğe İzin Ver </string>
+    <string name="polycentric_local_cache_description">Yükleme sürelerini azaltmak için Polycentric sonuçlarını cihazda önbelleğe alır, değişiklik uygulamanın yeniden başlatılmasını gerektirir</string>
+    <string name="can_be_disabled_when_you_are_experiencing_issues">Sorun yaşıyorsanız devre dışı bırakılabilir</string>
+    <string name="bypass_rotation_prevention_description">Video olmayan görüntülerde döndürmeyi etkinleştirir.\nUYARI: Bunun için tasarlanmamıştır</string>
+    <string name="bypass_rotation_prevention_warning">Bu beklenmeyen davranışlara neden olabilir ve çoğunlukla test edilmemiştir.</string>
+    <string name="changing_this_field_requires_restart">Bu bölümü değiştirmek uygulamanın yeniden başlatılmasını gerektirmektedir.</string>
+    <string name="player">Oynatıcı</string>
+    <string name="plugins">Eklentiler</string>
+    <string name="preferred_casting_quality">Tercih Edilen Yayınlama Kalitesi</string>
+    <string name="preferred_casting_quality_description">Harici bir cihaza yayınlarken varsayılan kalite</string>
+    <string name="preferred_metered_quality">Tercih Edilen Kalite (Ölçülü)</string>
+    <string name="preferred_metered_quality_description">Hücresel gibi ölçülü bağlantılarda varsayılan kalite</string>
+    <string name="preferred_preview_quality">Tercih Edilen Önizleme Kalitesi</string>
+    <string name="preferred_preview_quality_description">Bir videoyu önizlerken varsayılan kalite</string>
+    <string name="primary_language">Birincil Dil</string>
+    <string name="prefer_original_audio">Orijinal Sesi Tercih Et</string>
+    <string name="prefer_original_audio_description">Tercih edilen dil bilindiğinde bunun yerine orijinal sesi kullanın</string>
+    <string name="default_comment_section">Varsayılan Yorum Bölümü</string>
+    <string name="hide_recommendations">Önerilenleri Gizle</string>
+    <string name="hide_recommendations_description">Önerilenler sekmesini tamamen gizle.</string>
+    <string name="default_recommendations">Varsayılan Olarak Önerilenler</string>
+    <string name="default_recommendations_description">Varsayılan olarak yorumlar yerine, önerilenleri gösterir.</string>
+    <string name="bad_reputation_comments_fading">Kötü İtibara Sahip Yorumları Gösterme</string>
+    <string name="bad_reputation_comments_fading_description">Kötü itibara sahip yorumların gösterilip gösterilmemesi. Devre dışı bırakmak deneyimi kötüleştirebilir.</string>
+    <string name="reinstall_embedded_plugins">Gömülü Eklentileri Yeniden İndir</string>
+    <string name="remove_cached_version">Önbelleğe Alınmış Versiyonu Kaldır</string>
+    <string name="remove_the_last_downloaded_version">Son indirilmiş versiyonu kaldır</string>
+    <string name="clear_hidden">Gizli Ögeleri Temizle</string>
+    <string name="clear_hidden_description">Gizlenmiş üreticileri ve videoları temizleyerek onları yeniden gösterir</string>
+    <string name="reset_announcements">Duyuruları sıfırla</string>
+    <string name="reset_hidden_announcements">Gizli duyuruları sıfırla</string>
+    <string name="restore_automatic_backup">Otomatik Yedeklemeyi Restore Et</string>
+    <string name="restore_a_previous_automatic_backup">Bir önceki otomatik yedeklemeyi restore et</string>
+    <string name="resume_after_preview">Önizlemeden Sonra Devam Et</string>
+    <string name="review_the_current_and_past_changelogs">Şu anki ve önceki değişiklikleri görüntüle</string>
+    <string name="restart_after_audio_focus_loss">Ses odak kaybından sonra yeniden başlat</string>
+    <string name="restart_playback_when_gaining_audio_focus_after_a_loss">Bir ses kayıptan sonra ses odağı kazanıldığında oynatmayı yeniden başlat</string>
+    <string name="restart_after_connectivity_loss">Bağlantı kaybından sonra yeniden başlat</string>
+    <string name="restart_playback_when_gaining_connectivity_after_a_loss">Bir bağlantı kayıptan sonra bağlantı sağlandığında oynatmayı yeniden başlat</string>
+    <string name="chapter_update_fps_title">Bölüm Güncelleme FPS\'i</string>
+    <string name="chapter_update_fps_description">Bölüm güncellemesinin doğruluğunu değiştirin, daha yüksek olması daha fazla performansa mal olabilir</string>
+    <string name="set_automatic_backup">Otomatik Yedeklemeyi Ayarlayın</string>
+    <string name="shortly_after_opening_the_app_start_fetching_subscriptions">Uygulamayı açtıktan kısa bir süre sonra, abonelikleri almaya başla</string>
+    <string name="show_faq">Sıkça Sorulan Soruları (SSS) Göster</string>
+    <string name="show_issues">Sorunları Göster</string>
+    <string name="specify_how_many_threads_are_used_to_fetch_channels">Kanalları almak için kaç thread kullanılacağını belirtin</string>
+    <string name="submit_feedback">Geri bildirim gönder</string>
+    <string name="submit_logs">Logları gönder</string>
+    <string name="clear_channel_cache">Kanal Önbelleğini Temizle</string>
+    <string name="clear_channel_cache_description">Abonelik kanalı önbelleğinden tüm içeriği siler</string>
+    <string name="submit_logs_to_help_us_narrow_down_issues">Sorunları azaltmamızda bize yardım etmek için logları gönderin</string>
+    <string name="subscription_concurrency">Abonelik Eşzamanlılığı</string>
+    <string name="track_playtime_locally">Oynatma Süresini Lokal Olarak Takip Et</string>
+    <string name="track_playtime_locally_description">Aboneliklerin oynatma süresini lokal olarak takip edin, abonelikleri sıralarken ve üretici önerilirken kullanılır.</string>
+    <string name="show_watch_metrics">İzleme Ölçümlerini Göster</string>
+    <string name="show_watch_metrics_description">Her üreticinin oynatma süresini ve oynatma sayısını üreticiler sekmesinde gösterir</string>
+    <string name="this_prevents_the_device_from_rotating_within_the_given_amount_of_degrees">Bu verilen dereceye göre cihazın dönmesine engel olur</string>
+    <string name="use_the_live_chat_web_window_when_available_over_native_implementation">Eğer varsa yerel uygulaması yerine canlı chat web penceresini kullanın</string>
+    <string name="version_code">Versiyon Kodu</string>
+    <string name="version_name">Versiyon İsmi</string>
+    <string name="version_type">Versiyon Tipi</string>
+    <string name="dev_info_channel_cache_size">Kanal Önbellek Büyüklüğü (Başlat)</string>
+    <string name="when_watching_a_video_in_preview_mode_resume_at_the_position_when_opening_the_video_code">Önizleme modunda video izlerken, videoyu açarken o konumdan devam et</string>
+    <string name="please_enable_logging_to_submit_logs">Lütfen log göndermek logları etkinleştirin</string>
+    <string name="embedded_plugins_reinstalled_a_reboot_is_recommended">Gömülü eklentiler yeniden kuruldu, uygulamayı yeniden başlatmanız önerilir</string>
+    <string name="announcements_reset">Duyurular sıfırlandı.</string>
+    <string name="failed_to_show_store">Mağazayı gösterme başarısız oldu.</string>
+    <string name="retrieving_changelog">Değişiklikler alınıyor</string>
+    <string name="paid">Ödendi</string>
+    <string name="not_paid">Ödenmedi</string>
+    <string name="licenses_cleared_might_require_app_restart">Lisanslar temizlendi, bu, uygulamanın yeniden başlatılmasını gerektirebilir</string>
+    <string name="attempts_to_fetch_2_pages_from_getHome">getHome\'dan 2 sayfa alma denemeleri</string>
+    <string name="background_subscription_testing">Arka Plan Abonelik Testi</string>
+    <string name="clear_all_downloaded">Bütün İndirilenleri Temizle</string>
+    <string name="clear_downloads">İndirilenleri Temizle</string>
+    <string name="clear_all_cookies_from_the_cookieManager">CookieManager\'dan bütün çerezleri temizle</string>
+    <string name="crash_me">Beni Çökert</string>
+    <string name="crashes_the_application_on_purpose">Uygulamayı bilerek çökertir</string>
+    <string name="delete_announcements">Duyuruları Sil</string>
+    <string name="delete_unresolved">Çözümlenmemişleri Sil</string>
+    <string name="delete_all_announcements">Tüm duyuruları sil</string>
+    <string name="deletes_all_downloaded_videos_and_related_files">Tüm indirilen videoları ve ilgili dosyaları siler</string>
+    <string name="deletes_all_ongoing_downloads">Devam eden indirilenleri siler</string>
+    <string name="deletes_all_unresolved_source_files">Çözümlenmemiş kaynak dosyalarını siler</string>
+    <string name="developer_mode">Geliştirici Modu</string>
+    <string name="allow_all_certificates">Tüm Sertifikalara İzin Ver</string>
+    <string name="allow_all_certificates_warning">Bu, Grayjay ağ trafiğinizin tamamının açığa çıkma riski taşır.</string>
+    <string name="development_server">Geliştirme Sunucusu</string>
+    <string name="experimental">Deneysel</string>
+    <string name="cache">Önbellek</string>
+    <string name="fill_storage_till_error">Depoyu hata alana kadar doldur</string>
+    <string name="inject">Enjekte Et</string>
+    <string name="injects_a_test_source_config_local_into_v8">V8\'e bir test kaynak konfigürasyonu (local) enjekte eder</string>
+    <string name="other">Diğer</string>
+    <string name="others_ellipsis">Diğerleri…</string>
+    <string name="removes_all_subscriptions">Tüm abonelikleri siler</string>
+    <string name="settings_related_to_development_server_be_careful_as_it_may_open_your_phone_to_security_vulnerabilities">Geliştirme sunucusu ile ilgili ayarlar, telefonunuzu güvenlik açıklarına maruz bırakabileceğinden dikkatli olun</string>
+    <string name="start_server">Sunucuyu Başlat</string>
+    <string name="test_playback">Oynatıcıyı Test Et</string>
+    <string name="test_playback_desc">Tüm videoları oynatmaya devam eder</string>
+    <string name="subscriptions_cache_5000">Abonelik Önbelleği 5000</string>
+    <string name="history_cache_100">Geçmiş Önbelleği 100</string>
+    <string name="start_server_on_boot">Başlangıçta sunucuyu başlat</string>
+    <string name="starts_a_devServer_on_port_11337_may_expose_vulnerabilities">Port 11337\'de bir DevServer başlatır, güvenlik açıklarını ortaya çıkarabilir.</string>
+    <string name="test_v8_communication_speed">V8 iletişim hızını test et</string>
+    <string name="test_v8_creation_speed">V8 oluşum hızını test et</string>
+    <string name="tests_v8_communication_speeds">V8 iletişim hızını test eder</string>
+    <string name="tests_v8_creation_times_and_running">V8 oluşturma sürelerini ve çalıştırmayı test eder</string>
+    <string name="unsubscribe_all">Tümünü abonelikten çık</string>
+    <string name="v8_benchmarks">V8 Denektaşları</string>
+    <string name="v8_script_testing">V8 Script Testleri</string>
+    <string name="various_benchmarks_using_the_integrated_v8_engine">Entegre V8 motorunu kullanan çeşitli kıyaslamalar</string>
+    <string name="various_tests_against_a_custom_source">Özel bir kaynağa karşı çeşitli testler</string>
+    <string name="writes_to_disk_till_no_space_is_left">Diskte yer kalmayana kadar yazar</string>
+    <string name="visibility">Görünürlük</string>
+    <string name="check_for_updates_setting">Güncellemeleri kontrol et</string>
+    <string name="check_for_updates_setting_description">Bir eklentinin başlangıçta güncellemeler açısından kontrol edilip edilmemesi</string>
+    <string name="automatic_update_setting">Otomatik Güncelleme</string>
+    <string name="automatic_update_setting_description">Hiçbir izin değiştirilmemişse ve eklenti etkinleştirilmişse başlangıç sırasında otomatik olarak güncellenir</string>
+    <string name="allow_developer_submit">Geliştirici Gönderimlerine İzin Ver</string>
+    <string name="allow_developer_submit_description">Geliştiricinin sunucusuna veri göndermesine olanak tanır, hassas veriler içerebileceğinden dikkatli olun.</string>
+    <string name="allow_developer_submit_warning">Geliştiriciye güvendiğinizden emin olun. Hassas verilere erişim kazanabilirler. Bunu yalnızca geliştiricinin bir hatayı düzeltmesine yardımcı olmaya çalışırken etkinleştirin.</string>
+    <string name="ratelimit">Oran Sınırı</string>
+    <string name="ratelimit_description">Bu eklentinin davranışının oran sınırlamasıyla ilgili ayarları</string>
+    <string name="ratelimit_sub_setting">Aboneliklerin Oranını Sınırla</string>
+    <string name="ratelimit_sub_setting_description">Yapılan abonelik isteklerinin miktarını sınırlayın</string>
+    <string name="enable_where_this_plugins_content_are_visible">Bu eklentinin içeriğinin göründüğü yerlerde etkinleştirin</string>
+    <string name="show_content_in_home_tab">İçeriği ana sayfa sekmesinde göster</string>
+    <string name="show_content_in_search_results">İçeriği arama sonuçlarında göster</string>
+    <string name="no_valid_url_provided">Geçerli bir URL sağlanmadı..</string>
+    <string name="invalid_config_format">Geçersiz Konfigürasyon Formatı</string>
+    <string name="failed_to_fetch_configuration">Konfigürasyon alınamadı</string>
+    <string name="failed_to_fetch_script">Script alma başarısız oldu</string>
+    <string name="url_access">URL Erişimi</string>
+    <string name="the_plugin_will_have_access_to_the_following_domains">Eklentinin şu domainlere erişimi olacak</string>
+    <string name="eval_access">Erişimi Değerlendir</string>
+    <string name="the_plugin_will_have_access_to_eval_capability_remote_injection">Eklenti, değerlendirme yeteneğine (uzaktan enjeksiyon) erişebilecek</string>
+    <string name="failed_to_scan_qr_code">QR kod okuma başarısız oldu</string>
+    <string name="not_a_plugin_url">Eklenti URL\'i değil</string>
+    <string name="scan_a_qr_code">Bir QR kod okutun</string>
+    <string name="not_implemented_yet">Henüz tamamlanmadı.</string>
+    <string name="unknown_context">Bilinmeyen Durum</string>
+    <string name="something_went_wrong_missing_stack_trace">Bir şeyler ters gitti… stack trace mi eksik?</string>
+    <string name="logs_already_submitted">Loglar zaten gönderildi.</string>
+    <string name="no_logs_found">Hiçbir log bulunamadı.</string>
+    <string name="failed_automated_share_share_manually">Otomatik paylaşım başarısız oldu, manuel paylaşmak ister misiniz?</string>
+    <string name="shared_id">{id} Paylaşıldı</string>
+    <string name="unhandled_exception_in_vs">VS\'de bilinmeyen hata (exception)</string>
+    <string name="send_exception_to_developers">Geliştiricilere exception\'ı gönder…</string>
+    <string name="your_license_key_has_been_set_an_app_restart_might_be_required">Lisans anahtarınız ayarlandı!\nUygulamayı yeniden başlatmanız gerekebilir.</string>
+    <string name="invalid_license_format">Geçersiz lisans formatı</string>
+    <string name="unknown_content_format">Bilinmeyen içerik formatı</string>
+    <string name="unknown_file_format">Bilinmeyen dosya formatı</string>
+    <string name="unknown_polycentric_format">Bilinmeyen Polycentric formatı</string>
+    <string name="unknown_url_format">Bilinmeyen URL formatı</string>
+    <string name="failed_to_handle_file">Dosya işleme başarısız oldu</string>
+    <string name="unknown_reconstruction_type">Bilinmeyen yeniden yapılandırma türü</string>
+    <string name="failed_to_parse_text_file">Metin belgesi işlenemedi</string>
+    <string name="failed_to_parse_newpipe_subscriptions">NewPipe abonelikleri işlenemedi</string>
+    <string name="failed_to_generate_qr_code">QR kod oluşturma başarısız oldu</string>
+    <string name="share_text">Metni Paylaş</string>
+    <string name="copied_text">Metin Kopyalandı</string>
+    <string name="must_be_at_least_3_characters_long">En az 3 karakter uzunluğunda olmak zorunda.</string>
+    <string name="failed_to_create_profile">Profil oluşturma başarısız oldu.</string>
+    <string name="failed_to_fully_backfill_servers">Sunucuların tam olarak geri doldurulması başarısız oldu.</string>
+    <string name="sign_in_to_this_identity">Bu kişiliğe giriş yap</string>
+    <string name="text_field_does_not_contain_any_data">Metin alanı herhangi bir veri içermiyor</string>
+    <string name="not_a_valid_url">Geçerli bir URL değil</string>
+    <string name="this_profile_is_already_imported">Bu profil zaten içe aktarıldı</string>
+    <string name="failed_to_import_profile">Profil içe aktarılıramadı:</string>
+    <string name="failed_to_backfill_client">İstemci geri doldurulamadı:</string>
+    <string name="are_you_sure_you_want_to_remove_this_profile">Bu profili silmek istediğinizden emin misiniz?</string>
+    <string name="no_process_handle_set">İşlem tanıtıcısı ayarlanmadı.</string>
+    <string name="name_must_be_at_least_3_characters_long">İsim en az 3 karakter uzunluğunda olmalı</string>
+    <string name="process_handle_unset">İşlem tanıtıcısı ayarlanmadı.</string>
+    <string name="failed_to_read_image">Görüntü okuma başarısız oldu</string>
+    <string name="changes_have_been_saved">Değişiklikler kaydedildi</string>
+    <string name="failed_to_synchronize_changes">Değişiklikler senkronize edilemedi</string>
+    <string name="image_picker_cancelled">Görüntü seçici iptal edildi</string>
+    <string name="you_are_now_in_developer_mode">Artık geliştirici modundasınız</string>
+    <string name="subscribers">Abone</string>
+    <string name="find_name_on">{name} şurada bulun</string>
+    <string name="failed_to_fetch">Alma başarısız oldu</string>
+    <string name="thanks_for_your_purchase_a_key_will_be_sent_to_your_email_after_your_payment_has_been_received">Satın alımınız için teşekkürler, ödeme alındıktan sonra e-postanıza bir anahtar kodu gönderilecek!</string>
+    <string name="payment_failed">Ödeme başarısız oldu</string>
+    <string name="payment_succeeded">Ödeme başarılı</string>
+    <string name="enter_license_key">Lisans anahtarını girin</string>
+    <string name="invalid_license_key">Geçersiz lisans anahtarı</string>
+    <string name="license">Lisans</string>
+    <string name="failed_to_activate_key">Anahtar etkinleştirme başarısız oldu</string>
+    <string name="no_source_enabled_to_support_this_channel">Bu kanalı destekleyen herhangi bir kaynak etkin değil</string>
+    <string name="do_you_want_to_convert_channel_channelname_to_a_playlist">{channelName} kanalını bir oynatma listesine dönüştürmek ister misiniz?</string>
+    <string name="failed_to_convert_channel">Kanal dönüştürme başarısız oldu</string>
+    <string name="page">Sayfa</string>
+    <string name="send_to_device">Videoyu Senkronize Et</string>
+    <string name="hide">Gizle</string>
+    <string name="hide_from_home">Ana Sayfada Gizle</string>
+    <string name="hide_creator_from_home">Üreticiyi Ana Sayfada Gizle</string>
+    <string name="play_feed_as_queue">Feed\'i Sırayla Oynat</string>
+    <string name="play_entire_feed">Bütün feed\'i oynat</string>
+    <string name="queued">Sıraya Eklendi</string>
+    <string name="already_queued">Zaten Sırada</string>
+    <string name="used">Kullanıldı</string>
+    <string name="available">Mevcut</string>
+    <string name="failed_to_load_next_page">Sonraki sayfayı yükleme başarısız oldu</string>
+    <string name="plugin_pluginname_failed_message">{pluginName} eklentisi başarısız oldu:\n{message}</string>
+    <string name="plugin_failed_due_to">Eklenti buna bağlı olarak başarısız oldu:</string>
+    <string name="failed_to_get_home_plugin">Ana sayfayı alma başarısız oldu \nEklenti</string>
+    <string name="failed_to_get_home">Ana sayfayı alma başarısız oldu</string>
+    <string name="no_home_available">Ana sayfa mevcut değil</string>
+    <string name="no_home_page_is_available_please_check_if_you_are_connected_to_the_internet_and_refresh">Ana sayfa mevcut değil, lütfen internet bağlantınızı kontrol edin ve yeniden deneyin.</string>
+    <string name="import_playlists">Oynatma Listelerini İçe Aktar</string>
+    <string name="playlists_imported">oynatma listeleri içe aktarıldı.</string>
+    <string name="index_out_of_size_selected">{index} arasından {size} tanesi seçildi</string>
+    <string name="import_subscriptions">Abonelikleri İçe Aktar</string>
+    <string name="subscriptions_imported">abonelikler içe aktarıldı.</string>
+    <string name="edit_playlist">Oynatma listesini düzenle</string>
+    <string name="share_as_text">Metin Olarak Paylaş</string>
+    <string name="share_as_a_list_of_video_urls">Bir video URL listesi olarak paylaş</string>
+    <string name="share_as_import">İçe Aktarma Olarak Paylaş</string>
+    <string name="share_as_a_import_file_for_grayjay">Grayjay\'e ait bir içe aktarma dosyası olarak paylaş</string>
+    <string name="failed_to_load_playlist">Oynatma listesi yükleme başarısız oldu</string>
+    <string name="please_wait_for_playlist_to_finish_loading">Lütfen oynatma listesinin yüklenmesi için bekleyin</string>
+    <string name="playlist_copied_as_local_playlist">Oynatma listesi lokal olarak kopyalandı</string>
+    <string name="are_you_sure_you_want_to_delete_the_downloaded_videos">İndirilmiş videoları silmek istediğinizden emin misiniz?</string>
+    <string name="create_new_playlist">Yeni bir oynatma listesi oluştur</string>
+    <string name="create_new_subgroup">Yeni bir grup oluştur</string>
+    <string name="expected_media_content_found">Beklenen medya içeriği bulundu</string>
+    <string name="failed_to_load_post">Gönderi yükleme başarısız oldu.</string>
+    <string name="replies">yanıtlar</string>
+    <string name="Replies">Yanıtlar</string>
+    <string name="plugin_settings_saved">Eklenti ayarları kaydedildi</string>
+    <string name="plugin_settings">Eklenti ayarları</string>
+    <string name="these_settings_are_defined_by_the_plugin">Bu ayarlar eklenti tarafından tanımlanmıştır</string>
+    <string name="failed_to_load_source">Kaynak yükleme başarısız oldu</string>
+    <string name="check_for_updates">Güncellemeleri kontrol et</string>
+    <string name="checks_for_new_versions_of_the_source">Kaynağın yeni versiyonlarını kontrol eder</string>
+    <string name="authentication">Doğrulama</string>
+    <string name="sign_out_of_the_platform">Bu platformdan çıkış yap</string>
+    <string name="import_your_subscriptions_from_this_source">Bu kaynaktan aboneliklerinizi içe aktarın</string>
+    <string name="import_your_playlists_from_this_source">Bu kaynaktan oynatma listelerinizi içe aktarın</string>
+    <string name="login">Giriş</string>
+    <string name="login_required">Giriş Gerekli</string>
+    <string name="sign_into_the_platform_of_this_source">Bu kaynağın platformuna giriş yapın</string>
+    <string name="management">Yönetim</string>
+    <string name="uninstall">Kaldır</string>
+    <string name="removes_the_plugin_from_the_app">Eklentiyi uygulamadan kaldırır</string>
+    <string name="delete_captcha">CAPTCHA\'yı sil</string>
+    <string name="deletes_stored_captcha_answer_for_this_plugin">Bu eklenti için kaydedilen CAPTCHA yanıtını siler</string>
+    <string name="failed_to_retrieve_playlists">Oynatma listeleri alınamadı.</string>
+    <string name="subscriptioncount_user_subscriptions_retrieved">{subscriptionCount} adet kullanıcı aboneliği alındı.</string>
+    <string name="failed_to_retrieve_subscriptions">Abonelikler alınamadı.</string>
+    <string name="are_you_sure_you_want_to_uninstall">Kaldırmak istediğinizden emin misiniz?</string>
+    <string name="uninstalled">Kaldırıldı </string>
+    <string name="failed_to_check_for_updates">Güncellemeler kontrol edilemedi</string>
+    <string name="plugin_is_fully_up_to_date">Eklenti tamamen güncel</string>
+    <string name="rate_limit_warning">Oran Sınırı Uyarısı</string>
+    <string name="this_is_a_temporary_measure_to_prevent_people_from_hitting_rate_limit_until_we_have_better_support_for_lots_of_subscriptions">Bu, çok sayıda aboneliğe daha iyi destek sağlayana kadar kullanıcıların oran sınırına ulaşmasını önlemek için geçici bir önlemdir.</string>
+    <string name="you_have_too_many_subscriptions_for_the_following_plugins">\n\nŞu eklentiler için çok fazla aboneliğiniz var:\n</string>
+    <string name="posts">Gönderiler</string>
+    <string name="planned">Planlanmış</string>
+    <string name="watched">İzlenmiş</string>
+    <string name="no_results_found_swipe_down_to_refresh">Hiçbir bir sonuç bulunamadı\nYenilemek için aşağı kaydırın</string>
+    <string name="overlay">Overlay</string>
+    <string name="reload">Yenile</string>
+    <string name="watching_now">şu anda izlenen</string>
+    <string name="views">görüntüleme</string>
+    <string name="planned_in">Planlanmış</string>
+    <string name="failed_to_get_playback_tracker">Oynatma takibini alma başarısız oldu</string>
+    <string name="exception_retrieving_live_events">Canlı etkinlikleri alırken istisna:</string>
+    <string name="exception_retrieving_live_chat_window">Canlı sohbet penceresini alırken istisna:</string>
+    <string name="live_chat_failed_to_load">Canlı sohbet yüklenemedi</string>
+    <string name="unsupported_cast_format">Desteklenmeyen yayın formatı</string>
+    <string name="failed_to_load_media">Medya yüklenemedi</string>
+    <string name="offline_playback">Çevrim Dışı Oynatma</string>
+    <string name="media_error">Medya Hatası</string>
+    <string name="the_media_source_encountered_an_unauthorized_error_this_might_be_solved_by_a_plugin_reload_would_you_like_to_reload_experimental">Medya kaynağı yetkisiz bir hatayla karşılaştı.\nBu, eklentinin yeniden yüklenmesiyle çözülebilir.\nYeniden yüklemek ister misiniz?\n(Deneysel)</string>
+    <string name="playback_rate">Oynatma Oranı</string>
+    <string name="quality">Kalite</string>
+    <string name="offline_video">Çevrim Dışı Video</string>
+    <string name="offline_audio">Çevrim Dışı Ses</string>
+    <string name="offline_subtitles">Çevrim Dişi Altyazılar</string>
+    <string name="stream_video">Videoyu Yayınla</string>
+    <string name="stream_audio">Sesi Yayınla</string>
+    <string name="audio">Ses</string>
+    <string name="subtitles">Altyazılar</string>
+    <string name="unavailable_video">Mevcut olmayan video</string>
+    <string name="this_video_is_unavailable">Bu video mevcut değil.</string>
+    <string name="there_was_an_unavailable_video_in_your_queue_videoname_by_authorname">Sıranızdaki [{authorName}] tarafından [{videoName}] videosu mevcut değil.</string>
+    <string name="back">Geri</string>
+    <string name="pause">Duraklat</string>
+    <string name="play">Oynat</string>
+    <string name="pauses_the_video">Videoyu durdurur</string>
+    <string name="resumes_the_video">Videoyu devam ettirir</string>
+    <string name="video_without_source">Kaynaksız video</string>
+    <string name="there_was_a_in_your_queue_videoname_by_authorname_without_the_required_source_being_enabled_playback_was_skipped">Sıranızdakı [{authorName}] tarafından [{videoName}] videosu için gerekli kaynak etkin değildi, oynatım atlandı.</string>
+    <string name="failed_to_load_video_scriptimplementationexception">Video yüklenemedi (ScriptImplementationException)</string>
+    <string name="invalid_video">Geçersiz video</string>
+    <string name="there_was_an_invalid_video_in_your_queue_videoname_by_authorname_playback_was_skipped">Sıranızdaki [{authorName}] tarafından [{videoName}] videosu geçersizdi, oynatım atlandı.</string>
+    <string name="age_restricted_video">Yaş sınırlaması olan video</string>
+    <string name="there_was_an_age_restricted_video_in_your_queue_videoname_by_authorname_this_video_was_not_accessible_and_playback_was_skipped">Sıranızdaki [{authorName}] tarafından [{videoName}] videosunda yaş sınırlaması vardı, video erişilebilir olmadığından oynatım atlandı.</string>
+    <string name="failed_to_load_video_scriptexception">Video yüklenemedi (ScriptException)</string>
+    <string name="failed_to_load_video">Video yüklenemedi</string>
+    <string name="not_yet_available_retrying_in_time_s">Şu anda mevcut değil, {time}s sonra tekrar deneyin.</string>
+    <string name="failed_to_retry_for_live_stream">Canlı yayın için yeniden deneme başarısız oldu</string>
+    <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Bu uygulama geliştirilme henüz aşamasında. Lütfen hata raporları gönderin ve birçok özelliğin eksik olduğunu anlayışla karşılayın.</string>
+    <string name="please_use_at_least_1_character">Lütfen en az 1 karakter kullanın</string>
+    <string name="are_you_sure_you_want_to_delete_this_video">Bu videoyu silmek istediğinizden emin misiniz?</string>
+    <string name="tap_to_open">Açmak için dokunun</string>
+    <string name="update_available_exclamation">Güncelleme mevcut!</string>
+    <string name="watching">izleniyor</string>
+    <string name="available_in">şurada mevcut</string>
+    <string name="seconds">saniye</string>
+    <string name="please_login_to_post_a_comment">Lütfen yorum yapmak için giriş yapın.</string>
+    <string name="failed_to_post_comment">Yorum yapılamadı:</string>
+    <string name="waiting_for_unmetered">Limitsiz bağlantı bekleniyor</string>
+    <string name="last_error">Son hata</string>
+    <string name="error">Hata</string>
+    <string name="filters">Filtreler</string>
+    <string name="viewers">izleyiciler</string>
+    <string name="expected_at_least_one_reply_but_no_replies_were_returned_by_the_server">En az bir yanıt beklendi fakat sunucu tarafından hiç yanıt gönderilmedi.</string>
+    <string name="please_login_to_like">Lütfen beğenmek için giriş yapın</string>
+    <string name="please_login_to_dislike">Lütfen beğenmemek için giriş yapın</string>
+    <string name="failed_to_load_comments">"Yorumlar yüklenemedi. "</string>
+    <string name="script_is_not_available">Script mevcut değil</string>
+    <string name="signature_is_valid">İmza geçerli</string>
+    <string name="signature_is_invalid">İmza geçersiz</string>
+    <string name="no_signature_available">İmza mevcut değil</string>
+    <string name="subscribed_to">"Abone Olundu "</string>
+    <string name="unsubscribed_from">"Abonelikten Çıkıldı "</string>
+    <string name="you_don_t_have_any_automatic_backups">Bir otomatik yedeklemeniz yok</string>
+    <string name="an_old_backup_is_available">Eski bir yedekleme mevcut</string>
+    <string name="would_you_like_to_restore_this_backup">Bu yedeklemeyi restore etmek ister misiniz?</string>
+    <string name="override">Geçersiz Kıl</string>
+    <string name="data_retry">Veri Denemesi</string>
+    <string name="no_downloads_available">İndirme mevcut değil</string>
+    <string name="no_downloadable_sources_yet">(henüz) indirilebilir kaynak bulunmuyor</string>
+    <string name="none">Hiç</string>
+    <string name="audio_only">Sadece Ses</string>
+    <string name="download_video">Videoyu İndir</string>
+    <string name="fetching_video_details">Videonun detayları alınıyor</string>
+    <string name="failed_to_fetch_details_for_download">İndirmenin detayları alınamadı</string>
+    <string name="target_resolution">Hedef Çözünürlük</string>
+    <string name="target_bitrate">Hedef Bitrate</string>
+    <string name="low_bitrate">Düşük Bitrate</string>
+    <string name="high_bitrate">Yüksek Bitrate</string>
+    <string name="actions">Eylemler</string>
+    <string name="download_the_video">Videoyu indir</string>
+    <string name="video_options">Video Seçenekleri</string>
+    <string name="change_pins">Pinleri Değiştir</string>
+    <string name="decide_which_buttons_should_be_pinned">Hangi butonların pinleneceğine karar ver</string>
+    <string name="select_your_pins_in_order">Pinlerinizi sırayla seçin</string>
+    <string name="more_options">Daha Fazla Seçenek</string>
+    <string name="save">Kaydet</string>
+    <string name="this_creator_has_not_set_any_support_options_on_harbor_polycentric">Bu üretici henüz Harbor (Polycentric) için bir destek seçeneği koymadı</string>
+    <string name="load_more">Daha Fazla Yükle</string>
+    <string name="stopped_after_requestcount_to_avoid_rate_limit_click_load_more_to_load_more">Oran sınırınından kaçınmak için {requestCount} istekten sonra durdu, daha fazla yüklemek için Daha Fazla Yükle\'ye dokunun.</string>
+    <string name="this_creator_has_not_setup_any_monetization_features">Bu üretici henüz bir para kazanma yönetemi ayarlamadı</string>
+    <string name="plus_tax">" + Vergi"</string>
+    <string name="new_playlist">Yeni oynatma listesi</string>
+    <string name="add_to_new_playlist">Yeni oynatma listesine ekle</string>
+    <string name="url_handling">URL yönetimi</string>
+    <string name="allow_grayjay_to_handle_specific_urls">Grayjay\'in URL\'leri yönetmesine izin ver?</string>
+    <string name="allow_grayjay_to_handle_specific_urls_please_set_it_as_default_in_the_app_settings">\'Evet\' e tıkladığınızda, Grayjay uygulama ayarları açılacak.\n\nOradan:\n1. "Varsayılan olarak aç" veya "Varsayılan olarak seç" bölümüne tıklayın.\n Bu seçeneği \'Gelişmiş\' bölümünün tam altında bulabilirsiniz, cihazınıza bağlı olarak.\n\n2. Grayjay için \'Desteklenen bağlantıları aç\' ı seçin.\n\n(bazı cihazlar bunu ana ayarlarda \'Varsayılan Uygulamalar\' ın altında listeledi, Grayjay için ilgili kategorileri seçin)</string>
+    <string name="failed_to_show_settings">Ayarları gösterme başarısız oldu</string>
+    <string name="play_store_version_does_not_support_default_url_handling">Play store versiyonu varsayılan bağlantı yönetimine izin vermiyor.</string>
+    <string name="these_are_all_commentcount_comments_you_have_made_in_grayjay">Bu {commentCount} yorumun hepsi Grayjay\'de yaptığınız yorumların tamamı.</string>
+    <string name="tutorial">Öğretici</string>
+    <string name="go_back_to_casting_add_dialog">Yayınlamaya dön diyalog ekle</string>
+    <string name="view_a_video_about_how_to_cast">Nasıl yayınlama yapılacağına dair bir video izle</string>
+    <string name="view_the_fcast_technical_documentation">FCast teknik dokümantasyonu görüntüle</string>
+    <string name="guide">Rehber</string>
+    <string name="how_to_use_fcast_guide">FCast kullanım rehberi</string>
+    <string name="fcast">FCast</string>
+    <string name="open_the_fcast_website">FCast\'in web sitesini açın</string>
+    <string name="fcast_website">FCast Website</string>
+    <string name="fcast_technical_documentation">FCast Teknik Dokümantasyon</string>
+    <string name="login_to_view_your_comments">Yorumlarınızı görüntülemek için giriş yapın</string>
+    <string name="polycentric_is_disabled">Polycentric devre dışı</string>
+    <string name="play_pause">Oynat Duraklat</string>
+    <string name="position">Pozisyon</string>
+    <string name="tutorials">Öğreticiler</string>
+    <string name="do_you_want_to_see_the_tutorials_you_can_find_them_at_any_time_through_the_more_button">Bu öğreticileri görmek istiyor musunuz? Onlara her zaman daha fazla butonu ile ulaşabilirsiniz.</string>
+    <string name="add_creator">Üretici Ekle</string>
+    <string name="select">Seç</string>
+    <string name="zoom">Yakınlaştır</string>
+    <string name="check_to_see_if_an_update_is_available">Güncelleme olup olmadığını kontrol et.</string>
+    <string name="scroll_to_top">En yukarıya kaydırın</string>
+    <string name="disable_battery_optimization">Pil Optimizasyonunu Devre Dışı Bırak</string>
+    <string name="click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions">Pil optimizasyon ayarlarına gitmek için tıklayın. Pil optimizasyonunu devre dışı bırakmak işletim sisteminin medya otutumlarını durdurmasına engel olacaktır.</string>
+    <string name="contribute_personal_subscriptions_list">Kişisel Abonelikler Listesine Katkıda Bulun</string>
+    <string name="contribute_personal_subscriptions_list_description">\nŞu anki abonelikler listenizle FUTO\'ya katkıda bulunmak ister misiniz?\n\nVeri, Grayjay gizlilik politikasına bağlı olarak yönetilecektir. Bu liste anonimize edilecek ve aboneliklerin kime ait olduğu ile ilgili bir referans bulundurmadan saklanacaktır.\n\nBunun amacı ise Grayjay ve FUTO\'nun bu verileri kullanarak platformlar arası bir öneri sistemi oluşturarak Grayjay\'de seveceğiniz yeni içerik üreticilerini bulmayı kolaylaştırmak istemesi.</string>
+    <string name="cd_cast_button">Yayın butonu</string>
+    <string name="cd_incognito_button">Incognito butonu</string>
+    <string name="cd_creator_thumbnail">Üretici thumbnail</string>
+    <string name="cd_button_clear_search">Aramayı temizle</string>
+    <string name="cd_button_search">Ara</string>
+    <string name="cd_search_icon">Arama ikonu</string>
+    <string name="cd_button_back">Geri butonu</string>
+    <string name="cd_app_icon">Uygulama ikonu</string>
+    <string name="cd_icon_history">Geçmiş ikonu</string>
+    <string name="cd_button_create_playlist">Oynatma listesi oluştur</string>
+    <string name="cd_button_share">Paylaş</string>
+    <string name="cd_button_filter">Filtrele</string>
+    <string name="cd_button_delete">Sil</string>
+    <string name="cd_button_settings">Ayarlar</string>
+    <string name="cd_image_group">Grup simgesi</string>
+    <string name="cd_button_edit">Düzenle</string>
+    <string name="cd_button_download">İndir</string>
+    <string name="cd_minimize_close">Kapat</string>
+    <string name="cd_minimize_pause">Duraklat</string>
+    <string name="cd_minimize_play">Oynat</string>
+    <string name="cd_donation_amount">Bağış miktarı</string>
+    <string name="cd_button_replies">Yanıtlar</string>
+    <string name="cd_image_like_icon">Beğen</string>
+    <string name="cd_image_dislike_icon">Beğenme</string>
+    <string name="cd_button_subscribe">Abone Ol</string>
+    <string name="cd_platform_indicator">Platform göstergesi</string>
+    <string name="cd_image_device">Cihaz ikonu</string>
+    <string name="cd_image_loader">Yükleyici</string>
+    <string name="cd_donation_author_image">Bağış yazarının görüntüsü</string>
+    <string name="cd_edit_image">Görüntüyü düzenle</string>
+    <string name="cd_button_add">Ekle</string>
+    <string name="cd_download_indicator">İndirme göstergeci</string>
+    <string name="cd_drag_drop">Çek ve bırak</string>
+    <string name="cd_button_add_to_watch_later">Daha Sonra İzle\'ye ekle</string>
+    <string name="cd_button_close">Kapat</string>
+    <string name="cd_thumbnail_player_unmute">Sesini aç</string>
+    <string name="cd_button_minimize">Küçült</string>
+    <string name="cd_button_rotate_lock">Döndürmeyi kilitle</string>
+    <string name="cd_button_loop">Tekrarla</string>
+    <string name="cd_button_previous">Önceki</string>
+    <string name="cd_button_next">Sonraki</string>
+    <string name="cd_button_fullscreen">Tam ekran</string>
+    <string name="cd_button_autoplay">Otomatik Oynatma</string>
+    <string name="cd_update_spinner">Güncelleme döndürgeci</string>
+    <string name="cd_button_play">Oynat</string>
+    <string name="cd_button_pause">Duraklat</string>
+    <string name="cd_button_stop">Durdur</string>
+    <string name="cd_button_scan_qr">QR kodu okut</string>
+    <string name="cd_button_help">Yardım</string>
+    <string name="cd_image_polycentric">Polycentric profil resmini değiştir</string>
+    <string-array name="home_screen_array">
+        <item>Önerilenler</item>
+        <item>Abonelikler</item>
+    </string-array>
+    <string-array name="playback_speeds" translatable="false">
+        <item>0.25</item>
+        <item>0.5</item>
+        <item>0.75</item>
+        <item>1.0</item>
+        <item>1.25</item>
+        <item>1.5</item>
+        <item>1.75</item>
+        <item>2.0</item>
+        <item>2.25</item>
+    </string-array>
+    <string-array name="preferred_quality_array">
+        <item>Otomatik (720p)</item>
+        <item>2160p</item>
+        <item>1440p</item>
+        <item>1080p</item>
+        <item>720p</item>
+        <item>480p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string-array name="preferred_video_download">
+        <item>Hiç (Sadece Ses)</item>
+        <item>2160p</item>
+        <item>1440p</item>
+        <item>1080p</item>
+        <item>720p</item>
+        <item>480p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string-array name="thread_count">
+        <item>1 Thread</item>
+        <item>2 Thread</item>
+        <item>4 Thread</item>
+        <item>6 Thread</item>
+        <item>8 Thread</item>
+        <item>10 Thread</item>
+        <item>15 Thread</item>
+    </string-array>
+    <string-array name="background_interval">
+        <item>Asla</item>
+        <item>Her 15 Dakika</item>
+        <item>Her Saat</item>
+        <item>Her 3 Saat</item>
+        <item>Her 6 Saat</item>
+        <item>Her 12 Saat</item>
+        <item>Her Gün</item>
+    </string-array>
+    <string-array name="preferred_audio_download">
+        <item>Düşük Bitrate</item>
+        <item>Yüksek Bitrate</item>
+    </string-array>
+    <string-array name="auto_update_when_array">
+        <item>Uygulamayı Başlatırken</item>
+        <item>Asla</item>
+    </string-array>
+    <string-array name="enabled_disabled_array">
+        <item>Devre Dışı</item>
+        <item>Etkin</item>
+    </string-array>
+    <string-array name="when_download">
+        <item>Sınırsız İnternet</item>
+        <item>Wifi &amp; Ethernet</item>
+        <item>Her Zaman</item>
+    </string-array>
+    <string-array name="background_download">
+        <item>Devre Dışı</item>
+        <item>Etkin</item>
+    </string-array>
+    <string-array name="comments_sortby_array">
+        <item>En Yeni</item>
+        <item>En Eski</item>
+    </string-array>
+    <string-array name="subscriptions_sortby_array">
+        <item>A\'dan Z\'ye</item>
+        <item>Z\'den A\'ya</item>
+        <item>Görüntüleme Artan</item>
+        <item>Görüntüleme Azalan</item>
+        <item>İzlenme Süresi Artan</item>
+        <item>İzlenme Süresi Azalan</item>
+    </string-array>
+    <string-array name="downloads_sortby_array">
+        <item>Ad (A\'dan Z\'ye)</item>
+        <item>Ad (Z\'den A\'ya)</item>
+        <item>İndirme Tarihi (En Eski)</item>
+        <item>İndirme Tarihi (En Yeni)</item>
+        <item>Çıkış Tarihi (En Eski)</item>
+        <item>Çıkış Tarihi (En Yeni)</item>
+    </string-array>
+    <string-array name="feed_style">
+        <item>Önizle</item>
+        <item>Listele</item>
+    </string-array>
+    <string-array name="app_languages">
+        <item>Sistem</item>
+        <item>İngilizce (EN)</item>
+        <item>Almanca (DE)</item>
+        <item>İspanyolca (ES)</item>
+        <item>Portekizce (PT)</item>
+        <item>Fransızca (FR)</item>
+        <item>Japonca (JA)</item>
+        <item>Korece (KO)</item>
+        <item>Çince (ZH)</item>
+        <item>Rusça (RU)</item>
+        <item>Arapça (AR)</item>
+    </string-array>
+    <string-array name="player_background_behavior">
+        <item>Hiç</item>
+        <item>Oynatmaya Devam Et</item>
+        <item>Oynatma Overlay\'i</item>
+    </string-array>
+    <string-array name="resume_after_preview">
+        <item>Baştan Başla</item>
+        <item>10s Sonra Başla</item>
+        <item>Her Zaman Devam Et</item>
+    </string-array>
+    <string-array name="chapter_fps">
+        <item>24</item>
+        <item>30</item>
+        <item>60</item>
+        <item>120</item>
+    </string-array>
+    <string-array name="comment_sections">
+        <item>Polycentric</item>
+        <item>Platform</item>
+        <item>Son Seçilen</item>
+    </string-array>
+    <string-array name="audio_languages">
+        <item>İngilizce</item>
+        <item>İspanyolca</item>
+        <item>Almanca</item>
+        <item>Fransızca</item>
+        <item>Japonca</item>
+        <item>Korece</item>
+        <item>Tayca</item>
+        <item>Vietnamca</item>
+        <item>Endonezce</item>
+        <item>Hintçe</item>
+        <item>Arapça</item>
+        <item>Türkçe</item>
+        <item>Rusça</item>
+        <item>Portekizce</item>
+        <item>Çince</item>
+    </string-array>
+    <string-array name="casting_device_type_array" translatable="false">
+        <item>FCast</item>
+        <item>ChromeCast</item>
+        <item>AirPlay</item>
+    </string-array>
+    <string-array name="log_levels">
+        <item>Hiç</item>
+        <item>Hata</item>
+        <item>Uyarı</item>
+        <item>Bilgi</item>
+        <item>Detaylı</item>
+    </string-array>
+    <string-array name="restart_playback_after_loss">
+        <item>Asla</item>
+        <item>10 saniye içinde</item>
+        <item>30 saniye içinde</item>
+        <item>Her Zaman</item>
+    </string-array>
+    <string-array name="rotation_zone">
+        <item>15</item>
+        <item>30</item>
+        <item>45</item>
+    </string-array>
+    <string-array name="rotation_threshold_time">
+        <item>100</item>
+        <item>500</item>
+        <item>750</item>
+        <item>1000</item>
+        <item>1500</item>
+        <item>2000</item>
+    </string-array>
+</resources>

From b5d3261f0317b93fa02a17876f6e5f28ab59eaef Mon Sep 17 00:00:00 2001
From: 0xrxL <127248639+0xrxL@users.noreply.github.com>
Date: Sat, 14 Jun 2025 09:01:41 +0200
Subject: [PATCH 02/46] Add files via upload

---
 app/src/main/res/strings.xml | 1145 ++++++++++++++++++++++++++++++++++
 1 file changed, 1145 insertions(+)
 create mode 100644 app/src/main/res/strings.xml

diff --git a/app/src/main/res/strings.xml b/app/src/main/res/strings.xml
new file mode 100644
index 00000000..4b9cb7e0
--- /dev/null
+++ b/app/src/main/res/strings.xml
@@ -0,0 +1,1145 @@
+<resources>
+    <string name="cast">Trasmetti</string>
+    <string name="search">Cerca</string>
+    <string name="add_to_query">Aggiungi alla lista</string>
+    <string name="thumbnail">Anteprima</string>
+    <string name="channel_image">Immagine del canale</string>
+    <string name="add_to">Aggiungi a</string>
+    <string name="lorem_ipsum" translatable="false">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</string>
+    <string name="add_to_queue">Aggiungi alla coda</string>
+    <string name="add_to_history">Aggiungi alla cronologia</string>
+    <string name="general">Generali</string>
+    <string name="channel">Canale</string>
+    <string name="home">Home</string>
+    <string name="progress_bar">Barra di avanzamento</string>
+    <string name="advanced_settings">Impostazioni avanzate</string>
+    <string name="advanced_settings_description">Se le impostazioni avanzate sono visibili, verranno mostrate preferenze supplementari per affinare la tua esperienza d\'uso.</string>
+    <string name="progress_bar_description">Se la barra di avanzamento cronologica deve essere mostrata</string>
+    <string name="hide_hidden_from_search">Applica 'Nascosto dalla home' anche alla ricerca'</string>
+    <string name="hide_hidden_from_search_description">Nascondi video e creatori nascosti dalla scheda home anche nei risultati di ricerca</string>
+    <string name="recommendations">Suggerimenti</string>
+    <string name="more">Altro</string>
+    <string name="playlists">Playlist</string>
+    <string name="subscriptions">Sottoscrizioni</string>
+    <string name="loading">Caricamento</string>
+    <string name="retry">Riprova</string>
+    <string name="cancel">Annulla</string>
+    <string name="failed_to_retrieve_data_are_you_connected">Recupero dei dati non riuscito, sei connesso ad una rete?</string>
+    <string name="settings">Impostazioni</string>
+    <string name="history">Cronologia</string>
+    <string name="sources">Sorgenti</string>
+    <string name="buy">Acquista</string>
+    <string name="faq">FAQ</string>
+    <string name="privacy_mode">Modalità Riservatezza</string>
+    <string name="the_top_source_will_be_considered_primary">La sorgente in alto sarà considerata come primaria</string>
+    <string name="defaults">Predefiniti</string>
+    <string name="home_screen">Scheda Home</string>
+    <string name="preferred_quality">Qualità Preferita</string>
+    <string name="preferred_quality_description">Qualità di visualizzazione video predefinita</string>
+    <string name="update">Aggiorna</string>
+    <string name="close">Chiudi</string>
+    <string name="never">Mai</string>
+    <string name="import_options">Seleziona una delle seguenti opzioni di importazione disponibili.</string>
+    <string name="there_is_an_update_available_do_you_wish_to_update">C\'è un aggiornamento disponibile, desideri installarlo ora?</string>
+    <string name="downloading_update">Download in corso…</string>
+    <string name="installing_update">Installazione in corso…</string>
+    <string name="done">Finito</string>
+    <string name="getHome" translatable="false">getHome</string>
+    <string name="success">Riuscito</string>
+    <string name="failed_to_update_with_error">Aggiornamento pacchetto non riuscito, con errore</string>
+    <string name="general_failure">Operazione non riuscita per cause generiche</string>
+    <string name="aborted">Operazione non riuscita per deliberato annullamento</string>
+    <string name="blocked">Operazione non riuscita perché bloccata</string>
+    <string name="conflict">Operazione non riuscita per conflitto (o inconsistenza) con un altro pacchetto già installato nel dispositivo</string>
+    <string name="incompatible">Operazione non riuscita per incompatibilità con il dispositivo</string>
+    <string name="invalid">Operazione non riuscita per uno o più APK non validi</string>
+    <string name="not_enough_storage">Operazionnon riuscita per problemi di archiviazione</string>
+    <string name="live_capitalized">LIVE</string>
+    <string name="live">Live</string>
+    <string name="click_to_read_more">Clicca per leggere altro</string>
+    <string name="click_to_hide">Clicca per nascondere</string>
+    <string name="version">Versione</string>
+    <string name="sort_by">Ordina per</string>
+    <string name="subscribe">Iscriviti</string>
+    <string name="unsubscribe">Disiscriviti</string>
+    <string name="background">Secondo piano</string>
+    <string name="background_revert">Video</string>
+    <string name="add">Aggiungi</string>
+    <string name="download">Download</string>
+    <string name="share">Condividi</string>
+    <string name="view_all">Mostra tutto</string>
+    <string name="creators">Creatori</string>
+    <string name="enabled">Attivo</string>
+    <string name="keep_screen_on">Mantieni schermo acceso</string>
+    <string name="keep_screen_on_while_casting">Mantieni schermo acceso in fase di trasmissione</string>
+    <string name="always_proxy_requests">Reindirizza sempre richieste</string>
+    <string name="always_proxy_requests_description">Reindirizza sempre le richieste attraverso il dispositivo durante la trasmissione dati.</string>
+    <string name="allow_ipv6">Consenti IPV6</string>
+    <string name="allow_ipv6_description">Se la trasmissione IPV6 è consentita, potrebbero verificarsi problemi su alcune reti</string>
+    <string name="allow_ipv4">Consenti Link Locale IPV4</string>
+    <string name="allow_ipv4_description">Se la trasmissione con link locale IPV4 è consentito, potrebbero verificarsi problemi su alcune reti</string>
+    <string name="discover">Scopri</string>
+    <string name="find_new_video_sources_to_add">Trova nuovi sorgenti video da aggiungere</string>
+    <string name="these_sources_have_been_disabled">Questi sorgenti sono stati disattivati</string>
+    <string name="these_creators_in_group">Questi sono i creatori visibili per questo gruppo.</string>
+    <string name="these_creators_not_in_group">Questi creatori non sono in questo gruppo.</string>
+    <string name="disabled">Disattivato</string>
+    <string name="watch_later">Guarda più Tardi</string>
+    <string name="create">Crea</string>
+    <string name="ok">OK</string>
+    <string name="yes">Sì</string>
+    <string name="no">No</string>
+    <string name="confirm">Conferma</string>
+    <string name="do_not_ask_again">Non chiedere di nuovo</string>
+    <string name="confirm_delete_playlist">Sei sicuro di voler eliminare questa playlist?</string>
+    <string name="confirm_delete_subscription">Sei sicuro di voler eliminare questa sottoscrizione?</string>
+    <string name="confirm_remove_source">Rimuovere questa sorgente causerà la mancata risoluzione di alcune tue sottoscrizioni.</string>
+    <string name="shuffle">Casuale</string>
+    <string name="play_all">Riproduci tutto</string>
+    <string name="search_history">Cerca cronologia</string>
+    <string name="app_error">Errore App</string>
+    <string name="developer">Sviluppatore</string>
+    <string name="remove_historical_suggestion">Rimuovi suggerimento cronologico</string>
+    <string name="comments">Commenti</string>
+    <string name="comments_description">La sezione commenti sottostante il lettore video</string>
+    <string name="merchandise">Merchandise</string>
+    <string name="reached_the_end_of_the_playlist">Raggiunta la fine della playlist</string>
+    <string name="the_playlist_will_restart_after_the_video_is_finished">La playlist si riavvierà dopo la fine del video</string>
+    <string name="restart_now">Riavvia Ora</string>
+    <string name="end_of_queue_reached">Raggiunta la fine della coda</string>
+    <string name="end_of_playlist_reached">Raggiunta la fine della playlist</string>
+    <string name="end_of_watch_later_reached">Raggiunta la fine della lista Guarda più tardi</string>
+    <string name="reached_the_end_of_the_queue">Raggiunta la fine della coda</string>
+    <string name="the_queue_will_restart_after_the_video_is_finished">La coda si riavvierà dopo la fine del video</string>
+    <string name="up_next">Prossimo</string>
+    <string name="queue">Coda</string>
+    <string name="clear">Pulisci</string>
+    <string name="last_hour">Ultima ora</string>
+    <string name="last_24_hours">Ultime 24 ore</string>
+    <string name="last_week">Ultima settimana</string>
+    <string name="last_30_days">Ultimi 30 giorni</string>
+    <string name="last_year">Ultimo anno</string>
+    <string name="all_time">Tutto</string>
+    <string name="are_you_sure_delete_historical">Sei sicuro di voler rimuovere queste voci di cronologia?</string>
+    <string name="removed">rimosse</string>
+    <string name="add_source">Aggiungi Sorgente</string>
+    <string name="platform_url">URL Piattaforma</string>
+    <string name="repository_url">URL Repository</string>
+    <string name="script_url">URL Script</string>
+    <string name="config_url">URL Configurazione</string>
+    <string name="source_permissions_explanation">Questi sono i permessi necessari al plugin per funzionare</string>
+    <string name="source_explain_eval_access">Il plugin avrà accesso a eval capacity</string>
+    <string name="source_explain_script_url">Il plugin avrà accesso ai seguenti domini</string>
+    <string name="scan_qr">Scansiona QR</string>
+    <string name="scan_qr_explain">Scansiona un codice QR per effettuare l\'installazione</string>
+    <string name="enter_url_explain">Inserisci un URL per caricare la configurazione del plugin.</string>
+    <string name="enter_url">Inserisci URL</string>
+    <string name="install">Installa</string>
+    <string name="no_devices_found_it_may_take_a_while_for_your_device_to_show_up_please_be_patient">Nessun dispositivo rilevato. Potrebbe volerci un pò per mostrare il tuo dispositivo, sii paziente</string>
+    <string name="not_ready">Non pronto</string>
+    <string name="connect">Connesso</string>
+    <string name="stop">Interrompi</string>
+    <string name="stop_casting">Interrompi trasmissione</string>
+    <string name="start">Inizia</string>
+    <string name="storage_space">Spazio di Archiviazione</string>
+    <string name="downloads">Download</string>
+    <string name="deselect_all">Deseleziona Tutto</string>
+    <string name="select_all">Seleziona Tutto</string>
+    <string name="add_casting_device">Aggiungi Dispositivo di Trasmissione</string>
+    <string name="new_activity">Nuova attività</string>
+    <string name="creator_is_on_neopass">Il creatore si trova su NeoPass</string>
+    <string name="options">Opzioni</string>
+    <string name="export">Esporta</string>
+    <string name="delete">Elimina</string>
+    <string name="loading_update">Caricamento aggiornamento…</string>
+    <string name="polycentric_explanation">Quando navighi tra i video online e desideri lasciare un commento, prendi in considerazione Polycentric, un nuovo modo di gestire la tua presenza online che è sia facile da usare che incentrato sulle tue esigenze. Ecco perché creare un profilo Polycentric è un\'ottima scelta:\n\n 1. Hai il controllo: Con Polycentric, i tuoi dati non sono archiviati in un unico luogo controllato da una singola azienda. Invece, sono distribuiti su più posizioni, offrendoti un maggiore controllo sulla tua presenza online. Decidi tu dove vengono archiviati i tuoi dati e puoi facilmente passare da un fornitore all\'altro o aggiungerne di nuovi.\n\n 2. Privacy e sicurezza: Polycentric mantiene le tue informazioni al sicuro utilizzando tecniche di sicurezza avanzate. Puoi star certo che i tuoi dati personali sono ben protetti e accessibili solo a coloro con cui scegli di condividerli.\n\n 3. Networking senza interruzioni: Polycentric ti consente di connetterti con altri e interagire con i loro contenuti senza essere legato a un\'unica piattaforma. Se un fornitore diventa inaffidabile o tenta di bloccare l\'accesso, il tuo client Polycentric troverà automaticamente le informazioni da altre fonti, mantenendoti connesso.\n\n 4. Ricerca e suggerimenti intelligenti: Polycentric utilizza più fonti per la ricerca ed i suggerimenti, offrendoti prestazioni di prim\'ordine e garantendo che nessun singolo fornitore abbia eccessiva influenza sui risultati che vedi.\n\n 5. Adattabile e aperto: Polycentric è progettato per essere flessibile e aperto a nuovi sviluppi, consentendo miglioramenti costanti e nuove funzionalità che si adattano alle esigenze dei suoi utenti.\n\n 6. Creando un profilo Polycentric, puoi lasciare commenti sui video online e goderti un\'esperienza più personalizzata. Scopri tu stesso come questa soluzione intuitiva ti mette al centro della tua vita digitale. Iscriviti oggi stesso a Polycentric!</string>
+    <string name="publish">Pubblica</string>
+    <string name="usage">Uso</string>
+    <string name="enable_in_home">Attiva in home</string>
+    <string name="enable_in_search">Attiva in ricerca</string>
+    <string name="check">Verifica</string>
+    <string name="buy_text">Grayjay non è un\'app facile o economica da costruire e mantenere. Abbiamo ingegneri a tempo pieno che lavorano sull\'app e sui suoi sistemi correlati. E probabilmente ciò non aiuterà a rientrare nei costi di sviluppo in tempi brevi, se mai ciò dovesse accadere.\n\nLa missione di FUTO è che il software open-source e le pratiche commerciali software non dannose diventino una fonte di reddito sostenibile per i progetti e i loro sviluppatori. Per questo motivo il team GrayJay si prefissa come obiettivo quello di far pagare agli utenti finali il proprio software.</string>
+    <string name="an_uncaught_exception_was_thrown_we_re_sorry_for_the_inconvenience">È stata lanciata un\'eccezione non gestita, siamo dispiaciuti per l\`inconveniente.</string>
+    <string name="to_help_us_solve_this_please_share_the_below_crash_report_with_us_and_perhaps_adds_some_context_on_what_you_were_doing">Per aiutarci a risolverla, ti chiediamo di inviarci la seguente segnalazione crash, aggiungendo eventuali informazioni sul contesto nel quale si è verificata.</string>
+    <string name="new_profile">Nuovo Profilo</string>
+    <string name="import_existing_profile">Importa Profilo Esistente</string>
+    <string name="generate_a_new_identity">Genera una nuova identità</string>
+    <string name="use_an_existing_identity">Utilizza un\'identità esistente</string>
+    <string name="permissions">Permessi</string>
+    <string name="security_warnings">Avvisi di Sicurezza</string>
+    <string name="these_are_warnings_of_plugin_behavior_and_implementation">Questi sono avvisi sui comportamenti e l\'implementazione del plugin</string>
+    <string name="please_enter_the_captcha_and_close_when_finished">Inserisci il captcha e chiudi una volta terminato</string>
+    <string name="close_capitalized">CHIUDI</string>
+    <string name="submit">Invia</string>
+    <string name="restart">Riavvia</string>
+    <string name="manage_tabs">Gestisci Schede</string>
+    <string name="scan_to_import">Scansiona per importare</string>
+    <string name="send_your_identity_to_another_app">Invia la tua identità ad un\'altra app</string>
+    <string name="copy">Copia</string>
+    <string name="copy_your_identity_to_clipboard">Copia la tua identità negli appunti</string>
+    <string name="polycentric">Polycentric</string>
+    <string name="profile_name">Nome Profilo</string>
+    <string name="this_will_be_visible_to_other_users">Questo sarà visibile ad altri utenti</string>
+    <string name="create_profile">Crea Profilo</string>
+    <string name="or_capitalized">O</string>
+    <string name="paste_profile_here_polycentric">Incolla profilo qui polycentric://…</string>
+    <string name="import_profile">Importa Profilo</string>
+    <string name="you_re_apparantly_a_developer">Apparentemente sei uno sviluppatore</string>
+    <string name="developer_settings">Impostazioni Sviluppatore</string>
+    <string name="migration">Migrazione</string>
+    <string name="set_a_password_for_your_daily_backup">Imposta una password per il tuo backup giornaliero</string>
+    <string name="set_a_password_used_to_encrypt_your_daily_backup_that_is_written_to_external_storage">Imposta una password per crittografare il tuo backup giornaliero scritto su memoria esterna.</string>
+    <string name="backup_password">Password Backup</string>
+    <string name="repeat_password">Ripeti Password</string>
+    <string name="restore_from_automatic_backup">Ripristina da Backup Automatico</string>
+    <string name="it_appears_an_automatic_backup_exists_on_your_device_if_you_would_like_to_restore_enter_your_backup_password">Sembra che un backup automatico esista già sul tuo dispositivo, se intendi ripristinarlo, inserisci la password del tuo backup.</string>
+    <string name="restore">Ripristina</string>
+    <string name="error_message_here">Messaggio di errore qui</string>
+    <string name="name">Nome</string>
+    <string name="ip">IP</string>
+    <string name="port">Porta</string>
+    <string name="discovered_devices">Dispositivi Rilevati</string>
+    <string name="available_devices">Dispositivi disponibili</string>
+    <string name="remembered_devices">Dispositivi Salvati</string>
+    <string name="unable_to_see_the_Device_youre_looking_for_try_add_the_device_manually">Non riesci a trovare il dispositivo che stai cercando? Prova ad aggiungerlo manualmente.</string>
+    <string name="there_are_no_remembered_devices">Non ci sono dispositivi salvati</string>
+    <string name="connected_to">Connesso a</string>
+    <string name="volume">Volume</string>
+    <string name="changelog">Lista cambiamenti</string>
+    <string name="changelog_plugin_description">Mostra le liste dei cambiamenti disponibili per la versioni corrente e passate</string>
+    <string name="some_example_changelog">Qualche esempio di lista cambiamenti.</string>
+    <string name="previous">Precedente</string>
+    <string name="next">Successivo</string>
+    <string name="comment">Commento</string>
+    <string name="add_manually">Aggiungi manualmente</string>
+    <string name="not_empty_close">Il commento non è vuoto, vuoi procedere comunque alla chiusura?</string>
+    <string name="str_import">Importa</string>
+    <string name="my_playlist_name">Nome della Mia Playlist</string>
+    <string name="do_you_want_to_import_this_store">Vuoi importare questo negozio?</string>
+    <string name="sources_required_need_to_be_enabled">La sorgente richiesta va attivata</string>
+    <string name="items_require_migration_or_are_corrupted_would_you_like_to_restore_them_from_backup_now">Gli elementi richiedono la migrazione o sono corrotti, vuoi procedere al loro ripristino da backup?</string>
+    <string name="if_ignored_you_will_be_asked_again_next_startup">Se ignorato ti verrà chiesto nuovamente al prossimo avvio.</string>
+    <string name="ignore">Ignora</string>
+    <string name="view_changelog">Mostra lista cambiamenti</string>
+    <string name="i_already_paid">Ho Già Pagato</string>
+    <string name="memberships">Membership</string>
+    <string name="a_monthly_recurring_payment_with_often">Un pagamento ricorrente con frequenza mensile</string>
+    <string name="additional_perks">vantaggi aggiuntivi</string>
+    <string name="a_one_time_payment_to_support_the_creator">Un pagamento una tantum per supportare il creatore</string>
+    <string name="a_store_by_the_creator">Un negozio di questo creatore</string>
+    <string name="donation">Donazione</string>
+    <string name="promotions">Promozioni</string>
+    <string name="current_promotions_by_this_creator">Promozioni correnti da questo creatore</string>
+    <string name="downloading">Download</string>
+    <string name="videos">Video</string>
+    <string name="clear_history">Pulisci cronologia</string>
+    <string name="nothing_to_import">Nulla da importare</string>
+    <string name="no_sources_installed">Non hai sorgenti intallate, aggiungine alcune se vuoi utilizzare l\'app nei modi previsti.</string>
+    <string name="enabling_lots_of_sources_can_reduce_the_loading_speed_of_your_application">Attivare molte sorgenti può ridurre la velocità di caricamento della tua applicazione.</string>
+    <string name="support">Supporto</string>
+    <string name="membership">Membership</string>
+    <string name="store">Store</string>
+    <string name="live_chat">Live Chat</string>
+    <string name="remove">Rimuovi</string>
+    <string name="space_videos">Video</string>
+    <string name="playlist">Playlist</string>
+    <string name="neopass_channel">Canale Polycentric</string>
+    <string name="enable">Attiva</string>
+    <string name="under_construction">In Costruzione</string>
+    <string name="under">IN</string>
+    <string name="construction">COSTRUZIONE</string>
+    <string name="disable">Disattiva</string>
+    <string name="the_following_content_cannot_be_opened_in_grayjay_due_to_a_missing_plugin">Il seguente creatore non può essere visualizzato su Grayjay a causa del plugin mancante.</string>
+    <string name="locked_content_description">Questo contenuto è bloccato</string>
+    <string name="unknown">Sconosciuto</string>
+    <string name="tap_to_open_in_browser">Tocca per aprire nel browser</string>
+    <string name="missing_plugin">Plugin Mancante</string>
+    <string name="viewers_are_raiding">Gli spettatori stanno accedendo</string>
+    <string name="go_now">Vai ora</string>
+    <string name="prevent">Previeni</string>
+    <string name="recently_used_playlist">Playlist Usate di Recente</string>
+    <string name="license_email">Licenza email</string>
+    <string name="required_to_send_the_license_key">Richiesta per l\'invio della chiave di licenza</string>
+    <string name="receipt_email_user_domain_com">Email di ricezione (utente@dominio.it)</string>
+    <string name="payment_using">Pagamento utilizzato</string>
+    <string name="country">Paese</string>
+    <string name="postal_code">Codice di Avviamento Postale</string>
+    <string name="grayjay">Grayjay</string>
+    <string name="sales_tax">Imposta sulle Vendite (</string>
+    <string name="total">Totale</string>
+    <string name="pay">Paga</string>
+    <string name="standard_payment_methods">Metodi di Pagamento Standard</string>
+    <string name="stripe_is_a_secure_online_payment_service_that_accepts_major_credit_cards_debit_cards_and_various_localized_payment_methods">Stripe è un servizio di pagamento online sicuro che accetta le principali carte di credito, di debito, e vari metodi di pagamento localizzati.</string>
+    <string name="add_a_comment">Aggiungi un commento…</string>
+    <string name="dismiss">Chiudi</string>
+    <string name="scan_a_qr_code_to_install">Scansiona un codice QR per installare</string>
+    <string name="toggle_fullscreen">Attiva/Disattiva schermo intero</string>
+    <string name="by">Dal</string>
+    <string name="signature">Firma</string>
+    <string name="valid">Valido</string>
+    <string name="repeat">Ripeti</string>
+    <string name="view">Vedi</string>
+    <string name="install_by_qr">Installa con QR</string>
+    <string name="install_a_plugin_by_scanning_a_qr_code">Installa un plugin scansionando un codice QR</string>
+    <string name="logout">Disconnetti</string>
+    <string name="video">Video</string>
+    <string name="view_a_more_in_depth_video">Guarda un video più approfondito</string>
+    <string name="technical_documentation">Documentazione Tecnica</string>
+    <string name="view_the_technical_documentation">Visualizza la documentazione tecnica</string>
+    <string name="visit_my_store">Visita il mio negozio</string>
+    <string name="make_a_backup_of_your_identity">Crea un backup della tua identità</string>
+    <string name="sign_out_of_this_identity">Disconnettiti da questa identità</string>
+    <string name="delete_this_profile">Elimina questo profilo</string>
+    <string name="install_by_url">Installa con URL</string>
+    <string name="cache_to_quickly_load_previously_fetched_videos">Memorizza i video precedentemente visti per caricarli più velocemente</string>
+    <string name="a_list_of_user_reported_and_self_reported_issues">Una lista di problemi segnalati dall\'utente e segnalati in automatico</string>
+    <string name="also_removes_any_data_related_plugin_like_login_or_settings">Rimuovi anche qualsiasi dato relativo al plugin come accesso o impostazioni</string>
+    <string name="announcement">Annuncu</string>
+    <string name="notifications">Notifiche</string>
+    <string name="check_disabled_plugin_updates">Verifica aggiornamenti plugin disattivati</string>
+    <string name="check_disabled_plugin_updates_description">Verifica gli aggiornamenti per i plugin disattivati</string>
+    <string name="planned_content_notifications">Notifiche Contenuto Pianificato</string>
+    <string name="planned_content_notifications_description">Programma il contenuto pianificato scoperto sotto forma di notifiche, più accurate per tale contenuto.</string>
+    <string name="attempt_to_utilize_byte_ranges">Tenta di utilizzare intervallo in byte</string>
+    <string name="auto_update">Aggiornamenti Automatici</string>
+    <string name="always_allow_reverse_landscape_auto_rotate">Consenti sempre la rotazione automatica inversa orizzontale</string>
+    <string name="always_allow_reverse_landscape_auto_rotate_description">La rotazione automatica sarà sempre presente tra i due orientamenti orizzontali in modalità a schermo intero, anche quando disattivi la rotazione automatica nelle impostazioni di sistema.</string>
+    <string name="simplify_sources">Semplifica sorgenti</string>
+    <string name="simplify_sources_description">Deduplica i sorgenti in base alla loro risoluzione in modo che siano visibili solo quelli più pertinenti.</string>
+    <string name="automatic_backup">Backup Automatico</string>
+    <string name="background_behavior">Comportamento in Secondo Piano</string>
+    <string name="background_update">Aggiornamento in Secondo Piano</string>
+    <string name="background_download">Download in Secondo Piano</string>
+    <string name="backup">Backup</string>
+    <string name="Browse">Navigazione</string>
+    <string name="byte_range_concurrency">Concorrenza ByteRange</string>
+    <string name="byte_range_download">Download ByteRange</string>
+    <string name="casting">Trasmissione</string>
+    <string name="change_behavior_of_the_player">Modifica il comportamento del lettore</string>
+    <string name="change_external_downloads_directory">Modifica il percorso esterno dei Download</string>
+    <string name="clear_external_downloads_directory">Cancella il percorso esterno dei Download</string>
+    <string name="change_external_general_directory">Modifica il percorso esterno generale</string>
+    <string name="change_tabs_visible_on_the_home_screen">Modifica le schede visibili nella scheda home</string>
+    <string name="link_handling">Gestione Link</string>
+    <string name="allow_grayjay_to_handle_links">Consenti a Grayjay di gestire i link</string>
+    <string name="change_the_external_directory_for_general_files">Modifica la directory esterna per i file generali</string>
+    <string name="clear_the_external_storage_for_download_files">Cancella l\'archivio esterno per i file di download</string>
+    <string name="change_the_external_storage_for_download_files">Modifica l\'archivio esterno per i file di download</string>
+    <string name="clear_cookies">Cancella Cookie</string>
+    <string name="clear_cookies_on_logout">Cancella Cookie Dopo Disconnessione</string>
+    <string name="test_background_worker">Test Worker in Secondo Piano</string>
+    <string name="test_background_worker_description"></string>
+    <string name="clear_payment">Cancella Pagamento</string>
+    <string name="clears_cookies_when_you_log_out">Cancella i cookie quando effettui la disconnessione</string>
+    <string name="clears_in_app_browser_cookies">Cancella i cookie del browser in-app</string>
+    <string name="configure_Browse_behavior">Configura il comportamento di navigazione</string>
+    <string name="time_bar">Barra minutaggio</string>
+    <string name="configure_if_historical_time_bar_should_be_shown">Configura se la barra del minutaggio cronologica deve essere mostrate</string>
+    <string name="configure_casting">Configurazione trasmissione</string>
+    <string name="configure_daily_backup_in_case_of_catastrophic_failure">Configura il backup giornaliero in caso di guasto catastrofico</string>
+    <string name="configure_downloading_of_videos">Configura il download dei video</string>
+    <string name="configure_how_your_home_tab_works_and_feels">Configurazione funzionale ed estetica della scheda Home</string>
+    <string name="configure_how_your_subscriptions_works_and_feels">Configurazione funzionale ed estetica delle tue sottoscrizioni</string>
+    <string name="configure_if_background_download_should_be_used">Configura se il download in secondo piano deve essere utilizzato</string>
+    <string name="configure_the_auto_updater">Configura l\'aggiornamento automatico</string>
+    <string name="configure_when_updates_should_be_downloaded">Configura quando gli aggiornamenti devono essere scaricati</string>
+    <string name="configure_when_videos_should_be_downloaded">Configura quando i video devono essere scaricati, se solo su reti non a consumo (Wi-Fi)</string>
+    <string name="creates_a_zip_file_with_your_data_which_can_be_imported_by_opening_it_with_grayjay">Crea un file zip con i tuoi dati che può essere importato su Grayjay</string>
+    <string name="default_audio_quality">Qualità Audio Predefinita</string>
+    <string name="default_playback_speed">Velocità di Riproduzione Predefinita</string>
+    <string name="default_video_quality">Qualità Video Predefinita</string>
+    <string name="deletes_license_keys_from_app">Elimina le chiavi di licenza dall\'app</string>
+    <string name="download_when">Scarica quando</string>
+    <string name="enable_video_cache">Attiva Memorizzazione Video</string>
+    <string name="enable_casting">Attiva trasmissione</string>
+    <string name="experimental_background_update_for_subscriptions_cache">Aggiornamento in secondo piano sperimentale per la memorizzazione delle sottoscrizioni</string>
+    <string name="export_data">Esporta Dati</string>
+    <string name="import_data">Importa Dati</string>
+    <string name="import_data_description">Seleziona un file da importare, supporta vari tipi di file (alternativa all\'apertura diretta)</string>
+    <string name="external_storage">Archivio Esterno</string>
+    <string name="feed_style">Stile Feed</string>
+    <string name="language">Lingua</string>
+    <string name="app_language">Lingua App</string>
+    <string name="may_require_restart">Potrebbe richiedere il riavvio</string>
+    <string name="fetch_on_app_boot">Recupera all\'avvio dell\'app</string>
+    <string name="fetch_on_tab_opened">Recupera all\'apertura della scheda</string>
+    <string name="fetch_on_tab_opened_description">Recupera nuovi risultati all\'apertura della scheda (se non ci sono ancora risultati, la disattivazione non è consigliata a meno che tu non abbia problemi)</string>
+    <string name="always_reload_from_cache">Ricarica sempre dalla memoria</string>
+    <string name="always_reload_from_cache_description">Non è consigliata, ma può rappresentare una soluzione per alcuni problemi.</string>
+    <string name="peek_channel_contents">Visualizza Contenuti Canale</string>
+    <string name="peek_channel_contents_description">Visualizza i contenuti del canale se supportato dal plugin delle chiamate a tasso limitato (potrebbe incrementare il tempo di ricarica della sottoscrizione).</string>
+    <string name="get_answers_to_common_questions">Ottieni risposte alle domande comuni</string>
+    <string name="give_feedback_on_the_application">Fornisci feedback sull\'applicazione</string>
+    <string name="info">Info</string>
+    <string name="networking">Networking</string>
+    <string name="synchronization">Sincronizzazione</string>
+    <string name="enabled_description">Attiva funzionalità</string>
+    <string name="broadcast">Broadcast mDNS</string>
+    <string name="broadcast_description">Consenti al dispositivo di trasmettere la propria presenza usando mDNS</string>
+    <string name="connect_discovered">Connessione mDNS</string>
+    <string name="connect_discovered_description">Consenti al dispositivo di cercare e avviare una connessione con dispositivi associati noti utilizzando mDNS</string>
+    <string name="connect_last">Connetti Ultimo Conosciuto</string>
+    <string name="connect_last_description">Consenti al dispositivo di connettersi automaticamente agli ultimi endpoint conosciuti</string>
+    <string name="discover_through_relay">Attiva Relay</string>
+    <string name="discover_through_relay_description">Consenti al dispositivo di utilizzare un relay per la scoperta/connessione ad un relay</string>
+    <string name="pair_through_relay">Associa Relay</string>
+    <string name="pair_through_relay_description">Consenti al dispositivo di essere associato tramite relay</string>
+    <string name="connect_through_relay">Connessione Relay</string>
+    <string name="connect_through_relay_description">Consenti al dispositivo di connettersi utilizzando un relay</string>
+    <string name="connect_local_direct_through_relay">Connessione Diretta Relay</string>
+    <string name="connect_local_direct_through_relay_description">Consenti al dispositivo di connettersi in maniera diretta utilizzando le informazioni pubblicate dal relay</string>
+    <string name="local_connections">Associa Listener</string>
+    <string name="local_connections_description">Consenti al dispositivo di connettersi direttamente</string>
+    <string name="gesture_controls">Controlli gestuali</string>
+    <string name="volume_slider">Cursore volume</string>
+    <string name="volume_slider_descr">Attiva il gesto di scorrimento per modificare il volume</string>
+    <string name="brightness_slider">Cursore luminosità</string>
+    <string name="brightness_slider_descr">Attiva il gesto di scorrimento per modificare la luminosità</string>
+    <string name="toggle_full_screen">Attiva/Disattiva schermo intero</string>
+    <string name="toggle_full_screen_descr">Attiva il gesto di scorrimento per entrare/uscire dalla modalità a schermo intero</string>
+    <string name="system_brightness">Luminosità di sistema</string>
+    <string name="system_brightness_descr">I controlli gestuali possono regolare la luminosità di sistema</string>
+    <string name="restore_system_brightness">Ripristina luminosità di sistema</string>
+    <string name="restore_system_brightness_descr">Ripristina la luminosità di sistema all\'uscita dalla modalità a schermo intero</string>
+    <string name="zoom_option">Attiva zoom</string>
+    <string name="zoom_option_descr">Attiva il gesto di zoom a due dita</string>
+    <string name="pan_option">Attiva pan</string>
+    <string name="pan_option_descr">Attiva il gesto di pan a due dita</string>
+    <string name="system_volume">Volume di sistema</string>
+    <string name="system_volume_descr">I controlli gestuali regolano il volume di sistema</string>
+    <string name="live_chat_webview">Live Chat Webview</string>
+    <string name="full_screen_portrait">Schermo intero verticale</string>
+    <string name="reverse_portrait">Consenti verticale inversa</string>
+    <string name="reverse_portrait_description">Consenti all\'app di capovolgersi in modalità verticale inversa</string>
+    <string name="rotation_zone">Zona di rotazione</string>
+    <string name="rotation_zone_description">Specifica la sensibilità delle zone di rotazione (diminuiscila per renderla meno sensibile)</string>
+    <string name="stability_threshold_time">Soglia temporale di stabilità</string>
+    <string name="stability_threshold_time_description">Specifica per quanto tempo l\'orientamento deve rimanere invariato prima che una rotazione si attivi</string>
+    <string name="prefer_webm">Prediligi Codec Video Webm</string>
+    <string name="prefer_webm_description">Se il lettore deve utilizzare i codec Webm (vp9/opus) anziché mp4 (h264/AAC). Potrebbe causare una peggiore compatibilità.</string>
+    <string name="full_autorotate_lock">Blocco rotazione automatica completa</string>
+    <string name="full_autorotate_lock_description">Impedisce qualsiasi rotazione mentre il blocco di rotazione è attivo (anche il passaggio tra orizzontale e orizzontale inverso).</string>
+    <string name="prefer_webm_audio">Prediligi Codec Audio Webm</string>
+    <string name="prefer_webm_audio_description">Se il lettore deve utilizzare i codec Webm (opus) anziché mp4 (AAC). Potrebbe causare una peggiore compatibilità.</string>
+    <string name="allow_under_cutout">Consenti video oltre ritaglio</string>
+    <string name="allow_under_cutout_description">Consenti al video di superare il ritaglio dello schermo sottostante in modalità a schermo intero.\nPotrebbe richiedere un riavvio</string>
+    <string name="autoplay">Riproduci automaticamente il video successivo per impostazione predefinita</string>
+    <string name="autoplay_description">La riproduzione automatica del video successivo sarà attiva per impostazione predefinita ogni volta che guarderai un video</string>
+    <string name="allow_full_screen_portrait">Consenti modalità verticale a schermo intero quando si guardano video orizzontali</string>
+    <string name="delete_watchlist_on_finish">Elimina da Guarda più tardi dopo visione</string>
+    <string name="delete_watchlist_on_finish_description">Dopo aver chiuso un video che hai guardato in larga parte, questo verrà rimosso da 'Guarda più tardi'.</string>
+    <string name="seek_offset">Durata ricerca</string>
+    <string name="min_playback_speed">Velocità di riproduzione minima</string>
+    <string name="min_playback_speed_description">Velocità minima disponibile</string>
+    <string name="max_playback_speed">Velocità di riproduzione massima</string>
+    <string name="max_playback_speed_description">Velocità massima disponibile</string>
+    <string name="hold_playback_speed">Mantieni velocità di riproduzione</string>
+    <string name="hold_playback_speed_description">Velocità di riproduzione quando si effettua una pressione prolungata sul lettore video</string>
+    <string name="step_playback_speed">AmpiezzaVelocità Avanzamento Riproduzione</string>
+    <string name="step_playback_speed_description">La velocità di avanzamento della riproduzione. Potrebbe non influenzare le velocità di riproduzione più elevate.</string>
+    <string name="seek_offset_description">Durata di avanzamento/riavvolgimento rapido</string>
+    <string name="background_switch_audio">Passa all\'audio in secondo piano</string>
+    <string name="subscription_group_menu">Gruppi</string>
+    <string name="show_subscription_group">Mostra gruppi di sottoscrizione</string>
+    <string name="use_subscription_exchange">Utilizza Scambio Sottoscrizioni (Sperimentale)</string>
+    <string name="use_subscription_exchange_description">Utilizza un server centralizzato crowd-sourced per ridurre significativamente le richieste necessarie per le sottoscrizioni. In cambio verranno inviate le tue sottoscrizioni al server.</string>
+    <string name="show_subscription_group_description">Se i gruppi di sottoscrizione devono essere mostrati al di sopra delle tue sottoscrizioni da filtrare</string>
+    <string name="preview_feed_items">Anteprima Elementi Feed</string>
+    <string name="preview_feed_items_description">Quando viene applicato lo stile anteprima per i feed, decide se gli elementi devono essere automaticamente visualizzati in anteprima quando si scorre su di essi</string>
+    <string name="show_home_filters">Mostra Filtri Home</string>
+    <string name="show_home_filters_description">Se i filtri nella scheda home devono essere mostrati al di sopra di quest\'ultima</string>
+    <string name="show_home_filters_plugin_names">Nomi Plugin Filtri Home</string>
+    <string name="show_home_filters_plugin_names_description">Se i filtri nella scheda home devono mostrare i nomi completi dei plugin o solo le icone</string>
+    <string name="log_level">Livello di Log</string>
+    <string name="logging">Logging</string>
+    <string name="license_status">Stato Licenza</string>
+    <string name="view_license_status">Visualizza stato licenza</string>
+    <string name="sync_grayjay">Sincronizza Grayjay</string>
+    <string name="sync_grayjay_description">Sincronizza i tuoi dati su più dispositivi</string>
+    <string name="manage_polycentric_identity">Gestisci identità Polycentric</string>
+    <string name="manage_your_polycentric_identity">Gestisci la tua identità Polycentric</string>
+    <string name="manual_check">Verifica manuale</string>
+    <string name="manually_check_for_updates">Verifica manualmente gli aggiornamenti</string>
+    <string name="number_of_concurrent_threads_to_multiply_download_speeds_from_throttled_sources">Numero di thread concorrenti per moltiplicare le velocità di download da fonti limitate</string>
+    <string name="payment">Pagamento</string>
+    <string name="payment_status">Stato Pagamento</string>
+    <string name="bypass_rotation_prevention">Aggira Prevenzione Rotazione</string>
+    <string name="playlist_delete_confirmation">Conferma Eliminazione Playlist</string>
+    <string name="playlist_delete_confirmation_description">Mostra la finestra di dialogo di conferma quando si elimina un media da una playlist</string>
+    <string name="playlist_allow_dups">Consenti video duplicati nella playlist</string>
+    <string name="playlist_allow_dups_description">Consenti l\'aggiunta di video duplicati alle playlist</string>
+    <string name="enable_polycentric">Attiva Polycentric</string>
+    <string name="polycentric_local_cache">Attiva Memorizzazione Locale Polycentric</string>
+    <string name="polycentric_local_cache_description">Memorizza i risultati Polycentric sul dispositivo per ridurre i tempi di caricamento, la modifica richiede il riavvio dell\'app</string>
+    <string name="can_be_disabled_when_you_are_experiencing_issues">Può essere disattivato quando si riscontrano problemi</string>
+    <string name="bypass_rotation_prevention_description">Consente la rotazione quando si visualizza un media non-video.\nATTENZIONE: Non è progettato per questo</string>
+    <string name="bypass_rotation_prevention_warning">Ciò potrebbe causare un comportamento inaspettato ed è per lo più non testato.</string>
+    <string name="changing_this_field_requires_restart">La modifica di questo campo richiederà il riavvio dell\'app.</string>
+    <string name="player">Lettore</string>
+    <string name="plugins">Plugin</string>
+    <string name="preferred_casting_quality">Qualità di Trasmissione Preferita</string>
+    <string name="preferred_casting_quality_description">Qualità predefinita durante la trasmissione su dispositivo esterno</string>
+    <string name="preferred_metered_quality">Qualità Preferita con Dati a Consumo</string>
+    <string name="preferred_metered_quality_description">Qualità predefinita su connessioni a consumo come la rete cellulare</string>
+    <string name="preferred_preview_quality">Qualità Anteprima Preferita</string>
+    <string name="preferred_preview_quality_description">Qualità predefinita durante l\'anteprima di un video in un feed</string>
+    <string name="primary_language">Lingua Principale</string>
+    <string name="prefer_original_audio">Prediligi Audio Originale</string>
+    <string name="prefer_original_audio_description">Utilizza l\'audio originale anziché la lingua preferita quando possibile</string>
+    <string name="default_comment_section">Sezione Commenti Predefinita</string>
+    <string name="hide_recommendations">Nascondi Suggerimenti</string>
+    <string name="hide_recommendations_description">Nascondi completamente la scheda dei suggerimenti.</string>
+    <string name="default_recommendations">Suggerimenti Come Predefiniti</string>
+    <string name="default_recommendations_description">Mostra i suggerimenti come elemento predefinito, anziché i commenti.</string>
+    <string name="bad_reputation_comments_fading">Scolora Commenti con Cattiva Reputazione</string>
+    <string name="bad_reputation_comments_fading_description">Se il colore dei commenti con una reputazione molto negativa deve essere ridotto. La disattivazione di questa opzione potrebbe peggiorare l\'esperienza d\'uso.</string>
+    <string name="reinstall_embedded_plugins">Reinstalla Plugin Integrati</string>
+    <string name="remove_cached_version">Rimuovi Versione Memorizzata</string>
+    <string name="remove_the_last_downloaded_version">Rimuovi l\'ultima versione scaricata</string>
+    <string name="clear_hidden">Cancella Nascosti</string>
+    <string name="clear_hidden_description">Rimuove tutti i creatori e i video nascosti, mostrandoli nuovamente</string>
+    <string name="reset_announcements">Reimposta annunci</string>
+    <string name="reset_hidden_announcements">Reimposta annunci nascosti</string>
+    <string name="restore_automatic_backup">Ripristina Backup Automatico</string>
+    <string name="restore_a_previous_automatic_backup">Ripristina un precedente backup automatico</string>
+    <string name="resume_after_preview">Riprendi dopo Anteprima</string>
+    <string name="review_the_current_and_past_changelogs">Visiona nuovamente le liste dei cambiamenti attuali e passate</string>
+    <string name="restart_after_audio_focus_loss">Riavvia dopo perdita di focus audio</string>
+    <string name="restart_playback_when_gaining_audio_focus_after_a_loss">Riavvia la riproduzione quando si riacquista il focus audio dopo una perdita</string>
+    <string name="restart_after_connectivity_loss">Riavvia dopo perdita di connettività</string>
+    <string name="restart_playback_when_gaining_connectivity_after_a_loss">Riavvia la riproduzione quando si riacquista la connettività dopo una perdita</string>
+    <string name="chapter_update_fps_title">FPS Aggiornamento Capitoli</string>
+    <string name="chapter_update_fps_description">Modifica la precisione dell\'aggiornamento dei capitoli, un valore più alto potrebbe richiedere maggiori risorse</string>
+    <string name="set_automatic_backup">Imposta Backup Automatico</string>
+    <string name="shortly_after_opening_the_app_start_fetching_subscriptions">Poco dopo aver aperto l\'app, inizia a recuperare le sottosscrizioni</string>
+    <string name="show_faq">Mostra FAQ</string>
+    <string name="show_issues">Mostra Problemi</string>
+    <string name="specify_how_many_threads_are_used_to_fetch_channels">Specifica quanti thread vengono utilizzati per recuperare i canali</string>
+    <string name="submit_feedback">Invia feedback</string>
+    <string name="submit_logs">Invia log</string>
+    <string name="clear_channel_cache">Cancella Memoria Canale</string>
+    <string name="clear_channel_cache_description">Elimina tutti i contenuti dalla memoria riservata ai canali di sottoscrizione</string>
+    <string name="submit_logs_to_help_us_narrow_down_issues">Invia i tuoi log per aiutarci ad isolare i problemi</string>
+    <string name="subscription_concurrency">Concorrenza Sottoscrizioni</string>
+    <string name="track_playtime_locally">Traccia Tempo di Riproduzione Localmente</string>
+    <string name="track_playtime_locally_description">Traccia localmente il tempo di riproduzione delle sottoscrizioni, utilizzato per il riordinamento di queste ultime e dei suggerimenti locali dei creatori.</string>
+    <string name="show_watch_metrics">Mostra Metriche di Visione</string>
+    <string name="show_watch_metrics_description">Mostra il tempo di visione e le visualizzazioni di ogni creatore nella scheda dedicata</string>
+    <string name="this_prevents_the_device_from_rotating_within_the_given_amount_of_degrees">Questo impedisce al dispositivo di ruotare entro la quantità di gradi specificata</string>
+    <string name="use_the_live_chat_web_window_when_available_over_native_implementation">Utilizza la finestra web della live chat quando disponibile anziché l\'implementazione nativa</string>
+    <string name="version_code">Codice Versione</string>
+    <string name="version_name">Nome Versione</string>
+    <string name="version_type">Tipo Versione</string>
+    <string name="dev_info_channel_cache_size">Dimensione Memoria Canale (Avvio)</string>
+    <string name="when_watching_a_video_in_preview_mode_resume_at_the_position_when_opening_the_video_code">Quando si guarda un video in modalità anteprima, riprendi la riproduzione da questa posizione dopo l\'apertura del video</string>
+    <string name="please_enable_logging_to_submit_logs">Attiva il logging per inviare i log</string>
+    <string name="embedded_plugins_reinstalled_a_reboot_is_recommended">Plugin integrati reinstallati, si consiglia un riavvio</string>
+    <string name="announcements_reset">Annunci ripristinati.</string>
+    <string name="failed_to_show_store">Apertura negozio non riuscita.</string>
+    <string name="retrieving_changelog">Recupero lista dei cambiamenti</string>
+    <string name="paid">Pagato</string>
+    <string name="not_paid">Non Pagato</string>
+    <string name="licenses_cleared_might_require_app_restart">Licenze cancellate, potrebbe richiedere il riavvio dell\'app</string>
+    <string name="attempts_to_fetch_2_pages_from_getHome">Tenta di recuperare 2 pagine da getHome</string>
+    <string name="background_subscription_testing">Test Sottoscrizioni in Secondo Piano</string>
+    <string name="clear_all_downloaded">Cancella Tutti i Download</string>
+    <string name="clear_downloads">Cancella Download</string>
+    <string name="clear_all_cookies_from_the_cookieManager">Cancella tutti i cookie dal Gestore Cookie</string>
+    <string name="crash_me">Fai Crashare</string>
+    <string name="crashes_the_application_on_purpose">Fa crashare l\'applicazione di proposito</string>
+    <string name="delete_announcements">Elimina Annunci</string>
+    <string name="delete_unresolved">Elimina Irrisolti</string>
+    <string name="delete_all_announcements">Elimina tutti gli annunci</string>
+    <string name="deletes_all_downloaded_videos_and_related_files">Elimina tutti i video scaricati e i file correlati</string>
+    <string name="deletes_all_ongoing_downloads">Elimina tutti i download in corso</string>
+    <string name="deletes_all_unresolved_source_files">Elimina tutti i file sorgente irrisolti</string>
+    <string name="developer_mode">Modalità Sviluppatore</string>
+    <string name="allow_all_certificates">Consenti Tutti i Certificati</string>
+    <string name="allow_all_certificates_warning">Ciò rischia di esporre tutto il tuo traffico di rete Grayjay.</string>
+    <string name="development_server">Server di Sviluppo</string>
+    <string name="experimental">Sperimentale</string>
+    <string name="cache">Memoria</string>
+    <string name="fill_storage_till_error">Riempi memoria di archiviazione fino a generare un errore</string>
+    <string name="inject">Inietta</string>
+    <string name="injects_a_test_source_config_local_into_v8">Inietta una configurazione test di origine (locale) in V8</string>
+    <string name="other">Altro</string>
+    <string name="others_ellipsis">Altri…</string>
+    <string name="removes_all_subscriptions">Rimuove tutte le sottoscrizioni</string>
+    <string name="settings_related_to_development_server_be_careful_as_it_may_open_your_phone_to_security_vulnerabilities">Impostazioni relative al server di sviluppo, fai attenzione poiché potrebbero esporre il tuo telefono a vulnerabilità di sicurezza</string>
+    <string name="start_server">Avvia Server</string>
+    <string name="test_playback">Test Riproduzione</string>
+    <string name="test_playback_desc">Continua a riprodurre video</string>
+    <string name="subscriptions_cache_5000">Memoria Sottoscrizioni 5000</string>
+    <string name="history_cache_100">Memoria Cronologia 100</string>
+    <string name="start_server_on_boot">Esegui Server all\'avvio</string>
+    <string name="starts_a_devServer_on_port_11337_may_expose_vulnerabilities">Esegui un DevServer sulla porta 11337. Ciò potrebbe esporre a vulnerabilità.</string>
+    <string name="test_v8_communication_speed">Test Velocità Comunicazione V8</string>
+    <string name="test_v8_creation_speed">Test Velocità Creazione V8</string>
+    <string name="tests_v8_communication_speeds">Testa le velocità di comunicazione V8</string>
+    <string name="tests_v8_creation_times_and_running">Testa i tempi di creazione e funzionamento di V8</string>
+    <string name="unsubscribe_all">Disiscriviti da tutti</string>
+    <string name="v8_benchmarks">Benchmark V8</string>
+    <string name="v8_script_testing">Test Script V8</string>
+    <string name="various_benchmarks_using_the_integrated_v8_engine">Vari benchmark utilizzando il motore V8 integrato</string>
+    <string name="various_tests_against_a_custom_source">Esegui vari test contro una fonte personalizzata</string>
+    <string name="writes_to_disk_till_no_space_is_left">Scrive su disco fino a quando non c\'è più spazio</string>
+    <string name="visibility">Visibilità</string>
+    <string name="check_for_updates_setting">Verifica aggiornamenti</string>
+    <string name="check_for_updates_setting_description">Se gli aggiornamenti di un plugin devono essere verificati all\'avvio</string>
+    <string name="automatic_update_setting">Aggiornamento Automatico</string>
+    <string name="automatic_update_setting_description">Aggiorna automaticamente all\'avvio se non sono cambiate le autorizzazioni e il plugin è attivo</string>
+    <string name="allow_developer_submit">Consenti Invio Sviluppatore</string>
+    <string name="allow_developer_submit_description">Consente allo sviluppatore di inviare dati al proprio server, fai attenzione poiché questo potrebbe esporre i tuoi dati sensibili.</string>
+    <string name="allow_developer_submit_warning">Assicurati di fidarti dello sviluppatore. Potrebbe ottenere l\'accesso a dati sensibili. Attiva questa opzione solo quando stai cercando di aiutare lo sviluppatore a risolvere un bug.</string>
+    <string name="ratelimit">Tasso di frequenza limite</string>
+    <string name="ratelimit_description">Impostazioni relative al limite del tasso di frequenza di questo plugin</string>
+    <string name="ratelimit_sub_setting">Tasso di frequenza limite Sottoscrizioni</string>
+    <string name="ratelimit_sub_setting_description">Limita la quantità di richieste di sottoscrizione effettuate</string>
+    <string name="enable_where_this_plugins_content_are_visible">Attiva dove i contenuti di questo plugin sono visibili</string>
+    <string name="show_content_in_home_tab">Mostra contenuti nella scheda home</string>
+    <string name="show_content_in_search_results">Mostra contenuti nei risultati di ricerca</string>
+    <string name="no_valid_url_provided">Nessun URL valido fornito...</string>
+    <string name="invalid_config_format">Formato Configurazione Non Valido</string>
+    <string name="failed_to_fetch_configuration">Recupero configurazione non riuscito</string>
+    <string name="failed_to_fetch_script">Recupero script non riuscito</string>
+    <string name="url_access">Accesso URL</string>
+    <string name="the_plugin_will_have_access_to_the_following_domains">Il plugin avrà accesso ai seguenti domini</string>
+    <string name="eval_access">Accesso Eval</string>
+    <string name="the_plugin_will_have_access_to_eval_capability_remote_injection">Il plugin avrà accesso alla funzionalità di valutazione (iniezione remota)</string>
+    <string name="failed_to_scan_qr_code">Scansionamento codice QR non riuscito</string>
+    <string name="not_a_plugin_url">Non è un URL di plugin</string>
+    <string name="scan_a_qr_code">Scansiona un codice QR</string>
+    <string name="not_implemented_yet">Non ancora implementato..</string>
+    <string name="unknown_context">Contesto Sconosciuto</string>
+    <string name="something_went_wrong_missing_stack_trace">Qualcosa è andato storto… traccia dello stack mancante?</string>
+    <string name="logs_already_submitted">Log già inviati.</string>
+    <string name="no_logs_found">Nessun log trovato.</string>
+    <string name="failed_automated_share_share_manually">Condivisione automatica non riuscita, passare alla modalità manuale?</string>
+    <string name="shared_id">Condiviso {id}</string>
+    <string name="unhandled_exception_in_vs">Eccezione non gestita in VS</string>
+    <string name="send_exception_to_developers">Invio eccezione agli sviluppatori…</string>
+    <string name="your_license_key_has_been_set_an_app_restart_might_be_required">La tua chiave di licenza è stata impostata!\nIl riavvio dell\'app potrebbe essere richiesto.</string>
+    <string name="invalid_license_format">Formato licenza non valido</string>
+    <string name="unknown_content_format">Formato contenuto sconosciuto</string>
+    <string name="unknown_file_format">Formato file sconosciuto</string>
+    <string name="unknown_polycentric_format">Formato Polycentric sconosciuto</string>
+    <string name="unknown_url_format">Formato url sconosciuto</string>
+    <string name="failed_to_handle_file">Gestione file non riuscita</string>
+    <string name="unknown_reconstruction_type">Tipo di ricostruzione sconosciuto</string>
+<string name="failed_to_parse_text_file">Analisi file di testo non riuscita</string>
+    <string name="failed_to_parse_newpipe_subscriptions">Analisi delle sottoscrizioni di NewPipe non riuscita</string>
+    <string name="failed_to_generate_qr_code">Generazione codice QR non riuscita</string>
+    <string name="share_text">Condividi testo</string>
+    <string name="copied_text">Testo copiato</string>
+    <string name="must_be_at_least_3_characters_long">Deve contenere almeno 3 caratteri.</string>
+    <string name="failed_to_create_profile">Creazione del profilo non riuscita.</string>
+    <string name="failed_to_fully_backfill_servers">Completo riempimento dei server non riuscito.</string>
+    <string name="sign_in_to_this_identity">Accedi a questa identità</string>
+    <string name="text_field_does_not_contain_any_data">Il campo di testo non contiene dati</string>
+    <string name="not_a_valid_url">URL non valido</string>
+    <string name="this_profile_is_already_imported">Questo profilo è già stato importato</string>
+    <string name="failed_to_import_profile">Importazione profilo non riuscita:</string>
+    <string name="failed_to_backfill_client">Riempimento client non riuscito</string>
+    <string name="are_you_sure_you_want_to_remove_this_profile">Sei sicuro di voler rimuovere questo profilo?</string>
+    <string name="no_process_handle_set">Nessun handle di processo impostato</string>
+    <string name="name_must_be_at_least_3_characters_long">Il nome deve contenere almeno 3 caratteri</string>
+    <string name="process_handle_unset">Handle di processo non impostato</string>
+    <string name="failed_to_read_image">Lettura immagine non riuscita</string>
+    <string name="changes_have_been_saved">Le modifiche sono state salvate</string>
+    <string name="failed_to_synchronize_changes">Sincronizzazione modifiche non riuscita</string>
+    <string name="image_picker_cancelled">Selezione immagine annullata</string>
+    <string name="you_are_now_in_developer_mode">Ora sei in modalità sviluppatore</string>
+    <string name="subscribers">Iscritti</string>
+    <string name="find_name_on">Trova {name} su</string>
+    <string name="failed_to_fetch">Recupero non riuscito</string>
+    <string name="thanks_for_your_purchase_a_key_will_be_sent_to_your_email_after_your_payment_has_been_received">Grazie per l\'acquisto, una chiave verrà inviata alla tua email una volta ricevuto il pagamento!</string>
+    <string name="payment_failed">Pagamento non riuscito</string>
+    <string name="payment_succeeded">Pagamento riuscito</string>
+    <string name="enter_license_key">Inserisci la chiave di licenza</string>
+    <string name="invalid_license_key">Chiave di licenza non valida</string>
+    <string name="license">Licenza</string>
+    <string name="failed_to_activate_key">Attivazione chiave non riuscita</string>
+    <string name="no_source_enabled_to_support_this_channel">Nessuna fonte attiva per supportare questo canale</string>
+    <string name="do_you_want_to_convert_channel_channelname_to_a_playlist">Vuoi convertire il canale {channelName} in una playlist?</string>
+    <string name="failed_to_convert_channel">Conversione canale non riuscita</string>
+    <string name="page">Pagina</string>
+    <string name="send_to_device">Sincronizza video</string>
+    <string name="hide">Nascondi</string>
+    <string name="hide_from_home">Nascondi dalla scheda Home</string>
+    <string name="hide_creator_from_home">Nascondi il creatore dalla Home</string>
+    <string name="play_feed_as_queue">Riproduci il feed come coda</string>
+    <string name="play_entire_feed">Riproduci l\'intero feed</string>
+    <string name="queued">In coda</string>
+    <string name="already_queued">Già in coda</string>
+    <string name="used">Utilizzato</string>
+    <string name="available">Disponibile</string>
+    <string name="failed_to_load_next_page">Caricamento della pagina successiva non riuscito</string>
+    <string name="plugin_pluginname_failed_message">Errore plugin {pluginName}:\n{message}</string>
+    <string name="plugin_failed_due_to">Errore plugin causato da:</string>
+    <string name="failed_to_get_home_plugin">Ottenimento plugin non riuscito\nHome</string>
+    <string name="failed_to_get_home">Ottenimento della Home non riuscito</string>
+    <string name="no_home_available">Nessuna home disponibile</string>
+    <string name="no_home_page_is_available_please_check_if_you_are_connected_to_the_internet_and_refresh">Nessuna home page è disponibile, verifica la connessione ad internet e ricarica.</string>
+    <string name="import_playlists">Importa playlist</string>
+    <string name="playlists_imported">playlist importate.</string>
+    <string name="index_out_of_size_selected">{index} su {size} selezionati</string>
+    <string name="import_subscriptions">Importa sottoscrizioni</string>
+    <string name="subscriptions_imported">sottoscrizioni importate.</string>
+    <string name="edit_playlist">Modifica playlist</string>
+    <string name="share_as_text">Condividi come testo</string>
+    <string name="share_as_a_list_of_video_urls">Condividi come lista di URL video</string>
+    <string name="share_as_import">Condividi come importazione</string>
+    <string name="share_as_a_import_file_for_grayjay">Condividi come file di importazione per Grayjay</string>
+    <string name="failed_to_load_playlist">Caricamento playlist non riuscito</string>
+    <string name="please_wait_for_playlist_to_finish_loading">Attendi il caricamento della playlist</string>
+    <string name="playlist_copied_as_local_playlist">Playlist copiata come playlist locale</string>
+    <string name="are_you_sure_you_want_to_delete_the_downloaded_videos">Sei sicuro di voler eliminare i video scaricati?</string>
+    <string name="create_new_playlist">Crea nuova playlist</string>
+    <string name="create_new_subgroup">Crea nuovo gruppo</string>
+    <string name="expected_media_content_found">Contenuto multimediale atteso, trovato</string>
+    <string name="failed_to_load_post">Caricamento post non riuscito.</string>
+    <string name="replies">risposte</string>
+    <string name="Replies">Risposte</string>
+    <string name="chapters">Capitoli</string>
+    <string name="plugin_settings_saved">Impostazioni plugin salvate</string>
+    <string name="plugin_settings">Impostazioni plugin</string>
+    <string name="these_settings_are_defined_by_the_plugin">Queste impostazioni sono definite dal plugin</string>
+    <string name="failed_to_load_source">Caricamento sorgente non riuscito</string>
+    <string name="check_for_updates">Verifica aggiornamenti</string>
+    <string name="checks_for_new_versions_of_the_source">Verifica l\'esistenza di nuove versioni della sorgente</string>
+    <string name="authentication">Autenticazione</string>
+    <string name="sign_out_of_the_platform">Esci dalla piattaforma</string>
+    <string name="import_your_subscriptions_from_this_source">Importa i tuoi abbonamenti da questa sorgente</string>
+    <string name="import_your_playlists_from_this_source">Importa le tue playlist da questa sorgente</string>
+    <string name="login">Accedi</string>
+    <string name="login_required">Accesso richiesto</string>
+    <string name="sign_into_the_platform_of_this_source">Accedi alla piattaforma di questa sorgente</string>
+    <string name="management">Gestione</string>
+    <string name="uninstall">Disinstalla</string>
+    <string name="removes_the_plugin_from_the_app">Rimuove il plugin dall\'app</string>
+    <string name="delete_captcha">Elimina Captcha</string>
+    <string name="deletes_stored_captcha_answer_for_this_plugin">Elimina la risposta captcha memorizzata per questo plugin</string>
+    <string name="failed_to_retrieve_playlists">Recupero playlist non riuscito.</string>
+    <string name="subscriptioncount_user_subscriptions_retrieved">{subscriptionCount} abbonamenti utente recuperati.</string>
+    <string name="failed_to_retrieve_subscriptions">Recupero abbonamenti non riuscito.</string>
+    <string name="are_you_sure_you_want_to_uninstall">Sei sicuro di voler procedere alla disinstallazione</string>
+    <string name="uninstalled">Disinstallato</string>
+    <string name="failed_to_check_for_updates">Verifica degli aggiornamenti non riuscita</string>
+    <string name="plugin_is_fully_up_to_date">Il plugin è completamente aggiornato</string>
+    <string name="rate_limit_warning">Avviso limite tasso di frequenza</string>
+    <string name="this_is_a_temporary_measure_to_prevent_people_from_hitting_rate_limit_until_we_have_better_support_for_lots_of_subscriptions">Questa è una misura temporanea per impedire alle persone di superare il limite del tasso di frequenza finché non avremo un supporto migliore per molti abbonamenti.</string>
+    <string name="you_have_too_many_subscriptions_for_the_following_plugins">\n\nHai troppi abbonamenti per i seguenti plugin:\n</string>
+    <string name="posts">Post</string>
+    <string name="planned">Pianificato</string>
+    <string name="watched">Guardato</string>
+    <string name="no_results_found_swipe_down_to_refresh">Nessun risultato trovato\nTrascina verso il basso per ricaricare</string>
+    <string name="overlay">Sovrapposizione</string>
+    <string name="reload">Ricarica</string>
+    <string name="watching_now">in visione ora</string>
+    <string name="views">visualizzazioni</string>
+    <string name="planned_in">Pianificato in</string>
+    <string name="failed_to_get_playback_tracker">Ottenimento Tracciatore Riproduzione non riuscito</string>
+    <string name="exception_retrieving_live_events">Eccezione durante il recupero degli eventi live:</string>
+    <string name="exception_retrieving_live_chat_window">Eccezione durante il recupero della finestra live chat:</string>
+    <string name="live_chat_failed_to_load">Caricamento live chat non riuscito</string>
+    <string name="unsupported_cast_format">Formato Trasmissione non supportato</string>
+    <string name="failed_to_load_media">Caricamento media non riuscito</string>
+    <string name="offline_playback">Riproduzione offline</string>
+    <string name="media_error">Errore media</string>
+    <string name="the_media_source_encountered_an_unauthorized_error_this_might_be_solved_by_a_plugin_reload_would_you_like_to_reload_experimental">La sorgente multimediale ha riscontrato un errore di mancata autorizzazione.\nQuesto potrebbe essere risolto ricaricando il plugin.\nVuoi ricaricarlo?\n(Sperimentale)</string>
+    <string name="playback_rate">Velocità di riproduzione</string>
+    <string name="quality">Qualità</string>
+    <string name="offline_video">Video offline</string>
+    <string name="offline_audio">Audio offline</string>
+    <string name="offline_subtitles">Sottotitoli offline</string>
+    <string name="stream_video">Streaming video</string>
+    <string name="stream_audio">Streaming audio</string>
+    <string name="audio">Audio</string>
+    <string name="subtitles">Sottotitoli</string>
+    <string name="unavailable_video">Video non disponibile</string>
+    <string name="this_video_is_unavailable">Questo video non è disponibile.</string>
+    <string name="there_was_an_unavailable_video_in_your_queue_videoname_by_authorname">C'era un video non disponibile nella tua coda: [{videoName}] di [{authorName}].</string>
+    <string name="back">Indietro</string>
+    <string name="pause">Pausa</string>
+    <string name="play">Riproduci</string>
+    <string name="pauses_the_video">Mette in pausa il video</string>
+    <string name="resumes_the_video">Riprende il video</string>
+    <string name="video_without_source">Video senza sorgente</string>
+    <string name="there_was_a_in_your_queue_videoname_by_authorname_without_the_required_source_being_enabled_playback_was_skipped">C\'era un video nella tua coda: [{videoName}] di [{authorName}], privo di una sorgente attiva richiesta, quindi la sua riproduzione è stata saltata.</string>
+    <string name="failed_to_load_video_scriptimplementationexception">Caricamento video non riuscito (ScriptImplementationException)</string>
+    <string name="invalid_video">Video non valido</string>
+    <string name="there_was_an_invalid_video_in_your_queue_videoname_by_authorname_playback_was_skipped">C\'era un video non valido nella tua coda: [{videoName}] di [{authorName}], quindi la sua riproduzione è stata saltata.</string>
+    <string name="age_restricted_video">Video con restrizioni di età</string>
+    <string name="there_was_an_age_restricted_video_in_your_queue_videoname_by_authorname_this_video_was_not_accessible_and_playback_was_skipped">C\'era un video con restrizioni di età nella tua coda: [{videoName}] di [{authorName}], questo video non era accessibile e la sua riproduzione è stata saltata.</string>
+    <string name="failed_to_load_video_scriptexception">Caricamento video non riuscito (ScriptException)</string>
+    <string name="failed_to_load_video">Caricamento video non riuscito</string>
+    <string name="not_yet_available_retrying_in_time_s">Non ancora disponibile, nuovo tentativo tra {time}s</string>
+    <string name="failed_to_retry_for_live_stream">Tentativo per lo streaming live non riuscito</string>
+    <string name="this_app_is_in_development_please_submit_bug_reports_and_understand_that_many_features_are_incomplete">Questa app è ancora in fase di sviluppo. Ti suggeriamo di inviare segnalazioni in caso di errori e di comprendere che molte funzionalità risultato essere incomplete.</string>
+    <string name="please_use_at_least_1_character">Utilizza almeno 1 carattere</string>
+    <string name="are_you_sure_you_want_to_delete_this_video">Sei sicuro di voler eliminare questo video?</string>
+    <string name="tap_to_open">Tocca per aprire</string>
+    <string name="update_available_exclamation">Aggiornamento disponibile!</string>
+    <string name="watching">in visione</string>
+    <string name="available_in">disponibile in</string>
+    <string name="seconds">secondi</string>
+    <string name="please_login_to_post_a_comment">Accedi per pubblicare un commento</string>
+    <string name="failed_to_post_comment">Pubblicazione del commento non riuscita:</string>
+    <string name="waiting_for_unmetered">In attesa di una connessione non a consumo</string>
+    <string name="last_error">Ultimo errore</string>
+    <string name="error">Errore</string>
+    <string name="filters">Filtri</string>
+    <string name="viewers">spettatori</string>
+    <string name="expected_at_least_one_reply_but_no_replies_were_returned_by_the_server">È prevista la ricezione di almeno una risposta, ma non ne è stata restituita alcuna dal server</string>
+    <string name="please_login_to_like">Accedi per mettere mi piace</string>
+    <string name="please_login_to_dislike">Accedi per poter aggiungere i dislike</string>
+    <string name="failed_to_load_comments">Caricamento commenti non riuscito.</string>
+    <string name="script_is_not_available">Script non disponibile</string>
+    <string name="signature_is_valid">Firma valida</string>
+    <string name="signature_is_invalid">Firma non valida</string>
+    <string name="no_signature_available">Nessuna firma disponibile</string>
+    <string name="subscribed_to">Iscritto a: </string>
+    <string name="unsubscribed_from">Disiscritto da: </string>
+    <string name="you_don_t_have_any_automatic_backups">Non hai backup automatici</string>
+    <string name="an_old_backup_is_available">È disponibile un vecchio backup</string>
+    <string name="would_you_like_to_restore_this_backup">Vuoi ripristinare questo backup?</string>
+    <string name="override">Sovrascrivi</string>
+    <string name="data_retry">Riprova dati</string>
+    <string name="no_downloads_available">Nessun download disponibile</string>
+    <string name="no_downloadable_sources_yet">Nessuna sorgente (ancora) scaricabile</string>
+    <string name="none">Nessuna</string>
+    <string name="audio_only">Solo audio</string>
+    <string name="download_video">Scarica video</string>
+    <string name="fetching_video_details">Recupero dettagli video</string>
+    <string name="failed_to_fetch_details_for_download">Impossibile recuperare i dettagli per il download</string>
+    <string name="target_resolution">Risoluzione di destinazione</string>
+    <string name="target_bitrate">Bitrate di destinazione</string>
+    <string name="low_bitrate">Bitrate basso</string>
+    <string name="high_bitrate">Bitrate alto</string>
+    <string name="actions">Azioni</string>
+    <string name="download_the_video">Scarica il video</string>
+    <string name="video_options">Opzioni video</string>
+    <string name="change_pins">Cambia pin</string>
+    <string name="decide_which_buttons_should_be_pinned">Decidi quali pulsanti devono essere bloccati</string>
+    <string name="select_your_pins_in_order">Seleziona i tuoi elementi fissati in ordine</string>
+    <string name="more_options">Altre opzioni</string>
+    <string name="save">Salva</string>
+    <string name="this_creator_has_not_set_any_support_options_on_harbor_polycentric">Questo creatore non ha impostato alcuna opzione di supporto su Harbor (Polycentric)</string>
+    <string name="load_more">Carica altro</string>
+    <string name="stopped_after_requestcount_to_avoid_rate_limit_click_load_more_to_load_more">Fermato dopo {requestCount} richieste per evitare di superare limite del tasso di frequenza, clicca su carica altro per caricare altre informazioni.</string>
+    <string name="this_creator_has_not_setup_any_monetization_features">Questo creatore non ha impostato alcuna funzionalità di monetizzazione</string>
+    <string name="plus_tax">" + Tasse"</string>
+    <string name="new_playlist">Nuova playlist</string>
+    <string name="add_to_new_playlist">Aggiungi a nuova playlist</string>
+    <string name="url_handling">Gestione URL</string>
+    <string name="allow_grayjay_to_handle_specific_urls">Consentire a Grayjay di gestire URL specifici?</string>
+    <string name="allow_grayjay_to_handle_specific_urls_please_set_it_as_default_in_the_app_settings">Quando fai clic su "Sì", si apriranno le impostazioni dell\'app Grayjay.\n\nDa lì, accedi a:\n1. Sezione 'Apri per impostazione predefinita' o 'Imposta come predefinito'.\nPotresti trovare questa opzione direttamente oppure nella categoria 'Impostazioni Avanzate', a seconda del tuo dispositivo.\n\n2. Seleziona 'Apri link supportati' per Grayjay.\n\n(alcuni dispositivi hanno questa opzione elencata nella finestra 'App predefinite' delle impostazioni di sistema, seguita dalla possibilità di selezionare Grayjay per le categorie pertinenti)</string>
+    <string name="failed_to_show_settings">Apertura impostazioni non riuscita</string>
+    <string name="play_store_version_does_not_support_default_url_handling">La versione del Play Store non supporta la gestione URL predefinita.</string>
+    <string name="these_are_all_commentcount_comments_you_have_made_in_grayjay">Questi sono tutti i {commentCount} commenti che hai postato con Grayjay.</string>
+    <string name="tutorial">Tutorial</string>
+    <string name="go_back_to_casting_add_dialog">Torna alla finestra di dialogo per l\'aggiunta di una sessione di trasmissione</string>
+    <string name="view_a_video_about_how_to_cast">Guarda un video su come trasmettere</string>
+    <string name="view_the_fcast_technical_documentation">Visualizza la documentazione tecnica di FCast</string>
+    <string name="guide">Guida</string>
+    <string name="how_to_use_fcast_guide">Guida all\'utilizzo di FCast</string>
+    <string name="fcast">FCast</string>
+    <string name="open_the_fcast_website">Apri il sito web di FCast</string>
+    <string name="fcast_website">Sito web di FCast</string>
+    <string name="fcast_technical_documentation">Documentazione tecnica di FCast</string>
+    <string name="login_to_view_your_comments">Accedi per visualizzare i tuoi commenti</string>
+    <string name="polycentric_is_disabled">Polycentric è disattivato</string>
+    <string name="play_pause">Riproduci/Pausa</string>
+    <string name="position">Posizione</string>
+    <string name="tutorials">Tutorial</string>
+    <string name="do_you_want_to_see_the_tutorials_you_can_find_them_at_any_time_through_the_more_button">Vuoi guardare i tutorial? Puoi accedervi in qualsiasi momento cliccando sul pulsante 'Altro'.</string>
+    <string name="add_creator">Aggiungi creatori</string>
+    <string name="select">Seleziona</string>
+    <string name="zoom">Zoom</string>
+    <string name="check_to_see_if_an_update_is_available">Verifica la disponibilità di aggiornamenti.</string>
+    <string name="scroll_to_top">Scorri in alto</string>
+    <string name="disable_battery_optimization">Disattiva ottimizzazione batteria</string>
+    <string name="click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions">Clicca per accedere alle impostazioni di ottimizzazione della batteria. Disattivare l\'ottimizzazione della batteria impedirà al sistema operativo di terminare le sessioni multimediali.</string>
+    <string name="contribute_personal_subscriptions_list">Contribuisci con l\'elenco delle sottoscrizioni personali</string>
+    <string name="contribute_personal_subscriptions_list_description">\nTi piacerebbe contribuire a FUTO con la tua attuale lista di sottoscrizioni ai creatori?\n\nI dati saranno gestiti in conformità con la politica sulla privacy di Grayjay. Ovvero, la lista sarà anonimizzata e archiviata senza alcun riferimento a chiunque appartenga l\'elenco dei creatori.\n\nL\'intenzione è che Grayjay e FUTO utilizzino questi dati per costruire un sistema di suggerimenti dei creatori multipiattaforma per rendere più facile trovarne di nuovi che potrebbero piacerti direttamente all\'interno di Grayjay.</string>
+    <string name="cd_cast_button">Pulsante trasmetti</string>
+    <string name="cd_incognito_button">Pulsante incognito</string>
+    <string name="cd_creator_thumbnail">Miniatura creatore</string>
+    <string name="cd_button_clear_search">Pulisci cerca</string>
+    <string name="cd_button_search">Cerca</string>
+    <string name="cd_search_icon">Icona cerca</string>
+    <string name="cd_button_back">Pulsante indietro</string>
+    <string name="cd_app_icon">Icona app</string>
+    <string name="cd_icon_history">Icona cronologia</string>
+    <string name="cd_button_create_playlist">Crea playlist</string>
+    <string name="cd_button_share">Condividi</string>
+    <string name="cd_button_filter">Filtra</string>
+    <string name="cd_button_delete">Elimina</string>
+    <string name="cd_button_settings">Impostazioni</string>
+    <string name="cd_image_group">Immagine del gruppo</string>
+    <string name="cd_button_edit">Modifica</string>
+    <string name="cd_button_download">Scarica</string>
+    <string name="cd_minimize_close">Chiudi</string>
+    <string name="cd_minimize_pause">Pausa</string>
+    <string name="cd_minimize_play">Riproduci</string>
+    <string name="cd_donation_amount">Ammontare donazione</string>
+    <string name="cd_button_replies">Repliche</string>
+    <string name="cd_image_like_icon">Like</string>
+    <string name="cd_image_dislike_icon">Dislike</string>
+    <string name="cd_button_subscribe">Iscriviti</string>
+    <string name="cd_platform_indicator">Indicatore piattaforma</string>
+    <string name="cd_image_device">Icona dispositivo</string>
+    <string name="cd_image_loader">Caricatore</string>
+    <string name="cd_donation_author_image">Immagine autore della donazione</string>
+    <string name="cd_edit_image">Modifica immagine</string>
+    <string name="cd_button_add">Aggiungi</string>
+    <string name="cd_download_indicator">Indicatore Scaricamento</string>
+    <string name="cd_drag_drop">Trascina e rilascia</string>
+    <string name="cd_button_add_to_watch_later">Aggiungi a Guarda Più Tardi</string>
+    <string name="cd_button_close">Chiudi</string>
+    <string name="cd_thumbnail_player_unmute">Smuta</string>
+    <string name="cd_button_minimize">Minimizza</string>
+    <string name="cd_button_rotate_lock">Blocca rotazione</string>
+    <string name="cd_button_loop">Ripeti</string>
+    <string name="cd_button_previous">Precedente</string>
+    <string name="cd_button_next">Prossimo</string>
+    <string name="cd_button_fullscreen">Schermo intero</string>
+    <string name="cd_button_autoplay">Riproduzione automatica</string>
+    <string name="cd_update_spinner">Aggiorna caricamento</string>
+    <string name="cd_button_play">Riproduci</string>
+    <string name="cd_button_pause">Pausa</string>
+    <string name="cd_button_stop">Ferma</string>
+    <string name="cd_button_scan_qr">Scansiona codice QR</string>
+    <string name="cd_button_help">Aiuto</string>
+    <string name="cd_image_polycentric">Modifica immagine di profilo Polycentric</string>
+    <string-array name="home_screen_array">
+        <item>Suggerimenti</item>
+        <item>Sottoscrizioni</item>
+    </string-array>
+    <string-array name="playback_speeds" translatable="false">
+        <item>0.25</item>
+        <item>0.5</item>
+        <item>0.75</item>
+        <item>1.0</item>
+        <item>1.25</item>
+        <item>1.5</item>
+        <item>1.75</item>
+        <item>2.0</item>
+        <item>2.25</item>
+    </string-array>
+    <string-array name="preferred_quality_array">
+        <item>Automatico (720p)</item>
+        <item>2160p</item>
+        <item>1440p</item>
+        <item>1080p</item>
+        <item>720p</item>
+        <item>480p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string-array name="preferred_video_download">
+        <item>Nessuno (Solo Audio)</item>
+        <item>2160p</item>
+        <item>1440p</item>
+        <item>1080p</item>
+        <item>720p</item>
+        <item>480p</item>
+        <item>360p</item>
+        <item>240p</item>
+        <item>144p</item>
+    </string-array>
+    <string-array name="thread_count">
+        <item>1 Threads</item>
+        <item>2 Threads</item>
+        <item>4 Threads</item>
+        <item>6 Threads</item>
+        <item>8 Threads</item>
+        <item>10 Threads</item>
+        <item>15 Threads</item>
+    </string-array>
+    <string-array name="background_interval">
+        <item>Mai</item>
+        <item>Ogni 15 Minuti</item>
+        <item>Ogni Ora</item>
+        <item>Ogni 3 Ore</item>
+        <item>Ogni 6 Ore</item>
+        <item>Ogni 12 Ore</item>
+        <item>Ogni Giorno</item>
+    </string-array>
+    <string-array name="preferred_audio_download">
+        <item>Basso Bitrate</item>
+        <item>Alto Bitrate</item>
+    </string-array>
+    <string-array name="auto_update_when_array">
+        <item>All\'Avvio</item>
+        <item>Mai</item>
+    </string-array>
+    <string-array name="enabled_disabled_array">
+        <item>Disattivato</item>
+        <item>Attivo</item>
+    </string-array>
+    <string-array name="when_download">
+        <item>Illimitato</item>
+        <item>Su Wi-Fi</item>
+        <item>Sempre</item>
+    </string-array>
+    <string-array name="background_download">
+        <item>Disattivato</item>
+        <item>Attivo</item>
+    </string-array>
+    <string-array name="comments_sortby_array">
+        <item>Più Recente</item>
+        <item>Più Vecchio</item>
+    </string-array>
+    <string-array name="subscriptions_sortby_array">
+        <item>Nome Crescente</item>
+        <item>Nome Discendente</item>
+        <item>Visualizzazioni Crescenti</item>
+        <item>Visualizzazioni Discendenti</item>
+        <item>Tempo di Visione Crescente</item>
+        <item>Tempo di Visione Discendente</item>
+    </string-array>
+    <string-array name="downloads_sortby_array">
+        <item>Nome (Crescente)</item>
+        <item>Nome (Discendente)</item>
+        <item>Data di Scaricament (Più Vecchia)</item>
+        <item>Data di Scaricamento (Più Recente)</item>
+        <item>Data di Rilascio (Più Vecchia)</item>
+        <item>Data di Rilascio (Più Recente)</item>
+        <item>Dimensione (Più Piccola)</item>
+        <item>Dimensione (Più Grande)</item>
+    </string-array>
+    <string-array name="playlists_sortby_array">
+        <item>Nome (Ascending)</item>
+        <item>Nome (Descending)</item>
+        <item>Data di Modifica Date (Più Vecchia)</item>
+        <item>Data di Modifica (Più Recente)</item>
+        <item>Data di Creazione (Più Vecchia)</item>
+        <item>Data di Creazione (Più Recente)</item>
+        <item>Data di Visione (Più Vecchia)</item>
+        <item>Data di Visione (Più Recente)</item>
+    </string-array>
+    <string-array name="feed_style">
+        <item>Anteprima</item>
+        <item>Lista</item>
+    </string-array>
+    <string-array name="app_languages">
+        <item>Sistema</item>
+        <item>Inglese (EN)</item>
+        <item>Tedesco (DE)</item>
+        <item>Italiano (IT)
+        <item>Spagnolo (ES)</item>
+        <item>Portoghese (PT)</item>
+        <item>Francese (FR)</item>
+        <item>Giapponese (JA)</item>
+        <item>Coreano (KO)</item>
+        <item>Cinese (ZH)</item>
+        <item>Russo (RU)</item>
+        <item>Arabo (AR)</item>
+    </string-array>
+    <string-array name="player_background_behavior">
+        <item>Nessuno</item>
+        <item>Continua a Riprodurre</item>
+        <item>Sovrapponi Riproduttore</item>
+    </string-array>
+    <string-array name="resume_after_preview">
+        <item>Ricomincia dall\'Inizio</item>
+        <item>Riprendi Dopo 10s</item>
+        <item>Riprendi Sempre</item>
+    </string-array>
+    <string-array name="chapter_fps">
+        <item>24</item>
+        <item>30</item>
+        <item>60</item>
+        <item>120</item>
+    </string-array>
+    <string-array name="comment_sections">
+        <item>Polycentric</item>
+        <item>Piattaforma</item>
+        <item>Ultima selezione</item>
+    </string-array>
+    <string-array name="audio_languages">
+        <item>Inglese</item>
+        <item>Spagnolo</item>
+        <item>Tedesco</item>
+        <item>Francese</item>
+        <item>Giapponese</item>
+        <item>Coreano</item>
+        <item>Thailandese</item>
+        <item>Vietnamita</item>
+        <item>Indonesiano</item>
+        <item>Indiano</item>
+        <item>Arabo</item>
+        <item>Turco</item>
+        <item>Russo</item>
+        <item>Portoghese</item>
+        <item>Cinese</item>
+    </string-array>
+    <string-array name="casting_device_type_array" translatable="false">
+        <item>FCast</item>
+        <item>ChromeCast</item>
+        <item>AirPlay</item>
+    </string-array>
+    <string-array name="log_levels">
+        <item>Nessuno</item>
+        <item>Errore</item>
+        <item>Avviso</item>
+        <item>Informazione</item>
+        <item>Verboso</item>
+    </string-array>
+    <string-array name="restart_playback_after_loss">
+        <item>Mai</item>
+        <item>Entro 10 secondi dalla perdita</item>
+        <item>Entro 30 secondi dalla perdita</item>
+        <item>Sempre</item>
+    </string-array>
+    <string-array name="seek_offset_duration">
+        <item>3 secondi</item>
+        <item>5 secondi</item>
+        <item>10 secondi</item>
+        <item>20 secondi</item>
+        <item>30 secondi</item>
+        <item>60 secondi</item>
+    </string-array>
+    <string-array name="max_playback_speed">
+        <item>2.0</item>
+        <item>2.25</item>
+        <item>3.0</item>
+        <item>4.0</item>
+        <item>5.0</item>
+    </string-array>
+    <string-array name="hold_playback_speeds">
+        <item>1.25</item>
+        <item>1.5</item>
+        <item>1.75</item>
+        <item>2.0</item>
+        <item>2.25</item>
+        <item>2.5</item>
+        <item>2.75</item>
+        <item>3.0</item>
+    </string-array>
+    <string-array name="min_playback_speed">
+        <item>0.25</item>
+        <item>0.5</item>
+        <item>1.0</item>
+    </string-array>
+    <string-array name="step_playback_speed">
+        <item>0.05</item>
+        <item>0.1</item>
+        <item>0.25</item>
+    </string-array>
+    <string-array name="rotation_zone">
+        <item>15</item>
+        <item>30</item>
+        <item>45</item>
+    </string-array>
+    <string-array name="rotation_threshold_time">
+        <item>100</item>
+        <item>500</item>
+        <item>750</item>
+        <item>1000</item>
+        <item>1500</item>
+        <item>2000</item>
+    </string-array>
+</resources>

From bb066a7a310de5cd081f3816a7cae7f6f04b0663 Mon Sep 17 00:00:00 2001
From: 0xrxL <127248639+0xrxL@users.noreply.github.com>
Date: Sat, 14 Jun 2025 09:02:25 +0200
Subject: [PATCH 03/46] Added italian localization

---
 app/src/main/res/{ => values-it}/strings.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/src/main/res/{ => values-it}/strings.xml (100%)

diff --git a/app/src/main/res/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 100%
rename from app/src/main/res/strings.xml
rename to app/src/main/res/values-it/strings.xml

From 98c637814840bea5a80e87b97f26fbacb2b5cbb1 Mon Sep 17 00:00:00 2001
From: 0xrxL <127248639+0xrxL@users.noreply.github.com>
Date: Sat, 14 Jun 2025 09:04:40 +0200
Subject: [PATCH 04/46] Fix spacing

---
 app/src/main/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4b9cb7e0..14a81c13 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -626,7 +626,7 @@
     <string name="unknown_url_format">Formato url sconosciuto</string>
     <string name="failed_to_handle_file">Gestione file non riuscita</string>
     <string name="unknown_reconstruction_type">Tipo di ricostruzione sconosciuto</string>
-<string name="failed_to_parse_text_file">Analisi file di testo non riuscita</string>
+    <string name="failed_to_parse_text_file">Analisi file di testo non riuscita</string>
     <string name="failed_to_parse_newpipe_subscriptions">Analisi delle sottoscrizioni di NewPipe non riuscita</string>
     <string name="failed_to_generate_qr_code">Generazione codice QR non riuscita</string>
     <string name="share_text">Condividi testo</string>

From 4eb20a184347c7e3ae1e0f51a767fa415f086e06 Mon Sep 17 00:00:00 2001
From: 0xrxL <127248639+0xrxL@users.noreply.github.com>
Date: Sat, 14 Jun 2025 15:29:49 +0200
Subject: [PATCH 05/46] Typo

---
 app/src/main/res/values-it/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 14a81c13..9e6b7015 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -154,7 +154,7 @@
     <string name="loading_update">Caricamento aggiornamento…</string>
     <string name="polycentric_explanation">Quando navighi tra i video online e desideri lasciare un commento, prendi in considerazione Polycentric, un nuovo modo di gestire la tua presenza online che è sia facile da usare che incentrato sulle tue esigenze. Ecco perché creare un profilo Polycentric è un\'ottima scelta:\n\n 1. Hai il controllo: Con Polycentric, i tuoi dati non sono archiviati in un unico luogo controllato da una singola azienda. Invece, sono distribuiti su più posizioni, offrendoti un maggiore controllo sulla tua presenza online. Decidi tu dove vengono archiviati i tuoi dati e puoi facilmente passare da un fornitore all\'altro o aggiungerne di nuovi.\n\n 2. Privacy e sicurezza: Polycentric mantiene le tue informazioni al sicuro utilizzando tecniche di sicurezza avanzate. Puoi star certo che i tuoi dati personali sono ben protetti e accessibili solo a coloro con cui scegli di condividerli.\n\n 3. Networking senza interruzioni: Polycentric ti consente di connetterti con altri e interagire con i loro contenuti senza essere legato a un\'unica piattaforma. Se un fornitore diventa inaffidabile o tenta di bloccare l\'accesso, il tuo client Polycentric troverà automaticamente le informazioni da altre fonti, mantenendoti connesso.\n\n 4. Ricerca e suggerimenti intelligenti: Polycentric utilizza più fonti per la ricerca ed i suggerimenti, offrendoti prestazioni di prim\'ordine e garantendo che nessun singolo fornitore abbia eccessiva influenza sui risultati che vedi.\n\n 5. Adattabile e aperto: Polycentric è progettato per essere flessibile e aperto a nuovi sviluppi, consentendo miglioramenti costanti e nuove funzionalità che si adattano alle esigenze dei suoi utenti.\n\n 6. Creando un profilo Polycentric, puoi lasciare commenti sui video online e goderti un\'esperienza più personalizzata. Scopri tu stesso come questa soluzione intuitiva ti mette al centro della tua vita digitale. Iscriviti oggi stesso a Polycentric!</string>
     <string name="publish">Pubblica</string>
-    <string name="usage">Uso</string>
+    <string name="usage">Utilizzo</string>
     <string name="enable_in_home">Attiva in home</string>
     <string name="enable_in_search">Attiva in ricerca</string>
     <string name="check">Verifica</string>

From c4d06c1ba2efcc42c74ab24569c43c0060131085 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Fri, 1 Aug 2025 21:55:47 +0200
Subject: [PATCH 06/46] Hide sync ui, thumbnails nullable

---
 .../platformplayer/api/media/LiveChatManager.kt |  2 --
 .../models/video/SerializedPlatformVideo.kt     |  3 ++-
 .../platforms/js/SourcePluginDescriptor.kt      | 17 ++---------------
 .../mainactivity/main/SourceDetailFragment.kt   |  5 +++++
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/api/media/LiveChatManager.kt b/app/src/main/java/com/futo/platformplayer/api/media/LiveChatManager.kt
index da7302fb..b6f61a33 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/LiveChatManager.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/LiveChatManager.kt
@@ -123,8 +123,6 @@ class LiveChatManager {
                             val requestPosition = _position;
                             _pager.nextPage(requestPosition.toInt());
                             var replayResults = _pager.getResults().filter { it.time > requestPosition || it is LiveEventEmojis };
-                            //TODO: Remove this once dripfeed is done properly
-                            replayResults = replayResults.filter{ it.time < requestPosition + 1500 || it is LiveEventEmojis };
                             if(replayResults.size > 0) {
                                 _eventsPosition = replayResults.maxOf { it.time };
                                 Logger.i(TAG, "VOD Events last event: " + _eventsPosition);
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformVideo.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformVideo.kt
index eadffc8d..7388dfa8 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformVideo.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/models/video/SerializedPlatformVideo.kt
@@ -3,6 +3,7 @@ package com.futo.platformplayer.api.media.models.video
 import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.Serializer
 import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.Thumbnail
 import com.futo.platformplayer.api.media.models.Thumbnails
 import com.futo.platformplayer.api.media.models.contents.ContentType
 import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
@@ -16,7 +17,7 @@ open class SerializedPlatformVideo(
     override val contentType: ContentType = ContentType.MEDIA,
     override val id: PlatformID,
     override val name: String,
-    override val thumbnails: Thumbnails,
+    override val thumbnails: Thumbnails = Thumbnails(),
     override val author: PlatformAuthorLink,
     @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
     @JsonNames("datetime", "dateTime")
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt
index 55921618..771e1feb 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginDescriptor.kt
@@ -116,25 +116,12 @@ class SourcePluginDescriptor {
             var enableShorts: Boolean? = null;
         }
 
-        @FormField(R.string.sync, "group", R.string.sync_desc, 3)
+        @FormField(R.string.sync, "group", R.string.sync_desc, 3,"sync")
         var sync = Sync();
         @Serializable
         class Sync {
-            @FormField(R.string.sync_history, FieldForm.TOGGLE, R.string.sync_history_desc, 1)
+            @FormField(R.string.sync_history, FieldForm.TOGGLE, R.string.sync_history_desc, 1,"syncHistory")
             var enableHistorySync: Boolean? = null;
-
-            @FormField(R.string.sync_history, FieldForm.BUTTON, R.string.sync_history_desc, 2)
-            @FormFieldButton()
-            fun syncHistoryNow() {
-                StateApp.instance.scopeOrNull?.launch(Dispatchers.IO) {
-                    val clients = StatePlatform.instance.getEnabledClients();
-                    for (client in clients) {
-                        if (client is JSClient) {//) && client.descriptor.appSettings.sync.enableHistorySync  == true) {
-                            StateHistory.instance.syncRemoteHistory(client);
-                        }
-                    }
-                };
-            }
         }
 
         @FormField(R.string.ratelimit, "group", R.string.ratelimit_description, 4)
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt
index 1b621c03..5c2a8085 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt
@@ -152,6 +152,11 @@ class SourceDetailFragment : MainFragment() {
                                 if(field is View)
                                     field.isVisible = false;
                             }
+                            if(!source.capabilities.hasGetUserHistory) {
+                                val field = _settingsAppForm.findField("sync");
+                                if(field is View)
+                                    field.isVisible = false;
+                            }
                             _settingsAppForm.onChanged.clear();
                             _settingsAppForm.onChanged.subscribe { field, value ->
                                 _settingsAppChanged = true;

From 8d08e19cd2d514180ffbfd43681643a82ad7692b Mon Sep 17 00:00:00 2001
From: Stefan <84-stefancruz@users.noreply.gitlab.futo.org>
Date: Thu, 7 Aug 2025 08:00:17 +0100
Subject: [PATCH 07/46] Add mixcloud plugin

---
 .gitmodules                                 | 6 ++++++
 app/src/stable/assets/sources/mixcloud      | 1 +
 app/src/stable/res/raw/plugin_config.json   | 3 ++-
 app/src/unstable/assets/sources/mixcloud    | 1 +
 app/src/unstable/res/raw/plugin_config.json | 3 ++-
 5 files changed, 12 insertions(+), 2 deletions(-)
 create mode 160000 app/src/stable/assets/sources/mixcloud
 create mode 160000 app/src/unstable/assets/sources/mixcloud

diff --git a/.gitmodules b/.gitmodules
index 00037939..cfc51de0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,9 @@
 [submodule "app/src/stable/assets/sources/crunchyroll"]
 	path = app/src/stable/assets/sources/crunchyroll
 	url = ../plugins/crunchyroll.git
+[submodule "app/src/stable/assets/sources/mixcloud"]
+	path = app/src/stable/assets/sources/mixcloud
+	url = ../plugins/mixcloud.git
+[submodule "app/src/unstable/assets/sources/mixcloud"]
+	path = app/src/unstable/assets/sources/mixcloud
+	url = ../plugins/mixcloud.git
diff --git a/app/src/stable/assets/sources/mixcloud b/app/src/stable/assets/sources/mixcloud
new file mode 160000
index 00000000..0bbe4c63
--- /dev/null
+++ b/app/src/stable/assets/sources/mixcloud
@@ -0,0 +1 @@
+Subproject commit 0bbe4c63f42f8bcb889d2e81840351fd7579c2ef
diff --git a/app/src/stable/res/raw/plugin_config.json b/app/src/stable/res/raw/plugin_config.json
index ce535388..78a83514 100644
--- a/app/src/stable/res/raw/plugin_config.json
+++ b/app/src/stable/res/raw/plugin_config.json
@@ -16,7 +16,8 @@
         "89ae4889-0420-4d16-ad6c-19c776b28f99": "sources/apple-podcasts/ApplePodcastsConfig.json",
         "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json",
         "273b6523-5438-44e2-9f5d-78e0325a8fd9": "sources/curiositystream/CuriosityStreamConfig.json",
-        "9bb33039-8580-48d4-9849-21319ae845a4": "sources/crunchyroll/CrunchyrollConfig.json"
+        "9bb33039-8580-48d4-9849-21319ae845a4": "sources/crunchyroll/CrunchyrollConfig.json",
+        "84331338-b045-419c-88e4-c86036f4cbf5": "sources/mixcloud/MixcloudConfig.json"
     },
     "SOURCES_EMBEDDED_DEFAULT": [
         "35ae969a-a7db-11ed-afa1-0242ac120002"
diff --git a/app/src/unstable/assets/sources/mixcloud b/app/src/unstable/assets/sources/mixcloud
new file mode 160000
index 00000000..0bbe4c63
--- /dev/null
+++ b/app/src/unstable/assets/sources/mixcloud
@@ -0,0 +1 @@
+Subproject commit 0bbe4c63f42f8bcb889d2e81840351fd7579c2ef
diff --git a/app/src/unstable/res/raw/plugin_config.json b/app/src/unstable/res/raw/plugin_config.json
index 5abe547e..3b8f034f 100644
--- a/app/src/unstable/res/raw/plugin_config.json
+++ b/app/src/unstable/res/raw/plugin_config.json
@@ -16,7 +16,8 @@
         "89ae4889-0420-4d16-ad6c-19c776b28f99": "sources/apple-podcasts/ApplePodcastsConfig.json",
         "8d029a7f-5507-4e36-8bd8-c19a3b77d383": "sources/tedtalks/TedTalksConfig.json",
         "273b6523-5438-44e2-9f5d-78e0325a8fd9": "sources/curiositystream/CuriosityStreamConfig.json",
-        "9bb33039-8580-48d4-9849-21319ae845a4": "sources/crunchyroll/CrunchyrollConfig.json"
+        "9bb33039-8580-48d4-9849-21319ae845a4": "sources/crunchyroll/CrunchyrollConfig.json",
+        "84331338-b045-419c-88e4-c86036f4cbf5": "sources/mixcloud/MixcloudConfig.json"
     },
     "SOURCES_EMBEDDED_DEFAULT": [
         "35ae969a-a7db-11ed-afa1-0242ac120002"

From 0c5ba0cd39e19c7ed59d96feb51d108c90af761a Mon Sep 17 00:00:00 2001
From: quonverbat <quonverbat@proton.me>
Date: Sun, 10 Aug 2025 16:22:56 +0300
Subject: [PATCH 08/46] Fix typos

---
 .github/ISSUE_TEMPLATE/1-bug_report.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/1-bug_report.yml b/.github/ISSUE_TEMPLATE/1-bug_report.yml
index e2108e3e..d3f9ee8c 100644
--- a/.github/ISSUE_TEMPLATE/1-bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1-bug_report.yml
@@ -26,7 +26,7 @@ body:
       label: Reproduction steps
       description: Please provide us with the steps to reproduce the issue if possible. This step makes a big difference if we are going to be able to fix it so be as precise as possible.
       placeholder: |
-        0. Play a Youtube video
+        0. Play a YouTube video
         1. Press on Download button
         2. Select quality 1440p
         3. Grayjay crashes when attempting to download
@@ -83,7 +83,7 @@ body:
         - "Spotify"
         - "TedTalks"
         - "Twitch"
-        - "Youtube"
+        - "YouTube"
         - "Other"
     validations:
       required: true

From d6a23ac0de2a9bb70d121242507da51c5917d42f Mon Sep 17 00:00:00 2001
From: Kai <git@seaoflaurels.com>
Date: Mon, 11 Aug 2025 14:48:23 -0500
Subject: [PATCH 09/46] fix PiP issue

reproduction steps

- play a video
- swipe home to enter PiP
- minimize the video and then close it with the X
- swipe home (PiP will launch even though it shouldn't because nothing is playing)

Changelog: changed
---
 .../platformplayer/fragment/mainactivity/main/VideoDetailView.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 5382ef13..7ac846f3 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -1207,6 +1207,7 @@ class VideoDetailView : ConstraintLayout {
         _taskLoadVideo.cancel();
         handleStop();
         _didStop = true;
+        onShouldEnterPictureInPictureChanged.emit()
         Logger.i(TAG, "_didStop set to true");
 
         StatePlayer.instance.rotationLock = false;

From 1507c70729792c4110925f3a3d693f5615957bbd Mon Sep 17 00:00:00 2001
From: Kai <git@seaoflaurels.com>
Date: Mon, 11 Aug 2025 16:45:03 -0400
Subject: [PATCH 10/46] fix
 https://github.com/futo-org/grayjay-android/issues/2585

Changelog: changed
---
 app/src/main/assets/scripts/source.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/src/main/assets/scripts/source.js b/app/src/main/assets/scripts/source.js
index 85195f47..4156abca 100644
--- a/app/src/main/assets/scripts/source.js
+++ b/app/src/main/assets/scripts/source.js
@@ -467,14 +467,20 @@ class AudioUrlWidevineSource extends AudioUrlSource {
             this.getLicenseRequestExecutor = () => {
                 return {
                     executeRequest: (url, _headers, _method, license_request_data) => {
-                        return http.POST(
+                        const response = http.POST(
                            url,
                            license_request_data,
                            { Authorization: `Bearer ${obj.bearerToken}` },
                            false,
                            true
-                       ).body
-                    }
+                       );
+
+                       if (!response.body) {
+                           throw new ScriptException("Unable to acquire license key");
+                       }
+
+                       return response.body;
+                   }
                 }
             }
         }

From 6cf47d592a11a1d5a7c5809dabe6da05116af2d3 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Tue, 12 Aug 2025 02:03:04 +0200
Subject: [PATCH 11/46] Various shorts improvements, login warnings support,
 etc

---
 app/build.gradle                              |   4 +-
 .../activities/LoginActivity.kt               |  15 +
 .../platforms/js/SourcePluginAuthConfig.kt    |  31 +-
 .../MultiDistributionContentPager.kt          |   2 +-
 .../fragment/mainactivity/main/ShortView.kt   | 589 +++---------------
 .../mainactivity/main/ShortsFragment.kt       |  45 +-
 .../special/CommentsModalBottomSheet.kt       | 454 ++++++++++++++
 .../platformplayer/states/StatePlatform.kt    |   2 +-
 .../views/buttons/ShortsButton.kt             | 117 ++++
 .../views/others/CreatorThumbnail.kt          |   7 +-
 app/src/main/res/drawable/ic_comment_s.xml    |  12 +
 app/src/main/res/drawable/ic_settings_s.xml   |  11 +
 app/src/main/res/drawable/ic_share_s.xml      |  11 +
 app/src/main/res/drawable/ic_thumb_down_s.xml |  11 +
 .../res/drawable/ic_thumb_down_s_filled.xml   |  10 +
 app/src/main/res/drawable/ic_thumb_up_s.xml   |  11 +
 .../res/drawable/ic_thumb_up_s_filled.xml     |  10 +
 .../main/res/layout/view_short_overlay.xml    | 384 +++---------
 app/src/main/res/layout/view_short_player.xml |   6 +-
 .../main/res/layout/view_shorts_button.xml    |  28 +
 .../main/res/values/shorts_button_attrs.xml   |   7 +
 app/src/stable/assets/sources/apple-podcasts  |   2 +-
 app/src/stable/assets/sources/kick            |   2 +-
 app/src/stable/assets/sources/peertube        |   2 +-
 app/src/stable/assets/sources/rumble          |   2 +-
 app/src/stable/assets/sources/spotify         |   2 +-
 app/src/stable/assets/sources/youtube         |   2 +-
 .../unstable/assets/sources/apple-podcasts    |   2 +-
 app/src/unstable/assets/sources/kick          |   2 +-
 app/src/unstable/assets/sources/peertube      |   2 +-
 app/src/unstable/assets/sources/rumble        |   2 +-
 app/src/unstable/assets/sources/spotify       |   2 +-
 app/src/unstable/assets/sources/youtube       |   2 +-
 33 files changed, 932 insertions(+), 859 deletions(-)
 create mode 100644 app/src/main/java/com/futo/platformplayer/fragment/mainactivity/special/CommentsModalBottomSheet.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/views/buttons/ShortsButton.kt
 create mode 100644 app/src/main/res/drawable/ic_comment_s.xml
 create mode 100644 app/src/main/res/drawable/ic_settings_s.xml
 create mode 100644 app/src/main/res/drawable/ic_share_s.xml
 create mode 100644 app/src/main/res/drawable/ic_thumb_down_s.xml
 create mode 100644 app/src/main/res/drawable/ic_thumb_down_s_filled.xml
 create mode 100644 app/src/main/res/drawable/ic_thumb_up_s.xml
 create mode 100644 app/src/main/res/drawable/ic_thumb_up_s_filled.xml
 create mode 100644 app/src/main/res/layout/view_shorts_button.xml
 create mode 100644 app/src/main/res/values/shorts_button_attrs.xml

diff --git a/app/build.gradle b/app/build.gradle
index 25d458d4..65f600c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -154,10 +154,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.dagger:dagger:2.48'
+    //implementation 'com.google.dagger:dagger:2.48'
     implementation 'androidx.test:monitor:1.7.2'
     implementation 'com.google.android.material:material:1.12.0'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
+    //annotationProcessor 'com.google.dagger:dagger-compiler:2.48'
 
     //Core
     implementation 'androidx.core:core-ktx:1.12.0'
diff --git a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
index 6ea7bd67..1dc4376e 100644
--- a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
+++ b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
@@ -15,6 +15,7 @@ import com.futo.platformplayer.api.media.platforms.js.SourceAuth
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginAuthConfig
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.matchesDomain
 import com.futo.platformplayer.others.LoginWebViewClient
 import com.futo.platformplayer.setNavigationBarColorAndIcons
 import com.futo.platformplayer.states.StateApp
@@ -74,6 +75,7 @@ class LoginActivity : AppCompatActivity() {
             finish();
         };
         var isFirstLoad = true;
+        val loginWarnings = authConfig.loginWarnings?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.Warning>();
         webViewClient.onPageLoaded.subscribe { view, url ->
             _textUrl.setText(url ?: "");
 
@@ -86,6 +88,19 @@ class LoginActivity : AppCompatActivity() {
                 //TODO: Find most reliable way to wait for page js to finish
                 view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
             }
+
+            if(loginWarnings.size > 0) {
+                synchronized(loginWarnings) {
+                    val warning = loginWarnings.find { it.url.matches(it.getRegex()) };
+                    if(warning != null) {
+                        if(warning.once == true)
+                            loginWarnings.remove(warning);
+                        UIDialogs.showDialog(this@LoginActivity, R.drawable.ic_warning_yellow, warning.text ?: "", warning.details ?: "", null, 0,
+                            UIDialogs.Action("Understood", {
+                            }, UIDialogs.ActionStyle.PRIMARY));
+                    }
+                }
+            }
         }
         _webView.settings.domStorageEnabled = true;
 
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt
index 439e8d82..8821c79e 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt
@@ -1,6 +1,10 @@
 package com.futo.platformplayer.api.media.platforms.js
 
-@kotlinx.serialization.Serializable
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+import java.util.Dictionary
+
+@Serializable
 class SourcePluginAuthConfig(
     val loginUrl: String,
     val completionUrl: String? = null,
@@ -11,5 +15,26 @@ class SourcePluginAuthConfig(
     val userAgent: String? = null,
     val loginButton: String? = null,
     val domainHeadersToFind: Map<String, List<String>>? = null,
-    val loginWarning: String? = null
-) { }
\ No newline at end of file
+    val loginWarning: String? = null,
+    val loginWarnings: List<Warning>? = null
+) {
+
+    @Serializable
+    class Warning(
+        val url: String,
+        val text: String?,
+        val details: String? = null,
+        val once: Boolean? = true
+    ) {
+        @Contextual
+        private var _regex: Regex? = null;
+
+        fun getRegex(): Regex {
+            return _regex ?: url.let {
+                val reg = Regex(it);
+                _regex = reg;
+                return reg;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/structures/MultiDistributionContentPager.kt b/app/src/main/java/com/futo/platformplayer/api/media/structures/MultiDistributionContentPager.kt
index 66554572..4380fea0 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/structures/MultiDistributionContentPager.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/structures/MultiDistributionContentPager.kt
@@ -12,7 +12,7 @@ class MultiDistributionContentPager<T : IPlatformContent> : MultiPager<T> {
     private val dist : HashMap<IPager<T>, Float>;
     private val distConsumed : HashMap<IPager<T>, Float>;
 
-    constructor(pagers : Map<IPager<T>, Float>) : super(pagers.keys.toMutableList()) {
+    constructor(pagers : Map<IPager<T>, Float>, pageSize: Int = 9) : super(pagers.keys.toMutableList(), false, pageSize) {
         val distTotal = pagers.values.sum();
         dist = HashMap();
 
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
index 478c2732..2ec3d993 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
@@ -1,46 +1,27 @@
 package com.futo.platformplayer.fragment.mainactivity.main
 
-import android.app.Dialog
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
-import android.graphics.Bitmap
 import android.graphics.drawable.Animatable
-import android.graphics.drawable.Drawable
-import android.os.Bundle
-import android.text.Spanned
 import android.util.AttributeSet
-import android.util.TypedValue
 import android.view.LayoutInflater
-import android.view.SoundEffectConstants
-import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.OvershootInterpolator
-import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.graphics.drawable.toDrawable
-import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.C
 import androidx.media3.common.Format
 import androidx.media3.common.util.UnstableApi
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.transition.Transition
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
-import com.futo.platformplayer.api.media.PlatformID
 import com.futo.platformplayer.api.media.exceptions.ContentNotAvailableYetException
 import com.futo.platformplayer.api.media.exceptions.NoPlatformClientException
-import com.futo.platformplayer.api.media.models.PlatformAuthorMembershipLink
-import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
 import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
-import com.futo.platformplayer.api.media.models.ratings.RatingLikes
 import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
@@ -54,40 +35,28 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.casting.CastConnectionState
-import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event3
 import com.futo.platformplayer.constructs.TaskHandler
 import com.futo.platformplayer.downloads.VideoLocal
-import com.futo.platformplayer.dp
 import com.futo.platformplayer.engine.exceptions.ScriptAgeException
 import com.futo.platformplayer.engine.exceptions.ScriptException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.engine.exceptions.ScriptLoginRequiredException
 import com.futo.platformplayer.engine.exceptions.ScriptUnavailableException
 import com.futo.platformplayer.exceptions.UnsupportedCastException
-import com.futo.platformplayer.fixHtmlLinks
-import com.futo.platformplayer.getNowDiffSeconds
+import com.futo.platformplayer.fragment.mainactivity.special.CommentsModalBottomSheet
 import com.futo.platformplayer.helpers.VideoHelper
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.selectBestImage
 import com.futo.platformplayer.states.StateApp
-import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.states.StatePolycentric
 import com.futo.platformplayer.toHumanBitrate
 import com.futo.platformplayer.toHumanBytesSize
-import com.futo.platformplayer.toHumanNowDiffString
-import com.futo.platformplayer.toHumanNumber
-import com.futo.platformplayer.views.MonetizationView
-import com.futo.platformplayer.views.comments.AddCommentView
+import com.futo.platformplayer.views.buttons.ShortsButton
 import com.futo.platformplayer.views.others.CreatorThumbnail
-import com.futo.platformplayer.views.overlays.DescriptionOverlay
-import com.futo.platformplayer.views.overlays.RepliesOverlay
-import com.futo.platformplayer.views.overlays.SupportOverlay
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuButtonList
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuGroup
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
@@ -95,20 +64,15 @@ import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuOverlay
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuTitle
 import com.futo.platformplayer.views.pills.OnLikeDislikeUpdatedArgs
 import com.futo.platformplayer.views.platform.PlatformIndicator
-import com.futo.platformplayer.views.segments.CommentsList
 import com.futo.platformplayer.views.video.FutoShortPlayer
 import com.futo.platformplayer.views.video.FutoVideoPlayerBase
 import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.Models
 import com.futo.polycentric.core.Opinion
-import com.futo.polycentric.core.PolycentricProfile
 import com.futo.polycentric.core.fullyBackfillServersAnnounceExceptions
-import com.futo.polycentric.core.toURLInfoSystemLinkUrl
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.button.MaterialButton
+//import com.google.android.material.button.MaterialButton
 import com.google.protobuf.ByteString
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -116,30 +80,29 @@ import userpackage.Protocol
 
 @UnstableApi
 class ShortView : FrameLayout {
-    private lateinit var mainFragment: MainFragment
+    private lateinit var fragment: MainFragment
     private val player: FutoShortPlayer
 
     private val channelInfo: LinearLayout
     private val creatorThumbnail: CreatorThumbnail
     private val channelName: TextView
     private val videoTitle: TextView
+    private val videoSubtitle: TextView
     private val platformIndicator: PlatformIndicator
 
+    //TODO: Replace with non-material button
     private val backButton: MaterialButton
     private val backButtonContainer: ConstraintLayout
 
-    private val likeContainer: FrameLayout
-    private val dislikeContainer: FrameLayout
-    private val likeButton: MaterialButton
-    private val likeCount: TextView
-    private val dislikeButton: MaterialButton
-    private val dislikeCount: TextView
+    private val likeButton: ShortsButton
+    //private val likeCount: TextView
+    private val dislikeButton: ShortsButton
+    //private val dislikeCount: TextView
 
-    private val commentsButton: MaterialButton
-    private val shareButton: MaterialButton
-    private val refreshButton: MaterialButton
-    private val refreshButtonContainer: View
-    private val qualityButton: MaterialButton
+    private val commentsButton: ShortsButton
+    private val shareButton: ShortsButton
+    private val refreshButton: ShortsButton
+    private val qualityButton: ShortsButton
 
     private val playPauseOverlay: FrameLayout
     private val playPauseIcon: ImageView
@@ -173,18 +136,21 @@ class ShortView : FrameLayout {
     private val onLikeDislikeUpdated = Event1<OnLikeDislikeUpdatedArgs>()
     private val onVideoUpdated = Event1<IPlatformVideo?>()
 
+    //TODO: Replace with non-material UI? Only true dependency on Material left
     private val bottomSheet: CommentsModalBottomSheet = CommentsModalBottomSheet()
 
     var likes: Long = 0
         set(value) {
             field = value
-            likeCount.text = value.toString()
+            likeButton.withPrimaryText(value.toString());
+            //likeCount.text = value.toString()
         }
 
     var dislikes: Long = 0
         set(value) {
             field = value
-            dislikeCount.text = value.toString()
+            dislikeButton.withPrimaryText(value.toString());
+            //dislikeCount.text = value.toString()
         }
 
     constructor(inflater: LayoutInflater, fragment: MainFragment, overlayQualityContainer: FrameLayout) : this(inflater.context) {
@@ -194,7 +160,7 @@ class ShortView : FrameLayout {
             LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT
         )
 
-        this.mainFragment = fragment
+        this.fragment = fragment
         bottomSheet.mainFragment = fragment
     }
 
@@ -217,19 +183,17 @@ class ShortView : FrameLayout {
         creatorThumbnail = findViewById(R.id.creator_thumbnail)
         channelName = findViewById(R.id.channel_name)
         videoTitle = findViewById(R.id.video_title)
+        videoSubtitle = findViewById(R.id.video_subtitle)
         platformIndicator = findViewById(R.id.short_platform_indicator)
         backButton = findViewById(R.id.back_button)
         backButtonContainer = findViewById(R.id.back_button_container)
-        likeContainer = findViewById(R.id.like_container)
-        dislikeContainer = findViewById(R.id.dislike_container)
         likeButton = findViewById(R.id.like_button)
-        likeCount = findViewById(R.id.like_count)
+        //likeCount = findViewById(R.id.like_count)
         dislikeButton = findViewById(R.id.dislike_button)
-        dislikeCount = findViewById(R.id.dislike_count)
+        //dislikeCount = findViewById(R.id.dislike_count)
         commentsButton = findViewById(R.id.comments_button)
         shareButton = findViewById(R.id.share_button)
         refreshButton = findViewById(R.id.refresh_button)
-        refreshButtonContainer = findViewById(R.id.refresh_button_container)
         qualityButton = findViewById(R.id.quality_button)
         playPauseOverlay = findViewById(R.id.play_pause_overlay)
         playPauseIcon = findViewById(R.id.play_pause_icon)
@@ -258,48 +222,44 @@ class ShortView : FrameLayout {
         }
 
         onVideoUpdated.subscribe {
+            Logger.i(TAG, "Shorts videoUpdated [${it?.name}] (isDetail: ${it is IPlatformVideoDetails}, thumbnail: ${it?.author?.thumbnail})");
             videoTitle.text = it?.name
+            videoSubtitle.text = if(it is IPlatformVideoDetails) it?.description; else "";
             platformIndicator.setPlatformFromClientID(it?.id?.pluginId)
             creatorThumbnail.setThumbnail(it?.author?.thumbnail, true)
             channelName.text = it?.author?.name
         }
 
         backButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
-            mainFragment.closeSegment()
+            fragment.closeSegment()
         }
 
         channelInfo.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
-            mainFragment.navigate<ChannelFragment>(video?.author)
+            fragment.navigate<ChannelFragment>(video?.author)
         }
 
         videoTitle.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
             if (!bottomSheet.isAdded) {
-                bottomSheet.show(mainFragment.childFragmentManager, CommentsModalBottomSheet.TAG)
+                bottomSheet.show(fragment.childFragmentManager, CommentsModalBottomSheet.TAG)
             }
         }
 
-        commentsButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
+        commentsButton.onClick.subscribe {
             if (!bottomSheet.isAdded) {
-                bottomSheet.show(mainFragment.childFragmentManager, CommentsModalBottomSheet.TAG)
+                bottomSheet.show(fragment.childFragmentManager, CommentsModalBottomSheet.TAG)
             }
         }
 
-        shareButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
+        shareButton.onClick.subscribe {
             val url = video?.shareUrl ?: video?.url
-            mainFragment.startActivity(Intent.createChooser(Intent().apply {
+            fragment.startActivity(Intent.createChooser(Intent().apply {
                 action = Intent.ACTION_SEND
                 putExtra(Intent.EXTRA_TEXT, url)
                 type = "text/plain"
             }, null))
         }
 
-        refreshButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
+        refreshButton.onClick.subscribe {
             onResetTriggered.emit()
         }
 
@@ -308,14 +268,12 @@ class ShortView : FrameLayout {
             false
         }
 
-        qualityButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
+        qualityButton.onClick.subscribe {
             showVideoSettings()
         }
 
-        likeButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
-            val checked = !likeButton.isChecked
+        likeButton.onClick.subscribe {
+            val checked = likeButton.iconId == R.drawable.ic_thumb_up_s // !likeButton.isChecked
             StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) {
                 if (checked) {
                     likes++
@@ -323,24 +281,27 @@ class ShortView : FrameLayout {
                     likes--
                 }
 
-                likeButton.isChecked = checked
+                if(checked)
+                    likeButton.withIcon(R.drawable.ic_thumb_up_s_filled) //.isChecked = checked
+                else
+                    likeButton.withIcon(R.drawable.ic_thumb_up_s)
 
-                if (dislikeButton.isChecked && checked) {
-                    dislikeButton.isChecked = false
+                if (dislikeButton.iconId == R.drawable.ic_thumb_down_s_filled && checked) {
+                    //dislikeButton.isChecked = false
+                    dislikeButton.withIcon(R.drawable.ic_thumb_down_s)
                     dislikes--
                 }
 
                 onLikeDislikeUpdated.emit(
                     OnLikeDislikeUpdatedArgs(
-                        it, likes, likeButton.isChecked, dislikes, dislikeButton.isChecked
+                        it, likes, checked, dislikes, !checked
                     )
                 )
             }
         }
 
-        dislikeButton.setOnClickListener {
-            playSoundEffect(SoundEffectConstants.CLICK)
-            val checked = !dislikeButton.isChecked
+        dislikeButton.onClick.subscribe {
+            val checked =  dislikeButton.iconId == R.drawable.ic_thumb_down_s //!dislikeButton.isChecked
             StatePolycentric.instance.requireLogin(context, context.getString(R.string.please_login_to_like)) {
                 if (checked) {
                     dislikes++
@@ -348,16 +309,21 @@ class ShortView : FrameLayout {
                     dislikes--
                 }
 
-                dislikeButton.isChecked = checked
+                //dislikeButton.isChecked = checked
+                if(checked)
+                    dislikeButton.withIcon(R.drawable.ic_thumb_down_s_filled) //.isChecked = checked
+                else
+                    dislikeButton.withIcon(R.drawable.ic_thumb_down_s)
 
-                if (likeButton.isChecked && checked) {
-                    likeButton.isChecked = false
+                if (likeButton.iconId == R.drawable.ic_thumb_up_s_filled && checked) {
+                    //likeButton.isChecked = false
+                    likeButton.withIcon(R.drawable.ic_thumb_up_s);
                     likes--
                 }
 
                 onLikeDislikeUpdated.emit(
                     OnLikeDislikeUpdatedArgs(
-                        it, likes, likeButton.isChecked, dislikes, dislikeButton.isChecked
+                        it, likes, !checked, dislikes, checked
                     )
                 )
             }
@@ -366,11 +332,11 @@ class ShortView : FrameLayout {
         onLikesLoaded.subscribe(tag) { rating, liked, disliked ->
             likes = rating.likes
             dislikes = rating.dislikes
-            likeButton.isChecked = liked
-            dislikeButton.isChecked = disliked
+            //likeButton.isChecked = liked
+            //dislikeButton.isChecked = disliked
 
-            dislikeContainer.visibility = VISIBLE
-            likeContainer.visibility = VISIBLE
+            dislikeButton.visibility = VISIBLE
+            likeButton.visibility = VISIBLE
         }
 
         player.onPlaybackStateChanged.subscribe {
@@ -565,7 +531,7 @@ class ShortView : FrameLayout {
         var toSet: ISubtitleSource? = subtitleSource
         if (_lastSubtitleSource == subtitleSource) toSet = null
 
-        mainFragment.lifecycleScope.launch(Dispatchers.Main) {
+        fragment.lifecycleScope.launch(Dispatchers.Main) {
             try {
                 player.swapSubtitles(toSet)
             } catch (e: Throwable) {
@@ -625,7 +591,7 @@ class ShortView : FrameLayout {
 
     @Suppress("unused")
     fun setMainFragment(fragment: MainFragment, overlayQualityContainer: FrameLayout) {
-        this.mainFragment = fragment
+        this.fragment = fragment
         this.bottomSheet.mainFragment = fragment
         this.overlayQualityContainer = overlayQualityContainer
     }
@@ -636,10 +602,10 @@ class ShortView : FrameLayout {
         }
         this.video = video
 
-        refreshButtonContainer.visibility = if (isChannelShortsMode) {
+        refreshButton.visibility = if (isChannelShortsMode) {
             GONE
         } else {
-            VISIBLE
+            GONE //TODO: Revert?
         }
         backButtonContainer.visibility = if (isChannelShortsMode) {
             VISIBLE
@@ -695,8 +661,8 @@ class ShortView : FrameLayout {
     }
 
     private fun loadLikes(video: IPlatformVideo) {
-        likeContainer.visibility = GONE
-        dislikeContainer.visibility = GONE
+        likeButton.visibility = GONE
+        dislikeButton.visibility = GONE
 
         loadLikesTask?.cancel()
         loadLikesTask =
@@ -735,13 +701,13 @@ class ShortView : FrameLayout {
                         args.processHandle.opinion(ref, Opinion.neutral)
                     }
 
-                    mainFragment.lifecycleScope.launch(Dispatchers.IO) {
+                    fragment.lifecycleScope.launch(Dispatchers.IO) {
                         try {
-                            Logger.i(CommentsModalBottomSheet.TAG, "Started backfill")
+                            Logger.i(TAG, "Started backfill")
                             args.processHandle.fullyBackfillServersAnnounceExceptions()
-                            Logger.i(CommentsModalBottomSheet.TAG, "Finished backfill")
+                            Logger.i(TAG, "Finished backfill")
                         } catch (e: Throwable) {
-                            Logger.e(CommentsModalBottomSheet.TAG, "Failed to backfill servers", e)
+                            Logger.e(TAG, "Failed to backfill servers", e)
                         }
                     }
 
@@ -763,20 +729,24 @@ class ShortView : FrameLayout {
 
         setLoading(true)
 
+        Logger.i(TAG, "Shorts loadVideo [${url}]");
+        val timeLoadVideoStart = System.currentTimeMillis();
         loadVideoTask = TaskHandler<String, IPlatformVideoDetails>(
             StateApp.instance.scopeGetter, {
                 val result = StatePlatform.instance.getContentDetails(it).await()
                 if (result !is IPlatformVideoDetails) throw IllegalStateException("Expected media content, found ${result.contentType}")
                 return@TaskHandler result
             }).success { result ->
-            videoDetails = result
-            video = result
+                val timeLoadVideo = System.currentTimeMillis() - timeLoadVideoStart;
+                Logger.i(TAG, "Shorts loadVideo [${url}] took ${timeLoadVideo}ms");
+                videoDetails = result
+                video = result
 
-            bottomSheet.video = result
+                bottomSheet.video = result
 
-            setLoading(false)
+                setLoading(false)
 
-            if (playWhenReady) playVideo()
+                if (playWhenReady) playVideo()
         }.exception<NoPlatformClientException> {
             Logger.w(TAG, "exception<NoPlatformClientException>", it)
             UIDialogs.showDialog(
@@ -799,7 +769,7 @@ class ShortView : FrameLayout {
             UIDialogs.showSingleButtonDialog(context, R.drawable.ic_schedule, "Video is available in ${it.availableWhen}.", "Close") { }
         }.exception<ScriptImplementationException> {
             Logger.w(TAG, "exception<ScriptImplementationException>", it)
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptimplementationexception), it, { loadVideo(url) }, null, mainFragment)
+            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptimplementationexception), it, { loadVideo(url) }, null, fragment)
         }.exception<ScriptAgeException> {
             Logger.w(TAG, "exception<ScriptAgeException>", it)
             UIDialogs.showDialog(
@@ -812,10 +782,10 @@ class ShortView : FrameLayout {
             )
         }.exception<ScriptException> {
             Logger.w(TAG, "exception<ScriptException>", it)
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptexception), it, { loadVideo(url) }, null, mainFragment)
+            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video_scriptexception), it, { loadVideo(url) }, null, fragment)
         }.exception<Throwable> {
             Logger.w(ChannelFragment.TAG, "Failed to load video.", it)
-            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video), it, { loadVideo(url) }, null, mainFragment)
+            UIDialogs.showGeneralRetryErrorDialog(context, context.getString(R.string.failed_to_load_video), it, { loadVideo(url) }, null, fragment)
         }
 
         loadVideoTask?.run(url)
@@ -849,6 +819,7 @@ class ShortView : FrameLayout {
             }
 
             val thumbnail = videoDetails.thumbnails.getHQThumbnail()
+            /*
             if (videoSource == null && !thumbnail.isNullOrBlank()) Glide.with(context).asBitmap()
                 .load(thumbnail).into(object : CustomTarget<Bitmap>() {
                     override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
@@ -860,8 +831,9 @@ class ShortView : FrameLayout {
                     }
                 })
             else player.setArtwork(null)
+            */
 
-            mainFragment.lifecycleScope.launch(Dispatchers.Main) {
+            fragment.lifecycleScope.launch(Dispatchers.Main) {
                 try {
                     player.setSource(videoSource, audioSource, play = true, keepSubtitles = false, resume = resumePositionMs > 0)
                     if (subtitleSource != null) player.swapSubtitles(subtitleSource)
@@ -887,397 +859,4 @@ class ShortView : FrameLayout {
         const val TAG = "VideoDetailView"
     }
 
-    class CommentsModalBottomSheet : BottomSheetDialogFragment() {
-        var mainFragment: MainFragment? = null
-
-        private lateinit var containerContent: FrameLayout
-        private lateinit var containerContentMain: LinearLayout
-        private lateinit var containerContentReplies: RepliesOverlay
-        private lateinit var containerContentDescription: DescriptionOverlay
-        private lateinit var containerContentSupport: SupportOverlay
-
-        private lateinit var title: TextView
-        private lateinit var subTitle: TextView
-        private lateinit var channelName: TextView
-        private lateinit var channelMeta: TextView
-        private lateinit var creatorThumbnail: CreatorThumbnail
-        private lateinit var channelButton: LinearLayout
-        private lateinit var monetization: MonetizationView
-        private lateinit var platform: PlatformIndicator
-        private lateinit var textLikes: TextView
-        private lateinit var textDislikes: TextView
-        private lateinit var layoutRating: LinearLayout
-        private lateinit var imageDislikeIcon: ImageView
-        private lateinit var imageLikeIcon: ImageView
-
-        private lateinit var description: TextView
-        private lateinit var descriptionContainer: LinearLayout
-        private lateinit var descriptionViewMore: TextView
-
-        private lateinit var commentsList: CommentsList
-        private lateinit var addCommentView: AddCommentView
-
-        private var polycentricProfile: PolycentricProfile? = null
-
-        private lateinit var buttonPolycentric: Button
-        private lateinit var buttonPlatform: Button
-
-        private var tabIndex: Int? = null
-
-        private var contentOverlayView: View? = null
-
-        lateinit var video: IPlatformVideoDetails
-
-        private lateinit var behavior: BottomSheetBehavior<FrameLayout>
-
-        private val _taskLoadPolycentricProfile =
-            TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) }).success { setPolycentricProfile(it, animate = true) }
-                .exception<Throwable> {
-                    Logger.w(TAG, "Failed to load claims.", it)
-                }
-
-        override fun onCreateDialog(
-            savedInstanceState: Bundle?,
-        ): Dialog {
-            val bottomSheetDialog =
-                BottomSheetDialog(requireContext(), R.style.Custom_BottomSheetDialog_Theme)
-            bottomSheetDialog.setContentView(R.layout.modal_comments)
-
-            behavior = bottomSheetDialog.behavior
-
-            // TODO figure out how to not need all of these non null assertions
-            containerContent = bottomSheetDialog.findViewById(R.id.content_container)!!
-            containerContentMain = bottomSheetDialog.findViewById(R.id.videodetail_container_main)!!
-            containerContentReplies =
-                bottomSheetDialog.findViewById(R.id.videodetail_container_replies)!!
-            containerContentDescription =
-                bottomSheetDialog.findViewById(R.id.videodetail_container_description)!!
-            containerContentSupport =
-                bottomSheetDialog.findViewById(R.id.videodetail_container_support)!!
-
-            title = bottomSheetDialog.findViewById(R.id.videodetail_title)!!
-            subTitle = bottomSheetDialog.findViewById(R.id.videodetail_meta)!!
-            channelName = bottomSheetDialog.findViewById(R.id.videodetail_channel_name)!!
-            channelMeta = bottomSheetDialog.findViewById(R.id.videodetail_channel_meta)!!
-            creatorThumbnail = bottomSheetDialog.findViewById(R.id.creator_thumbnail)!!
-            channelButton = bottomSheetDialog.findViewById(R.id.videodetail_channel_button)!!
-            monetization = bottomSheetDialog.findViewById(R.id.monetization)!!
-            platform = bottomSheetDialog.findViewById(R.id.videodetail_platform)!!
-            layoutRating = bottomSheetDialog.findViewById(R.id.layout_rating)!!
-            textDislikes = bottomSheetDialog.findViewById(R.id.text_dislikes)!!
-            textLikes = bottomSheetDialog.findViewById(R.id.text_likes)!!
-            imageLikeIcon = bottomSheetDialog.findViewById(R.id.image_like_icon)!!
-            imageDislikeIcon = bottomSheetDialog.findViewById(R.id.image_dislike_icon)!!
-
-            description = bottomSheetDialog.findViewById(R.id.videodetail_description)!!
-            descriptionContainer =
-                bottomSheetDialog.findViewById(R.id.videodetail_description_container)!!
-            descriptionViewMore =
-                bottomSheetDialog.findViewById(R.id.videodetail_description_view_more)!!
-
-            addCommentView = bottomSheetDialog.findViewById(R.id.add_comment_view)!!
-            commentsList = bottomSheetDialog.findViewById(R.id.comments_list)!!
-            buttonPolycentric = bottomSheetDialog.findViewById(R.id.button_polycentric)!!
-            buttonPlatform = bottomSheetDialog.findViewById(R.id.button_platform)!!
-
-            commentsList.onAuthorClick.subscribe { c ->
-                if (c !is PolycentricPlatformComment) {
-                    return@subscribe
-                }
-                val id = c.author.id.value
-
-                Logger.i(TAG, "onAuthorClick: $id")
-                if (id != null && id.startsWith("polycentric://")) {
-                    val navUrl = "https://harbor.social/" + id.substring("polycentric://".length)
-                    mainFragment!!.startActivity(Intent(Intent.ACTION_VIEW, navUrl.toUri()))
-                }
-            }
-            commentsList.onRepliesClick.subscribe { c ->
-                val replyCount = c.replyCount ?: 0
-                var metadata = ""
-                if (replyCount > 0) {
-                    metadata += "$replyCount " + requireContext().getString(R.string.replies)
-                }
-
-                if (c is PolycentricPlatformComment) {
-                    var parentComment: PolycentricPlatformComment = c
-                    containerContentReplies.load(tabIndex!! != 0, metadata, c.contextUrl, c.reference, c, { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) }, {
-                        val newComment = parentComment.cloneWithUpdatedReplyCount(
-                            (parentComment.replyCount ?: 0) + 1
-                        )
-                        commentsList.replaceComment(parentComment, newComment)
-                        parentComment = newComment
-                    })
-                } else {
-                    containerContentReplies.load(tabIndex!! != 0, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) })
-                }
-                animateOpenOverlayView(containerContentReplies)
-            }
-
-            if (StatePolycentric.instance.enabled) {
-                buttonPolycentric.setOnClickListener {
-                    setTabIndex(0)
-                    StateMeta.instance.setLastCommentSection(0)
-                }
-            } else {
-                buttonPolycentric.visibility = GONE
-            }
-
-            buttonPlatform.setOnClickListener {
-                setTabIndex(1)
-                StateMeta.instance.setLastCommentSection(1)
-            }
-
-            val ref = Models.referenceFromBuffer(video.url.toByteArray())
-            addCommentView.setContext(video.url, ref)
-
-            if (Settings.instance.comments.recommendationsDefault && !Settings.instance.comments.hideRecommendations) {
-                setTabIndex(2, true)
-            } else {
-                when (Settings.instance.comments.defaultCommentSection) {
-                    0 -> if (Settings.instance.other.polycentricEnabled) setTabIndex(0, true) else setTabIndex(1, true)
-                    1 -> setTabIndex(1, true)
-                    2 -> setTabIndex(StateMeta.instance.getLastCommentSection(), true)
-                }
-            }
-
-            containerContentDescription.onClose.subscribe { animateCloseOverlayView() }
-            containerContentReplies.onClose.subscribe { animateCloseOverlayView() }
-
-            descriptionViewMore.setOnClickListener {
-                animateOpenOverlayView(containerContentDescription)
-            }
-
-            updateDescriptionUI(video.description.fixHtmlLinks())
-
-            val dp5 =
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics)
-            val dp2 =
-                TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2f, resources.displayMetrics)
-
-            //UI
-            title.text = video.name
-            channelName.text = video.author.name
-            if (video.author.subscribers != null) {
-                channelMeta.text = if ((video.author.subscribers
-                        ?: 0) > 0
-                ) video.author.subscribers!!.toHumanNumber() + " " + requireContext().getString(R.string.subscribers) else ""
-                (channelName.layoutParams as MarginLayoutParams).setMargins(
-                    0, (dp5 * -1).toInt(), 0, 0
-                )
-            } else {
-                channelMeta.text = ""
-                (channelName.layoutParams as MarginLayoutParams).setMargins(0, (dp2).toInt(), 0, 0)
-            }
-
-            video.author.let {
-                if (it is PlatformAuthorMembershipLink && !it.membershipUrl.isNullOrEmpty()) monetization.setPlatformMembership(video.id.pluginId, it.membershipUrl)
-                else monetization.setPlatformMembership(null, null)
-            }
-
-            val subTitleSegments: ArrayList<String> = ArrayList()
-            if (video.viewCount > 0) subTitleSegments.add("${video.viewCount.toHumanNumber()} ${if (video.isLive) requireContext().getString(R.string.watching_now) else requireContext().getString(R.string.views)}")
-            if (video.datetime != null) {
-                val diff = video.datetime?.getNowDiffSeconds() ?: 0
-                val ago = video.datetime?.toHumanNowDiffString(true)
-                if (diff >= 0) subTitleSegments.add("$ago ago")
-                else subTitleSegments.add("available in $ago")
-            }
-
-            platform.setPlatformFromClientID(video.id.pluginId)
-            subTitle.text = subTitleSegments.joinToString(" • ")
-            creatorThumbnail.setThumbnail(video.author.thumbnail, false)
-
-            setPolycentricProfile(null, animate = false)
-            _taskLoadPolycentricProfile.run(video.author.id)
-
-            when (video.rating) {
-                is RatingLikeDislikes -> {
-                    val r = video.rating as RatingLikeDislikes
-                    layoutRating.visibility = VISIBLE
-
-                    textLikes.visibility = VISIBLE
-                    imageLikeIcon.visibility = VISIBLE
-                    textLikes.text = r.likes.toHumanNumber()
-
-                    imageDislikeIcon.visibility = VISIBLE
-                    textDislikes.visibility = VISIBLE
-                    textDislikes.text = r.dislikes.toHumanNumber()
-                }
-
-                is RatingLikes -> {
-                    val r = video.rating as RatingLikes
-                    layoutRating.visibility = VISIBLE
-
-                    textLikes.visibility = VISIBLE
-                    imageLikeIcon.visibility = VISIBLE
-                    textLikes.text = r.likes.toHumanNumber()
-
-                    imageDislikeIcon.visibility = GONE
-                    textDislikes.visibility = GONE
-                }
-
-                else -> {
-                    layoutRating.visibility = GONE
-                }
-            }
-
-            monetization.onSupportTap.subscribe {
-                containerContentSupport.setPolycentricProfile(polycentricProfile)
-                animateOpenOverlayView(containerContentSupport)
-            }
-
-            monetization.onStoreTap.subscribe {
-                polycentricProfile?.systemState?.store?.let {
-                    try {
-                        val uri = it.toUri()
-                        val intent = Intent(Intent.ACTION_VIEW)
-                        intent.data = uri
-                        requireContext().startActivity(intent)
-                    } catch (e: Throwable) {
-                        Logger.e(TAG, "Failed to open URI: '${it}'.", e)
-                    }
-                }
-            }
-            monetization.onUrlTap.subscribe {
-                mainFragment!!.navigate<BrowserFragment>(it)
-            }
-
-            addCommentView.onCommentAdded.subscribe {
-                commentsList.addComment(it)
-            }
-
-            channelButton.setOnClickListener {
-                mainFragment!!.navigate<ChannelFragment>(video.author)
-            }
-
-            return bottomSheetDialog
-        }
-
-        override fun onDismiss(dialog: DialogInterface) {
-            super.onDismiss(dialog)
-            animateCloseOverlayView()
-        }
-
-        private fun setPolycentricProfile(profile: PolycentricProfile?, animate: Boolean) {
-            polycentricProfile = profile
-
-            val dp35 = 35.dp(requireContext().resources)
-            val avatar = profile?.systemState?.avatar?.selectBestImage(dp35 * dp35)
-                ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) }
-
-            if (avatar != null) {
-                creatorThumbnail.setThumbnail(avatar, animate)
-            } else {
-                creatorThumbnail.setThumbnail(video.author.thumbnail, animate)
-                creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto())
-            }
-
-            val username = profile?.systemState?.username
-            if (username != null) {
-                channelName.text = username
-            }
-
-            monetization.setPolycentricProfile(profile)
-        }
-
-        private fun setTabIndex(index: Int?, forceReload: Boolean = false) {
-            Logger.i(TAG, "setTabIndex (index: ${index}, forceReload: ${forceReload})")
-            val changed = tabIndex != index || forceReload
-            if (!changed) {
-                return
-            }
-
-            tabIndex = index
-            buttonPlatform.setTextColor(resources.getColor(if (index == 1) R.color.white else R.color.gray_ac, null))
-            buttonPolycentric.setTextColor(resources.getColor(if (index == 0) R.color.white else R.color.gray_ac, null))
-
-            when (index) {
-                null -> {
-                    addCommentView.visibility = GONE
-                    commentsList.clear()
-                }
-
-                0 -> {
-                    addCommentView.visibility = VISIBLE
-                    fetchPolycentricComments()
-                }
-
-                1 -> {
-                    addCommentView.visibility = GONE
-                    fetchComments()
-                }
-            }
-        }
-
-        private fun fetchComments() {
-            Logger.i(TAG, "fetchComments")
-            video.let {
-                commentsList.load(true) { StatePlatform.instance.getComments(it) }
-            }
-        }
-
-        private fun fetchPolycentricComments() {
-            Logger.i(TAG, "fetchPolycentricComments")
-            val video = video
-            val idValue = video.id.value
-            if (video.url.isEmpty()) {
-                Logger.w(TAG, "Failed to fetch polycentric comments because url was null")
-                commentsList.clear()
-                return
-            }
-
-            val ref = Models.referenceFromBuffer(video.url.toByteArray())
-            val extraBytesRef = idValue?.let { if (it.isNotEmpty()) it.toByteArray() else null }
-            commentsList.load(false) { StatePolycentric.instance.getCommentPager(video.url, ref, listOfNotNull(extraBytesRef)); }
-        }
-
-        private fun updateDescriptionUI(text: Spanned) {
-            containerContentDescription.load(text)
-            description.text = text
-
-            if (description.text.isNotEmpty()) descriptionContainer.visibility = VISIBLE
-            else descriptionContainer.visibility = GONE
-        }
-
-        private fun animateOpenOverlayView(view: View) {
-            if (contentOverlayView != null) {
-                Logger.e(TAG, "Content overlay already open")
-                return
-            }
-
-            behavior.isDraggable = false
-            behavior.state = BottomSheetBehavior.STATE_EXPANDED
-
-            val animHeight = containerContentMain.height
-
-            view.translationY = animHeight.toFloat()
-            view.visibility = VISIBLE
-
-            view.animate().setDuration(300).translationY(0f).withEndAction {
-                contentOverlayView = view
-            }.start()
-        }
-
-        private fun animateCloseOverlayView() {
-            val curView = contentOverlayView
-            if (curView == null) {
-                Logger.e(TAG, "No content overlay open")
-                return
-            }
-
-            behavior.isDraggable = true
-
-            val animHeight = contentOverlayView!!.height
-
-            curView.animate().setDuration(300).translationY(animHeight.toFloat()).withEndAction {
-                curView.visibility = GONE
-                contentOverlayView = null
-            }.start()
-        }
-
-        companion object {
-            const val TAG = "ModalBottomSheet"
-        }
-    }
 }
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
index f082c91d..61e91199 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortsFragment.kt
@@ -11,6 +11,7 @@ import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.LinearLayout
 import androidx.annotation.OptIn
+import androidx.lifecycle.lifecycleScope
 import androidx.media3.common.util.UnstableApi
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
@@ -25,6 +26,9 @@ import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.views.buttons.BigButton
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlin.system.measureTimeMillis
 
 @UnstableApi
 class ShortsFragment : MainFragment() {
@@ -35,6 +39,7 @@ class ShortsFragment : MainFragment() {
     private var loadPagerTask: TaskHandler<ShortsFragment, IPager<IPlatformVideo>>? = null
     private var nextPageTask: TaskHandler<ShortsFragment, List<IPlatformVideo>>? = null
 
+    //TODO: Reduce number of pagers (1, or at most 2)
     private var mainShortsPager: IPager<IPlatformVideo>? = null
     private val mainShorts: MutableList<IPlatformVideo> = mutableListOf()
 
@@ -58,6 +63,7 @@ class ShortsFragment : MainFragment() {
     private var customViewAdapter: CustomViewAdapter? = null
 
     // we just completely reset the data structure so we want to tell the adapter that
+    //TODO: Move most of this logic to ShortsView
     @SuppressLint("NotifyDataSetChanged")
     override fun onShownWithView(parameter: Any?, isBack: Boolean) {
         (activity as MainActivity?)?.getFragment<VideoDetailFragment>()?.closeVideoDetails()
@@ -118,7 +124,6 @@ class ShortsFragment : MainFragment() {
         overlayQualityContainer = view.findViewById(R.id.shorts_quality_overview)
 
         sourcesButton.onClick.subscribe {
-            sourcesButton.playSoundEffect(SoundEffectConstants.CLICK)
             navigate<SourcesFragment>()
         }
 
@@ -145,7 +150,7 @@ class ShortsFragment : MainFragment() {
 
         this.customViewAdapter = customViewAdapter
 
-        if (loadPagerTask == null && currentShorts.isEmpty()) {
+        if (loadPagerTask == null) {// && currentShorts.isEmpty()) {
             loadPager()
 
             loadPagerTask!!.success {
@@ -207,28 +212,29 @@ class ShortsFragment : MainFragment() {
     }
 
     private fun nextPage() {
-        nextPageTask?.cancel()
-
-        val nextPageTask =
-            TaskHandler<ShortsFragment, List<IPlatformVideo>>(StateApp.instance.scopeGetter, {
-                currentShortsPager!!.nextPage()
-
-                return@TaskHandler currentShortsPager!!.getResults()
-            }).success { newVideos ->
+        Logger.i(TAG, "ShortsFragment nextPage");
+        lifecycleScope.launch(Dispatchers.IO) {
+            try {
+                val time = measureTimeMillis {
+                    currentShortsPager!!.nextPage();
+                }
+                val newVideos = currentShortsPager!!.getResults();
                 val prevCount = customViewAdapter!!.itemCount
+                Logger.i(TAG, "Shorts nextPage took ${time}ms, ${prevCount}-${prevCount + newVideos.size}, hasMore: ${currentShortsPager?.hasMorePages()}");
                 currentShorts.addAll(newVideos)
                 if (isChannelShortsMode) {
                     channelShorts.addAll(newVideos)
                 } else {
                     mainShorts.addAll(newVideos)
                 }
-                customViewAdapter!!.notifyItemRangeInserted(prevCount, newVideos.size)
+                lifecycleScope.launch(Dispatchers.Main) {
+                    customViewAdapter!!.notifyItemRangeInserted(prevCount, newVideos.size)
+                }
                 nextPageTask = null
+            } catch (ex: Throwable) {
+                Logger.e(TAG, "Shorts Failed to call nextPage", ex);
             }
-
-        nextPageTask.run(this)
-
-        this.nextPageTask = nextPageTask
+        }
     }
 
     // we just completely reset the data structure so we want to tell the adapter that
@@ -236,12 +242,16 @@ class ShortsFragment : MainFragment() {
     private fun loadPager() {
         loadPagerTask?.cancel()
 
+        Logger.i(TAG, "Shorts loadPage");
+        var loadPageStart = System.currentTimeMillis();
         val loadPagerTask =
             TaskHandler<ShortsFragment, IPager<IPlatformVideo>>(StateApp.instance.scopeGetter, {
-                val pager = StatePlatform.instance.getShorts()
+                val pager = StatePlatform.instance.getShorts();
 
                 return@TaskHandler pager
             }).success { pager ->
+                val timeLoadPage = System.currentTimeMillis() - loadPageStart;
+                Logger.i(TAG, "Shorts loadPage took ${timeLoadPage}ms");
                 mainShorts.clear()
                 mainShorts.addAll(pager.getResults())
                 mainShortsPager = pager
@@ -259,7 +269,7 @@ class ShortsFragment : MainFragment() {
                 loadPagerTask = null
             }.exception<Throwable> { err ->
                 val message = "Unable to load shorts $err"
-                Logger.i(TAG, message)
+                Logger.w(TAG, message, err)
                 if (context != null) {
                     UIDialogs.showDialog(
                         requireContext(), R.drawable.ic_sources, message, null, null, 0, UIDialogs.Action(
@@ -329,6 +339,7 @@ class ShortsFragment : MainFragment() {
 
         @OptIn(UnstableApi::class)
         override fun onBindViewHolder(holder: CustomViewHolder, position: Int) {
+            Logger.i(TAG, "Shorts change (position: ${position}): ${videos[position].name} (${videos[position].id.value})")
             holder.shortView.changeVideo(videos[position], isChannelShortsMode())
 
             if (position == itemCount - 1) {
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/special/CommentsModalBottomSheet.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/special/CommentsModalBottomSheet.kt
new file mode 100644
index 00000000..c74a7218
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/special/CommentsModalBottomSheet.kt
@@ -0,0 +1,454 @@
+package com.futo.platformplayer.fragment.mainactivity.special
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.content.Intent
+import android.os.Bundle
+import android.text.Spanned
+import android.util.TypedValue
+import android.view.View
+import android.view.ViewGroup.MarginLayoutParams
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.FrameLayout.GONE
+import android.widget.FrameLayout.VISIBLE
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.net.toUri
+import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.models.PlatformAuthorMembershipLink
+import com.futo.platformplayer.api.media.models.comments.PolycentricPlatformComment
+import com.futo.platformplayer.api.media.models.ratings.RatingLikeDislikes
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
+import com.futo.platformplayer.constructs.TaskHandler
+import com.futo.platformplayer.dp
+import com.futo.platformplayer.fixHtmlLinks
+import com.futo.platformplayer.fragment.mainactivity.main.BrowserFragment
+import com.futo.platformplayer.fragment.mainactivity.main.ChannelFragment
+import com.futo.platformplayer.fragment.mainactivity.main.MainFragment
+import com.futo.platformplayer.getNowDiffSeconds
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.selectBestImage
+import com.futo.platformplayer.states.StateApp
+import com.futo.platformplayer.states.StateMeta
+import com.futo.platformplayer.states.StatePlatform
+import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.toHumanNowDiffString
+import com.futo.platformplayer.toHumanNumber
+import com.futo.platformplayer.views.MonetizationView
+import com.futo.platformplayer.views.comments.AddCommentView
+import com.futo.platformplayer.views.others.CreatorThumbnail
+import com.futo.platformplayer.views.overlays.DescriptionOverlay
+import com.futo.platformplayer.views.overlays.RepliesOverlay
+import com.futo.platformplayer.views.overlays.SupportOverlay
+import com.futo.platformplayer.views.platform.PlatformIndicator
+import com.futo.platformplayer.views.segments.CommentsList
+import com.futo.polycentric.core.ApiMethods
+import com.futo.polycentric.core.Models
+import com.futo.polycentric.core.PolycentricProfile
+import com.futo.polycentric.core.toURLInfoSystemLinkUrl
+
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+
+class CommentsModalBottomSheet : BottomSheetDialogFragment() {
+    var mainFragment: MainFragment? = null
+
+    private lateinit var containerContent: FrameLayout
+    private lateinit var containerContentMain: LinearLayout
+    private lateinit var containerContentReplies: RepliesOverlay
+    private lateinit var containerContentDescription: DescriptionOverlay
+    private lateinit var containerContentSupport: SupportOverlay
+
+    private lateinit var title: TextView
+    private lateinit var subTitle: TextView
+    private lateinit var channelName: TextView
+    private lateinit var channelMeta: TextView
+    private lateinit var creatorThumbnail: CreatorThumbnail
+    private lateinit var channelButton: LinearLayout
+    private lateinit var monetization: MonetizationView
+    private lateinit var platform: PlatformIndicator
+    private lateinit var textLikes: TextView
+    private lateinit var textDislikes: TextView
+    private lateinit var layoutRating: LinearLayout
+    private lateinit var imageDislikeIcon: ImageView
+    private lateinit var imageLikeIcon: ImageView
+
+    private lateinit var description: TextView
+    private lateinit var descriptionContainer: LinearLayout
+    private lateinit var descriptionViewMore: TextView
+
+    private lateinit var commentsList: CommentsList
+    private lateinit var addCommentView: AddCommentView
+
+    private var polycentricProfile: PolycentricProfile? = null
+
+    private lateinit var buttonPolycentric: Button
+    private lateinit var buttonPlatform: Button
+
+    private var tabIndex: Int? = null
+
+    private var contentOverlayView: View? = null
+
+    lateinit var video: IPlatformVideoDetails
+
+    private lateinit var behavior: BottomSheetBehavior<FrameLayout>
+
+    private val _taskLoadPolycentricProfile =
+        TaskHandler<PlatformID, PolycentricProfile?>(StateApp.instance.scopeGetter, { ApiMethods.getPolycentricProfileByClaim(
+            ApiMethods.SERVER, ApiMethods.FUTO_TRUST_ROOT, it.claimFieldType.toLong(), it.claimType.toLong(), it.value!!) }).success { setPolycentricProfile(it, animate = true) }
+            .exception<Throwable> {
+                Logger.w(TAG, "Failed to load claims.", it)
+            }
+
+    override fun onCreateDialog(
+        savedInstanceState: Bundle?,
+    ): Dialog {
+        val bottomSheetDialog =
+            BottomSheetDialog(requireContext(), R.style.Custom_BottomSheetDialog_Theme)
+        bottomSheetDialog.setContentView(R.layout.modal_comments)
+
+        behavior = bottomSheetDialog.behavior
+
+        // TODO figure out how to not need all of these non null assertions
+        containerContent = bottomSheetDialog.findViewById(R.id.content_container)!!
+        containerContentMain = bottomSheetDialog.findViewById(R.id.videodetail_container_main)!!
+        containerContentReplies =
+            bottomSheetDialog.findViewById(R.id.videodetail_container_replies)!!
+        containerContentDescription =
+            bottomSheetDialog.findViewById(R.id.videodetail_container_description)!!
+        containerContentSupport =
+            bottomSheetDialog.findViewById(R.id.videodetail_container_support)!!
+
+        title = bottomSheetDialog.findViewById(R.id.videodetail_title)!!
+        subTitle = bottomSheetDialog.findViewById(R.id.videodetail_meta)!!
+        channelName = bottomSheetDialog.findViewById(R.id.videodetail_channel_name)!!
+        channelMeta = bottomSheetDialog.findViewById(R.id.videodetail_channel_meta)!!
+        creatorThumbnail = bottomSheetDialog.findViewById(R.id.creator_thumbnail)!!
+        channelButton = bottomSheetDialog.findViewById(R.id.videodetail_channel_button)!!
+        monetization = bottomSheetDialog.findViewById(R.id.monetization)!!
+        platform = bottomSheetDialog.findViewById(R.id.videodetail_platform)!!
+        layoutRating = bottomSheetDialog.findViewById(R.id.layout_rating)!!
+        textDislikes = bottomSheetDialog.findViewById(R.id.text_dislikes)!!
+        textLikes = bottomSheetDialog.findViewById(R.id.text_likes)!!
+        imageLikeIcon = bottomSheetDialog.findViewById(R.id.image_like_icon)!!
+        imageDislikeIcon = bottomSheetDialog.findViewById(R.id.image_dislike_icon)!!
+
+        description = bottomSheetDialog.findViewById(R.id.videodetail_description)!!
+        descriptionContainer =
+            bottomSheetDialog.findViewById(R.id.videodetail_description_container)!!
+        descriptionViewMore =
+            bottomSheetDialog.findViewById(R.id.videodetail_description_view_more)!!
+
+        addCommentView = bottomSheetDialog.findViewById(R.id.add_comment_view)!!
+        commentsList = bottomSheetDialog.findViewById(R.id.comments_list)!!
+        buttonPolycentric = bottomSheetDialog.findViewById(R.id.button_polycentric)!!
+        buttonPlatform = bottomSheetDialog.findViewById(R.id.button_platform)!!
+
+        commentsList.onAuthorClick.subscribe { c ->
+            if (c !is PolycentricPlatformComment) {
+                return@subscribe
+            }
+            val id = c.author.id.value
+
+            Logger.i(TAG, "onAuthorClick: $id")
+            if (id != null && id.startsWith("polycentric://")) {
+                val navUrl = "https://harbor.social/" + id.substring("polycentric://".length)
+                mainFragment!!.startActivity(Intent(Intent.ACTION_VIEW, navUrl.toUri()))
+            }
+        }
+        commentsList.onRepliesClick.subscribe { c ->
+            val replyCount = c.replyCount ?: 0
+            var metadata = ""
+            if (replyCount > 0) {
+                metadata += "$replyCount " + requireContext().getString(R.string.replies)
+            }
+
+            if (c is PolycentricPlatformComment) {
+                var parentComment: PolycentricPlatformComment = c
+                containerContentReplies.load(tabIndex!! != 0, metadata, c.contextUrl, c.reference, c, { StatePolycentric.instance.getCommentPager(c.contextUrl, c.reference) }, {
+                    val newComment = parentComment.cloneWithUpdatedReplyCount(
+                        (parentComment.replyCount ?: 0) + 1
+                    )
+                    commentsList.replaceComment(parentComment, newComment)
+                    parentComment = newComment
+                })
+            } else {
+                containerContentReplies.load(tabIndex!! != 0, metadata, null, null, c, { StatePlatform.instance.getSubComments(c) })
+            }
+            animateOpenOverlayView(containerContentReplies)
+        }
+
+        if (StatePolycentric.instance.enabled) {
+            buttonPolycentric.setOnClickListener {
+                setTabIndex(0)
+                StateMeta.instance.setLastCommentSection(0)
+            }
+        } else {
+            buttonPolycentric.visibility = GONE
+        }
+
+        buttonPlatform.setOnClickListener {
+            setTabIndex(1)
+            StateMeta.instance.setLastCommentSection(1)
+        }
+
+        val ref = Models.referenceFromBuffer(video.url.toByteArray())
+        addCommentView.setContext(video.url, ref)
+
+        if (Settings.instance.comments.recommendationsDefault && !Settings.instance.comments.hideRecommendations) {
+            setTabIndex(2, true)
+        } else {
+            when (Settings.instance.comments.defaultCommentSection) {
+                0 -> if (Settings.instance.other.polycentricEnabled) setTabIndex(0, true) else setTabIndex(1, true)
+                1 -> setTabIndex(1, true)
+                2 -> setTabIndex(StateMeta.instance.getLastCommentSection(), true)
+            }
+        }
+
+        containerContentDescription.onClose.subscribe { animateCloseOverlayView() }
+        containerContentReplies.onClose.subscribe { animateCloseOverlayView() }
+
+        descriptionViewMore.setOnClickListener {
+            animateOpenOverlayView(containerContentDescription)
+        }
+
+        updateDescriptionUI(video.description.fixHtmlLinks())
+
+        val dp5 =
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 5f, resources.displayMetrics)
+        val dp2 =
+            TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2f, resources.displayMetrics)
+
+        //UI
+        title.text = video.name
+        channelName.text = video.author.name
+        if (video.author.subscribers != null) {
+            channelMeta.text = if ((video.author.subscribers
+                    ?: 0) > 0
+            ) video.author.subscribers!!.toHumanNumber() + " " + requireContext().getString(R.string.subscribers) else ""
+            (channelName.layoutParams as MarginLayoutParams).setMargins(
+                0, (dp5 * -1).toInt(), 0, 0
+            )
+        } else {
+            channelMeta.text = ""
+            (channelName.layoutParams as MarginLayoutParams).setMargins(0, (dp2).toInt(), 0, 0)
+        }
+
+        video.author.let {
+            if (it is PlatformAuthorMembershipLink && !it.membershipUrl.isNullOrEmpty()) monetization.setPlatformMembership(video.id.pluginId, it.membershipUrl)
+            else monetization.setPlatformMembership(null, null)
+        }
+
+        val subTitleSegments: ArrayList<String> = ArrayList()
+        if (video.viewCount > 0) subTitleSegments.add("${video.viewCount.toHumanNumber()} ${if (video.isLive) requireContext().getString(
+            R.string.watching_now) else requireContext().getString(R.string.views)}")
+        if (video.datetime != null) {
+            val diff = video.datetime?.getNowDiffSeconds() ?: 0
+            val ago = video.datetime?.toHumanNowDiffString(true)
+            if (diff >= 0) subTitleSegments.add("$ago ago")
+            else subTitleSegments.add("available in $ago")
+        }
+
+        platform.setPlatformFromClientID(video.id.pluginId)
+        subTitle.text = subTitleSegments.joinToString(" • ")
+        creatorThumbnail.setThumbnail(video.author.thumbnail, false)
+
+        setPolycentricProfile(null, animate = false)
+        _taskLoadPolycentricProfile.run(video.author.id)
+
+        when (video.rating) {
+            is RatingLikeDislikes -> {
+                val r = video.rating as RatingLikeDislikes
+                layoutRating.visibility = VISIBLE
+
+                textLikes.visibility = VISIBLE
+                imageLikeIcon.visibility = VISIBLE
+                textLikes.text = r.likes.toHumanNumber()
+
+                imageDislikeIcon.visibility = VISIBLE
+                textDislikes.visibility = VISIBLE
+                textDislikes.text = r.dislikes.toHumanNumber()
+            }
+
+            is RatingLikes -> {
+                val r = video.rating as RatingLikes
+                layoutRating.visibility = VISIBLE
+
+                textLikes.visibility = VISIBLE
+                imageLikeIcon.visibility = VISIBLE
+                textLikes.text = r.likes.toHumanNumber()
+
+                imageDislikeIcon.visibility = GONE
+                textDislikes.visibility = GONE
+            }
+
+            else -> {
+                layoutRating.visibility = GONE
+            }
+        }
+
+        monetization.onSupportTap.subscribe {
+            containerContentSupport.setPolycentricProfile(polycentricProfile)
+            animateOpenOverlayView(containerContentSupport)
+        }
+
+        monetization.onStoreTap.subscribe {
+            polycentricProfile?.systemState?.store?.let {
+                try {
+                    val uri = it.toUri()
+                    val intent = Intent(Intent.ACTION_VIEW)
+                    intent.data = uri
+                    requireContext().startActivity(intent)
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to open URI: '${it}'.", e)
+                }
+            }
+        }
+        monetization.onUrlTap.subscribe {
+            mainFragment!!.navigate<BrowserFragment>(it)
+        }
+
+        addCommentView.onCommentAdded.subscribe {
+            commentsList.addComment(it)
+        }
+
+        channelButton.setOnClickListener {
+            mainFragment!!.navigate<ChannelFragment>(video.author)
+        }
+
+        return bottomSheetDialog
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        animateCloseOverlayView()
+    }
+
+    private fun setPolycentricProfile(profile: PolycentricProfile?, animate: Boolean) {
+        polycentricProfile = profile
+
+        val dp35 = 35.dp(requireContext().resources)
+        val avatar = profile?.systemState?.avatar?.selectBestImage(dp35 * dp35)
+            ?.let { it.toURLInfoSystemLinkUrl(profile.system.toProto(), it.process, profile.systemState.servers.toList()) }
+
+        if (avatar != null) {
+            creatorThumbnail.setThumbnail(avatar, animate)
+        } else {
+            creatorThumbnail.setThumbnail(video.author.thumbnail, animate)
+            creatorThumbnail.setHarborAvailable(profile != null, animate, profile?.system?.toProto())
+        }
+
+        val username = profile?.systemState?.username
+        if (username != null) {
+            channelName.text = username
+        }
+
+        monetization.setPolycentricProfile(profile)
+    }
+
+    private fun setTabIndex(index: Int?, forceReload: Boolean = false) {
+        Logger.i(TAG, "setTabIndex (index: ${index}, forceReload: ${forceReload})")
+        val changed = tabIndex != index || forceReload
+        if (!changed) {
+            return
+        }
+
+        tabIndex = index
+        buttonPlatform.setTextColor(resources.getColor(if (index == 1) R.color.white else R.color.gray_ac, null))
+        buttonPolycentric.setTextColor(resources.getColor(if (index == 0) R.color.white else R.color.gray_ac, null))
+
+        when (index) {
+            null -> {
+                addCommentView.visibility = GONE
+                commentsList.clear()
+            }
+
+            0 -> {
+                addCommentView.visibility = VISIBLE
+                fetchPolycentricComments()
+            }
+
+            1 -> {
+                addCommentView.visibility = GONE
+                fetchComments()
+            }
+        }
+    }
+
+    private fun fetchComments() {
+        Logger.i(TAG, "fetchComments")
+        video.let {
+            commentsList.load(true) { StatePlatform.instance.getComments(it) }
+        }
+    }
+
+    private fun fetchPolycentricComments() {
+        Logger.i(TAG, "fetchPolycentricComments")
+        val video = video
+        val idValue = video.id.value
+        if (video.url.isEmpty()) {
+            Logger.w(TAG, "Failed to fetch polycentric comments because url was null")
+            commentsList.clear()
+            return
+        }
+
+        val ref = Models.referenceFromBuffer(video.url.toByteArray())
+        val extraBytesRef = idValue?.let { if (it.isNotEmpty()) it.toByteArray() else null }
+        commentsList.load(false) { StatePolycentric.instance.getCommentPager(video.url, ref, listOfNotNull(extraBytesRef)); }
+    }
+
+    private fun updateDescriptionUI(text: Spanned) {
+        containerContentDescription.load(text)
+        description.text = text
+
+        if (description.text.isNotEmpty()) descriptionContainer.visibility = VISIBLE
+        else descriptionContainer.visibility = GONE
+    }
+
+    private fun animateOpenOverlayView(view: View) {
+        if (contentOverlayView != null) {
+            Logger.e(TAG, "Content overlay already open")
+            return
+        }
+
+        behavior.isDraggable = false
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        val animHeight = containerContentMain.height
+
+        view.translationY = animHeight.toFloat()
+        view.visibility = VISIBLE
+
+        view.animate().setDuration(300).translationY(0f).withEndAction {
+            contentOverlayView = view
+        }.start()
+    }
+
+    private fun animateCloseOverlayView() {
+        val curView = contentOverlayView
+        if (curView == null) {
+            Logger.e(TAG, "No content overlay open")
+            return
+        }
+
+        behavior.isDraggable = true
+
+        val animHeight = contentOverlayView!!.height
+
+        curView.animate().setDuration(300).translationY(animHeight.toFloat()).withEndAction {
+            curView.visibility = GONE
+            contentOverlayView = null
+        }.start()
+    }
+
+    companion object {
+        const val TAG = "ModalBottomSheet"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
index cba656dd..972ce336 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
@@ -500,7 +500,7 @@ class StatePlatform {
             .toList()
             .associateWith { 1f };
 
-        val pager = MultiDistributionContentPager(pages);
+        val pager = MultiDistributionContentPager(pages, 2);
         pager.initialize();
         return pager;
     }
diff --git a/app/src/main/java/com/futo/platformplayer/views/buttons/ShortsButton.kt b/app/src/main/java/com/futo/platformplayer/views/buttons/ShortsButton.kt
new file mode 100644
index 00000000..68ba715b
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/views/buttons/ShortsButton.kt
@@ -0,0 +1,117 @@
+package com.futo.platformplayer.views.buttons
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.View
+import android.widget.ImageView
+import android.widget.LinearLayout
+import android.widget.TextView
+import com.futo.platformplayer.R
+import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.constructs.Event0
+import com.google.android.material.imageview.ShapeableImageView
+import com.google.android.material.shape.ShapeAppearanceModel
+
+class ShortsButton : LinearLayout {
+    private val _root: LinearLayout;
+    private val _icon: ImageView;
+    private val _textPrimary: TextView;
+    val onClick = Event0();
+
+    var iconId: Int? = null;
+
+    constructor(context : Context, text: String, icon: Int, action: ()->Unit) : super(context) {
+        inflate(context, R.layout.view_shorts_button, this);
+        _icon = findViewById(R.id.button_icon);
+        _textPrimary = findViewById(R.id.button_text);
+        _root = findViewById(R.id.root);
+
+        withPrimaryText(text);
+        withIcon(icon);
+
+        _root.apply {
+            isClickable = true;
+            setOnClickListener {
+                if(!isEnabled)
+                    return@setOnClickListener;
+                action();
+                onClick.emit();
+                UIDialogs.toast("Clicked button: " + _textPrimary.text);
+            };
+        }
+    }
+    constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
+        inflate(context, R.layout.view_shorts_button, this);
+        _icon = findViewById(R.id.image_icon);
+        _textPrimary = findViewById(R.id.text_title);
+        _root = findViewById(R.id.root);
+        _root.apply {
+            isClickable = true;
+            setOnClickListener {
+                if(!isEnabled)
+                    return@setOnClickListener;
+                onClick.emit();
+            };
+        }
+
+        val attrArr = context.obtainStyledAttributes(attrs, R.styleable.ShortsButton, 0, 0);
+        val attrIconRef = attrArr.getResourceId(R.styleable.ShortsButton_buttonIcon_s, -1);
+        val attrText = attrArr.getText(R.styleable.ShortsButton_buttonText_s) ?: "";
+        attrArr.recycle()
+
+        withIcon(attrIconRef);
+        withPrimaryText(attrText.toString());
+    }
+
+    fun withMargin(bottom: Int, side: Int = 0): ShortsButton {
+        setPadding(side, 0, side, bottom)
+        return this;
+    }
+    fun withPrimaryText(text: String): ShortsButton {
+        _textPrimary.text = text;
+
+        if(text.isNullOrBlank())
+            _textPrimary.visibility = View.GONE;
+        else
+            _textPrimary.visibility = View.VISIBLE;
+        return this;
+    }
+
+    fun withIcon(resourceId: Int): ShortsButton {
+        if (resourceId != -1) {
+            _icon.visibility = View.VISIBLE;
+            _icon.setImageResource(resourceId);
+        } else
+            _icon.visibility = View.GONE;
+        _icon.scaleType = ImageView.ScaleType.CENTER_CROP;
+        iconId = resourceId;
+
+        return this;
+    }
+
+
+    fun withIcon(bitmap: Bitmap): ShortsButton {
+        _icon.visibility = View.VISIBLE;
+        _icon.setImageBitmap(bitmap);
+        iconId = -1;
+
+        _icon.scaleType = ImageView.ScaleType.CENTER_CROP;
+
+        return this;
+    }
+
+    fun setButtonEnabled(enabled: Boolean) {
+        if(enabled) {
+            alpha = 1f;
+            isEnabled = true;
+            isClickable = true;
+        }
+        else {
+            alpha = 0.5f;
+            isEnabled = false;
+            isClickable = false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/views/others/CreatorThumbnail.kt b/app/src/main/java/com/futo/platformplayer/views/others/CreatorThumbnail.kt
index d655d7dd..9ea6819f 100644
--- a/app/src/main/java/com/futo/platformplayer/views/others/CreatorThumbnail.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/others/CreatorThumbnail.kt
@@ -14,6 +14,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.getDataLinkFromUrl
 import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.views.IdenticonView
 import userpackage.Protocol
 
@@ -82,14 +83,14 @@ class CreatorThumbnail : ConstraintLayout {
             Glide.with(_imageChannelThumbnail)
                 .load(url)
                 .placeholder(R.drawable.placeholder_channel_thumbnail)
-                .diskCacheStrategy(DiskCacheStrategy.DATA)
+                .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
                 .crossfade()
-                .into(_imageChannelThumbnail);
+                .into(_imageChannelThumbnail)
         } else {
             Glide.with(_imageChannelThumbnail)
                 .load(url)
                 .placeholder(R.drawable.placeholder_channel_thumbnail)
-                .diskCacheStrategy(DiskCacheStrategy.DATA)
+                .diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
                 .into(_imageChannelThumbnail);
         }
     }
diff --git a/app/src/main/res/drawable/ic_comment_s.xml b/app/src/main/res/drawable/ic_comment_s.xml
new file mode 100644
index 00000000..6fdc655f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_comment_s.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:strokeColor="#222"
+      android:strokeWidth="20"
+      android:pathData="M240,560L720,560L720,480L240,480L240,560ZM240,440L720,440L720,360L240,360L240,440ZM240,320L720,320L720,240L240,240L240,320ZM880,880L720,720L160,720Q127,720 103.5,696.5Q80,673 80,640L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,880ZM160,640L754,640L800,685L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,640Q160,640 160,640Q160,640 160,640ZM160,640Q160,640 160,640Q160,640 160,640L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_s.xml b/app/src/main/res/drawable/ic_settings_s.xml
new file mode 100644
index 00000000..0ef3317e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_s.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:strokeColor="#222"
+      android:strokeWidth="20"
+      android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_s.xml b/app/src/main/res/drawable/ic_share_s.xml
new file mode 100644
index 00000000..9d814197
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_s.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:strokeColor="#222"
+      android:strokeWidth="20"
+      android:pathData="M680,880Q630,880 595,845Q560,810 560,760Q560,754 563,732L282,568Q266,583 245,591.5Q224,600 200,600Q150,600 115,565Q80,530 80,480Q80,430 115,395Q150,360 200,360Q224,360 245,368.5Q266,377 282,392L563,228Q561,221 560.5,214.5Q560,208 560,200Q560,150 595,115Q630,80 680,80Q730,80 765,115Q800,150 800,200Q800,250 765,285Q730,320 680,320Q656,320 635,311.5Q614,303 598,288L317,452Q319,459 319.5,465.5Q320,472 320,480Q320,488 319.5,494.5Q319,501 317,508L598,672Q614,657 635,648.5Q656,640 680,640Q730,640 765,675Q800,710 800,760Q800,810 765,845Q730,880 680,880ZM680,800Q697,800 708.5,788.5Q720,777 720,760Q720,743 708.5,731.5Q697,720 680,720Q663,720 651.5,731.5Q640,743 640,760Q640,777 651.5,788.5Q663,800 680,800ZM200,520Q217,520 228.5,508.5Q240,497 240,480Q240,463 228.5,451.5Q217,440 200,440Q183,440 171.5,451.5Q160,463 160,480Q160,497 171.5,508.5Q183,520 200,520ZM680,240Q697,240 708.5,228.5Q720,217 720,200Q720,183 708.5,171.5Q697,160 680,160Q663,160 651.5,171.5Q640,183 640,200Q640,217 651.5,228.5Q663,240 680,240ZM680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760Q680,760 680,760ZM200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480Q200,480 200,480ZM680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Q680,200 680,200Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_thumb_down_s.xml b/app/src/main/res/drawable/ic_thumb_down_s.xml
new file mode 100644
index 00000000..aa4228fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_down_s.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:strokeColor="#222"
+      android:strokeWidth="20"
+      android:pathData="M240,120L680,120L680,640L400,920L350,870Q343,863 338.5,851Q334,839 334,828L334,814L378,640L120,640Q88,640 64,616Q40,592 40,560L40,480Q40,473 42,465Q44,457 46,450L166,168Q175,148 196,134Q217,120 240,120ZM600,200L240,200Q240,200 240,200Q240,200 240,200L120,480L120,560Q120,560 120,560Q120,560 120,560L480,560L426,780L600,606L600,200ZM600,606L600,606L600,560L600,560Q600,560 600,560Q600,560 600,560L600,480L600,200Q600,200 600,200Q600,200 600,200L600,200L600,606ZM680,640L680,560L800,560L800,200L680,200L680,120L880,120L880,640L680,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_thumb_down_s_filled.xml b/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
new file mode 100644
index 00000000..96f55911
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,120L640,120L640,640L360,920L310,870Q303,863 298.5,851Q294,839 294,828L294,814L338,640L120,640Q88,640 64,616Q40,592 40,560L40,480Q40,473 41.5,465Q43,457 46,450L166,168Q175,148 196,134Q217,120 240,120ZM720,640L720,120L880,120L880,640L720,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_thumb_up_s.xml b/app/src/main/res/drawable/ic_thumb_up_s.xml
new file mode 100644
index 00000000..2a0d62e9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_up_s.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="@android:color/white"
+      android:strokeColor="#222"
+      android:strokeWidth="20"
+      android:pathData="M720,840L280,840L280,320L560,40L610,90Q617,97 621.5,109Q626,121 626,132L626,146L582,320L840,320Q872,320 896,344Q920,368 920,400L920,480Q920,487 918,495Q916,503 914,510L794,792Q785,812 764,826Q743,840 720,840ZM360,760L720,760Q720,760 720,760Q720,760 720,760L840,480L840,400Q840,400 840,400Q840,400 840,400L480,400L534,180L360,354L360,760ZM360,354L360,354L360,400L360,400Q360,400 360,400Q360,400 360,400L360,480L360,760Q360,760 360,760Q360,760 360,760L360,760L360,354ZM280,320L280,400L160,400L160,760L280,760L280,840L80,840L80,320L280,320Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_thumb_up_s_filled.xml b/app/src/main/res/drawable/ic_thumb_up_s_filled.xml
new file mode 100644
index 00000000..a029aca4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_thumb_up_s_filled.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M720,840L320,840L320,320L600,40L650,90Q657,97 661.5,109Q666,121 666,132L666,146L622,320L840,320Q872,320 896,344Q920,368 920,400L920,480Q920,487 918.5,495Q917,503 914,510L794,792Q785,812 764,826Q743,840 720,840ZM240,320L240,840L80,840L80,320L240,320Z"/>
+</vector>
diff --git a/app/src/main/res/layout/view_short_overlay.xml b/app/src/main/res/layout/view_short_overlay.xml
index b55e49e0..3d961c6b 100644
--- a/app/src/main/res/layout/view_short_overlay.xml
+++ b/app/src/main/res/layout/view_short_overlay.xml
@@ -129,6 +129,19 @@
                 android:text=""
                 android:textColor="@android:color/white"
                 android:textSize="14sp" />
+            <TextView
+                android:id="@+id/video_subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="4dp"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:paddingHorizontal="4dp"
+                android:shadowColor="@android:color/black"
+                android:shadowRadius="8"
+                android:text=""
+                android:textColor="#CCC"
+                android:textSize="14sp" />
         </LinearLayout>
 
         <!-- Buttons section -->
@@ -143,341 +156,88 @@
             app:layout_constraintEnd_toEndOf="parent">
 
             <!-- Like button -->
-            <FrameLayout
-                android:id="@+id/like_container"
+            <com.futo.platformplayer.views.buttons.ShortsButton
+                android:id="@+id/like_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="12dp"
-                android:visibility="gone">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/button_shadow"
-                        app:layout_constraintBottom_toBottomOf="@id/like_button"
-                        app:layout_constraintEnd_toEndOf="@id/like_button"
-                        app:layout_constraintStart_toStartOf="@id/like_button"
-                        app:layout_constraintTop_toTopOf="@id/like_button"
-                        app:tint="@color/black"
-                        tools:ignore="ImageContrastCheck" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/like_button"
-                        style="@style/Widget.Material3.Button.IconButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:checkable="true"
-                        android:contentDescription="@string/cd_image_like_icon"
-                        app:backgroundTint="@color/transparent"
-                        app:icon="@drawable/thumb_up_selector"
-                        app:iconSize="24dp"
-                        app:iconTint="@android:color/white"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rippleColor="@color/ripple"
-                        app:toggleCheckedStateOnClick="false" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <TextView
-                    android:id="@+id/like_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:paddingHorizontal="4dp"
-                    android:shadowColor="@android:color/black"
-                    android:shadowRadius="8"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp" />
-            </FrameLayout>
+                android:layout_marginBottom="10dp"
+                android:checkable="true"
+                android:contentDescription="@string/cd_image_like_icon"
+                app:backgroundTint="@color/transparent"
+                app:buttonIcon_s="@drawable/ic_thumb_up_s"
+                app:iconSize="24dp"
+                app:iconTint="@android:color/white"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:rippleColor="@color/ripple"
+                app:toggleCheckedStateOnClick="false" />
 
             <!-- Dislike button -->
-            <FrameLayout
-                android:id="@+id/dislike_container"
+            <com.futo.platformplayer.views.buttons.ShortsButton
+                android:id="@+id/dislike_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="12dp"
-                android:visibility="gone">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/button_shadow"
-                        app:layout_constraintBottom_toBottomOf="@id/dislike_button"
-                        app:layout_constraintEnd_toEndOf="@id/dislike_button"
-                        app:layout_constraintStart_toStartOf="@id/dislike_button"
-                        app:layout_constraintTop_toTopOf="@id/dislike_button"
-                        app:tint="@color/black"
-                        tools:ignore="ImageContrastCheck" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/dislike_button"
-                        style="@style/Widget.Material3.Button.IconButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:checkable="true"
-                        android:contentDescription="@string/cd_image_dislike_icon"
-                        app:backgroundTint="@color/transparent"
-                        app:icon="@drawable/thumb_down_selector"
-                        app:iconSize="24dp"
-                        app:iconTint="@android:color/white"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rippleColor="@color/ripple"
-                        app:toggleCheckedStateOnClick="false" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <TextView
-                    android:id="@+id/dislike_count"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:paddingHorizontal="4dp"
-                    android:shadowColor="@android:color/black"
-                    android:shadowRadius="8"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp" />
-            </FrameLayout>
+                android:layout_marginBottom="20dp"
+                android:checkable="true"
+                android:contentDescription="@string/cd_image_dislike_icon"
+                app:backgroundTint="@color/transparent"
+                app:buttonIcon_s="@drawable/ic_thumb_down_s"
+                app:iconSize="24dp"
+                app:iconTint="@android:color/white"
+                app:rippleColor="@color/ripple"
+                app:toggleCheckedStateOnClick="false" />
 
             <!-- Comments button -->
-            <FrameLayout
+            <com.futo.platformplayer.views.buttons.ShortsButton
+                android:id="@+id/comments_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="12dp">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/button_shadow"
-                        app:layout_constraintBottom_toBottomOf="@id/comments_button"
-                        app:layout_constraintEnd_toEndOf="@id/comments_button"
-                        app:layout_constraintStart_toStartOf="@id/comments_button"
-                        app:layout_constraintTop_toTopOf="@id/comments_button"
-                        app:tint="@color/black"
-                        tools:ignore="ImageContrastCheck" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/comments_button"
-                        style="@style/Widget.Material3.Button.IconButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/comments"
-                        app:icon="@drawable/desktop_comments"
-                        app:iconSize="24dp"
-                        app:iconTint="@android:color/white"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rippleColor="@color/ripple" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:importantForAccessibility="no"
-                    android:paddingHorizontal="4dp"
-                    android:shadowColor="@android:color/black"
-                    android:shadowRadius="8"
-                    android:text="@string/comments"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp"
-                    tools:ignore="TextContrastCheck" />
-            </FrameLayout>
+                android:layout_marginBottom="20dp"
+                android:contentDescription="@string/comments"
+                app:buttonIcon_s="@drawable/ic_comment_s"
+                app:buttonText_s=""
+                app:iconSize="24dp"
+                app:iconTint="@android:color/white"
+                app:rippleColor="@color/ripple" />
 
             <!-- Share button -->
-            <FrameLayout
+            <com.futo.platformplayer.views.buttons.ShortsButton
+                android:id="@+id/share_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="12dp">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/button_shadow"
-                        app:layout_constraintBottom_toBottomOf="@id/share_button"
-                        app:layout_constraintEnd_toEndOf="@id/share_button"
-                        app:layout_constraintStart_toStartOf="@id/share_button"
-                        app:layout_constraintTop_toTopOf="@id/share_button"
-                        app:tint="@color/black"
-                        tools:ignore="ImageContrastCheck" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/share_button"
-                        style="@style/Widget.Material3.Button.IconButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/share"
-                        app:icon="@drawable/desktop_share"
-                        app:iconSize="24dp"
-                        app:iconTint="@android:color/white"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rippleColor="@color/ripple" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:importantForAccessibility="no"
-                    android:paddingHorizontal="4dp"
-                    android:shadowColor="@android:color/black"
-                    android:shadowRadius="8"
-                    android:text="@string/share"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp"
-                    tools:ignore="TextContrastCheck" />
-            </FrameLayout>
+                android:layout_marginBottom="20dp"
+                android:contentDescription="@string/share"
+                app:buttonIcon_s="@drawable/ic_share_s"
+                app:iconSize="24dp"
+                app:iconTint="@android:color/white"
+                app:rippleColor="@color/ripple" />
 
             <!-- Refresh button -->
-            <FrameLayout
-                android:id="@+id/refresh_button_container"
+            <com.futo.platformplayer.views.buttons.ShortsButton
+                android:id="@+id/refresh_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="12dp">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/button_shadow"
-                        app:layout_constraintBottom_toBottomOf="@id/refresh_button"
-                        app:layout_constraintEnd_toEndOf="@id/refresh_button"
-                        app:layout_constraintStart_toStartOf="@id/refresh_button"
-                        app:layout_constraintTop_toTopOf="@id/refresh_button"
-                        app:tint="@color/black"
-                        tools:ignore="ImageContrastCheck" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/refresh_button"
-                        style="@style/Widget.Material3.Button.IconButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/refresh"
-                        app:icon="@drawable/desktop_refresh"
-                        app:iconSize="24dp"
-                        app:iconTint="@android:color/white"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rippleColor="@color/ripple" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:importantForAccessibility="no"
-                    android:paddingHorizontal="4dp"
-                    android:shadowColor="@android:color/black"
-                    android:shadowRadius="8"
-                    android:text="@string/refresh"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp"
-                    tools:ignore="TextContrastCheck" />
-            </FrameLayout>
+                android:layout_marginBottom="20dp"
+                android:contentDescription="@string/refresh"
+                app:buttonIcon_s="@drawable/ic_refresh"
+                app:iconSize="24dp"
+                app:iconTint="@android:color/white"
+                app:rippleColor="@color/ripple" />
 
             <!-- Quality/More button -->
-            <FrameLayout
+            <com.futo.platformplayer.views.buttons.ShortsButton
+                android:id="@+id/quality_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal">
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal">
-
-                    <ImageView
-                        android:layout_width="0dp"
-                        android:layout_height="0dp"
-                        android:importantForAccessibility="no"
-                        android:src="@drawable/button_shadow"
-                        app:layout_constraintBottom_toBottomOf="@id/quality_button"
-                        app:layout_constraintEnd_toEndOf="@id/quality_button"
-                        app:layout_constraintStart_toStartOf="@id/quality_button"
-                        app:layout_constraintTop_toTopOf="@id/quality_button"
-                        app:tint="@color/black"
-                        tools:ignore="ImageContrastCheck" />
-
-                    <com.google.android.material.button.MaterialButton
-                        android:id="@+id/quality_button"
-                        style="@style/Widget.Material3.Button.IconButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
-                        android:contentDescription="@string/quality"
-                        app:icon="@drawable/desktop_gear"
-                        app:iconSize="24dp"
-                        app:iconTint="@android:color/white"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:rippleColor="@color/ripple" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:importantForAccessibility="no"
-                    android:paddingHorizontal="4dp"
-                    android:shadowColor="@android:color/black"
-                    android:shadowRadius="8"
-                    android:text="@string/quality"
-                    android:textColor="@android:color/white"
-                    android:textSize="12sp"
-                    tools:ignore="TextContrastCheck" />
-            </FrameLayout>
+                android:layout_marginBottom="10dp"
+                android:contentDescription="@string/quality"
+                app:buttonIcon_s="@drawable/ic_settings_s"
+                app:iconSize="24dp"
+                app:iconTint="@android:color/white"
+                app:rippleColor="@color/ripple" />
         </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/view_short_player.xml b/app/src/main/res/layout/view_short_player.xml
index c067de8c..ca3f7c70 100644
--- a/app/src/main/res/layout/view_short_player.xml
+++ b/app/src/main/res/layout/view_short_player.xml
@@ -9,7 +9,7 @@
         android:layout_above="@+id/short_player_progress_bar"
         android:background="@color/black"
         app:default_artwork="@drawable/placeholder_video_thumbnail"
-        app:resize_mode="fit"
+        app:resize_mode="fill"
         app:show_buffering="when_playing"
         app:use_artwork="true"
         app:use_controller="false" />
@@ -17,9 +17,9 @@
     <androidx.media3.ui.DefaultTimeBar
         android:id="@+id/short_player_progress_bar"
         android:layout_width="match_parent"
-        android:layout_height="6dp"
+        android:layout_height="3dp"
         android:layout_alignParentBottom="true"
-        app:bar_height="6dp"
+        app:bar_height="3dp"
         app:buffered_color="#DDEEEEEE"
         app:played_color="@color/colorPrimary"
         app:scrubber_disabled_size="0dp"
diff --git a/app/src/main/res/layout/view_shorts_button.xml b/app/src/main/res/layout/view_shorts_button.xml
new file mode 100644
index 00000000..252f9705
--- /dev/null
+++ b/app/src/main/res/layout/view_shorts_button.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dp"
+    android:orientation="vertical"
+    android:background="@color/transparent"
+    android:id="@+id/root"
+    android:paddingTop="3dp"
+    android:paddingLeft="10dp"
+    android:paddingRight="10dp">
+    <ImageView
+        android:id="@+id/image_icon"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:src="@drawable/ic_qr" />
+    <TextView
+        android:id="@+id/text_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textSize="14dp"
+        android:autoSizeTextType="uniform"
+        android:fontFamily="@font/inter_light"
+        android:textColor="@color/white"
+        android:textAlignment="center"
+        android:maxLines="1"
+        android:text="" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/shorts_button_attrs.xml b/app/src/main/res/values/shorts_button_attrs.xml
new file mode 100644
index 00000000..de2738e0
--- /dev/null
+++ b/app/src/main/res/values/shorts_button_attrs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="ShortsButton">
+        <attr name="buttonIcon_s" format="reference" />
+        <attr name="buttonText_s" format="string" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/stable/assets/sources/apple-podcasts b/app/src/stable/assets/sources/apple-podcasts
index 089987f0..8cff240c 160000
--- a/app/src/stable/assets/sources/apple-podcasts
+++ b/app/src/stable/assets/sources/apple-podcasts
@@ -1 +1 @@
-Subproject commit 089987f007319cf22972090a0cb09afd8c008adb
+Subproject commit 8cff240ca7e9089ab26c03f78b6104d9cc2162fe
diff --git a/app/src/stable/assets/sources/kick b/app/src/stable/assets/sources/kick
index b7173f15..4ff0b027 160000
--- a/app/src/stable/assets/sources/kick
+++ b/app/src/stable/assets/sources/kick
@@ -1 +1 @@
-Subproject commit b7173f1538a8259ace0c606dfc3441426a659536
+Subproject commit 4ff0b02700fb5d52fe5bf4cf9bb379d21f6b6853
diff --git a/app/src/stable/assets/sources/peertube b/app/src/stable/assets/sources/peertube
index 56bff391..21dcf4be 160000
--- a/app/src/stable/assets/sources/peertube
+++ b/app/src/stable/assets/sources/peertube
@@ -1 +1 @@
-Subproject commit 56bff391239e676e7d347ad3730df17795938a7b
+Subproject commit 21dcf4bef5847898752a7856b1208456a3031b6d
diff --git a/app/src/stable/assets/sources/rumble b/app/src/stable/assets/sources/rumble
index 401274b1..3368dfaa 160000
--- a/app/src/stable/assets/sources/rumble
+++ b/app/src/stable/assets/sources/rumble
@@ -1 +1 @@
-Subproject commit 401274b1ec2806b3a61f877080ff023b4bf5dc0d
+Subproject commit 3368dfaa2ccaaa060cbbc0e91c86200e4d927b6e
diff --git a/app/src/stable/assets/sources/spotify b/app/src/stable/assets/sources/spotify
index 8c0f03f5..207738f5 160000
--- a/app/src/stable/assets/sources/spotify
+++ b/app/src/stable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 8c0f03f5fbc9b4e499437b85c757ec40cb7c0126
+Subproject commit 207738f5997f52219c150d2122bd068c6aed2970
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 2b724f21..95c60c2d 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 2b724f21a727c3fefe16adb38f06aa8730b1b8ec
+Subproject commit 95c60c2dc6aad556bb6fcc1e55795a412ac96340
diff --git a/app/src/unstable/assets/sources/apple-podcasts b/app/src/unstable/assets/sources/apple-podcasts
index 089987f0..8cff240c 160000
--- a/app/src/unstable/assets/sources/apple-podcasts
+++ b/app/src/unstable/assets/sources/apple-podcasts
@@ -1 +1 @@
-Subproject commit 089987f007319cf22972090a0cb09afd8c008adb
+Subproject commit 8cff240ca7e9089ab26c03f78b6104d9cc2162fe
diff --git a/app/src/unstable/assets/sources/kick b/app/src/unstable/assets/sources/kick
index b7173f15..4ff0b027 160000
--- a/app/src/unstable/assets/sources/kick
+++ b/app/src/unstable/assets/sources/kick
@@ -1 +1 @@
-Subproject commit b7173f1538a8259ace0c606dfc3441426a659536
+Subproject commit 4ff0b02700fb5d52fe5bf4cf9bb379d21f6b6853
diff --git a/app/src/unstable/assets/sources/peertube b/app/src/unstable/assets/sources/peertube
index 56bff391..21dcf4be 160000
--- a/app/src/unstable/assets/sources/peertube
+++ b/app/src/unstable/assets/sources/peertube
@@ -1 +1 @@
-Subproject commit 56bff391239e676e7d347ad3730df17795938a7b
+Subproject commit 21dcf4bef5847898752a7856b1208456a3031b6d
diff --git a/app/src/unstable/assets/sources/rumble b/app/src/unstable/assets/sources/rumble
index 401274b1..3368dfaa 160000
--- a/app/src/unstable/assets/sources/rumble
+++ b/app/src/unstable/assets/sources/rumble
@@ -1 +1 @@
-Subproject commit 401274b1ec2806b3a61f877080ff023b4bf5dc0d
+Subproject commit 3368dfaa2ccaaa060cbbc0e91c86200e4d927b6e
diff --git a/app/src/unstable/assets/sources/spotify b/app/src/unstable/assets/sources/spotify
index 8c0f03f5..207738f5 160000
--- a/app/src/unstable/assets/sources/spotify
+++ b/app/src/unstable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 8c0f03f5fbc9b4e499437b85c757ec40cb7c0126
+Subproject commit 207738f5997f52219c150d2122bd068c6aed2970
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 2b724f21..95c60c2d 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 2b724f21a727c3fefe16adb38f06aa8730b1b8ec
+Subproject commit 95c60c2dc6aad556bb6fcc1e55795a412ac96340

From dc76934d0eb93fdb6d3e0d4b8788c275c56b965a Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Tue, 12 Aug 2025 17:05:54 +0200
Subject: [PATCH 12/46] Add explicit long type for dash dwonload length

---
 .../java/com/futo/platformplayer/downloads/VideoDownload.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt b/app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt
index 23ace157..2d0bc47b 100644
--- a/app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt
+++ b/app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt
@@ -719,7 +719,7 @@ class VideoDownload {
 
             Logger.i(TAG, "Download $name Dash, CueCount: " + foundCues.count().toString());
 
-            var written = 0;
+            var written: Long = 0;
             var indexCounter = 0;
             onProgress(foundCues.count().toLong(), 0, 0);
             for(cue in foundCues) {
@@ -744,7 +744,7 @@ class VideoDownload {
 
                 indexCounter++;
             }
-            sourceLength = written.toLong();
+            sourceLength = written;
 
             Logger.i(TAG, "$name downloadSource Finished");
         }

From 3909343adcc0fff648addf542e4b127284151092 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Wed, 13 Aug 2025 00:23:54 +0200
Subject: [PATCH 13/46] Pre-generate support shorts, subtitle size, short
 like/dislike color

---
 .../java/com/futo/platformplayer/Settings.kt  |  5 +++++
 .../sources/JSDashManifestRawAudioSource.kt   | 13 ++++++++++++
 .../models/sources/JSDashManifestRawSource.kt | 12 +++++++++++
 .../fragment/mainactivity/main/ShortView.kt   | 21 +++++++++++++++++++
 .../views/video/FutoShortPlayer.kt            |  3 +++
 .../res/drawable/ic_thumb_down_s_filled.xml   |  2 +-
 .../res/drawable/ic_thumb_up_s_filled.xml     |  5 ++---
 app/src/main/res/values/strings.xml           |  2 ++
 8 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index da414d8f..360a281c 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -603,6 +603,11 @@ class Settings : FragmentedStorageFileJson() {
                 else -> 2.0
             }
         }
+
+
+        @AdvancedField
+        @FormField(R.string.shorts_pregenerate, FieldForm.TOGGLE, R.string.shorts_pregenerate_description, 28)
+        var shortsPregenerate: Boolean = false;
     }
 
     @FormField(R.string.comments, "group", R.string.comments_description, 6)
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt
index 7b6388cd..f376ee6e 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawAudioSource.kt
@@ -17,6 +17,7 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.invokeV8Async
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.others.Language
 import com.futo.platformplayer.states.StateDeveloper
 import kotlinx.coroutines.CompletableDeferred
@@ -57,12 +58,24 @@ class JSDashManifestRawAudioSource : JSSource, IAudioSource, IJSDashManifestRawS
         hasGenerate = _obj.has("generate");
     }
 
+    private var _pregenerate: V8Deferred<String?>? = null;
+    fun pregenerateAsync(scope: CoroutineScope): V8Deferred<String?>? {
+        _pregenerate = generateAsync(scope);
+        return _pregenerate;
+    }
+
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
         if(!hasGenerate)
             return V8Deferred(CompletableDeferred(manifest));
         if(_obj.isClosed)
             throw IllegalStateException("Source object already closed");
 
+        val pregenerated = _pregenerate;
+        if(pregenerated != null) {
+            Logger.w("JSDashManifestRawAudioSource", "Returning pre-generated audio");
+            return pregenerated;
+        }
+
         val plugin = _plugin.getUnderlyingPlugin();
 
         var result: V8Deferred<V8ValueString>? = null;
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawSource.kt
index aebaab23..9345b174 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawSource.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/models/sources/JSDashManifestRawSource.kt
@@ -18,6 +18,7 @@ import com.futo.platformplayer.getOrNull
 import com.futo.platformplayer.getOrThrow
 import com.futo.platformplayer.invokeV8
 import com.futo.platformplayer.invokeV8Async
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateDeveloper
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
@@ -65,11 +66,22 @@ open class JSDashManifestRawSource: JSSource, IVideoSource, IJSDashManifestRawSo
         hasGenerate = _obj.has("generate");
     }
 
+    private var _pregenerate: V8Deferred<String?>? = null;
+    fun pregenerateAsync(scope: CoroutineScope): V8Deferred<String?>? {
+        _pregenerate = generateAsync(scope);
+        return _pregenerate;
+    }
+
     override fun generateAsync(scope: CoroutineScope): V8Deferred<String?> {
         if(!hasGenerate)
             return V8Deferred(CompletableDeferred(manifest));
         if(_obj.isClosed)
             throw IllegalStateException("Source object already closed");
+        val pregenerated = _pregenerate;
+        if(pregenerated != null) {
+            Logger.w("JSDashManifestRawSource", "Returning pre-generated video");
+            return pregenerated;
+        }
 
         val plugin = _plugin.getUnderlyingPlugin();
 
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
index 2ec3d993..7078fd5d 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/ShortView.kt
@@ -35,6 +35,8 @@ import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource
 import com.futo.platformplayer.api.media.models.video.IPlatformVideo
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawAudioSource
+import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event3
@@ -66,6 +68,8 @@ import com.futo.platformplayer.views.pills.OnLikeDislikeUpdatedArgs
 import com.futo.platformplayer.views.platform.PlatformIndicator
 import com.futo.platformplayer.views.video.FutoShortPlayer
 import com.futo.platformplayer.views.video.FutoVideoPlayerBase
+import com.futo.platformplayer.views.video.FutoVideoPlayerBase.Companion.PREFERED_AUDIO_CONTAINERS
+import com.futo.platformplayer.views.video.FutoVideoPlayerBase.Companion.PREFERED_VIDEO_CONTAINERS
 import com.futo.polycentric.core.ApiMethods
 import com.futo.polycentric.core.ContentType
 import com.futo.polycentric.core.Models
@@ -742,6 +746,23 @@ class ShortView : FrameLayout {
                 videoDetails = result
                 video = result
 
+                if(Settings.instance.playback.shortsPregenerate)
+                    fragment.lifecycleScope.launch(Dispatchers.IO) {
+                        if(result != null) {
+                            val prefVid = VideoHelper.selectBestVideoSource(result.video, Settings.instance.playback.getCurrentPreferredQualityPixelCount(), PREFERED_VIDEO_CONTAINERS);
+                            val prefAud = VideoHelper.selectBestAudioSource(result.video, PREFERED_AUDIO_CONTAINERS, Settings.instance.playback.getPrimaryLanguage(context));
+
+                            if(prefVid != null && prefVid is JSDashManifestRawSource) {
+                                Logger.i(TAG, "Shorts pregenerating video (${result.name})");
+                                prefVid.pregenerateAsync(fragment.lifecycleScope);
+                            }
+                            if(prefAud != null && prefAud is JSDashManifestRawAudioSource) {
+                                Logger.i(TAG, "Shorts pregenerating audio (${result.name})");
+                                prefAud.pregenerateAsync(fragment.lifecycleScope);
+                            }
+                        }
+                    }
+
                 bottomSheet.video = result
 
                 setLoading(false)
diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt
index cb5f1240..0b74781d 100644
--- a/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.animation.LinearInterpolator
+import androidx.annotation.Dimension
 import androidx.annotation.OptIn
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.common.Player
@@ -65,6 +66,8 @@ class FutoShortPlayer(context: Context, attrs: AttributeSet? = null) :
         videoView = findViewById(R.id.short_player_view)
         progressBar = findViewById(R.id.short_player_progress_bar)
 
+        videoView.subtitleView?.setFixedTextSize(Dimension.SP, 18F);
+
         if (!isInEditMode) {
             player = StatePlayer.instance.getShortPlayerOrCreate(context)
             player.player.repeatMode = Player.REPEAT_MODE_ONE
diff --git a/app/src/main/res/drawable/ic_thumb_down_s_filled.xml b/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
index 96f55911..6dbc120c 100644
--- a/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
+++ b/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/colorPrimary"
       android:pathData="M240,120L640,120L640,640L360,920L310,870Q303,863 298.5,851Q294,839 294,828L294,814L338,640L120,640Q88,640 64,616Q40,592 40,560L40,480Q40,473 41.5,465Q43,457 46,450L166,168Q175,148 196,134Q217,120 240,120ZM720,640L720,120L880,120L880,640L720,640Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_thumb_up_s_filled.xml b/app/src/main/res/drawable/ic_thumb_up_s_filled.xml
index a029aca4..ba1ac372 100644
--- a/app/src/main/res/drawable/ic_thumb_up_s_filled.xml
+++ b/app/src/main/res/drawable/ic_thumb_up_s_filled.xml
@@ -2,9 +2,8 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/colorPrimary"
       android:pathData="M720,840L320,840L320,320L600,40L650,90Q657,97 661.5,109Q666,121 666,132L666,146L622,320L840,320Q872,320 896,344Q920,368 920,400L920,480Q920,487 918.5,495Q917,503 914,510L794,792Q785,812 764,826Q743,840 720,840ZM240,320L240,840L80,840L80,320L240,320Z"/>
 </vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5ddeef06..6a7a30a3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -435,6 +435,8 @@
     <string name="allow_full_screen_portrait">Allow full-screen portrait when watching horizontal videos</string>
     <string name="delete_watchlist_on_finish">Delete from WatchLater when watched</string>
     <string name="delete_watchlist_on_finish_description">After you leave a video that you mostly watched, it will be removed from watch later.</string>
+    <string name="shorts_pregenerate">Pre-generate shorts sources</string>
+    <string name="shorts_pregenerate_description">Generates short sources (when applicable) one video ahead</string>
     <string name="seek_offset">Seek duration</string>
     <string name="min_playback_speed">Minimum Playback Speed</string>
     <string name="min_playback_speed_description">Minimum Available Speed</string>

From e080702a52f9d8b311dc2a9bc54227efb68c5064 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Wed, 13 Aug 2025 17:56:27 +0200
Subject: [PATCH 14/46] Fix dislike color

---
 app/src/main/res/drawable/ic_thumb_down_s_filled.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/res/drawable/ic_thumb_down_s_filled.xml b/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
index 6dbc120c..d3e4bcde 100644
--- a/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
+++ b/app/src/main/res/drawable/ic_thumb_down_s_filled.xml
@@ -2,8 +2,7 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
+    android:viewportHeight="960">
   <path
       android:fillColor="@color/colorPrimary"
       android:pathData="M240,120L640,120L640,640L360,920L310,870Q303,863 298.5,851Q294,839 294,828L294,814L338,640L120,640Q88,640 64,616Q40,592 40,560L40,480Q40,473 41.5,465Q43,457 46,450L166,168Q175,148 196,134Q217,120 240,120ZM720,640L720,120L880,120L880,640L720,640Z"/>

From 5247997ea554b0620ef54d5552e57111279e8b77 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Wed, 13 Aug 2025 19:36:26 +0200
Subject: [PATCH 15/46] Set plugin install request timeouts, fix messaging
 surrounding downloading icons

---
 .../java/com/futo/platformplayer/states/StatePlugins.kt    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
index cbb7b4d4..7e1f8ba4 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
@@ -475,6 +475,7 @@ class StatePlugins {
                 delay(500);
 
                 val client = ManagedHttpClient();
+                client.setTimeout(10000);
                 try {
                     withContext(Dispatchers.Main) {
                         onProgress.invoke("Validating script", 0.25);
@@ -489,14 +490,14 @@ class StatePlugins {
                     }
 
                     val icon = config.absoluteIconUrl?.let { absIconUrl ->
-                        withContext(Dispatchers.Main) {
-                            onProgress.invoke("Saving plugin", 0.75);
-                        }
                         val iconResp = client.get(absIconUrl);
                         if (iconResp.isOk)
                             return@let iconResp.body?.byteStream()?.use { it.readBytes() };
                         return@let null;
                     }
+                    withContext(Dispatchers.Main) {
+                        onProgress.invoke("Saving plugin", 0.75);
+                    }
                     val installEx = StatePlugins.instance.createPlugin(config, script, icon, true);
                     if (installEx != null)
                         throw installEx;

From a0f4cc760c80358d4254122e65e4b8614ce56041 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 14 Aug 2025 12:35:46 +0200
Subject: [PATCH 16/46] Fix background play, disable artwork on background till
 improved, renamed variable that caused confusion

---
 .../mainactivity/main/VideoDetailFragment.kt  |  6 ++--
 .../mainactivity/main/VideoDetailView.kt      | 31 +++++++++----------
 .../views/video/FutoVideoPlayer.kt            |  6 +++-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt
index 304f52b2..af228bf7 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailFragment.kt
@@ -437,7 +437,7 @@ class VideoDetailFragment() : MainFragment() {
 
     fun onUserLeaveHint() {
         val viewDetail = _viewDetail;
-        Logger.i(TAG, "onUserLeaveHint preventPictureInPicture=${viewDetail?.preventPictureInPicture} isCasting=${StateCasting.instance.isCasting} isBackgroundPictureInPicture=${Settings.instance.playback.isBackgroundPictureInPicture()} allowBackground=${viewDetail?.allowBackground}");
+        Logger.i(TAG, "onUserLeaveHint preventPictureInPicture=${viewDetail?.preventPictureInPicture} isCasting=${StateCasting.instance.isCasting} isBackgroundPictureInPicture=${Settings.instance.playback.isBackgroundPictureInPicture()} allowBackground=${viewDetail?.isAudioOnlyUserAction}");
 
         if (viewDetail === null) {
             return
@@ -446,7 +446,7 @@ class VideoDetailFragment() : MainFragment() {
         if (viewDetail.shouldEnterPictureInPicture) {
             _leavingPiP = false
         }
-        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && Settings.instance.playback.isBackgroundPictureInPicture() && !viewDetail.allowBackground) {
+        if(Build.VERSION.SDK_INT < Build.VERSION_CODES.S && viewDetail.preventPictureInPicture == false && !StateCasting.instance.isCasting && Settings.instance.playback.isBackgroundPictureInPicture() && !viewDetail.isAudioOnlyUserAction) {
             val params = _viewDetail?.getPictureInPictureParams();
             if(params != null) {
                 Logger.i(TAG, "enterPictureInPictureMode")
@@ -526,7 +526,7 @@ class VideoDetailFragment() : MainFragment() {
 
     private fun stopIfRequired() {
         var shouldStop = true;
-        if (_viewDetail?.allowBackground == true) {
+        if (_viewDetail?.isAudioOnlyUserAction == true) {
             shouldStop = false;
         } else if (Settings.instance.playback.isBackgroundPictureInPicture() && !_leavingPiP) {
             shouldStop = false;
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 5382ef13..09e7b20d 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -10,7 +10,6 @@ import android.content.Intent
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.graphics.Bitmap
-import android.graphics.Rect
 import android.graphics.drawable.Animatable
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
@@ -51,7 +50,6 @@ import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.UISlideOverlays
 import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.activities.SyncShowPairingCodeActivity.Companion.activity
 import com.futo.platformplayer.api.media.IPluginSourced
 import com.futo.platformplayer.api.media.LiveChatManager
 import com.futo.platformplayer.api.media.PlatformID
@@ -82,7 +80,6 @@ import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
 import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo
 import com.futo.platformplayer.api.media.platforms.js.JSClient
 import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
-import com.futo.platformplayer.api.media.platforms.js.models.JSVideo
 import com.futo.platformplayer.api.media.platforms.js.models.JSVideoDetails
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.structures.IPager
@@ -326,7 +323,7 @@ class VideoDetailView : ConstraintLayout {
     val onEnterPictureInPicture = Event0();
     val onVideoChanged = Event2<Int, Int>()
 
-    var allowBackground: Boolean = false
+    var isAudioOnlyUserAction: Boolean = false
         private set(value) {
             if (field != value) {
                 field = value
@@ -338,7 +335,7 @@ class VideoDetailView : ConstraintLayout {
         get() = !preventPictureInPicture &&
                 !StateCasting.instance.isCasting &&
                 Settings.instance.playback.isBackgroundPictureInPicture() &&
-                !allowBackground &&
+                !isAudioOnlyUserAction &&
                 isPlaying
 
     val onShouldEnterPictureInPictureChanged = Event0();
@@ -764,7 +761,7 @@ class VideoDetailView : ConstraintLayout {
         MediaControlReceiver.onBackgroundReceived.subscribe(this) {
             Logger.i(TAG, "MediaControlReceiver.onBackgroundReceived")
             _player.switchToAudioMode(video);
-            allowBackground = true;
+            isAudioOnlyUserAction = true;
             StateApp.instance.contextOrNull?.let {
                 try {
                     if (it is MainActivity) {
@@ -1009,14 +1006,14 @@ class VideoDetailView : ConstraintLayout {
                     }
                     _slideUpOverlay?.hide();
                 } else null,
-            if (!isLimitedVersion) RoundButton(context, R.drawable.ic_screen_share, if (allowBackground) context.getString(R.string.background_revert) else context.getString(R.string.background), TAG_BACKGROUND) {
-                if (!allowBackground) {
+            if (!isLimitedVersion) RoundButton(context, R.drawable.ic_screen_share, if (isAudioOnlyUserAction) context.getString(R.string.background_revert) else context.getString(R.string.background), TAG_BACKGROUND) {
+                if (!isAudioOnlyUserAction) {
                     _player.switchToAudioMode(video);
-                    allowBackground = true;
+                    isAudioOnlyUserAction = true;
                     it.text.text = resources.getString(R.string.background_revert);
                 } else {
                     _player.switchToVideoMode();
-                    allowBackground = false;
+                    isAudioOnlyUserAction = false;
                     it.text.text = resources.getString(R.string.background);
                 }
                 _slideUpOverlay?.hide();
@@ -1156,11 +1153,14 @@ class VideoDetailView : ConstraintLayout {
 
         if(_player.isAudioMode) {
             //Requested behavior to leave it in audio mode. leaving it commented if it causes issues, revert?
-            if(!allowBackground) {
+            if(!isAudioOnlyUserAction) {
                 _player.switchToVideoMode();
-                allowBackground = false;
+                isAudioOnlyUserAction = false;
                 _buttonPins.getButtonByTag(TAG_BACKGROUND)?.text?.text = resources.getString(R.string.background);
             }
+            else {
+                _buttonPins.getButtonByTag(TAG_BACKGROUND)?.text?.text = resources.getString(R.string.video);
+            }
         }
         if(!_player.isFitMode && !_player.isFullScreen && !fragment.isInPictureInPicture)
             _player.fitHeight();
@@ -1176,7 +1176,7 @@ class VideoDetailView : ConstraintLayout {
         if(StateCasting.instance.isCasting)
             return;
 
-        if(allowBackground)
+        if(isAudioOnlyUserAction)
             StatePlayer.instance.startOrUpdateMediaSession(context, video);
         else {
             when (Settings.instance.playback.backgroundPlay) {
@@ -1184,7 +1184,6 @@ class VideoDetailView : ConstraintLayout {
                 1 -> {
                     if(!(video?.isLive ?: false)) {
                         _player.switchToAudioMode(video);
-                        allowBackground = true;
                     }
                     StatePlayer.instance.startOrUpdateMediaSession(context, video);
                 }
@@ -1971,10 +1970,10 @@ class VideoDetailView : ConstraintLayout {
 
                 if (isLimitedVersion && _player.isAudioMode) {
                     _player.switchToVideoMode()
-                    allowBackground = false;
+                    isAudioOnlyUserAction = false;
                 } else {
                     val thumbnail = video.thumbnails.getHQThumbnail();
-                    if ((videoSource == null || _player.isAudioMode) && !thumbnail.isNullOrBlank())
+                    if ((videoSource == null) && !thumbnail.isNullOrBlank()) // || _player.isAudioMode
                         Glide.with(context).asBitmap().load(thumbnail)
                             .into(object: CustomTarget<Bitmap>() {
                                 override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
index f6432752..c71b8239 100644
--- a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayer.kt
@@ -907,11 +907,14 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
 
     override fun switchToVideoMode() {
         super.switchToVideoMode()
-        setArtwork(null)
+        //setArtwork(null)
     }
 
     override fun switchToAudioMode(video: IPlatformVideoDetails?) {
         super.switchToAudioMode(video)
+
+        //This causes issues, and is in general confusing, needs improvements
+        /*
         val thumbnail = video?.thumbnails?.getHQThumbnail()
         if (!thumbnail.isNullOrBlank()) {
             Glide.with(context).asBitmap().load(thumbnail)
@@ -928,5 +931,6 @@ class FutoVideoPlayer : FutoVideoPlayerBase {
                     }
                 })
         }
+        */
     }
 }
\ No newline at end of file

From 8569eaa5db9936470732e5965ae95469763dfa67 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 14 Aug 2025 20:36:56 +0200
Subject: [PATCH 17/46] Hide DevSubmit filter

---
 .../futo/platformplayer/engine/packages/PackageBridge.kt    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt b/app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt
index db44c1fc..038c734d 100644
--- a/app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt
+++ b/app/src/main/java/com/futo/platformplayer/engine/packages/PackageBridge.kt
@@ -194,7 +194,11 @@ class PackageBridge : V8Package {
 
         val stackTrace = Thread.currentThread().stackTrace;
         val callerMethod = stackTrace.findLast {
-            it.className == JSClient::class.java.name
+            it.className == JSClient::class.java.name &&
+                    it.methodName != "isBusy" &&
+                    it.methodName != "busy" &&
+                    it.methodName != "getCopy" &&
+                    it.methodName != "isBusyWith"
         }?.methodName ?: "";
         val session = StateApp.instance.sessionId;
         val pluginId = _plugin.config.id;

From 17027ba364e98ef21c65c7872cb105a953eacbf8 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 14 Aug 2025 21:03:39 +0200
Subject: [PATCH 18/46] Remote history sync on toggle

---
 .../mainactivity/main/SourceDetailFragment.kt | 42 ++++++++++++++++++-
 .../platformplayer/states/StateHistory.kt     |  9 ++--
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt
index 5c2a8085..0452395f 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/SourceDetailFragment.kt
@@ -25,6 +25,7 @@ import com.futo.platformplayer.api.media.platforms.js.SourcePluginConfig
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.states.StateDeveloper
+import com.futo.platformplayer.states.StateHistory
 import com.futo.platformplayer.states.StatePlatform
 import com.futo.platformplayer.states.StatePlugins
 import com.futo.platformplayer.views.buttons.BigButton
@@ -152,11 +153,50 @@ class SourceDetailFragment : MainFragment() {
                                 if(field is View)
                                     field.isVisible = false;
                             }
-                            if(!source.capabilities.hasGetUserHistory) {
+                            if(!source.capabilities.hasGetUserHistory || !source.isLoggedIn) {
                                 val field = _settingsAppForm.findField("sync");
                                 if(field is View)
                                     field.isVisible = false;
                             }
+                            else {
+                                val field = _settingsAppForm.findField("syncHistory");
+                                field?.onChanged?.subscribe { field, new, old ->
+                                    if(old != new && new == true && StatePlatform.instance.isClientEnabled(config.id)) {
+                                        UIDialogs.showDialog(context, R.drawable.ic_sources, "Would you like to sync now?",
+                                            "This will attempt to update your history from the platform, when this setting is enabled, it is done during startup.", null, 0,
+                                            UIDialogs.Action("No", {
+
+                                            }),
+                                            UIDialogs.Action("Yes", {
+                                                UIDialogs.showDialogProgress(context, {
+                                                    it.setText("Importing history..");
+                                                    fragment.lifecycleScope.launch(Dispatchers.IO) {
+                                                        try {
+                                                            val client = StatePlatform.instance.getClient(config.id);
+                                                            if (client != null && client is JSClient) {
+                                                                val count = StateHistory.instance.syncRemoteHistory(client);
+                                                                withContext(Dispatchers.Main) {
+                                                                    it.hide();
+                                                                    if(count > 0)
+                                                                        UIDialogs.showDialogOk(context, R.drawable.ic_pair_success, "Imported ${count} history items");
+                                                                    else
+                                                                        UIDialogs.showDialogOk(context, R.drawable.ic_help, "Imported no history items");
+                                                                }
+
+                                                            }
+                                                        }
+                                                        catch(ex: Throwable) {
+                                                            withContext(Dispatchers.Main) {
+                                                                UIDialogs.appToast("Sync History failed due to:\n" + ex.message);
+                                                                it.hide();
+                                                            }
+                                                        }
+                                                    }
+                                                });
+                                            }, UIDialogs.ActionStyle.PRIMARY));
+                                    }
+                                }
+                            }
                             _settingsAppForm.onChanged.clear();
                             _settingsAppForm.onChanged.subscribe { field, value ->
                                 _settingsAppChanged = true;
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateHistory.kt b/app/src/main/java/com/futo/platformplayer/states/StateHistory.kt
index f3bcca55..26fc3170 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StateHistory.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StateHistory.kt
@@ -194,17 +194,18 @@ class StateHistory {
         _remoteHistoryDatesStore.save();
     }
 
-    fun syncRemoteHistory(plugin: JSClient) {
+    fun syncRemoteHistory(plugin: JSClient): Int {
         if (plugin.capabilities.hasGetUserHistory &&
             plugin.isLoggedIn) {
             Logger.i(TAG, "Syncing remote history for plugin [${plugin.name}]");
 
             val hist = StatePlatform.instance.getUserHistory(plugin.id);
 
-            syncRemoteHistory(plugin.id, hist, 100, 3);
+            return syncRemoteHistory(plugin.id, hist, 100, 3);
         }
+        return 0;
     }
-    fun syncRemoteHistory(pluginId: String, videos: IPager<IPlatformContent>, maxVideos: Int, maxPages: Int) {
+    fun syncRemoteHistory(pluginId: String, videos: IPager<IPlatformContent>, maxVideos: Int, maxPages: Int): Int {
         val lastDate = _remoteHistoryDatesStore.get(pluginId) ?: OffsetDateTime.MIN;
         val maxVideosCount = if(maxVideos <= 0) 500 else maxVideos;
         val maxPageCount = if(maxPages <= 0) 3 else maxPages;
@@ -272,12 +273,14 @@ class StateHistory {
                     }
                     catch(ex: Throwable){}
                 }
+                return updated;
             }
         }
         catch(ex: Throwable) {
             val plugin = if(pluginId != StateDeveloper.DEV_ID) StatePlugins.instance.getPlugin(pluginId) else null;
             Logger.e(TAG, "Sync Remote History failed for [${plugin?.config?.name}] due to: " + ex.message)
         }
+        return 0;
     }
 
     companion object {

From 91060faac91f92b90e4dbd3e92c95a58e882a83b Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Fri, 15 Aug 2025 16:36:38 +0200
Subject: [PATCH 19/46] VOD chat

---
 .../fragment/mainactivity/main/VideoDetailView.kt   | 13 +++++++++++++
 app/src/main/res/values/strings.xml                 |  1 +
 2 files changed, 14 insertions(+)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index e9765a3b..3d6a29e4 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -1006,6 +1006,18 @@ class VideoDetailView : ConstraintLayout {
                     }
                     _slideUpOverlay?.hide();
                 } else null,
+            if(video is JSVideoDetails && (video as JSVideoDetails).hasVODEvents())
+                RoundButton(context, R.drawable.ic_chat, context.getString(R.string.vod_chat), TAG_VODCHAT) {
+                    video?.let {
+                        try {
+                            loadVODChat(it);
+                        }
+                        catch(ex: Throwable) {
+                            Logger.e(TAG, "Failed to reopen vod chat", ex);
+                        }
+                    }
+                    _slideUpOverlay?.hide();
+                } else null,
             if (!isLimitedVersion) RoundButton(context, R.drawable.ic_screen_share, if (isAudioOnlyUserAction) context.getString(R.string.background_revert) else context.getString(R.string.background), TAG_BACKGROUND) {
                 if (!isAudioOnlyUserAction) {
                     _player.switchToAudioMode(video);
@@ -3443,6 +3455,7 @@ class VideoDetailView : ConstraintLayout {
         const val TAG_SHARE = "share";
         const val TAG_OVERLAY = "overlay";
         const val TAG_LIVECHAT = "livechat";
+        const val TAG_VODCHAT = "vodchat";
         const val TAG_CHAPTERS = "chapters";
         const val TAG_OPEN = "open";
         const val TAG_SEND_TO_DEVICE = "send_to_device";
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a7a30a3..f387e1f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -247,6 +247,7 @@
     <string name="membership">Membership</string>
     <string name="store">Store</string>
     <string name="live_chat">Live Chat</string>
+    <string name="vod_chat">VOD Chat</string>
     <string name="remove">Remove</string>
     <string name="space_videos">Videos</string>
     <string name="playlist">Playlist</string>

From 1edc8aabf808fadfa141969bdec3f8999358ab93 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Fri, 15 Aug 2025 21:20:23 +0200
Subject: [PATCH 20/46] Fix login dialog

---
 .../fragment/mainactivity/main/VideoDetailView.kt | 15 ++++++++++++---
 .../futo/platformplayer/states/StatePlugins.kt    |  5 +++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 3d6a29e4..006da03a 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -1141,10 +1141,14 @@ class VideoDetailView : ConstraintLayout {
 
 
     //Lifecycle
+    var isLoginStop = false; //TODO: This is a bit jank, but easiest solution for now without reworking flow. (Alternatively, fix MainActivity getting stopped/disposing video)
     fun onResume() {
         Logger.v(TAG, "onResume");
         _onPauseCalled = false;
 
+        val wasLoginCall = isLoginStop;
+        isLoginStop = false;
+
         Logger.i(TAG, "_video: ${video?.name ?: "no video"}");
         Logger.i(TAG, "_didStop: $_didStop");
 
@@ -1153,7 +1157,7 @@ class VideoDetailView : ConstraintLayout {
             val t = (lastPositionMilliseconds / 1000.0f).roundToLong();
             if(_searchVideo != null)
                 setVideoOverview(_searchVideo!!, true, t);
-            else if(_url != null)
+            else if(_url != null && !wasLoginCall)
                 setVideo(_url!!, t, _playWhenReady);
         }
         else if(_didStop) {
@@ -3276,8 +3280,13 @@ class VideoDetailView : ConstraintLayout {
                     val id = e.config.let { if(it is SourcePluginConfig) it.id else null };
                     val didLogin = if(id == null)
                         false
-                    else StatePlugins.instance.loginPlugin(context, id) {
-                        fetchVideo();
+                    else {
+                        isLoginStop = true;
+                        StatePlugins.instance.loginPlugin(context, id) {
+                            fragment.lifecycleScope.launch(Dispatchers.Main) {
+                                fetchVideo();
+                            }
+                        }
                     }
                     if(!didLogin)
                         UIDialogs.showDialogOk(context, R.drawable.ic_error_pred, "Failed to login");
diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
index 7e1f8ba4..e80a2df3 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
@@ -179,8 +179,9 @@ class StatePlugins {
             }
 
             StateApp.instance.scope.launch(Dispatchers.IO) {
-                StatePlatform.instance.reloadClient(context, id);
-                afterLogin.invoke();
+                StatePlatform.instance.reloadClient(context, id) {
+                    afterLogin.invoke();
+                }
             }
         };
         return true;

From ca3454afbea966babf19bfb333766a66468361c1 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 18 Aug 2025 19:35:12 +0200
Subject: [PATCH 21/46] Login warning fixes, uimod (disabled)

---
 .../activities/LoginActivity.kt               | 37 ++++++++++++++++++-
 .../platforms/js/SourcePluginAuthConfig.kt    | 20 +++++++++-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
index 1dc4376e..f072c549 100644
--- a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
+++ b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
@@ -76,6 +76,10 @@ class LoginActivity : AppCompatActivity() {
         };
         var isFirstLoad = true;
         val loginWarnings = authConfig.loginWarnings?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.Warning>();
+        val uiMods = authConfig.uiMods?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.UIMod>();
+        var currentScale = 100;
+        var currentDesktop = false;
+        _webView.setInitialScale(50);
         webViewClient.onPageLoaded.subscribe { view, url ->
             _textUrl.setText(url ?: "");
 
@@ -89,9 +93,9 @@ class LoginActivity : AppCompatActivity() {
                 view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
             }
 
-            if(loginWarnings.size > 0) {
+            if(loginWarnings.size > 0 && url != null) {
                 synchronized(loginWarnings) {
-                    val warning = loginWarnings.find { it.url.matches(it.getRegex()) };
+                    val warning = loginWarnings.find { url.matches(it.getRegex()) };
                     if(warning != null) {
                         if(warning.once == true)
                             loginWarnings.remove(warning);
@@ -101,6 +105,35 @@ class LoginActivity : AppCompatActivity() {
                     }
                 }
             }
+
+            /*
+            var specifiedScale = false;
+            var specifiedDesktop = false;
+            if(uiMods.size > 0 && url != null) {
+                synchronized(uiMods) {
+                    val uimod = uiMods.find { url.matches(it.getRegex()) };
+                    if(uimod != null) {
+                        if(uimod.scale != null) {
+                            currentScale =(uimod.scale * 100).toInt();
+                            _webView.setInitialScale(currentScale);
+                            specifiedScale = true;
+                        }
+                        if(uimod.desktop != null && uimod.desktop) {
+                            _webView.settings.useWideViewPort = true;
+                            specifiedDesktop = true;
+                        }
+                    }
+                }
+            }
+            if(!specifiedScale && currentScale != 100) {
+                currentScale = (100).toInt();
+                _webView.setInitialScale(currentScale);
+            }
+            if(!specifiedDesktop && currentDesktop) {
+                _webView.settings.useWideViewPort = false;
+                currentDesktop = false;
+            }
+            */
         }
         _webView.settings.domStorageEnabled = true;
 
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt
index 8821c79e..4a05a720 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/js/SourcePluginAuthConfig.kt
@@ -16,7 +16,8 @@ class SourcePluginAuthConfig(
     val loginButton: String? = null,
     val domainHeadersToFind: Map<String, List<String>>? = null,
     val loginWarning: String? = null,
-    val loginWarnings: List<Warning>? = null
+    val loginWarnings: List<Warning>? = null,
+    val uiMods: List<UIMod>? = null
 ) {
 
     @Serializable
@@ -29,6 +30,23 @@ class SourcePluginAuthConfig(
         @Contextual
         private var _regex: Regex? = null;
 
+        fun getRegex(): Regex {
+            return _regex ?: url.let {
+                val reg = Regex(it);
+                _regex = reg;
+                return reg;
+            }
+        }
+    }
+    @Serializable
+    class UIMod(
+        val url: String,
+        val scale: Float?,
+        val desktop: Boolean?
+    ) {
+        @Contextual
+        private var _regex: Regex? = null;
+
         fun getRegex(): Regex {
             return _regex ?: url.let {
                 val reg = Regex(it);

From 43ec7e821b1a063d13100f0c0c403877ccb936e6 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 18 Aug 2025 21:31:49 +0200
Subject: [PATCH 22/46] Refs

---
 app/src/stable/assets/sources/bilibili   | 2 +-
 app/src/stable/assets/sources/spotify    | 2 +-
 app/src/stable/assets/sources/youtube    | 2 +-
 app/src/unstable/assets/sources/bilibili | 2 +-
 app/src/unstable/assets/sources/spotify  | 2 +-
 app/src/unstable/assets/sources/youtube  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/stable/assets/sources/bilibili b/app/src/stable/assets/sources/bilibili
index 12226380..0fc4e8fb 160000
--- a/app/src/stable/assets/sources/bilibili
+++ b/app/src/stable/assets/sources/bilibili
@@ -1 +1 @@
-Subproject commit 12226380428664a1de75abd2886ae12e00ec691f
+Subproject commit 0fc4e8fbbf86eb1e53d17b40d2a0ac5f28a69905
diff --git a/app/src/stable/assets/sources/spotify b/app/src/stable/assets/sources/spotify
index 207738f5..092faa64 160000
--- a/app/src/stable/assets/sources/spotify
+++ b/app/src/stable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 207738f5997f52219c150d2122bd068c6aed2970
+Subproject commit 092faa64d59105284745d88e69017f9a3e27f01d
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 95c60c2d..bd6fbe8d 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 95c60c2dc6aad556bb6fcc1e55795a412ac96340
+Subproject commit bd6fbe8d4994013515a530570d7346635f8613c6
diff --git a/app/src/unstable/assets/sources/bilibili b/app/src/unstable/assets/sources/bilibili
index 12226380..0fc4e8fb 160000
--- a/app/src/unstable/assets/sources/bilibili
+++ b/app/src/unstable/assets/sources/bilibili
@@ -1 +1 @@
-Subproject commit 12226380428664a1de75abd2886ae12e00ec691f
+Subproject commit 0fc4e8fbbf86eb1e53d17b40d2a0ac5f28a69905
diff --git a/app/src/unstable/assets/sources/spotify b/app/src/unstable/assets/sources/spotify
index 207738f5..092faa64 160000
--- a/app/src/unstable/assets/sources/spotify
+++ b/app/src/unstable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 207738f5997f52219c150d2122bd068c6aed2970
+Subproject commit 092faa64d59105284745d88e69017f9a3e27f01d
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 95c60c2d..bd6fbe8d 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 95c60c2dc6aad556bb6fcc1e55795a412ac96340
+Subproject commit bd6fbe8d4994013515a530570d7346635f8613c6

From 9481bbf3f14e8f084ba38e4d37d4ce918edb9ef9 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Tue, 19 Aug 2025 16:42:17 +0200
Subject: [PATCH 23/46] Vod chat button fix, default settings in devportal

---
 app/src/main/assets/devportal/index.html      | 24 +++++++++++++++++--
 .../mainactivity/main/VideoDetailView.kt      |  3 +--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/src/main/assets/devportal/index.html b/app/src/main/assets/devportal/index.html
index 9ae84f5a..47bf94c7 100644
--- a/app/src/main/assets/devportal/index.html
+++ b/app/src/main/assets/devportal/index.html
@@ -1022,15 +1022,35 @@
 					return x.value
 				});
 
+
+				let settingsToUse = __DEV_SETTINGS ?? {};
+				if (true) {
+					for (let setting of this.Plugin?.currentPlugin?.settings) {
+						if (typeof settingsToUse[setting.variable] == "undefined") {
+							switch (setting?.type?.toLowerCase()) {
+								case "boolean":
+									settingsToUse[setting.variable] = setting.default === 'true';
+									break;
+								case "dropdown":
+									let dropDownIndex = parseInt(setting.default);
+									if (dropDownIndex) {
+										settingsToUse[setting.variable] = setting.options[dropDownIndex];
+									}
+									break;
+							}
+						}
+					}
+				}
+
 				if(name == "enable") {
 					if(parameterVals.length > 0)
 						parameterVals[0] = this.Plugin.currentPlugin;
 					else
 						parameterVals.push(this.Plugin.currentPlugin);
 					if(parameterVals.length > 1)
-						parameterVals[1] = __DEV_SETTINGS;
+						parameterVals[1] = settingsToUse;
 					else
-						parameterVals.push(__DEV_SETTINGS);
+						parameterVals.push(settingsToUse);
 				}
 
 				const func = source[name];
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 006da03a..bc5b9a49 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -1005,8 +1005,7 @@ class VideoDetailView : ConstraintLayout {
                         }
                     }
                     _slideUpOverlay?.hide();
-                } else null,
-            if(video is JSVideoDetails && (video as JSVideoDetails).hasVODEvents())
+                } else if(video is JSVideoDetails && (video as JSVideoDetails).hasVODEvents())
                 RoundButton(context, R.drawable.ic_chat, context.getString(R.string.vod_chat), TAG_VODCHAT) {
                     video?.let {
                         try {

From b7c123c281f8166131728e4dcaedd4e46470bac4 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Tue, 19 Aug 2025 16:45:57 +0200
Subject: [PATCH 24/46] Refs

---
 app/src/stable/assets/sources/spotify   | 2 +-
 app/src/stable/assets/sources/youtube   | 2 +-
 app/src/unstable/assets/sources/spotify | 2 +-
 app/src/unstable/assets/sources/youtube | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/stable/assets/sources/spotify b/app/src/stable/assets/sources/spotify
index 092faa64..0b50c2e6 160000
--- a/app/src/stable/assets/sources/spotify
+++ b/app/src/stable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 092faa64d59105284745d88e69017f9a3e27f01d
+Subproject commit 0b50c2e61b6b497f2633e866370daf5cfc51f351
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index bd6fbe8d..91d3b683 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit bd6fbe8d4994013515a530570d7346635f8613c6
+Subproject commit 91d3b68324b27a996f08deadfe961e3935344ef8
diff --git a/app/src/unstable/assets/sources/spotify b/app/src/unstable/assets/sources/spotify
index 092faa64..0b50c2e6 160000
--- a/app/src/unstable/assets/sources/spotify
+++ b/app/src/unstable/assets/sources/spotify
@@ -1 +1 @@
-Subproject commit 092faa64d59105284745d88e69017f9a3e27f01d
+Subproject commit 0b50c2e61b6b497f2633e866370daf5cfc51f351
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index bd6fbe8d..91d3b683 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit bd6fbe8d4994013515a530570d7346635f8613c6
+Subproject commit 91d3b68324b27a996f08deadfe961e3935344ef8

From 66f87110552d773dda6e21c5c4f5654797161dae Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Tue, 19 Aug 2025 17:52:14 +0200
Subject: [PATCH 25/46] Fix login warnings working on redirects

---
 .../activities/LoginActivity.kt               | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
index f072c549..80062a24 100644
--- a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
+++ b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt
@@ -79,20 +79,9 @@ class LoginActivity : AppCompatActivity() {
         val uiMods = authConfig.uiMods?.toMutableList() ?: mutableListOf<SourcePluginAuthConfig.UIMod>();
         var currentScale = 100;
         var currentDesktop = false;
-        _webView.setInitialScale(50);
         webViewClient.onPageLoaded.subscribe { view, url ->
             _textUrl.setText(url ?: "");
 
-            if(!isFirstLoad)
-                return@subscribe;
-            isFirstLoad = false;
-
-            if(!authConfig.loginButton.isNullOrEmpty() && authConfig.loginButton.matches(REGEX_LOGIN_BUTTON)) {
-                Logger.i(TAG, "Clicking login button [${authConfig.loginButton}]");
-                //TODO: Find most reliable way to wait for page js to finish
-                view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
-            }
-
             if(loginWarnings.size > 0 && url != null) {
                 synchronized(loginWarnings) {
                     val warning = loginWarnings.find { url.matches(it.getRegex()) };
@@ -106,6 +95,16 @@ class LoginActivity : AppCompatActivity() {
                 }
             }
 
+            if(!isFirstLoad)
+                return@subscribe;
+            isFirstLoad = false;
+
+            if(!authConfig.loginButton.isNullOrEmpty() && authConfig.loginButton.matches(REGEX_LOGIN_BUTTON)) {
+                Logger.i(TAG, "Clicking login button [${authConfig.loginButton}]");
+                //TODO: Find most reliable way to wait for page js to finish
+                view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {});
+            }
+
             /*
             var specifiedScale = false;
             var specifiedDesktop = false;

From b1fce443e978011f30f941c9720f86e9480456f4 Mon Sep 17 00:00:00 2001
From: Kai <git@seaoflaurels.com>
Date: Wed, 20 Aug 2025 08:39:12 -0400
Subject: [PATCH 26/46] fix pause and play buttons not working correctly in PiP

Changelog: changed
---
 .../fragment/mainactivity/main/VideoDetailView.kt               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index bc5b9a49..2b4abede 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -2517,6 +2517,7 @@ class VideoDetailView : ConstraintLayout {
         if (!StateCasting.instance.resumeVideo()) {
             _player.play();
         }
+        onShouldEnterPictureInPictureChanged.emit()
 
         //TODO: This was needed because handleLowerVolume was done.
         //_player.setVolume(1.0f);
@@ -2533,6 +2534,7 @@ class VideoDetailView : ConstraintLayout {
         if (!StateCasting.instance.pauseVideo()) {
             _player.pause();
         }
+        onShouldEnterPictureInPictureChanged.emit()
     }
     private fun handleSeek(ms: Long) {
         Logger.i(TAG, "handleSeek(ms=$ms)")

From ad97b5a406dc9b719dad1ee9eb1e2967bdc50cca Mon Sep 17 00:00:00 2001
From: zvonimir <zvonimir@futo.org>
Date: Thu, 21 Aug 2025 17:59:08 +0200
Subject: [PATCH 27/46] fix: login prompt looping on search video

---
 .../fragment/mainactivity/main/VideoDetailView.kt               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 2b4abede..0818f9ed 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -1154,7 +1154,7 @@ class VideoDetailView : ConstraintLayout {
         //Recover cancelled loads
         if(video == null) {
             val t = (lastPositionMilliseconds / 1000.0f).roundToLong();
-            if(_searchVideo != null)
+            if(_searchVideo != null && !wasLoginCall)
                 setVideoOverview(_searchVideo!!, true, t);
             else if(_url != null && !wasLoginCall)
                 setVideo(_url!!, t, _playWhenReady);

From 40c4a51a2bced82fa85d97ceddbbb623563f6e3e Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 21 Aug 2025 20:41:18 +0200
Subject: [PATCH 28/46] Dialog input support, configurable relay server, radio
 views select/deselect all long press

---
 .../java/com/futo/platformplayer/Settings.kt  | 33 ++++++++++++++
 .../java/com/futo/platformplayer/UIDialogs.kt | 43 ++++++++++++++++---
 .../futo/platformplayer/states/StateSync.kt   |  5 ++-
 .../views/others/RadioGroupView.kt            | 23 ++++++++++
 .../platformplayer/views/others/RadioView.kt  |  8 ++++
 .../main/res/layout/dialog_multi_button.xml   | 10 +++++
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 117 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index 360a281c..8779a7fd 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -25,6 +25,7 @@ import com.futo.platformplayer.states.StateCache
 import com.futo.platformplayer.states.StateMeta
 import com.futo.platformplayer.states.StatePayment
 import com.futo.platformplayer.states.StatePolycentric
+import com.futo.platformplayer.states.StateSync
 import com.futo.platformplayer.states.StateUpdate
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.stores.FragmentedStorageFileJson
@@ -1092,6 +1093,38 @@ class Settings : FragmentedStorageFileJson() {
 
         @FormField(R.string.local_connections, FieldForm.TOGGLE, R.string.local_connections_description, 3)
         var localConnections: Boolean = true;
+
+
+
+        var syncServerUrl: String? = null;
+        @FormField(R.string.payment_status, FieldForm.READONLYTEXT, -1, 6)
+        val syncServer: String get() = if(syncServerUrl?.isBlank() == true) StateSync.RELAY_SERVER else syncServerUrl ?: StateSync.RELAY_SERVER;
+
+        @FormField(R.string.configure_sync_server, FieldForm.BUTTON, R.string.configure_sync_server_description, 7)
+        fun configureSyncServer() {
+            SettingsActivity.getActivity()?.let { context ->
+                UIDialogs.showDialog(context, R.drawable.device_sync, false,
+                    "Enter the url to your relay server",
+                    "Using your own relay server requires a proper setup with portforwarding.\nUse at your own risk.",
+                    null,
+                    syncServerUrl ?: "",
+                    "YourRelayServerDomain.com", 0,
+                        UIDialogs.Action("Cancel", {}),
+                        UIDialogs.Action("Reset", {
+                            syncServerUrl = null;
+                            instance.save();
+                            context.reloadSettings();
+                            UIDialogs.toast("Sync server changes require a restart");
+                        }, UIDialogs.ActionStyle.ACCENT),
+                        UIDialogs.Action.withInput("Configure", {
+                            syncServerUrl = it?.text
+                            instance.save();
+                            context.reloadSettings();
+                            UIDialogs.toast("Sync server changes require a restart");
+                        }, UIDialogs.ActionStyle.PRIMARY),
+                    )
+            }
+        }
     }
 
     @FormField(R.string.info, FieldForm.GROUP, -1, 21)
diff --git a/app/src/main/java/com/futo/platformplayer/UIDialogs.kt b/app/src/main/java/com/futo/platformplayer/UIDialogs.kt
index 36755512..59917e75 100644
--- a/app/src/main/java/com/futo/platformplayer/UIDialogs.kt
+++ b/app/src/main/java/com/futo/platformplayer/UIDialogs.kt
@@ -113,8 +113,8 @@ class UIDialogs {
                 currentDialog.code,
                 currentDialog.defaultCloseAction,
                 *currentDialog.actions.map {
-                    return@map Action(it.text, {
-                        it.action();
+                    return@map Action.withInput(it.text, { str ->
+                        it.invokeAction(str);
                         multiShowDialog(context, dialogDescriptor.drop(1), finally);
                     }, it.style);
                 }.toTypedArray());
@@ -203,7 +203,9 @@ class UIDialogs {
         fun showDialog(context: Context, icon: Int, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
             return showDialog(context, icon, false, text, textDetails, code, defaultCloseAction, *actions);
         }
-        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
+        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, defaultCloseAction: Int, vararg actions: Action): AlertDialog
+            = showDialog(context, icon, animated, text, textDetails, code, null, null, defaultCloseAction, *actions);
+        fun showDialog(context: Context, icon: Int, animated: Boolean, text: String, textDetails: String? = null, code: String? = null, input: String?, placeholder: String?, defaultCloseAction: Int, vararg actions: Action): AlertDialog {
             val builder = AlertDialog.Builder(context);
             val view = LayoutInflater.from(context).inflate(R.layout.dialog_multi_button, null);
             builder.setView(view);
@@ -226,6 +228,16 @@ class UIDialogs {
                     this.text = textDetails;
                 }
             };
+            var inputView = view.findViewById<TextView>(R.id.dialog_text_input);
+            inputView.apply {
+                if (input == null && placeholder == null) this.visibility = View.GONE;
+                else {
+                    this.text = input ?: "";
+                    this.hint = placeholder ?: "";
+                    this.visibility = View.VISIBLE;
+                    this.textAlignment = View.TEXT_ALIGNMENT_VIEW_START
+                }
+            };
             view.findViewById<TextView>(R.id.dialog_text_code).apply {
                 if (code == null) this.visibility = View.GONE;
                 else {
@@ -250,7 +262,7 @@ class UIDialogs {
                     buttonView.textSize = 14f;
                     buttonView.typeface = resources.getFont(R.font.inter_regular);
                     buttonView.text = act.text;
-                    buttonView.setOnClickListener { act.action(); dialog.dismiss(); };
+                    buttonView.setOnClickListener { act.invokeAction(DialogResult(inputView?.text?.toString())); dialog.dismiss(); };
                     when(act.style) {
                         ActionStyle.PRIMARY -> buttonView.setBackgroundResource(R.drawable.background_button_primary);
                         ActionStyle.ACCENT -> buttonView.setBackgroundResource(R.drawable.background_button_accent);
@@ -275,7 +287,7 @@ class UIDialogs {
             };
             dialog.setOnCancelListener {
                 if(defaultCloseAction >= 0 && defaultCloseAction < actions.size)
-                    actions[defaultCloseAction].action();
+                    actions[defaultCloseAction].invokeAction(DialogResult(inputView?.text?.toString()));
             }
             dialog.setOnDismissListener {
                 registerDialogClosed(dialog);
@@ -535,17 +547,36 @@ class UIDialogs {
     }
     class Action {
         val text: String;
-        val action: ()->Unit;
+        val action: ((DialogResult?)->Unit);
         val style: ActionStyle;
         var center: Boolean;
 
         constructor(text: String, action: ()->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false) {
+            this.text = text;
+            this.action = { action() };
+            this.style = style;
+            this.center = center;
+        }
+        protected constructor(text: String, action: (DialogResult?)->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false) {
             this.text = text;
             this.action = action;
             this.style = style;
             this.center = center;
         }
+
+        fun invokeAction(input: DialogResult? = null) {
+            this.action(input);
+        }
+
+        companion object {
+            fun withInput(text: String, action: (DialogResult?)->Unit, style: ActionStyle = ActionStyle.NONE, center: Boolean = false): Action {
+                return Action(text, action, style, center);
+            }
+        }
     }
+    class DialogResult(
+      val text: String?
+    );
     enum class ActionStyle {
         NONE,
         PRIMARY,
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt
index 25cff055..8b620239 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StateSync.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StateSync.kt
@@ -57,9 +57,12 @@ class StateSync {
             return
         }
 
+        var relayServerUrl = Settings.instance.synchronization.syncServer;
+        Logger.i(TAG, "Relay used: ${relayServerUrl}");
+
         syncService = SyncService(
             SERVICE_NAME,
-            RELAY_SERVER,
+            relayServerUrl,
             RELAY_PUBLIC_KEY,
             APP_ID,
             StoreBasedSyncDatabaseProvider(),
diff --git a/app/src/main/java/com/futo/platformplayer/views/others/RadioGroupView.kt b/app/src/main/java/com/futo/platformplayer/views/others/RadioGroupView.kt
index 8c26d1e1..2004051e 100644
--- a/app/src/main/java/com/futo/platformplayer/views/others/RadioGroupView.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/others/RadioGroupView.kt
@@ -50,6 +50,29 @@ class RadioGroupView : FlexboxLayout {
             radioView.layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)
             radioView.setInfo(option.first, initiallySelectedOptions.contains(option.second));
             radioView.setPadding(_padding_px, _padding_px, _padding_px, _padding_px);
+            if(multiSelect)
+                radioView.onLongClick.subscribe {
+                    val selected = !radioView.selected;
+                    if (selected) {
+                        selectedOptions.clear();
+                        for(v in radioViews)
+                            v.setIsSelected(true);
+                        selectedOptions.addAll(options.map { it.second });
+                    } else {
+                        if(atLeastOne) {
+                            for(v in radioViews)
+                                v.setIsSelected(false);
+                            selectedOptions.clear();
+                            selectedOptions.add(option.second);
+                        }
+                        else {
+                            for(v in radioViews)
+                                v.setIsSelected(false);
+                            selectedOptions.clear();
+                        }
+                    }
+                    onSelectedChange.emit(selectedOptions);
+                }
             radioView.onClick.subscribe {
                 val selected = !radioView.selected;
                 if (selected) {
diff --git a/app/src/main/java/com/futo/platformplayer/views/others/RadioView.kt b/app/src/main/java/com/futo/platformplayer/views/others/RadioView.kt
index 13a865a2..40f36467 100644
--- a/app/src/main/java/com/futo/platformplayer/views/others/RadioView.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/others/RadioView.kt
@@ -20,6 +20,7 @@ class RadioView : LinearLayout {
 
     val selected get() = _selected;
     var onClick = Event0();
+    var onLongClick = Event0();
     var onSelectedChange = Event1<Boolean>();
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
@@ -32,6 +33,13 @@ class RadioView : LinearLayout {
                 setIsSelected(!_selected)
             }
         };
+        _root.setOnLongClickListener {
+            onLongClick.emit();
+            if (_handleClick) {
+                setIsSelected(!_selected)
+            }
+            return@setOnLongClickListener true;
+        }
 
         _root.setBackgroundResource(R.drawable.background_radio_unselected);
         _textTag.setTextColor(ContextCompat.getColor(context, R.color.gray_67));
diff --git a/app/src/main/res/layout/dialog_multi_button.xml b/app/src/main/res/layout/dialog_multi_button.xml
index 9410b23a..2cc40874 100644
--- a/app/src/main/res/layout/dialog_multi_button.xml
+++ b/app/src/main/res/layout/dialog_multi_button.xml
@@ -63,6 +63,16 @@
             android:layout_height="wrap_content"
             tools:ignore="HardcodedText" />
 
+        <EditText
+            android:id="@+id/dialog_text_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"
+            />
+
         <LinearLayout
             android:id="@+id/dialog_buttons"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f387e1f7..de730286 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -338,6 +338,8 @@
     <string name="test_background_worker">Test Background Worker</string>
     <string name="test_background_worker_description"></string>
     <string name="clear_payment">Clear Payment</string>
+    <string name="configure_sync_server">Configure Sync Server</string>
+    <string name="configure_sync_server_description">Allows you to change the Sync Server to a self-hosted one.</string>
     <string name="clears_cookies_when_you_log_out">Clears cookies when you log out</string>
     <string name="clears_in_app_browser_cookies">Clears in-app browser cookies</string>
     <string name="configure_browsing_behavior">Configure browsing behavior</string>

From 91a8996c110e086ad6944c5dced1c01dfd7f2114 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 21 Aug 2025 22:06:52 +0200
Subject: [PATCH 29/46] Shorts fix video size scaling for some aspect ratios,
 long press support for tags, home plugin filters now support long press to
 only select that one

---
 .../mainactivity/main/HomeFragment.kt         |  8 +++++
 .../futo/platformplayer/views/ToggleBar.kt    | 34 +++++++++++++++---
 .../views/others/ToggleTagView.kt             | 35 +++++++++++++++----
 app/src/main/res/layout/view_short_player.xml |  2 +-
 4 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt
index 988d7a3f..0b393a08 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HomeFragment.kt
@@ -279,6 +279,14 @@ class HomeFragment : MainFragment() {
                                     else {
                                         view.setToggle(!active);
                                     }
+                                }, { view, views, enabled ->
+                                    val toDisable = views.filter { it != view && it.tag == "plugins" };
+                                    if(!view.isActive)
+                                        view.handleClick();
+                                    for(tag in toDisable) {
+                                        if(tag.isActive)
+                                            tag.handleClick();
+                                    }
                                 }).withTag("plugins")
                             })
                     else listOf())
diff --git a/app/src/main/java/com/futo/platformplayer/views/ToggleBar.kt b/app/src/main/java/com/futo/platformplayer/views/ToggleBar.kt
index 4a545a26..647061a4 100644
--- a/app/src/main/java/com/futo/platformplayer/views/ToggleBar.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/ToggleBar.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import androidx.core.view.children
 import androidx.lifecycle.findViewTreeLifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
@@ -28,6 +29,8 @@ import kotlinx.coroutines.launch
 class ToggleBar : LinearLayout {
     private val _tagsContainer: LinearLayout;
 
+    private var allowLongPress: Boolean = false;
+
     override fun onAttachedToWindow() {
         super.onAttachedToWindow();
     }
@@ -48,12 +51,31 @@ class ToggleBar : LinearLayout {
         for(button in buttons) {
             _tagsContainer.addView(ToggleTagView(context).apply {
                 if(button.icon > 0)
-                    this.setInfo(button.icon, button.name, button.isActive, button.isButton);
+                    this.setInfo(button.icon, button.name, button.isActive, button.isButton, button.tag);
                 else if(button.iconVariable != null)
-                    this.setInfo(button.iconVariable, button.name, button.isActive, button.isButton);
+                    this.setInfo(button.iconVariable, button.name, button.isActive, button.isButton, button.tag);
                 else
-                    this.setInfo(button.name, button.isActive, button.isButton);
+                    this.setInfo(button.name, button.isActive, button.isButton, button.tag);
                 this.onClick.subscribe({ view, enabled -> button.action(view, enabled); });
+                if(allowLongPress) {
+                    this.onLongClick.subscribe({ view, enabled ->
+                        for (tagView in _tagsContainer.children.filter { it is ToggleTagView }) {
+                            if (tagView != view && tagView is ToggleTagView && !tagView.isButton) {
+                                if (enabled && !tagView.isActive) {
+                                    tagView.handleClick();
+                                } else if (!enabled && tagView.isActive) {
+                                    tagView.handleClick();
+                                }
+                            }
+                        }
+                    })
+                }
+                else if(button.actionLong != null) {
+                    this.onLongClick.subscribe({ view, enabled ->
+                        val tags = _tagsContainer.children.filter { it is ToggleTagView }.map { it as ToggleTagView }.toList();
+                        button.actionLong!!(view, tags, enabled);
+                    });
+                }
             });
         }
     }
@@ -63,16 +85,18 @@ class ToggleBar : LinearLayout {
         val icon: Int;
         val iconVariable: ImageVariable?;
         val action: (ToggleTagView, Boolean)->Unit;
+        val actionLong: ((ToggleTagView, List<ToggleTagView>, Boolean) -> Unit)?;
         val isActive: Boolean;
         var isButton: Boolean = false
             private set;
         var tag: String? = null;
 
-        constructor(name: String, icon: ImageVariable?, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
+        constructor(name: String, icon: ImageVariable?, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit, actionLong: ((ToggleTagView, List<ToggleTagView>, Boolean)->Unit)? = null) {
             this.name = name;
             this.icon = 0;
             this.iconVariable = icon;
             this.action = action;
+            this.actionLong = actionLong;
             this.isActive = isActive;
         }
         constructor(name: String, icon: Int, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
@@ -80,6 +104,7 @@ class ToggleBar : LinearLayout {
             this.icon = icon;
             this.iconVariable = null;
             this.action = action;
+            this.actionLong = null;
             this.isActive = isActive;
         }
         constructor(name: String, isActive: Boolean = false, action: (ToggleTagView, Boolean)->Unit) {
@@ -87,6 +112,7 @@ class ToggleBar : LinearLayout {
             this.icon = 0;
             this.iconVariable = null;
             this.action = action;
+            this.actionLong = null;
             this.isActive = isActive;
         }
 
diff --git a/app/src/main/java/com/futo/platformplayer/views/others/ToggleTagView.kt b/app/src/main/java/com/futo/platformplayer/views/others/ToggleTagView.kt
index 3ba65413..b7ce770c 100644
--- a/app/src/main/java/com/futo/platformplayer/views/others/ToggleTagView.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/others/ToggleTagView.kt
@@ -23,12 +23,16 @@ class ToggleTagView : LinearLayout {
     private var _text: String = "";
     private var _image: ImageView;
 
+    var tag: String? = null
+        private set;
+
     var isActive: Boolean = false
         private set;
     var isButton: Boolean = false
         private set;
 
     var onClick = Event2<ToggleTagView, Boolean>();
+    var onLongClick = Event2<ToggleTagView, Boolean>();
 
     constructor(context: Context, attrs: AttributeSet? = null) : super(context, attrs) {
         LayoutInflater.from(context).inflate(R.layout.view_toggle_tag, this, true);
@@ -36,10 +40,25 @@ class ToggleTagView : LinearLayout {
         _textTag = findViewById(R.id.text_tag);
         _image = findViewById(R.id.image_tag);
         _root.setOnClickListener {
-            if(!isButton)
-                setToggle(!isActive);
-            onClick.emit(this, isActive);
+            handleClick();
         }
+        _root.setOnLongClickListener {
+            if(onLongClick.hasListeners())
+                onLongClick.emit(this, isActive);
+            else {
+                if(!isButton) {
+                    setToggle(!isActive);
+                }
+                onClick.emit(this, isActive);
+            }
+            return@setOnLongClickListener true;
+        }
+    }
+
+    fun handleClick() {
+        if(!isButton)
+            setToggle(!isActive);
+        onClick.emit(this, isActive);
     }
 
     fun setToggle(isActive: Boolean) {
@@ -70,9 +89,10 @@ class ToggleTagView : LinearLayout {
             _image.visibility = View.VISIBLE;
         _textTag.visibility = if(!toggle.name.isNullOrEmpty()) View.VISIBLE else View.GONE;
         this.isButton = isButton;
+        tag = toggle.tag;
     }
 
-    fun setInfo(imageResource: Int, text: String, isActive: Boolean, isButton: Boolean = false) {
+    fun setInfo(imageResource: Int, text: String, isActive: Boolean, isButton: Boolean = false, tag: String? = null) {
         _text = text;
         _textTag.text = text;
         setToggle(isActive);
@@ -80,8 +100,9 @@ class ToggleTagView : LinearLayout {
         _image.visibility = View.VISIBLE;
         _textTag.visibility = if(!text.isNullOrEmpty()) View.VISIBLE else View.GONE;
         this.isButton = isButton;
+        this.tag = tag;
     }
-    fun setInfo(image: ImageVariable, text: String, isActive: Boolean, isButton: Boolean = false) {
+    fun setInfo(image: ImageVariable, text: String, isActive: Boolean, isButton: Boolean = false, tag: String? = null) {
         _text = text;
         _textTag.text = text;
         setToggle(isActive);
@@ -89,13 +110,15 @@ class ToggleTagView : LinearLayout {
         _image.visibility = View.VISIBLE;
         _textTag.visibility = if(!text.isNullOrEmpty()) View.VISIBLE else View.GONE;
         this.isButton = isButton;
+        this.tag = tag;
     }
-    fun setInfo(text: String, isActive: Boolean, isButton: Boolean = false) {
+    fun setInfo(text: String, isActive: Boolean, isButton: Boolean = false, tag: String? = null) {
         _image.visibility = View.GONE;
         _text = text;
         _textTag.text = text;
         _textTag.visibility = if(!text.isNullOrEmpty()) View.VISIBLE else View.GONE;
         setToggle(isActive);
         this.isButton = isButton;
+        this.tag = tag;
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_short_player.xml b/app/src/main/res/layout/view_short_player.xml
index ca3f7c70..a1815382 100644
--- a/app/src/main/res/layout/view_short_player.xml
+++ b/app/src/main/res/layout/view_short_player.xml
@@ -9,7 +9,7 @@
         android:layout_above="@+id/short_player_progress_bar"
         android:background="@color/black"
         app:default_artwork="@drawable/placeholder_video_thumbnail"
-        app:resize_mode="fill"
+        app:resize_mode="zoom"
         app:show_buffering="when_playing"
         app:use_artwork="true"
         app:use_controller="false" />

From ac05edca77b194005a52eb39af8e7cf2a49d8b46 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 21 Aug 2025 22:14:30 +0200
Subject: [PATCH 30/46] Setting to disable short filling

---
 app/src/main/java/com/futo/platformplayer/Settings.kt      | 6 ++++++
 .../com/futo/platformplayer/views/video/FutoShortPlayer.kt | 7 +++++++
 app/src/main/res/values/strings.xml                        | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index 8779a7fd..f66e493e 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -35,6 +35,7 @@ import com.futo.platformplayer.views.fields.DropdownFieldOptionsId
 import com.futo.platformplayer.views.fields.FieldForm
 import com.futo.platformplayer.views.fields.FormField
 import com.futo.platformplayer.views.fields.FormFieldButton
+import com.futo.platformplayer.views.fields.FormFieldWarning
 import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -609,6 +610,11 @@ class Settings : FragmentedStorageFileJson() {
         @AdvancedField
         @FormField(R.string.shorts_pregenerate, FieldForm.TOGGLE, R.string.shorts_pregenerate_description, 28)
         var shortsPregenerate: Boolean = false;
+
+        @AdvancedField
+        @FormField(R.string.shorts_fit_video, FieldForm.TOGGLE, R.string.shorts_fit_video_description, 29)
+        @FormFieldWarning(R.string.shorts_fit_video_warning)
+        var shortsFitVideo: Boolean = false;
     }
 
     @FormField(R.string.comments, "group", R.string.comments_description, 6)
diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt
index 0b74781d..322a080a 100644
--- a/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoShortPlayer.kt
@@ -11,10 +11,12 @@ import androidx.annotation.OptIn
 import androidx.media3.common.PlaybackParameters
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.ui.AspectRatioFrameLayout
 import androidx.media3.ui.DefaultTimeBar
 import androidx.media3.ui.PlayerView
 import androidx.media3.ui.TimeBar
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StatePlayer
@@ -66,6 +68,11 @@ class FutoShortPlayer(context: Context, attrs: AttributeSet? = null) :
         videoView = findViewById(R.id.short_player_view)
         progressBar = findViewById(R.id.short_player_progress_bar)
 
+        if(Settings.instance.playback.shortsFitVideo)
+            videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_FIT;
+        else
+            videoView.resizeMode = AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+
         videoView.subtitleView?.setFixedTextSize(Dimension.SP, 18F);
 
         if (!isInEditMode) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de730286..51d08ac4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -440,6 +440,9 @@
     <string name="delete_watchlist_on_finish_description">After you leave a video that you mostly watched, it will be removed from watch later.</string>
     <string name="shorts_pregenerate">Pre-generate shorts sources</string>
     <string name="shorts_pregenerate_description">Generates short sources (when applicable) one video ahead</string>
+    <string name="shorts_fit_video">Fit Shorts Video</string>
+    <string name="shorts_fit_video_description">Will scale the video to fit the view, instead of filling the view properly.</string>
+    <string name="shorts_fit_video_warning">This setting will require you to reboot Grayjay.</string>
     <string name="seek_offset">Seek duration</string>
     <string name="min_playback_speed">Minimum Playback Speed</string>
     <string name="min_playback_speed_description">Minimum Available Speed</string>

From 042966517313e2b5ee3a0274a8bf16f33a39937d Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 21 Aug 2025 22:18:00 +0200
Subject: [PATCH 31/46] Fix title for relay server

---
 app/src/main/java/com/futo/platformplayer/Settings.kt | 2 +-
 app/src/main/res/values/strings.xml                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index f66e493e..9f7a1b15 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -1103,7 +1103,7 @@ class Settings : FragmentedStorageFileJson() {
 
 
         var syncServerUrl: String? = null;
-        @FormField(R.string.payment_status, FieldForm.READONLYTEXT, -1, 6)
+        @FormField(R.string.relay_server, FieldForm.READONLYTEXT, -1, 6)
         val syncServer: String get() = if(syncServerUrl?.isBlank() == true) StateSync.RELAY_SERVER else syncServerUrl ?: StateSync.RELAY_SERVER;
 
         @FormField(R.string.configure_sync_server, FieldForm.BUTTON, R.string.configure_sync_server_description, 7)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51d08ac4..ace799c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,6 +478,7 @@
     <string name="number_of_concurrent_threads_to_multiply_download_speeds_from_throttled_sources">Number of concurrent threads to multiply download speeds from throttled sources</string>
     <string name="payment">Payment</string>
     <string name="payment_status">Payment Status</string>
+    <string name="relay_server">Sync Relay Server</string>
     <string name="bypass_rotation_prevention">Bypass Rotation Prevention</string>
     <string name="playlist_delete_confirmation">Playlist Delete Confirmation</string>
     <string name="playlist_delete_confirmation_description">Show confirmation dialog when deleting media from a playlist</string>

From 713d46c78164705d172718f65f6971a87ad9577f Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Thu, 21 Aug 2025 22:23:07 +0200
Subject: [PATCH 32/46] Refs

---
 app/src/stable/assets/sources/youtube   | 2 +-
 app/src/unstable/assets/sources/youtube | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 91d3b683..f370a886 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 91d3b68324b27a996f08deadfe961e3935344ef8
+Subproject commit f370a88604433d5caf22d7e4910e28bd6d861e97
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 91d3b683..f370a886 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 91d3b68324b27a996f08deadfe961e3935344ef8
+Subproject commit f370a88604433d5caf22d7e4910e28bd6d861e97

From 2ca2a9db239193fef9270ebcf810461b6ddda0fa Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Sun, 24 Aug 2025 19:35:15 +0200
Subject: [PATCH 33/46] Workaround for global lifetime scope unavailable

---
 app/src/main/java/com/futo/platformplayer/Settings.kt     | 1 +
 .../main/java/com/futo/platformplayer/states/StateApp.kt  | 8 ++++++--
 .../java/com/futo/platformplayer/views/fields/Field.kt    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index 9f7a1b15..fdd06dad 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -1106,6 +1106,7 @@ class Settings : FragmentedStorageFileJson() {
         @FormField(R.string.relay_server, FieldForm.READONLYTEXT, -1, 6)
         val syncServer: String get() = if(syncServerUrl?.isBlank() == true) StateSync.RELAY_SERVER else syncServerUrl ?: StateSync.RELAY_SERVER;
 
+        @AdvancedField
         @FormField(R.string.configure_sync_server, FieldForm.BUTTON, R.string.configure_sync_server_description, 7)
         fun configureSyncServer() {
             SettingsActivity.getActivity()?.let { context ->
diff --git a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt
index c7174c12..7883b4fd 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt
@@ -135,8 +135,12 @@ class StateApp {
         return _scope;
     }
     val scope: CoroutineScope get() {
-        val thisScope = scopeOrNull
-            ?: throw IllegalStateException("Attempted to use a global lifetime scope while MainActivity is no longer available");
+        val thisScope = scopeOrNull;
+        if(thisScope == null) {
+            //throw IllegalStateException("Attempted to use a global lifetime scope while MainActivity is no longer available");
+            Logger.w(TAG, "Attempted to use a global lifetime scope while MainActivity is no longer available, USING GLOBAL SCOPE");
+            return GlobalScope;
+        }
         return thisScope;
     }
     val scopeGetter: ()->CoroutineScope get() {
diff --git a/app/src/main/java/com/futo/platformplayer/views/fields/Field.kt b/app/src/main/java/com/futo/platformplayer/views/fields/Field.kt
index b11ce641..bc2464dd 100644
--- a/app/src/main/java/com/futo/platformplayer/views/fields/Field.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/fields/Field.kt
@@ -4,7 +4,7 @@ import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.constructs.Event3
 import java.lang.reflect.Field
 
-@Target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY)
+@Target(AnnotationTarget.FIELD, AnnotationTarget.PROPERTY, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
 annotation class AdvancedField();
 

From 4d017ad3570f59f7e77973c909949415b83def98 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Sun, 24 Aug 2025 21:41:07 +0200
Subject: [PATCH 34/46] Refs

---
 app/src/stable/assets/sources/bilibili   | 2 +-
 app/src/stable/assets/sources/youtube    | 2 +-
 app/src/unstable/assets/sources/bilibili | 2 +-
 app/src/unstable/assets/sources/youtube  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/stable/assets/sources/bilibili b/app/src/stable/assets/sources/bilibili
index 0fc4e8fb..f636e971 160000
--- a/app/src/stable/assets/sources/bilibili
+++ b/app/src/stable/assets/sources/bilibili
@@ -1 +1 @@
-Subproject commit 0fc4e8fbbf86eb1e53d17b40d2a0ac5f28a69905
+Subproject commit f636e9713d87e174b8d88284b42d88f072eeaf2e
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index f370a886..f1465628 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit f370a88604433d5caf22d7e4910e28bd6d861e97
+Subproject commit f1465628ecb67c9bceb96aed667355e6ddbb49d3
diff --git a/app/src/unstable/assets/sources/bilibili b/app/src/unstable/assets/sources/bilibili
index 0fc4e8fb..f636e971 160000
--- a/app/src/unstable/assets/sources/bilibili
+++ b/app/src/unstable/assets/sources/bilibili
@@ -1 +1 @@
-Subproject commit 0fc4e8fbbf86eb1e53d17b40d2a0ac5f28a69905
+Subproject commit f636e9713d87e174b8d88284b42d88f072eeaf2e
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index f370a886..f1465628 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit f370a88604433d5caf22d7e4910e28bd6d861e97
+Subproject commit f1465628ecb67c9bceb96aed667355e6ddbb49d3

From 14ae5f157202fd120458a64e2644009f46a47ab8 Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Tue, 26 Aug 2025 21:32:13 +0200
Subject: [PATCH 35/46] Fixed translations to align.

---
 .../main/java/com/futo/platformplayer/Settings.kt |  2 ++
 app/src/main/res/values-ar/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-de/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-es/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-fr/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-it/strings.xml            | 13 ++-----------
 app/src/main/res/values-ja/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-ko/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-pt/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-ru/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values-tr/strings.xml            |  5 ++++-
 app/src/main/res/values-zh/strings.xml            | 15 +++++++++++++++
 app/src/main/res/values/strings.xml               |  2 ++
 13 files changed, 145 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index fdd06dad..4a536855 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -203,6 +203,8 @@ class Settings : FragmentedStorageFileJson() {
                 8 -> "zh";
                 9 -> "ru";
                 10 -> "ar";
+                11 -> "it";
+                12 -> "tr";
                 else -> null
             }
         }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 98898961..4724f6ce 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>النظام</item>
+        <item>الإنجليزية (EN)</item>
+        <item>الألمانية (DE)</item>
+        <item>الإسبانية (ES)</item>
+        <item>البرتغالية (PT)</item>
+        <item>الفرنسية (FR)</item>
+        <item>اليابانية (JA)</item>
+        <item>الكورية (KO)</item>
+        <item>الصينية (ZH)</item>
+        <item>الروسية (RU)</item>
+        <item>العربية (AR)</item>
+        <item>الإيطالية (IT)</item>
+        <item>التركية (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 51911585..234bb900 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>System</item>
+        <item>Englisch (EN)</item>
+        <item>Deutsch (DE)</item>
+        <item>Spanisch (ES)</item>
+        <item>Portugiesisch (PT)</item>
+        <item>Französisch (FR)</item>
+        <item>Japanisch (JA)</item>
+        <item>Koreanisch (KO)</item>
+        <item>Chinesisch (ZH)</item>
+        <item>Russisch (RU)</item>
+        <item>Arabisch (AR)</item>
+        <item>Italienisch (IT)</item>
+        <item>Türkisch (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 43461707..96b9449a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -714,4 +714,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>Sistema</item>
+        <item>Inglés (EN)</item>
+        <item>Alemán (DE)</item>
+        <item>Español (ES)</item>
+        <item>Portugués (PT)</item>
+        <item>Francés (FR)</item>
+        <item>Japonés (JA)</item>
+        <item>Coreano (KO)</item>
+        <item>Chino (ZH)</item>
+        <item>Ruso (RU)</item>
+        <item>Árabe (AR)</item>
+        <item>Italiano (IT)</item>
+        <item>Turco (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 438020da..557c485f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -712,4 +712,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>Système</item>
+        <item>Anglais (EN)</item>
+        <item>Allemand (DE)</item>
+        <item>Espagnol (ES)</item>
+        <item>Portugais (PT)</item>
+        <item>Français (FR)</item>
+        <item>Japonais (JA)</item>
+        <item>Coréen (KO)</item>
+        <item>Chinois (ZH)</item>
+        <item>Russe (RU)</item>
+        <item>Arabe (AR)</item>
+        <item>Italien (IT)</item>
+        <item>Turc (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9e6b7015..2defbce6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1028,7 +1028,6 @@
         <item>Sistema</item>
         <item>Inglese (EN)</item>
         <item>Tedesco (DE)</item>
-        <item>Italiano (IT)
         <item>Spagnolo (ES)</item>
         <item>Portoghese (PT)</item>
         <item>Francese (FR)</item>
@@ -1037,6 +1036,8 @@
         <item>Cinese (ZH)</item>
         <item>Russo (RU)</item>
         <item>Arabo (AR)</item>
+        <item>Italiano (IT)</item>
+        <item>Turco (TR)</item>
     </string-array>
     <string-array name="player_background_behavior">
         <item>Nessuno</item>
@@ -1109,16 +1110,6 @@
         <item>4.0</item>
         <item>5.0</item>
     </string-array>
-    <string-array name="hold_playback_speeds">
-        <item>1.25</item>
-        <item>1.5</item>
-        <item>1.75</item>
-        <item>2.0</item>
-        <item>2.25</item>
-        <item>2.5</item>
-        <item>2.75</item>
-        <item>3.0</item>
-    </string-array>
     <string-array name="min_playback_speed">
         <item>0.25</item>
         <item>0.5</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 1598bd60..e3452959 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>システム</item>
+        <item>英語 (EN)</item>
+        <item>ドイツ語 (DE)</item>
+        <item>スペイン語 (ES)</item>
+        <item>ポルトガル語 (PT)</item>
+        <item>フランス語 (FR)</item>
+        <item>日本語 (JA)</item>
+        <item>韓国語 (KO)</item>
+        <item>中国語 (ZH)</item>
+        <item>ロシア語 (RU)</item>
+        <item>アラビア語 (AR)</item>
+        <item>イタリア語 (IT)</item>
+        <item>トルコ語 (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b74f1c12..0312da2f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>시스템</item>
+        <item>영어 (EN)</item>
+        <item>독일어 (DE)</item>
+        <item>스페인어 (ES)</item>
+        <item>포르투갈어 (PT)</item>
+        <item>프랑스어 (FR)</item>
+        <item>일본어 (JA)</item>
+        <item>한국어 (KO)</item>
+        <item>중국어 (ZH)</item>
+        <item>러시아어 (RU)</item>
+        <item>아랍어 (AR)</item>
+        <item>이탈리아어 (IT)</item>
+        <item>터키어 (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index ec593b0c..de46d305 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>Sistema</item>
+        <item>Inglês (EN)</item>
+        <item>Alemão (DE)</item>
+        <item>Espanhol (ES)</item>
+        <item>Português (PT)</item>
+        <item>Francês (FR)</item>
+        <item>Japonês (JA)</item>
+        <item>Coreano (KO)</item>
+        <item>Chinês (ZH)</item>
+        <item>Russo (RU)</item>
+        <item>Árabe (AR)</item>
+        <item>Italiano (IT)</item>
+        <item>Turco (TR)</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 79f775e8..82a479ad 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>Система</item>
+        <item>Английский (EN)</item>
+        <item>Немецкий (DE)</item>
+        <item>Испанский (ES)</item>
+        <item>Португальский (PT)</item>
+        <item>Французский (FR)</item>
+        <item>Японский (JA)</item>
+        <item>Корейский (KO)</item>
+        <item>Китайский (ZH)</item>
+        <item>Русский (RU)</item>
+        <item>Арабский (AR)</item>
+        <item>Итальянский (IT)</item>
+        <item>Турецкий (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index bb0d98a5..5a17d7b9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -409,7 +409,6 @@
     <string name="delete_watchlist_on_finish">İzlendikten sonra Daha Sonra İzle\'den kaldır</string>
     <string name="delete_watchlist_on_finish_description">Büyük bir çoğunluğunu izlediğiniz bir videoyu Daha Sonra İzle\'de bırakırsanız, Daha Sonra İzle\'den kaldırılacaktır.</string>
     <string name="background_switch_audio">Arka planda sese değiştir</string>
-    <string name="background_switch_audio_description">Mümkünse arka planda yalnızca ses akışına geçerek bant genişliği kullanımını optimize edin, bu takılmalara neden olabilir</string>
     <string name="subscription_group_menu">Gruplar</string>
     <string name="show_subscription_group">Abonelik Gruplarını Göster</string>
     <string name="show_subscription_group_description">Abonelik gruplarının filtrelemek için aboneliklerinizin üzerinde gösterilmesi gerekiyorsa</string>
@@ -969,6 +968,8 @@
         <item>İndirme Tarihi (En Yeni)</item>
         <item>Çıkış Tarihi (En Eski)</item>
         <item>Çıkış Tarihi (En Yeni)</item>
+        <item>Boyut (En Küçük)</item>
+        <item>Boyut (En Büyük)</item>
     </string-array>
     <string-array name="feed_style">
         <item>Önizle</item>
@@ -986,6 +987,8 @@
         <item>Çince (ZH)</item>
         <item>Rusça (RU)</item>
         <item>Arapça (AR)</item>
+        <item>İtalyanca (IT)</item>
+        <item>Türkçe (TR)</item>
     </string-array>
     <string-array name="player_background_behavior">
         <item>Hiç</item>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 211cfe88..1e0e843f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -704,4 +704,19 @@
         <item>Newest</item>
         <item>Oldest</item>
     </string-array>
+    <string-array name="app_languages">
+        <item>系统</item>
+        <item>英语 (EN)</item>
+        <item>德语 (DE)</item>
+        <item>西班牙语 (ES)</item>
+        <item>葡萄牙语 (PT)</item>
+        <item>法语 (FR)</item>
+        <item>日语 (JA)</item>
+        <item>韩语 (KO)</item>
+        <item>中文 (ZH)</item>
+        <item>俄语 (RU)</item>
+        <item>阿拉伯语 (AR)</item>
+        <item>意大利语 (IT)</item>
+        <item>土耳其语 (TR)</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ace799c5..6bc87252 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1058,6 +1058,8 @@
         <item>Chinese (ZH)</item>
         <item>Russian (RU)</item>
         <item>Arabic (AR)</item>
+        <item>Italian (IT)</item>
+        <item>Turkish (TR)</item>
     </string-array>
     <string-array name="player_background_behavior">
         <item>None</item>

From 8c1a18d8b4d34cb934cb2d10e2de4119b7b3dbdd Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Wed, 27 Aug 2025 09:58:54 +0200
Subject: [PATCH 36/46] Build fixes.

---
 app/src/main/res/values-it/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2defbce6..263067ba 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -15,7 +15,7 @@
     <string name="advanced_settings">Impostazioni avanzate</string>
     <string name="advanced_settings_description">Se le impostazioni avanzate sono visibili, verranno mostrate preferenze supplementari per affinare la tua esperienza d\'uso.</string>
     <string name="progress_bar_description">Se la barra di avanzamento cronologica deve essere mostrata</string>
-    <string name="hide_hidden_from_search">Applica 'Nascosto dalla home' anche alla ricerca'</string>
+    <string name="hide_hidden_from_search">Applica \'Nascosto dalla home\' anche alla ricerca\'</string>
     <string name="hide_hidden_from_search_description">Nascondi video e creatori nascosti dalla scheda home anche nei risultati di ricerca</string>
     <string name="recommendations">Suggerimenti</string>
     <string name="more">Altro</string>
@@ -427,7 +427,7 @@
     <string name="autoplay_description">La riproduzione automatica del video successivo sarà attiva per impostazione predefinita ogni volta che guarderai un video</string>
     <string name="allow_full_screen_portrait">Consenti modalità verticale a schermo intero quando si guardano video orizzontali</string>
     <string name="delete_watchlist_on_finish">Elimina da Guarda più tardi dopo visione</string>
-    <string name="delete_watchlist_on_finish_description">Dopo aver chiuso un video che hai guardato in larga parte, questo verrà rimosso da 'Guarda più tardi'.</string>
+    <string name="delete_watchlist_on_finish_description">Dopo aver chiuso un video che hai guardato in larga parte, questo verrà rimosso da \'Guarda più tardi\'.</string>
     <string name="seek_offset">Durata ricerca</string>
     <string name="min_playback_speed">Velocità di riproduzione minima</string>
     <string name="min_playback_speed_description">Velocità minima disponibile</string>
@@ -758,7 +758,7 @@
     <string name="subtitles">Sottotitoli</string>
     <string name="unavailable_video">Video non disponibile</string>
     <string name="this_video_is_unavailable">Questo video non è disponibile.</string>
-    <string name="there_was_an_unavailable_video_in_your_queue_videoname_by_authorname">C'era un video non disponibile nella tua coda: [{videoName}] di [{authorName}].</string>
+    <string name="there_was_an_unavailable_video_in_your_queue_videoname_by_authorname">C\'era un video non disponibile nella tua coda: [{videoName}] di [{authorName}].</string>
     <string name="back">Indietro</string>
     <string name="pause">Pausa</string>
     <string name="play">Riproduci</string>
@@ -833,7 +833,7 @@
     <string name="add_to_new_playlist">Aggiungi a nuova playlist</string>
     <string name="url_handling">Gestione URL</string>
     <string name="allow_grayjay_to_handle_specific_urls">Consentire a Grayjay di gestire URL specifici?</string>
-    <string name="allow_grayjay_to_handle_specific_urls_please_set_it_as_default_in_the_app_settings">Quando fai clic su "Sì", si apriranno le impostazioni dell\'app Grayjay.\n\nDa lì, accedi a:\n1. Sezione 'Apri per impostazione predefinita' o 'Imposta come predefinito'.\nPotresti trovare questa opzione direttamente oppure nella categoria 'Impostazioni Avanzate', a seconda del tuo dispositivo.\n\n2. Seleziona 'Apri link supportati' per Grayjay.\n\n(alcuni dispositivi hanno questa opzione elencata nella finestra 'App predefinite' delle impostazioni di sistema, seguita dalla possibilità di selezionare Grayjay per le categorie pertinenti)</string>
+    <string name="allow_grayjay_to_handle_specific_urls_please_set_it_as_default_in_the_app_settings">Quando fai clic su "Sì", si apriranno le impostazioni dell\'app Grayjay.\n\nDa lì, accedi a:\n1. Sezione \'Apri per impostazione predefinita\' o \'Imposta come predefinito\'.\nPotresti trovare questa opzione direttamente oppure nella categoria \'Impostazioni Avanzate\', a seconda del tuo dispositivo.\n\n2. Seleziona \'Apri link supportati\' per Grayjay.\n\n(alcuni dispositivi hanno questa opzione elencata nella finestra \'App predefinite\' delle impostazioni di sistema, seguita dalla possibilità di selezionare Grayjay per le categorie pertinenti)</string>
     <string name="failed_to_show_settings">Apertura impostazioni non riuscita</string>
     <string name="play_store_version_does_not_support_default_url_handling">La versione del Play Store non supporta la gestione URL predefinita.</string>
     <string name="these_are_all_commentcount_comments_you_have_made_in_grayjay">Questi sono tutti i {commentCount} commenti che hai postato con Grayjay.</string>
@@ -852,7 +852,7 @@
     <string name="play_pause">Riproduci/Pausa</string>
     <string name="position">Posizione</string>
     <string name="tutorials">Tutorial</string>
-    <string name="do_you_want_to_see_the_tutorials_you_can_find_them_at_any_time_through_the_more_button">Vuoi guardare i tutorial? Puoi accedervi in qualsiasi momento cliccando sul pulsante 'Altro'.</string>
+    <string name="do_you_want_to_see_the_tutorials_you_can_find_them_at_any_time_through_the_more_button">Vuoi guardare i tutorial? Puoi accedervi in qualsiasi momento cliccando sul pulsante \'Altro\'.</string>
     <string name="add_creator">Aggiungi creatori</string>
     <string name="select">Seleziona</string>
     <string name="zoom">Zoom</string>
@@ -861,7 +861,7 @@
     <string name="disable_battery_optimization">Disattiva ottimizzazione batteria</string>
     <string name="click_to_go_to_battery_optimization_settings_disabling_battery_optimization_will_prevent_the_os_from_killing_media_sessions">Clicca per accedere alle impostazioni di ottimizzazione della batteria. Disattivare l\'ottimizzazione della batteria impedirà al sistema operativo di terminare le sessioni multimediali.</string>
     <string name="contribute_personal_subscriptions_list">Contribuisci con l\'elenco delle sottoscrizioni personali</string>
-    <string name="contribute_personal_subscriptions_list_description">\nTi piacerebbe contribuire a FUTO con la tua attuale lista di sottoscrizioni ai creatori?\n\nI dati saranno gestiti in conformità con la politica sulla privacy di Grayjay. Ovvero, la lista sarà anonimizzata e archiviata senza alcun riferimento a chiunque appartenga l\'elenco dei creatori.\n\nL\'intenzione è che Grayjay e FUTO utilizzino questi dati per costruire un sistema di suggerimenti dei creatori multipiattaforma per rendere più facile trovarne di nuovi che potrebbero piacerti direttamente all\'interno di Grayjay.</string>
+    <string name="contribute_personal_subscriptions_list_description">\nTi piacerebbe contribuire a FUTO con la tua attuale lista di sottanother sanityoscrizioni ai creatori?\n\nI dati saranno gestiti in conformità con la politica sulla privacy di Grayjay. Ovvero, la lista sarà anonimizzata e archiviata senza alcun riferimento a chiunque appartenga l\'elenco dei creatori.\n\nL\'intenzione è che Grayjay e FUTO utilizzino questi dati per costruire un sistema di suggerimenti dei creatori multipiattaforma per rendere più facile trovarne di nuovi che potrebbero piacerti direttamente all\'interno di Grayjay.</string>
     <string name="cd_cast_button">Pulsante trasmetti</string>
     <string name="cd_incognito_button">Pulsante incognito</string>
     <string name="cd_creator_thumbnail">Miniatura creatore</string>

From a9bb9009943eb91b2054e2de707e0d9ae540dab3 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 8 Sep 2025 19:00:41 +0200
Subject: [PATCH 37/46] Change when plugins are disabled on reload and listing
 reloads

---
 .../platformplayer/states/StatePlatform.kt    | 37 ++++++++++++++-----
 .../platformplayer/states/StatePlugins.kt     | 29 ++++++++-------
 2 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
index 972ce336..8f5fc3ba 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
@@ -177,16 +177,11 @@ class StatePlatform {
         }
 
         withContext(Dispatchers.IO) {
+            var toDisables = mutableListOf<IPlatformClient>();
             var enabled: Array<String>;
             synchronized(_clientsLock) {
                 for(e in _enabledClients) {
-                    try {
-                        e.disable();
-                        onSourceDisabled.emit(e);
-                    }
-                    catch(ex: Throwable) {
-                        UIDialogs.appToast(ToastView.Toast("If this happens often, please inform the developers on Github", false, null, "Plugin [${e.name}] failed to disable"));
-                    }
+                    toDisables.add(e);
                 }
 
                 _enabledClients.clear();
@@ -236,6 +231,18 @@ class StatePlatform {
                 }
             }
             selectClients(*enabled);
+
+            for(toDisable in toDisables) {
+                launch(Dispatchers.IO) {
+                    try {
+                        toDisable.disable();
+                        onSourceDisabled.emit(toDisable);
+                    }
+                    catch(ex: Throwable) {
+                        Logger.e(TAG, "FAILED TO DISABLE CLIENT [${toDisable?.name}] AFTER UpdateAvailableClients", ex);
+                    }
+                }
+            }
         };
     }
 
@@ -348,11 +355,11 @@ class StatePlatform {
                 StateApp.instance.handleCaptchaException(c, ex);
             }
 
+            var toDisable: IPlatformClient? = null;
             synchronized(_clientsLock) {
                 if (_enabledClients.contains(client)) {
                     _enabledClients.remove(client);
-                    client.disable();
-                    onSourceDisabled.emit(client);
+                    toDisable = client;
                     newClient.initialize();
                     _enabledClients.add(newClient);
                 }
@@ -360,6 +367,18 @@ class StatePlatform {
                 _availableClients.removeIf { it.id == id };
                 _availableClients.add(newClient);
             }
+            if(toDisable != null) {
+                launch(Dispatchers.IO) {
+                    try {
+                        toDisable?.disable();
+                        onSourceDisabled.emit(client);
+                    }
+                    catch (ex: Throwable) {
+                        Logger.e(TAG, "FAILED TO DISABLE CLIENT [${toDisable?.name}] AFTER RELOAD", ex);
+                    }
+                }
+            }
+
             afterReload?.invoke();
             return@withContext newClient;
         };
diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
index e80a2df3..65674610 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
@@ -402,18 +402,25 @@ class StatePlugins {
                         }
 
                         val icon = config.absoluteIconUrl?.let { absIconUrl ->
-                            withContext(Dispatchers.Main) {
-                                it.setText("Saving plugin...");
-                                it.setProgress(0.75);
-                            }
                             val iconResp = client.get(absIconUrl);
                             if(iconResp.isOk)
                                 return@let iconResp.body?.byteStream()?.use { it.readBytes() };
                             return@let null;
                         }
+
+                        withContext(Dispatchers.Main) {
+                            it.setText("Saving plugin...");
+                            it.setProgress(0.75);
+                        }
+
                         val installEx = StatePlugins.instance.createPlugin(config, script, icon, reinstall);
                         if(installEx != null)
                             throw installEx;
+
+                        withContext(Dispatchers.Main) {
+                            it.setText("Reloading available plugins...");
+                            it.setProgress(0.9);
+                        }
                         StatePlatform.instance.updateAvailableClients(context);
 
                         withContext(Dispatchers.Main) {
@@ -522,9 +529,7 @@ class StatePlugins {
         if(id == StateDeveloper.DEV_ID)
             throw IllegalStateException("Attempted to retrieve a persistent developer plugin, this is not allowed");
 
-        synchronized(_plugins) {
-            return _plugins.findItem { it.config.id == id };
-        }
+        return _plugins.findItem { it.config.id == id };
     }
     fun getPlugins(): List<SourcePluginDescriptor> {
         return _plugins.getItems();
@@ -533,12 +538,10 @@ class StatePlugins {
 
     fun deletePlugin(id: String) {
         synchronized(_pluginScripts) {
-            synchronized(_plugins) {
-                _pluginScripts.deleteFile(id);
-                val plugins = _plugins.findItems { it.config.id == id };
-                for(plugin in plugins)
-                    _plugins.delete(plugin);
-            }
+            _pluginScripts.deleteFile(id);
+            val plugins = _plugins.findItems { it.config.id == id };
+            for(plugin in plugins)
+                _plugins.delete(plugin);
         }
     }
     fun createPlugin(config: SourcePluginConfig, script: String, icon: ByteArray? = null, reinstall: Boolean = false, flags: List<String> = listOf()) : Throwable? {

From 4fc33411fdb53bda3a453009ac5957c818e9b0d1 Mon Sep 17 00:00:00 2001
From: Marcus Hanestad <marcus@futo.org>
Date: Wed, 10 Sep 2025 15:26:16 +0000
Subject: [PATCH 38/46] Experimental casting backend

---
 app/build.gradle                              |   6 +
 .../java/com/futo/platformplayer/Settings.kt  |   5 +
 .../platformplayer/activities/MainActivity.kt |   2 +-
 .../casting/AirPlayCastingDevice.kt           |   2 +-
 .../platformplayer/casting/CastingDevice.kt   | 189 ++---
 .../casting/CastingDeviceExp.kt               | 271 ++++++
 .../casting/CastingDeviceLegacy.kt            | 242 ++++++
 .../casting/ChomecastCastingDevice.kt         |   2 +-
 .../casting/FCastCastingDevice.kt             |   5 +-
 .../platformplayer/casting/StateCasting.kt    | 797 +++++++-----------
 .../platformplayer/casting/StateCastingExp.kt | 174 ++++
 .../casting/StateCastingLegacy.kt             | 397 +++++++++
 .../dialogs/CastingAddDialog.kt               |  16 +-
 .../dialogs/ConnectCastingDialog.kt           |   9 +-
 .../dialogs/ConnectedCastingDialog.kt         |  66 +-
 .../mainactivity/main/VideoDetailView.kt      |  13 +-
 .../models/CastingDeviceInfo.kt               |  19 +-
 .../views/adapters/DeviceViewHolder.kt        |  64 +-
 .../views/casting/CastButton.kt               |   5 -
 .../platformplayer/views/casting/CastView.kt  |  54 +-
 app/src/main/res/drawable/ic_exp_fc.xml       |  14 +
 app/src/main/res/values/strings.xml           |   6 +
 22 files changed, 1598 insertions(+), 760 deletions(-)
 create mode 100644 app/src/main/java/com/futo/platformplayer/casting/CastingDeviceExp.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/casting/CastingDeviceLegacy.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/casting/StateCastingExp.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/casting/StateCastingLegacy.kt
 create mode 100644 app/src/main/res/drawable/ic_exp_fc.xml

diff --git a/app/build.gradle b/app/build.gradle
index 65f600c6..5b375434 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -231,4 +231,10 @@ dependencies {
     testImplementation "org.mockito:mockito-core:5.4.0"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    //Rust casting SDK
+    implementation('org.futo.gitlab.videostreaming.fcast-sdk-jitpack:sender-sdk-minimal:0.3.1') {
+        // Polycentricandroid includes this
+        exclude group: 'net.java.dev.jna'
+    }
 }
diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt
index 4a536855..d67a531a 100644
--- a/app/src/main/java/com/futo/platformplayer/Settings.kt
+++ b/app/src/main/java/com/futo/platformplayer/Settings.kt
@@ -719,6 +719,11 @@ class Settings : FragmentedStorageFileJson() {
         @Serializable(with = FlexibleBooleanSerializer::class)
         var allowLinkLocalIpv4: Boolean = false;
 
+        @AdvancedField
+        @FormField(R.string.experimental_cast, FieldForm.TOGGLE, R.string.experimental_cast_description, 6)
+        @Serializable(with = FlexibleBooleanSerializer::class)
+        var experimentalCasting: Boolean = false
+
         /*TODO: Should we have a different casting quality?
         @FormField("Preferred Casting Quality", FieldForm.DROPDOWN, "", 3)
         @DropdownFieldOptionsId(R.array.preferred_quality_array)
diff --git a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
index 0d5bf8d9..5e4e1e42 100644
--- a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
+++ b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
@@ -1046,7 +1046,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         Logger.i(TAG, "handleFCast");
 
         try {
-            StateCasting.instance.handleUrl(this, url)
+            StateCasting.instance.handleUrl(url)
             return true;
         } catch (e: Throwable) {
             Log.e(TAG, "Failed to parse FCast URL '${url}'.", e)
diff --git a/app/src/main/java/com/futo/platformplayer/casting/AirPlayCastingDevice.kt b/app/src/main/java/com/futo/platformplayer/casting/AirPlayCastingDevice.kt
index 0cc1bebc..b8ea2df6 100644
--- a/app/src/main/java/com/futo/platformplayer/casting/AirPlayCastingDevice.kt
+++ b/app/src/main/java/com/futo/platformplayer/casting/AirPlayCastingDevice.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.launch
 import java.net.InetAddress
 import java.util.UUID
 
-class AirPlayCastingDevice : CastingDevice {
+class AirPlayCastingDevice : CastingDeviceLegacy {
     //See for more info: https://nto.github.io/AirPlay
 
     override val protocol: CastProtocolType get() = CastProtocolType.AIRPLAY;
diff --git a/app/src/main/java/com/futo/platformplayer/casting/CastingDevice.kt b/app/src/main/java/com/futo/platformplayer/casting/CastingDevice.kt
index 69f74747..cb6c9ab0 100644
--- a/app/src/main/java/com/futo/platformplayer/casting/CastingDevice.kt
+++ b/app/src/main/java/com/futo/platformplayer/casting/CastingDevice.kt
@@ -2,147 +2,78 @@ package com.futo.platformplayer.casting
 
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.models.CastingDeviceInfo
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
+import org.fcast.sender_sdk.Metadata
 import java.net.InetAddress
 
-enum class CastConnectionState {
-    DISCONNECTED,
-    CONNECTING,
-    CONNECTED
-}
-
-@Serializable(with = CastProtocolType.CastProtocolTypeSerializer::class)
-enum class CastProtocolType {
-    CHROMECAST,
-    AIRPLAY,
-    FCAST;
-
-    object CastProtocolTypeSerializer : KSerializer<CastProtocolType> {
-        override val descriptor: SerialDescriptor = PrimitiveSerialDescriptor("CastProtocolType", PrimitiveKind.STRING)
-
-        override fun serialize(encoder: Encoder, value: CastProtocolType) {
-            encoder.encodeString(value.name)
-        }
-
-        override fun deserialize(decoder: Decoder): CastProtocolType {
-            val name = decoder.decodeString()
-            return when (name) {
-                "FASTCAST" -> FCAST // Handle the renamed case
-                else -> CastProtocolType.valueOf(name)
-            }
-        }
-    }
-}
-
 abstract class CastingDevice {
-    abstract val protocol: CastProtocolType;
-    abstract val isReady: Boolean;
-    abstract var usedRemoteAddress: InetAddress?;
-    abstract var localAddress: InetAddress?;
-    abstract val canSetVolume: Boolean;
-    abstract val canSetSpeed: Boolean;
+    abstract val isReady: Boolean
+    abstract val usedRemoteAddress: InetAddress?
+    abstract val localAddress: InetAddress?
+    abstract val name: String?
+    abstract val onConnectionStateChanged: Event1<CastConnectionState>
+    abstract val onPlayChanged: Event1<Boolean>
+    abstract val onTimeChanged: Event1<Double>
+    abstract val onDurationChanged: Event1<Double>
+    abstract val onVolumeChanged: Event1<Double>
+    abstract val onSpeedChanged: Event1<Double>
+    abstract var connectionState: CastConnectionState
+    abstract val protocolType: CastProtocolType
+    abstract var isPlaying: Boolean
+    abstract val expectedCurrentTime: Double
+    abstract var speed: Double
+    abstract var time: Double
+    abstract var duration: Double
+    abstract var volume: Double
+    abstract fun canSetVolume(): Boolean
+    abstract fun canSetSpeed(): Boolean
 
-    var name: String? = null;
-    var isPlaying: Boolean = false
-            set(value) {
-                val changed = value != field;
-                field = value;
-                if (changed) {
-                    onPlayChanged.emit(value);
-                }
-            };
+    @Throws
+    abstract fun resumePlayback()
 
-    private var lastTimeChangeTime_ms: Long = 0
-    var time: Double = 0.0
-        private set
+    @Throws
+    abstract fun pausePlayback()
 
-    protected fun setTime(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastTimeChangeTime_ms && value != time) {
-            time = value
-            lastTimeChangeTime_ms = changeTime_ms
-            onTimeChanged.emit(value)
-        }
-    }
+    @Throws
+    abstract fun stopPlayback()
 
-    private var lastDurationChangeTime_ms: Long = 0
-    var duration: Double = 0.0
-        private set
+    @Throws
+    abstract fun seekTo(timeSeconds: Double)
 
-    protected fun setDuration(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastDurationChangeTime_ms && value != duration) {
-            duration = value
-            lastDurationChangeTime_ms = changeTime_ms
-            onDurationChanged.emit(value)
-        }
-    }
+    @Throws
+    abstract fun changeVolume(timeSeconds: Double)
 
-    private var lastVolumeChangeTime_ms: Long = 0
-    var volume: Double = 1.0
-        private set
+    @Throws
+    abstract fun changeSpeed(speed: Double)
 
-    protected fun setVolume(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastVolumeChangeTime_ms && value != volume) {
-            volume = value
-            lastVolumeChangeTime_ms = changeTime_ms
-            onVolumeChanged.emit(value)
-        }
-    }
+    @Throws
+    abstract fun connect()
 
-    private var lastSpeedChangeTime_ms: Long = 0
-    var speed: Double = 1.0
-        private set
+    @Throws
+    abstract fun disconnect()
+    abstract fun getDeviceInfo(): CastingDeviceInfo
+    abstract fun getAddresses(): List<InetAddress>
 
-    protected fun setSpeed(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
-        if (changeTime_ms > lastSpeedChangeTime_ms && value != speed) {
-            speed = value
-            lastSpeedChangeTime_ms = changeTime_ms
-            onSpeedChanged.emit(value)
-        }
-    }
+    @Throws
+    abstract fun loadVideo(
+        streamType: String,
+        contentType: String,
+        contentId: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?,
+        metadata: Metadata?
+    )
 
-    val expectedCurrentTime: Double
-        get() {
-            val diff = if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
-            return time + diff;
-        };
-    var connectionState: CastConnectionState = CastConnectionState.DISCONNECTED
-        set(value) {
-            val changed = value != field;
-            field = value;
+    @Throws
+    abstract fun loadContent(
+        contentType: String,
+        content: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?,
+        metadata: Metadata?
+    )
 
-            if (changed) {
-                onConnectionStateChanged.emit(value);
-            }
-        };
+    abstract fun ensureThreadStarted()
+}
 
-    var onConnectionStateChanged = Event1<CastConnectionState>();
-    var onPlayChanged = Event1<Boolean>();
-    var onTimeChanged = Event1<Double>();
-    var onDurationChanged = Event1<Double>();
-    var onVolumeChanged = Event1<Double>();
-    var onSpeedChanged = Event1<Double>();
-
-    abstract fun stopCasting();
-
-    abstract fun seekVideo(timeSeconds: Double);
-    abstract fun stopVideo();
-    abstract fun pauseVideo();
-    abstract fun resumeVideo();
-    abstract fun loadVideo(streamType: String, contentType: String, contentId: String, resumePosition: Double, duration: Double, speed: Double?);
-    abstract fun loadContent(contentType: String, content: String, resumePosition: Double, duration: Double, speed: Double?);
-    open fun changeVolume(volume: Double) { throw NotImplementedError() }
-    open fun changeSpeed(speed: Double) { throw NotImplementedError() }
-
-    abstract fun start();
-    abstract fun stop();
-
-    abstract fun getDeviceInfo(): CastingDeviceInfo;
-
-    abstract fun getAddresses(): List<InetAddress>;
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/casting/CastingDeviceExp.kt b/app/src/main/java/com/futo/platformplayer/casting/CastingDeviceExp.kt
new file mode 100644
index 00000000..1560eff1
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/casting/CastingDeviceExp.kt
@@ -0,0 +1,271 @@
+package com.futo.platformplayer.casting
+
+import android.os.Build
+import com.futo.platformplayer.BuildConfig
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.CastingDeviceInfo
+import org.fcast.sender_sdk.ApplicationInfo
+import org.fcast.sender_sdk.GenericKeyEvent
+import org.fcast.sender_sdk.GenericMediaEvent
+import org.fcast.sender_sdk.PlaybackState
+import org.fcast.sender_sdk.Source
+import java.net.InetAddress
+import org.fcast.sender_sdk.CastingDevice as RsCastingDevice;
+import org.fcast.sender_sdk.DeviceEventHandler as RsDeviceEventHandler;
+import org.fcast.sender_sdk.DeviceConnectionState
+import org.fcast.sender_sdk.DeviceFeature
+import org.fcast.sender_sdk.IpAddr
+import org.fcast.sender_sdk.LoadRequest
+import org.fcast.sender_sdk.Metadata
+import org.fcast.sender_sdk.ProtocolType
+import org.fcast.sender_sdk.urlFormatIpAddr
+import java.net.Inet4Address
+import java.net.Inet6Address
+
+private fun ipAddrToInetAddress(addr: IpAddr): InetAddress = when (addr) {
+    is IpAddr.V4 -> Inet4Address.getByAddress(
+        byteArrayOf(
+            addr.o1.toByte(),
+            addr.o2.toByte(),
+            addr.o3.toByte(),
+            addr.o4.toByte()
+        )
+    )
+
+    is IpAddr.V6 -> Inet6Address.getByAddress(
+        byteArrayOf(
+            addr.o1.toByte(),
+            addr.o2.toByte(),
+            addr.o3.toByte(),
+            addr.o4.toByte(),
+            addr.o5.toByte(),
+            addr.o6.toByte(),
+            addr.o7.toByte(),
+            addr.o8.toByte(),
+            addr.o9.toByte(),
+            addr.o10.toByte(),
+            addr.o11.toByte(),
+            addr.o12.toByte(),
+            addr.o13.toByte(),
+            addr.o14.toByte(),
+            addr.o15.toByte(),
+            addr.o16.toByte()
+        )
+    )
+}
+
+class CastingDeviceExp(val device: RsCastingDevice) : CastingDevice() {
+    class EventHandler : RsDeviceEventHandler {
+        var onConnectionStateChanged = Event1<DeviceConnectionState>();
+        var onPlayChanged = Event1<Boolean>()
+        var onTimeChanged = Event1<Double>()
+        var onDurationChanged = Event1<Double>()
+        var onVolumeChanged = Event1<Double>()
+        var onSpeedChanged = Event1<Double>()
+
+        override fun connectionStateChanged(state: DeviceConnectionState) {
+            onConnectionStateChanged.emit(state)
+        }
+
+        override fun volumeChanged(volume: Double) {
+            onVolumeChanged.emit(volume)
+        }
+
+        override fun timeChanged(time: Double) {
+            onTimeChanged.emit(time)
+        }
+
+        override fun playbackStateChanged(state: PlaybackState) {
+            onPlayChanged.emit(state == PlaybackState.PLAYING)
+        }
+
+        override fun durationChanged(duration: Double) {
+            onDurationChanged.emit(duration)
+        }
+
+        override fun speedChanged(speed: Double) {
+            onSpeedChanged.emit(speed)
+        }
+
+        override fun sourceChanged(source: Source) {
+            // TODO
+        }
+
+        override fun keyEvent(event: GenericKeyEvent) {
+            // Unreachable
+        }
+
+        override fun mediaEvent(event: GenericMediaEvent) {
+            // Unreachable
+        }
+
+        override fun playbackError(message: String) {
+            Logger.e(TAG, "Playback error: $message")
+        }
+    }
+
+    val eventHandler = EventHandler()
+    override val isReady: Boolean
+        get() = device.isReady()
+    override val name: String
+        get() = device.name()
+    override var usedRemoteAddress: InetAddress? = null
+    override var localAddress: InetAddress? = null
+    override fun canSetVolume(): Boolean = device.supportsFeature(DeviceFeature.SET_VOLUME)
+    override fun canSetSpeed(): Boolean = device.supportsFeature(DeviceFeature.SET_SPEED)
+
+    override val onConnectionStateChanged =
+        Event1<CastConnectionState>()
+    override val onPlayChanged: Event1<Boolean>
+        get() = eventHandler.onPlayChanged
+    override val onTimeChanged: Event1<Double>
+        get() = eventHandler.onTimeChanged
+    override val onDurationChanged: Event1<Double>
+        get() = eventHandler.onDurationChanged
+    override val onVolumeChanged: Event1<Double>
+        get() = eventHandler.onVolumeChanged
+    override val onSpeedChanged: Event1<Double>
+        get() = eventHandler.onSpeedChanged
+
+    override fun resumePlayback() = device.resumePlayback()
+    override fun pausePlayback() = device.pausePlayback()
+    override fun stopPlayback() = device.stopPlayback()
+    override fun seekTo(timeSeconds: Double) = device.seek(timeSeconds)
+    override fun changeVolume(newVolume: Double) {
+        device.changeVolume(newVolume)
+        volume = newVolume
+    }
+    override fun changeSpeed(speed: Double) = device.changeSpeed(speed)
+    override fun connect() = device.connect(
+        ApplicationInfo(
+            "Grayjay Android",
+            "${BuildConfig.VERSION_NAME}-${BuildConfig.FLAVOR}",
+            "${Build.MANUFACTURER} ${Build.MODEL}"
+        ),
+        eventHandler,
+        1000.toULong()
+    )
+
+    override fun disconnect() = device.disconnect()
+
+    override fun getDeviceInfo(): CastingDeviceInfo {
+        val info = device.getDeviceInfo()
+        return CastingDeviceInfo(
+            info.name,
+            when (info.protocol) {
+                ProtocolType.CHROMECAST -> CastProtocolType.CHROMECAST
+                ProtocolType.F_CAST -> CastProtocolType.FCAST
+            },
+            addresses = info.addresses.map { urlFormatIpAddr(it) }.toTypedArray(),
+            port = info.port.toInt(),
+        )
+    }
+
+    override fun getAddresses(): List<InetAddress> = device.getAddresses().map {
+        ipAddrToInetAddress(it)
+    }
+
+    override fun loadVideo(
+        streamType: String,
+        contentType: String,
+        contentId: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?,
+        metadata: Metadata?
+    ) = device.load(
+        LoadRequest.Video(
+            contentType = contentType,
+            url = contentId,
+            resumePosition = resumePosition,
+            speed = speed,
+            volume = volume,
+            metadata = metadata
+        )
+    )
+
+    override fun loadContent(
+        contentType: String,
+        content: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?,
+        metadata: Metadata?
+    ) = device.load(
+        LoadRequest.Content(
+            contentType = contentType,
+            content = content,
+            resumePosition = resumePosition,
+            speed = speed,
+            volume = volume,
+            metadata = metadata,
+        )
+    )
+
+    override var connectionState = CastConnectionState.DISCONNECTED
+    override val protocolType: CastProtocolType
+        get() = when (device.castingProtocol()) {
+            ProtocolType.CHROMECAST -> CastProtocolType.CHROMECAST
+            ProtocolType.F_CAST -> CastProtocolType.FCAST
+        }
+    override var volume: Double = 1.0
+    override var duration: Double = 0.0
+    private var lastTimeChangeTime_ms: Long = 0
+    override var time: Double = 0.0
+    override var speed: Double = 0.0
+    override var isPlaying: Boolean = false
+
+    override val expectedCurrentTime: Double
+        get() {
+            val diff =
+                if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
+            return time + diff
+        }
+
+    init {
+        eventHandler.onConnectionStateChanged.subscribe { newState ->
+            when (newState) {
+                is DeviceConnectionState.Connected -> {
+                    usedRemoteAddress = ipAddrToInetAddress(newState.usedRemoteAddr)
+                    localAddress = ipAddrToInetAddress(newState.localAddr)
+                    connectionState = CastConnectionState.CONNECTED
+                    onConnectionStateChanged.emit(CastConnectionState.CONNECTED)
+                }
+
+                DeviceConnectionState.Connecting, DeviceConnectionState.Reconnecting ->  {
+                    connectionState = CastConnectionState.CONNECTING
+                    onConnectionStateChanged.emit(CastConnectionState.CONNECTING)
+                }
+
+                DeviceConnectionState.Disconnected -> {
+                    connectionState = CastConnectionState.CONNECTING
+                    onConnectionStateChanged.emit(CastConnectionState.DISCONNECTED)
+                }
+            }
+
+            if (newState == DeviceConnectionState.Disconnected) {
+                try {
+                    Logger.i(TAG, "Stopping device")
+                    device.disconnect()
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to stop device: $e")
+                }
+            }
+        }
+        eventHandler.onPlayChanged.subscribe { isPlaying = it }
+        eventHandler.onTimeChanged.subscribe {
+            lastTimeChangeTime_ms = System.currentTimeMillis()
+            time = it
+        }
+        eventHandler.onDurationChanged.subscribe { duration = it }
+        eventHandler.onVolumeChanged.subscribe { volume = it }
+        eventHandler.onSpeedChanged.subscribe { speed = it }
+    }
+
+    override fun ensureThreadStarted() {}
+
+    companion object {
+        private val TAG = "CastingDeviceExp"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/casting/CastingDeviceLegacy.kt b/app/src/main/java/com/futo/platformplayer/casting/CastingDeviceLegacy.kt
new file mode 100644
index 00000000..d9ed6956
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/casting/CastingDeviceLegacy.kt
@@ -0,0 +1,242 @@
+package com.futo.platformplayer.casting
+
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.models.CastingDeviceInfo
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+import org.fcast.sender_sdk.Metadata
+import java.net.InetAddress
+
+enum class CastConnectionState {
+    DISCONNECTED,
+    CONNECTING,
+    CONNECTED
+}
+
+@Serializable(with = CastProtocolType.CastProtocolTypeSerializer::class)
+enum class CastProtocolType {
+    CHROMECAST,
+    AIRPLAY,
+    FCAST;
+
+    object CastProtocolTypeSerializer : KSerializer<CastProtocolType> {
+        override val descriptor: SerialDescriptor =
+            PrimitiveSerialDescriptor("CastProtocolType", PrimitiveKind.STRING)
+
+        override fun serialize(encoder: Encoder, value: CastProtocolType) {
+            encoder.encodeString(value.name)
+        }
+
+        override fun deserialize(decoder: Decoder): CastProtocolType {
+            val name = decoder.decodeString()
+            return when (name) {
+                "FASTCAST" -> FCAST // Handle the renamed case
+                else -> CastProtocolType.valueOf(name)
+            }
+        }
+    }
+}
+
+abstract class CastingDeviceLegacy {
+    abstract val protocol: CastProtocolType;
+    abstract val isReady: Boolean;
+    abstract var usedRemoteAddress: InetAddress?;
+    abstract var localAddress: InetAddress?;
+    abstract val canSetVolume: Boolean;
+    abstract val canSetSpeed: Boolean;
+
+    var name: String? = null;
+    var isPlaying: Boolean = false
+        set(value) {
+            val changed = value != field;
+            field = value;
+            if (changed) {
+                onPlayChanged.emit(value);
+            }
+        };
+
+    private var lastTimeChangeTime_ms: Long = 0
+    var time: Double = 0.0
+        private set
+
+    protected fun setTime(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastTimeChangeTime_ms && value != time) {
+            time = value
+            lastTimeChangeTime_ms = changeTime_ms
+            onTimeChanged.emit(value)
+        }
+    }
+
+    private var lastDurationChangeTime_ms: Long = 0
+    var duration: Double = 0.0
+        private set
+
+    protected fun setDuration(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastDurationChangeTime_ms && value != duration) {
+            duration = value
+            lastDurationChangeTime_ms = changeTime_ms
+            onDurationChanged.emit(value)
+        }
+    }
+
+    private var lastVolumeChangeTime_ms: Long = 0
+    var volume: Double = 1.0
+        private set
+
+    protected fun setVolume(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastVolumeChangeTime_ms && value != volume) {
+            volume = value
+            lastVolumeChangeTime_ms = changeTime_ms
+            onVolumeChanged.emit(value)
+        }
+    }
+
+    private var lastSpeedChangeTime_ms: Long = 0
+    var speed: Double = 1.0
+        private set
+
+    protected fun setSpeed(value: Double, changeTime_ms: Long = System.currentTimeMillis()) {
+        if (changeTime_ms > lastSpeedChangeTime_ms && value != speed) {
+            speed = value
+            lastSpeedChangeTime_ms = changeTime_ms
+            onSpeedChanged.emit(value)
+        }
+    }
+
+    val expectedCurrentTime: Double
+        get() {
+            val diff =
+                if (isPlaying) ((System.currentTimeMillis() - lastTimeChangeTime_ms).toDouble() / 1000.0) else 0.0;
+            return time + diff;
+        };
+    var connectionState: CastConnectionState = CastConnectionState.DISCONNECTED
+        set(value) {
+            val changed = value != field;
+            field = value;
+
+            if (changed) {
+                onConnectionStateChanged.emit(value);
+            }
+        };
+
+    var onConnectionStateChanged = Event1<CastConnectionState>();
+    var onPlayChanged = Event1<Boolean>();
+    var onTimeChanged = Event1<Double>();
+    var onDurationChanged = Event1<Double>();
+    var onVolumeChanged = Event1<Double>();
+    var onSpeedChanged = Event1<Double>();
+
+    abstract fun stopCasting();
+
+    abstract fun seekVideo(timeSeconds: Double);
+    abstract fun stopVideo();
+    abstract fun pauseVideo();
+    abstract fun resumeVideo();
+    abstract fun loadVideo(
+        streamType: String,
+        contentType: String,
+        contentId: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?
+    );
+
+    abstract fun loadContent(
+        contentType: String,
+        content: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?
+    );
+
+    open fun changeVolume(volume: Double) {
+        throw NotImplementedError()
+    }
+
+    open fun changeSpeed(speed: Double) {
+        throw NotImplementedError()
+    }
+
+    abstract fun start();
+    abstract fun stop();
+
+    abstract fun getDeviceInfo(): CastingDeviceInfo;
+
+    abstract fun getAddresses(): List<InetAddress>;
+}
+
+class CastingDeviceLegacyWrapper(val inner: CastingDeviceLegacy) : CastingDevice() {
+    override val isReady: Boolean get() = inner.isReady
+    override val usedRemoteAddress: InetAddress? get() = inner.usedRemoteAddress
+    override val localAddress: InetAddress? get() = inner.localAddress
+    override val name: String? get() = inner.name
+    override val onConnectionStateChanged: Event1<CastConnectionState> get() = inner.onConnectionStateChanged
+    override val onPlayChanged: Event1<Boolean> get() = inner.onPlayChanged
+    override val onTimeChanged: Event1<Double> get() = inner.onTimeChanged
+    override val onDurationChanged: Event1<Double> get() = inner.onDurationChanged
+    override val onVolumeChanged: Event1<Double> get() = inner.onVolumeChanged
+    override val onSpeedChanged: Event1<Double> get() = inner.onSpeedChanged
+    override var connectionState: CastConnectionState
+        get() = inner.connectionState
+        set(_) = Unit
+    override val protocolType: CastProtocolType get() = inner.protocol
+    override var isPlaying: Boolean
+        get() = inner.isPlaying
+        set(_) = Unit
+    override val expectedCurrentTime: Double
+        get() = inner.expectedCurrentTime
+    override var speed: Double
+        get() = inner.speed
+        set(_) = Unit
+    override var time: Double
+        get() = inner.time
+        set(_) = Unit
+    override var duration: Double
+        get() = inner.duration
+        set(_) = Unit
+    override var volume: Double
+        get() = inner.volume
+        set(_) = Unit
+
+    override fun canSetVolume(): Boolean = inner.canSetVolume
+    override fun canSetSpeed(): Boolean = inner.canSetSpeed
+    override fun resumePlayback() = inner.resumeVideo()
+    override fun pausePlayback() = inner.pauseVideo()
+    override fun stopPlayback() = inner.stopVideo()
+    override fun seekTo(timeSeconds: Double) = inner.seekVideo(timeSeconds)
+    override fun changeVolume(timeSeconds: Double) = inner.changeVolume(timeSeconds)
+    override fun changeSpeed(speed: Double) = inner.changeSpeed(speed)
+    override fun connect() = inner.start()
+    override fun disconnect() = inner.stop()
+    override fun getDeviceInfo(): CastingDeviceInfo = inner.getDeviceInfo()
+    override fun getAddresses(): List<InetAddress> = inner.getAddresses()
+    override fun loadVideo(
+        streamType: String,
+        contentType: String,
+        contentId: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?,
+        metadata: Metadata?
+    ) = inner.loadVideo(streamType, contentType, contentId, resumePosition, duration, speed)
+
+    override fun loadContent(
+        contentType: String,
+        content: String,
+        resumePosition: Double,
+        duration: Double,
+        speed: Double?,
+        metadata: Metadata?
+    ) = inner.loadContent(contentType, content, resumePosition, duration, speed)
+
+    override fun ensureThreadStarted() = when (inner) {
+        is FCastCastingDevice -> inner.ensureThreadStarted()
+        is ChromecastCastingDevice -> inner.ensureThreadsStarted()
+        else -> {}
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt b/app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt
index f6582055..ed10832c 100644
--- a/app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt
+++ b/app/src/main/java/com/futo/platformplayer/casting/ChomecastCastingDevice.kt
@@ -27,7 +27,7 @@ import javax.net.ssl.SSLSocket
 import javax.net.ssl.TrustManager
 import javax.net.ssl.X509TrustManager
 
-class ChromecastCastingDevice : CastingDevice {
+class ChromecastCastingDevice : CastingDeviceLegacy {
     //See for more info: https://developers.google.com/cast/docs/media/messages
 
     override val protocol: CastProtocolType get() = CastProtocolType.CHROMECAST;
diff --git a/app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt b/app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt
index be62f726..71d1890b 100644
--- a/app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt
+++ b/app/src/main/java/com/futo/platformplayer/casting/FCastCastingDevice.kt
@@ -3,7 +3,6 @@ package com.futo.platformplayer.casting
 import android.os.Looper
 import android.util.Base64
 import android.util.Log
-import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.models.FCastDecryptedMessage
 import com.futo.platformplayer.casting.models.FCastEncryptedMessage
@@ -25,7 +24,6 @@ import com.futo.platformplayer.toInetAddress
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.serialization.encodeToString
@@ -34,7 +32,6 @@ import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
 import java.math.BigInteger
-import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
@@ -72,7 +69,7 @@ enum class Opcode(val value: Byte) {
     }
 }
 
-class FCastCastingDevice : CastingDevice {
+class FCastCastingDevice : CastingDeviceLegacy {
     //See for more info: TODO
 
     override val protocol: CastProtocolType get() = CastProtocolType.FCAST;
diff --git a/app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt b/app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt
index f7802e86..4c3e3323 100644
--- a/app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt
+++ b/app/src/main/java/com/futo/platformplayer/casting/StateCasting.kt
@@ -3,15 +3,8 @@ package com.futo.platformplayer.casting
 import android.app.AlertDialog
 import android.content.ContentResolver
 import android.content.Context
-import android.net.Uri
-import android.net.nsd.NsdManager
-import android.net.nsd.NsdServiceInfo
-import android.os.Build
 import android.os.Looper
-import android.util.Base64
 import android.util.Log
-import java.net.NetworkInterface
-import java.net.Inet4Address
 import androidx.annotation.OptIn
 import androidx.media3.common.util.UnstableApi
 import com.futo.platformplayer.R
@@ -41,39 +34,38 @@ import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManif
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManifestRawSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.builders.DashBuilder
+import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.exceptions.UnsupportedCastException
 import com.futo.platformplayer.findPreferredAddress
 import com.futo.platformplayer.logging.Logger
-import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.parsers.HLS
 import com.futo.platformplayer.states.StateApp
 import com.futo.platformplayer.stores.CastingDeviceInfoStorage
 import com.futo.platformplayer.stores.FragmentedStorage
 import com.futo.platformplayer.toUrlAddress
+import com.futo.platformplayer.views.casting.CastView
+import com.futo.platformplayer.views.casting.CastView.Companion
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
+import org.fcast.sender_sdk.Metadata
 import java.net.Inet6Address
-import java.net.InetAddress
 import java.net.URLDecoder
 import java.net.URLEncoder
-import java.util.Collections
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicInteger
 
-class StateCasting {
-    private val _scopeIO = CoroutineScope(Dispatchers.IO);
-    private val _scopeMain = CoroutineScope(Dispatchers.Main);
+abstract class StateCasting {
+    val _scopeIO = CoroutineScope(Dispatchers.IO);
+    val _scopeMain = CoroutineScope(Dispatchers.Main);
     private val _storage: CastingDeviceInfoStorage = FragmentedStorage.get();
 
-    private val _castServer = ManagedHttpServer();
-    private var _started = false;
+    val _castServer = ManagedHttpServer();
+    var _started = false;
 
     var devices: HashMap<String, CastingDevice> = hashMapOf();
     val onDeviceAdded = Event1<CastingDevice>();
@@ -89,212 +81,46 @@ class StateCasting {
     private var _audioExecutor: JSRequestExecutor? = null
     private val _client = ManagedHttpClient();
     var _resumeCastingDevice: CastingDeviceInfo? = null;
-    private var _nsdManager: NsdManager? = null
     val isCasting: Boolean get() = activeDevice != null;
     private val _castId = AtomicInteger(0)
 
-    private val _discoveryListeners = mapOf(
-        "_googlecast._tcp" to createDiscoveryListener(::addOrUpdateChromeCastDevice),
-        "_airplay._tcp" to createDiscoveryListener(::addOrUpdateAirPlayDevice),
-        "_fastcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice),
-        "_fcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice)
-    )
+    abstract fun handleUrl(url: String)
+    abstract fun onStop()
+    abstract fun start(context: Context)
+    abstract fun stop()
 
-    fun handleUrl(context: Context, url: String) {
-        val uri = Uri.parse(url)
-        if (uri.scheme != "fcast") {
-            throw Exception("Expected scheme to be FCast")
-        }
-
-        val type = uri.host
-        if (type != "r") {
-            throw Exception("Expected type r")
-        }
-
-        val connectionInfo = uri.pathSegments[0]
-        val json = Base64.decode(connectionInfo, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP).toString(Charsets.UTF_8)
-        val networkConfig = Json.decodeFromString<FCastNetworkConfig>(json)
-        val tcpService = networkConfig.services.first { v -> v.type == 0 }
-
-        val foundInfo = addRememberedDevice(CastingDeviceInfo(
-            name = networkConfig.name,
-            type = CastProtocolType.FCAST,
-            addresses = networkConfig.addresses.toTypedArray(),
-            port = tcpService.port
-        ))
-
-        connectDevice(deviceFromCastingDeviceInfo(foundInfo))
-    }
-
-    fun onStop() {
-        val ad = activeDevice ?: return;
-        _resumeCastingDevice = ad.getDeviceInfo()
-        Log.i(TAG, "_resumeCastingDevice set to '${ad.name}'")
-        Logger.i(TAG, "Stopping active device because of onStop.");
-        ad.stop();
-    }
+    @Throws
+    abstract fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDevice
+    abstract fun startUpdateTimeJob(
+        onTimeJobTimeChanged_s: Event1<Long>, setTime: (Long) -> Unit
+    ): Job?
 
     fun onResume() {
         val ad = activeDevice
         if (ad != null) {
-            if (ad is FCastCastingDevice) {
-                ad.ensureThreadStarted()
-            } else if (ad is ChromecastCastingDevice) {
-                ad.ensureThreadsStarted()
-            }
+            ad.ensureThreadStarted()
         } else {
             val resumeCastingDevice = _resumeCastingDevice
             if (resumeCastingDevice != null) {
-                connectDevice(deviceFromCastingDeviceInfo(resumeCastingDevice))
+                val dev = deviceFromInfo(resumeCastingDevice) ?: return
+                connectDevice(dev)
                 _resumeCastingDevice = null
                 Log.i(TAG, "_resumeCastingDevice set to null onResume")
             }
         }
     }
 
-    @Synchronized
-    fun start(context: Context) {
-        if (_started)
+    fun cancel() {
+        _castId.incrementAndGet()
+    }
+
+    fun invokeInMainScopeIfRequired(action: () -> Unit) {
+        if (Looper.getMainLooper().thread != Thread.currentThread()) {
+            _scopeMain.launch { action() }
             return;
-        _started = true;
-
-        Log.i(TAG, "_resumeCastingDevice set null start")
-        _resumeCastingDevice = null;
-
-        Logger.i(TAG, "CastingService starting...");
-
-        _castServer.start();
-        enableDeveloper(true);
-
-        Logger.i(TAG, "CastingService started.");
-
-        _nsdManager = context.getSystemService(Context.NSD_SERVICE) as NsdManager
-        startDiscovering()
-    }
-
-    @Synchronized
-    private fun startDiscovering() {
-        _nsdManager?.apply {
-            _discoveryListeners.forEach {
-                discoverServices(it.key, NsdManager.PROTOCOL_DNS_SD, it.value)
-            }
         }
-    }
 
-    @Synchronized
-    private fun stopDiscovering() {
-        _nsdManager?.apply {
-            _discoveryListeners.forEach {
-                try {
-                    stopServiceDiscovery(it.value)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-        }
-    }
-
-    @Synchronized
-    fun stop() {
-        if (!_started)
-            return;
-
-        _started = false;
-
-        Logger.i(TAG, "CastingService stopping.")
-
-        stopDiscovering()
-        _scopeIO.cancel();
-        _scopeMain.cancel();
-
-        Logger.i(TAG, "Stopping active device because StateCasting is being stopped.")
-        val d = activeDevice;
-        activeDevice = null;
-        d?.stop();
-
-        _castServer.stop();
-        _castServer.removeAllHandlers();
-
-        Logger.i(TAG, "CastingService stopped.")
-
-        _nsdManager = null
-    }
-
-    private fun createDiscoveryListener(addOrUpdate: (String, Array<InetAddress>, Int) -> Unit): NsdManager.DiscoveryListener {
-        return object : NsdManager.DiscoveryListener {
-            override fun onDiscoveryStarted(regType: String) {
-                Log.d(TAG, "Service discovery started for $regType")
-            }
-
-            override fun onDiscoveryStopped(serviceType: String) {
-                Log.i(TAG, "Discovery stopped: $serviceType")
-            }
-
-            override fun onServiceLost(service: NsdServiceInfo) {
-                Log.e(TAG, "service lost: $service")
-                // TODO: Handle service lost, e.g., remove device
-            }
-
-            override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
-                Log.e(TAG, "Discovery failed for $serviceType: Error code:$errorCode")
-                try {
-                    _nsdManager?.stopServiceDiscovery(this)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-
-            override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
-                Log.e(TAG, "Stop discovery failed for $serviceType: Error code:$errorCode")
-                try {
-                    _nsdManager?.stopServiceDiscovery(this)
-                } catch (e: Throwable) {
-                    Logger.w(TAG, "Failed to stop service discovery", e)
-                }
-            }
-
-            override fun onServiceFound(service: NsdServiceInfo) {
-                Log.v(TAG, "Service discovery success for ${service.serviceType}: $service")
-                val addresses = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    service.hostAddresses.toTypedArray()
-                } else {
-                    arrayOf(service.host)
-                }
-                addOrUpdate(service.serviceName, addresses, service.port)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
-                    _nsdManager?.registerServiceInfoCallback(service, { it.run() }, object : NsdManager.ServiceInfoCallback {
-                        override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
-                            Log.v(TAG, "onServiceUpdated: $serviceInfo")
-                            addOrUpdate(serviceInfo.serviceName, serviceInfo.hostAddresses.toTypedArray(), serviceInfo.port)
-                        }
-
-                        override fun onServiceLost() {
-                            Log.v(TAG, "onServiceLost: $service")
-                            // TODO: Handle service lost
-                        }
-
-                        override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
-                            Log.v(TAG, "onServiceInfoCallbackRegistrationFailed: $errorCode")
-                        }
-
-                        override fun onServiceInfoCallbackUnregistered() {
-                            Log.v(TAG, "onServiceInfoCallbackUnregistered")
-                        }
-                    })
-                } else {
-                    _nsdManager?.resolveService(service, object : NsdManager.ResolveListener {
-                        override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {
-                            Log.v(TAG, "Resolve failed: $errorCode")
-                        }
-
-                        override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
-                            Log.v(TAG, "Resolve Succeeded: $serviceInfo")
-                            addOrUpdate(serviceInfo.serviceName, arrayOf(serviceInfo.host), serviceInfo.port)
-                        }
-                    })
-                }
-            }
-        }
+        action();
     }
 
     private val _castingDialogLock = Any();
@@ -302,8 +128,9 @@ class StateCasting {
 
     @Synchronized
     fun connectDevice(device: CastingDevice) {
-        if (activeDevice == device)
-            return;
+        if (activeDevice == device) {
+            return
+        }
 
         val ad = activeDevice;
         if (ad != null) {
@@ -313,11 +140,11 @@ class StateCasting {
             device.onTimeChanged.clear();
             device.onVolumeChanged.clear();
             device.onDurationChanged.clear();
-            ad.stop();
+            ad.disconnect()
         }
 
         device.onConnectionStateChanged.subscribe { castConnectionState ->
-            Logger.i(TAG, "Active device connection state changed: $castConnectionState");
+            Logger.i(TAG, "Active device connection state changed: $castConnectionState")
 
             if (castConnectionState == CastConnectionState.DISCONNECTED) {
                 Logger.i(TAG, "Clearing events: $castConnectionState");
@@ -351,10 +178,14 @@ class StateCasting {
                                 synchronized(_castingDialogLock) {
                                     if(_currentDialog == null) {
                                         _currentDialog = UIDialogs.showDialog(context, R.drawable.ic_loader_animated, true,
-                                                "Connecting to [${device.name}]",
-                                                "Make sure you are on the same network\n\nVPNs and guest networks can cause issues", null, -2,
+                                            "Connecting to [${device.name}]",
+                                            "Make sure you are on the same network\n\nVPNs and guest networks can cause issues", null, -2,
                                             UIDialogs.Action("Disconnect", {
-                                                device.stop();
+                                                try {
+                                                    device.disconnect()
+                                                } catch (e: Throwable) {
+                                                    Logger.e(TAG, "Failed to disconnect from device: $e")
+                                                }
                                             }));
                                     }
                                 }
@@ -376,7 +207,7 @@ class StateCasting {
         };
         device.onPlayChanged.subscribe {
             invokeInMainScopeIfRequired { onActiveDevicePlayChanged.emit(it) };
-        }
+        };
         device.onDurationChanged.subscribe {
             invokeInMainScopeIfRequired { onActiveDeviceDurationChanged.emit(it) };
         };
@@ -388,7 +219,7 @@ class StateCasting {
         };
 
         try {
-            device.start();
+            device.connect();
         } catch (e: Throwable) {
             Logger.w(TAG, "Failed to connect to device.");
             device.onConnectionStateChanged.clear();
@@ -399,52 +230,24 @@ class StateCasting {
             return;
         }
 
-        activeDevice = device;
-        Logger.i(TAG, "Connect to device ${device.name}");
+        activeDevice = device
+        Logger.i(TAG, "Connect to device ${device.name}")
     }
 
-    fun addRememberedDevice(deviceInfo: CastingDeviceInfo): CastingDeviceInfo {
-        val device = deviceFromCastingDeviceInfo(deviceInfo);
-        return addRememberedDevice(device);
-    }
-
-    fun getRememberedCastingDevices(): List<CastingDevice> {
-        return _storage.getDevices().map { deviceFromCastingDeviceInfo(it) }
-    }
-
-    fun getRememberedCastingDeviceNames(): List<String> {
-        return _storage.getDeviceNames()
-    }
-
-    fun addRememberedDevice(device: CastingDevice): CastingDeviceInfo {
-        val deviceInfo = device.getDeviceInfo()
-        return _storage.addDevice(deviceInfo)
-    }
-
-    fun removeRememberedDevice(device: CastingDevice) {
-        val name = device.name ?: return
-        _storage.removeDevice(name)
-    }
-
-    private fun invokeInMainScopeIfRequired(action: () -> Unit){
-        if(Looper.getMainLooper().thread != Thread.currentThread()) {
-            _scopeMain.launch { action(); }
-            return;
-        }
-
-        action();
-    }
-
-    fun cancel() {
-        _castId.incrementAndGet()
+    fun metadataFromVideo(video: IPlatformVideoDetails): Metadata {
+        return Metadata(
+            title = video.name, thumbnailUrl = video.thumbnails.getHQThumbnail()
+        )
     }
 
+    @Throws
     suspend fun castIfAvailable(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoSource?, audioSource: IAudioSource?, subtitleSource: ISubtitleSource?, ms: Long = -1, speed: Double?, onLoadingEstimate: ((Int) -> Unit)? = null, onLoading: ((Boolean) -> Unit)? = null): Boolean {
         return withContext(Dispatchers.IO) {
             val ad = activeDevice ?: return@withContext false;
             if (ad.connectionState != CastConnectionState.CONNECTED) {
                 return@withContext false;
             }
+            val deviceProto = ad.protocolType
 
             val resumePosition = if (ms > 0L) (ms.toDouble() / 1000.0) else 0.0;
             val castId = _castId.incrementAndGet()
@@ -460,7 +263,7 @@ class StateCasting {
 
             if (sourceCount > 1) {
                 if (videoSource is LocalVideoSource || audioSource is LocalAudioSource || subtitleSource is LocalSubtitleSource) {
-                    if (ad is AirPlayCastingDevice) {
+                    if (deviceProto == CastProtocolType.AIRPLAY) {
                         Logger.i(TAG, "Casting as local HLS");
                         castLocalHls(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition, speed);
                     } else {
@@ -468,16 +271,17 @@ class StateCasting {
                         castLocalDash(video, videoSource as LocalVideoSource?, audioSource as LocalAudioSource?, subtitleSource as LocalSubtitleSource?, resumePosition, speed);
                     }
                 } else {
-                    val isRawDash = videoSource is JSDashManifestRawSource || audioSource is JSDashManifestRawAudioSource
+                    val isRawDash =
+                        videoSource is JSDashManifestRawSource || audioSource is JSDashManifestRawAudioSource
                     if (isRawDash) {
                         Logger.i(TAG, "Casting as raw DASH");
 
                         castDashRaw(contentResolver, video, videoSource as JSDashManifestRawSource?, audioSource as JSDashManifestRawAudioSource?, subtitleSource, resumePosition, speed, castId, onLoadingEstimate, onLoading);
                     } else {
-                        if (ad is FCastCastingDevice) {
+                        if (deviceProto == CastProtocolType.FCAST) {
                             Logger.i(TAG, "Casting as DASH direct");
                             castDashDirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
-                        } else if (ad is AirPlayCastingDevice) {
+                        } else if (deviceProto == CastProtocolType.AIRPLAY) {
                             Logger.i(TAG, "Casting as HLS indirect");
                             castHlsIndirect(contentResolver, video, videoSource as IVideoUrlSource?, audioSource as IAudioUrlSource?, subtitleSource, resumePosition, speed);
                         } else {
@@ -495,27 +299,27 @@ class StateCasting {
                     val videoPath = "/video-${id}"
                     val videoUrl = if(proxyStreams) url + videoPath else videoSource.getVideoUrl();
                     Logger.i(TAG, "Casting as singular video");
-                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed);
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
                 } else if (audioSource is IAudioUrlSource) {
                     val audioPath = "/audio-${id}"
                     val audioUrl = if(proxyStreams) url + audioPath else audioSource.getAudioUrl();
                     Logger.i(TAG, "Casting as singular audio");
-                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed);
-                } else if(videoSource is IHLSManifestSource) {
-                    if (proxyStreams || ad is ChromecastCastingDevice) {
+                    ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
+                } else if (videoSource is IHLSManifestSource) {
+                    if (proxyStreams || deviceProto == CastProtocolType.CHROMECAST) {
                         Logger.i(TAG, "Casting as proxied HLS");
                         castProxiedHls(video, videoSource.url, videoSource.codec, resumePosition, speed);
                     } else {
                         Logger.i(TAG, "Casting as non-proxied HLS");
-                        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed);
+                        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", videoSource.container, videoSource.url, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
                     }
-                } else if(audioSource is IHLSManifestAudioSource) {
-                    if (proxyStreams || ad is ChromecastCastingDevice) {
+                } else if (audioSource is IHLSManifestAudioSource) {
+                    if (proxyStreams || deviceProto == CastProtocolType.CHROMECAST) {
                         Logger.i(TAG, "Casting as proxied audio HLS");
                         castProxiedHls(video, audioSource.url, audioSource.codec, resumePosition, speed);
                     } else {
                         Logger.i(TAG, "Casting as non-proxied audio HLS");
-                        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble(), speed);
+                        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", audioSource.container, audioSource.url, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
                     }
                 } else if (videoSource is LocalVideoSource) {
                     Logger.i(TAG, "Casting as local video");
@@ -545,28 +349,69 @@ class StateCasting {
 
     fun resumeVideo(): Boolean {
         val ad = activeDevice ?: return false;
-        ad.resumeVideo();
+        try {
+            ad.resumePlayback();
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to resume playback: $e")
+            return false
+        }
         return true;
     }
 
     fun pauseVideo(): Boolean {
         val ad = activeDevice ?: return false;
-        ad.pauseVideo();
+        try {
+            ad.pausePlayback();
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to pause playback: $e")
+            return false
+        }
         return true;
     }
 
     fun stopVideo(): Boolean {
         val ad = activeDevice ?: return false;
-        ad.stopVideo();
+        try {
+            ad.stopPlayback();
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to stop playback: $e")
+            return false
+        }
         return true;
     }
 
     fun videoSeekTo(timeSeconds: Double): Boolean {
         val ad = activeDevice ?: return false;
-        ad.seekVideo(timeSeconds);
+        try {
+            ad.seekTo(timeSeconds);
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to seek: $e")
+            return false
+        }
         return true;
     }
 
+    fun changeVolume(volume: Double): Boolean {
+        val ad = activeDevice ?: return false;
+        try {
+            ad.changeVolume(volume);
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to change volume: $e")
+            return false
+        }
+        return true;
+    }
+
+    fun changeSpeed(speed: Double): Boolean {
+        val ad = activeDevice ?: return false;
+        try {
+            ad.changeSpeed(speed);
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to change speed: $e")
+            return false
+        }
+        return true;
+    }
     private fun castLocalVideo(video: IPlatformVideoDetails, videoSource: LocalVideoSource, resumePosition: Double, speed: Double?) : List<String> {
         val ad = activeDevice ?: return listOf();
 
@@ -581,7 +426,7 @@ class StateCasting {
         ).withTag("cast");
 
         Logger.i(TAG, "Casting local video (videoUrl: $videoUrl).");
-        ad.loadVideo("BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed);
+        ad.loadVideo("BUFFERED", videoSource.container, videoUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf(videoUrl);
     }
@@ -600,7 +445,7 @@ class StateCasting {
         ).withTag("cast");
 
         Logger.i(TAG, "Casting local audio (audioUrl: $audioUrl).");
-        ad.loadVideo("BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed);
+        ad.loadVideo("BUFFERED", audioSource.container, audioUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf(audioUrl);
     }
@@ -696,7 +541,7 @@ class StateCasting {
         ).withTag("castLocalHls")
 
         Logger.i(TAG, "added new castLocalHls handlers (hlsPath: $hlsPath, videoPath: $videoPath, audioPath: $audioPath, subtitlePath: $subtitlePath).")
-        ad.loadVideo("BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble(), speed)
+        ad.loadVideo("BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video))
 
         return listOf(hlsUrl, videoUrl, audioUrl, subtitleUrl)
     }
@@ -721,10 +566,10 @@ class StateCasting {
         Logger.v(TAG) { "Dash manifest: $dashContent" };
 
         _castServer.addHandlerWithAllowAllOptions(
-                HttpConstantHandler("GET", dashPath, dashContent,
-                    "application/dash+xml")
-                    .withHeader("Access-Control-Allow-Origin", "*"), true
-            ).withTag("cast");
+            HttpConstantHandler("GET", dashPath, dashContent,
+                "application/dash+xml")
+                .withHeader("Access-Control-Allow-Origin", "*"), true
+        ).withTag("cast");
         if (videoSource != null) {
             _castServer.addHandlerWithAllowAllOptions(
                 HttpFileHandler("GET", videoPath, videoSource.container, videoSource.filePath)
@@ -745,7 +590,7 @@ class StateCasting {
         }
 
         Logger.i(TAG, "added new castLocalDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath, subtitlePath: $subtitlePath).");
-        ad.loadVideo("BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed);
+        ad.loadVideo("BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf(dashUrl, videoUrl, audioUrl, subtitleUrl);
     }
@@ -810,12 +655,18 @@ class StateCasting {
 
         Logger.i(TAG, "Direct dash cast to casting device (videoUrl: $videoUrl, audioUrl: $audioUrl).");
         Logger.v(TAG) { "Dash manifest: $content" };
-        ad.loadContent("application/dash+xml", content, resumePosition, video.duration.toDouble(), speed);
+        ad.loadContent("application/dash+xml", content, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf(videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }
 
-    private fun castProxiedHls(video: IPlatformVideoDetails, sourceUrl: String, codec: String?, resumePosition: Double, speed: Double?): List<String> {
+    private fun castProxiedHls(
+        video: IPlatformVideoDetails,
+        sourceUrl: String,
+        codec: String?,
+        resumePosition: Double,
+        speed: Double?
+    ): List<String> {
         _castServer.removeAllHandlers("castProxiedHlsMaster")
 
         val ad = activeDevice ?: return listOf();
@@ -826,117 +677,151 @@ class StateCasting {
         val hlsUrl = url + hlsPath
         Logger.i(TAG, "HLS url: $hlsUrl");
 
-        _castServer.addHandlerWithAllowAllOptions(HttpFunctionHandler("GET", hlsPath) { masterContext ->
-            _castServer.removeAllHandlers("castProxiedHlsVariant")
+        _castServer.addHandlerWithAllowAllOptions(
+            HttpFunctionHandler(
+                "GET", hlsPath
+            ) { masterContext ->
+                _castServer.removeAllHandlers("castProxiedHlsVariant")
 
-            val headers = masterContext.headers.clone()
-            headers["Content-Type"] = "application/vnd.apple.mpegurl";
+                val headers = masterContext.headers.clone()
+                headers["Content-Type"] = "application/vnd.apple.mpegurl";
 
-            val masterPlaylistResponse = _client.get(sourceUrl)
-            check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
+                val masterPlaylistResponse = _client.get(sourceUrl)
+                check(masterPlaylistResponse.isOk) { "Failed to get master playlist: ${masterPlaylistResponse.code}" }
 
-            val masterPlaylistContent = masterPlaylistResponse.body?.string()
-                ?: throw Exception("Master playlist content is empty")
+                val masterPlaylistContent = masterPlaylistResponse.body?.string()
+                    ?: throw Exception("Master playlist content is empty")
 
-            val masterPlaylist: HLS.MasterPlaylist
-            try {
-                masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
-            } catch (e: Throwable) {
-                if (masterPlaylistContent.lines().any { it.startsWith("#EXTINF:") }) {
-                    //This is a variant playlist, not a master playlist
-                    Logger.i(TAG, "HLS casting as variant playlist (codec: $codec): $hlsUrl");
+                val masterPlaylist: HLS.MasterPlaylist
+                try {
+                    masterPlaylist = HLS.parseMasterPlaylist(masterPlaylistContent, sourceUrl)
+                } catch (e: Throwable) {
+                    if (masterPlaylistContent.lines().any { it.startsWith("#EXTINF:") }) {
+                        //This is a variant playlist, not a master playlist
+                        Logger.i(TAG, "HLS casting as variant playlist (codec: $codec): $hlsUrl");
 
-                    val vpHeaders = masterContext.headers.clone()
-                    vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
-
-                    val variantPlaylist = HLS.parseVariantPlaylist(masterPlaylistContent, sourceUrl)
-                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, id, variantPlaylist, video.isLive)
-                    val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
-                    masterContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
-                    return@HttpFunctionHandler
-                } else {
-                    throw e
-                }
-            }
-
-            Logger.i(TAG, "HLS casting as master playlist: $hlsUrl");
-
-            val newVariantPlaylistRefs = arrayListOf<HLS.VariantPlaylistReference>()
-            val newMediaRenditions = arrayListOf<HLS.MediaRendition>()
-            val newMasterPlaylist = HLS.MasterPlaylist(newVariantPlaylistRefs, newMediaRenditions, masterPlaylist.sessionDataList, masterPlaylist.independentSegments)
-
-            for (variantPlaylistRef in masterPlaylist.variantPlaylistsRefs) {
-                val playlistId = UUID.randomUUID();
-                val newPlaylistPath = "/hls-playlist-${playlistId}"
-                val newPlaylistUrl = url + newPlaylistPath;
-
-                _castServer.addHandlerWithAllowAllOptions(HttpFunctionHandler("GET", newPlaylistPath) { vpContext ->
-                    val vpHeaders = vpContext.headers.clone()
-                    vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
-
-                    val response = _client.get(variantPlaylistRef.url)
-                    check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
-
-                    val vpContent = response.body?.string()
-                        ?: throw Exception("Variant playlist content is empty")
-
-                    val variantPlaylist = HLS.parseVariantPlaylist(vpContent, variantPlaylistRef.url)
-                    val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
-                    val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
-                    vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
-                }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsVariant")
-
-                newVariantPlaylistRefs.add(HLS.VariantPlaylistReference(
-                    newPlaylistUrl,
-                    variantPlaylistRef.streamInfo
-                ))
-            }
-
-            for (mediaRendition in masterPlaylist.mediaRenditions) {
-                val playlistId = UUID.randomUUID()
-
-                var newPlaylistUrl: String? = null
-                if (mediaRendition.uri != null) {
-                    val newPlaylistPath = "/hls-playlist-${playlistId}"
-                    newPlaylistUrl = url + newPlaylistPath
-
-                    _castServer.addHandlerWithAllowAllOptions(HttpFunctionHandler("GET", newPlaylistPath) { vpContext ->
-                        val vpHeaders = vpContext.headers.clone()
+                        val vpHeaders = masterContext.headers.clone()
                         vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
 
-                        val response = _client.get(mediaRendition.uri)
-                        check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
-
-                        val vpContent = response.body?.string()
-                            ?: throw Exception("Variant playlist content is empty")
-
-                        val variantPlaylist = HLS.parseVariantPlaylist(vpContent, mediaRendition.uri)
-                        val proxiedVariantPlaylist = proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
+                        val variantPlaylist =
+                            HLS.parseVariantPlaylist(masterPlaylistContent, sourceUrl)
+                        val proxiedVariantPlaylist =
+                            proxyVariantPlaylist(url, id, variantPlaylist, video.isLive)
                         val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
-                        vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
-                    }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsVariant")
+                        masterContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                        return@HttpFunctionHandler
+                    } else {
+                        throw e
+                    }
                 }
 
-                newMediaRenditions.add(HLS.MediaRendition(
-                    mediaRendition.type,
-                    newPlaylistUrl,
-                    mediaRendition.groupID,
-                    mediaRendition.language,
-                    mediaRendition.name,
-                    mediaRendition.isDefault,
-                    mediaRendition.isAutoSelect,
-                    mediaRendition.isForced
-                ))
-            }
+                Logger.i(TAG, "HLS casting as master playlist: $hlsUrl");
 
-            masterContext.respondCode(200, headers, newMasterPlaylist.buildM3U8());
-        }.withHeader("Access-Control-Allow-Origin", "*"), true).withTag("castProxiedHlsMaster")
+                val newVariantPlaylistRefs = arrayListOf<HLS.VariantPlaylistReference>()
+                val newMediaRenditions = arrayListOf<HLS.MediaRendition>()
+                val newMasterPlaylist = HLS.MasterPlaylist(
+                    newVariantPlaylistRefs,
+                    newMediaRenditions,
+                    masterPlaylist.sessionDataList,
+                    masterPlaylist.independentSegments
+                )
+
+                for (variantPlaylistRef in masterPlaylist.variantPlaylistsRefs) {
+                    val playlistId = UUID.randomUUID();
+                    val newPlaylistPath = "/hls-playlist-${playlistId}"
+                    val newPlaylistUrl = url + newPlaylistPath;
+
+                    _castServer.addHandlerWithAllowAllOptions(
+                        HttpFunctionHandler(
+                            "GET", newPlaylistPath
+                        ) { vpContext ->
+                            val vpHeaders = vpContext.headers.clone()
+                            vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+
+                            val response = _client.get(variantPlaylistRef.url)
+                            check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
+
+                            val vpContent = response.body?.string()
+                                ?: throw Exception("Variant playlist content is empty")
+
+                            val variantPlaylist =
+                                HLS.parseVariantPlaylist(vpContent, variantPlaylistRef.url)
+                            val proxiedVariantPlaylist =
+                                proxyVariantPlaylist(url, playlistId, variantPlaylist, video.isLive)
+                            val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
+                            vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                        }.withHeader("Access-Control-Allow-Origin", "*"), true
+                    ).withTag("castProxiedHlsVariant")
+
+                    newVariantPlaylistRefs.add(
+                        HLS.VariantPlaylistReference(
+                            newPlaylistUrl, variantPlaylistRef.streamInfo
+                        )
+                    )
+                }
+
+                for (mediaRendition in masterPlaylist.mediaRenditions) {
+                    val playlistId = UUID.randomUUID()
+
+                    var newPlaylistUrl: String? = null
+                    if (mediaRendition.uri != null) {
+                        val newPlaylistPath = "/hls-playlist-${playlistId}"
+                        newPlaylistUrl = url + newPlaylistPath
+
+                        _castServer.addHandlerWithAllowAllOptions(
+                            HttpFunctionHandler(
+                                "GET", newPlaylistPath
+                            ) { vpContext ->
+                                val vpHeaders = vpContext.headers.clone()
+                                vpHeaders["Content-Type"] = "application/vnd.apple.mpegurl";
+
+                                val response = _client.get(mediaRendition.uri)
+                                check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
+
+                                val vpContent = response.body?.string()
+                                    ?: throw Exception("Variant playlist content is empty")
+
+                                val variantPlaylist =
+                                    HLS.parseVariantPlaylist(vpContent, mediaRendition.uri)
+                                val proxiedVariantPlaylist = proxyVariantPlaylist(
+                                    url, playlistId, variantPlaylist, video.isLive
+                                )
+                                val proxiedVariantPlaylist_m3u8 = proxiedVariantPlaylist.buildM3U8()
+                                vpContext.respondCode(200, vpHeaders, proxiedVariantPlaylist_m3u8);
+                            }.withHeader("Access-Control-Allow-Origin", "*"), true
+                        ).withTag("castProxiedHlsVariant")
+                    }
+
+                    newMediaRenditions.add(HLS.MediaRendition(
+                        mediaRendition.type,
+                        newPlaylistUrl,
+                        mediaRendition.groupID,
+                        mediaRendition.language,
+                        mediaRendition.name,
+                        mediaRendition.isDefault,
+                        mediaRendition.isAutoSelect,
+                        mediaRendition.isForced
+                    ))
+                }
+
+                masterContext.respondCode(200, headers, newMasterPlaylist.buildM3U8());
+            }.withHeader("Access-Control-Allow-Origin", "*"), true
+        ).withTag("castProxiedHlsMaster")
 
         Logger.i(TAG, "added new castHlsIndirect handlers (hlsPath: $hlsPath).");
 
         //ChromeCast is sometimes funky with resume position 0
-        val hackfixResumePosition = if (ad is ChromecastCastingDevice && !video.isLive && resumePosition == 0.0) 0.1 else resumePosition;
-        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, hackfixResumePosition, video.duration.toDouble(), speed);
+        val hackfixResumePosition =
+            if (ad.protocolType == CastProtocolType.CHROMECAST && !video.isLive && resumePosition == 0.0) 0.1 else resumePosition;
+        ad.loadVideo(
+            if (video.isLive) "LIVE" else "BUFFERED",
+            "application/vnd.apple.mpegurl",
+            hlsUrl,
+            hackfixResumePosition,
+            video.duration.toDouble(),
+            speed,
+            metadataFromVideo(video)
+        );
 
         return listOf(hlsUrl);
     }
@@ -1110,14 +995,14 @@ class StateCasting {
         ).withTag("castHlsIndirectMaster")
 
         Logger.i(TAG, "added new castHls handlers (hlsPath: $hlsPath).");
-        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble(), speed);
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/vnd.apple.mpegurl", hlsUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf(hlsUrl, videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }
 
     private fun shouldProxyStreams(castingDevice: CastingDevice, videoSource: IVideoSource?, audioSource: IAudioSource?): Boolean {
         val hasRequestModifier = (videoSource as? JSSource)?.hasRequestModifier == true || (audioSource as? JSSource)?.hasRequestModifier == true
-        return Settings.instance.casting.alwaysProxyRequests || castingDevice !is FCastCastingDevice || hasRequestModifier
+        return Settings.instance.casting.alwaysProxyRequests || castingDevice.protocolType != CastProtocolType.FCAST || hasRequestModifier
     }
 
     private suspend fun castDashIndirect(contentResolver: ContentResolver, video: IPlatformVideoDetails, videoSource: IVideoUrlSource?, audioSource: IAudioUrlSource?, subtitleSource: ISubtitleSource?, resumePosition: Double, speed: Double?) : List<String> {
@@ -1193,12 +1078,12 @@ class StateCasting {
         }
 
         Logger.i(TAG, "added new castDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath).");
-        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed);
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf(dashUrl, videoUrl ?: "", audioUrl ?: "", subtitlesUrl ?: "", videoSource?.getVideoUrl() ?: "", audioSource?.getAudioUrl() ?: "", subtitlesUri.toString());
     }
 
-    private fun cleanExecutors() {
+    fun cleanExecutors() {
         if (_videoExecutor != null) {
             _videoExecutor?.cleanup()
             _videoExecutor = null
@@ -1397,163 +1282,61 @@ class StateCasting {
         }
 
         Logger.i(TAG, "added new castDash handlers (dashPath: $dashPath, videoPath: $videoPath, audioPath: $audioPath).");
-        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed);
+        ad.loadVideo(if (video.isLive) "LIVE" else "BUFFERED", "application/dash+xml", dashUrl, resumePosition, video.duration.toDouble(), speed, metadataFromVideo(video));
 
         return listOf()
     }
 
-    private fun deviceFromCastingDeviceInfo(deviceInfo: CastingDeviceInfo): CastingDevice {
-        return when (deviceInfo.type) {
-            CastProtocolType.CHROMECAST -> {
-                ChromecastCastingDevice(deviceInfo);
-            }
-            CastProtocolType.AIRPLAY -> {
-                AirPlayCastingDevice(deviceInfo);
-            }
-            CastProtocolType.FCAST -> {
-                FCastCastingDevice(deviceInfo);
-            }
-        }
+    fun addRememberedDevice(deviceInfo: CastingDeviceInfo): CastingDeviceInfo {
+        val device = deviceFromInfo(deviceInfo);
+        return addRememberedDevice(device);
     }
 
-    private fun addOrUpdateChromeCastDevice(name: String, addresses: Array<InetAddress>, port: Int) {
-        return addOrUpdateCastDevice<ChromecastCastingDevice>(name,
-            deviceFactory = { ChromecastCastingDevice(name, addresses, port) },
-            deviceUpdater = { d ->
-                if (d.isReady) {
-                    return@addOrUpdateCastDevice false;
-                }
-
-                val changed = addresses.contentEquals(d.addresses) || d.name != name || d.port != port;
-                if (changed) {
-                    d.name = name;
-                    d.addresses = addresses;
-                    d.port = port;
-                }
-
-                return@addOrUpdateCastDevice changed;
-            }
-        );
+    fun addRememberedDevice(device: CastingDevice): CastingDeviceInfo {
+        val deviceInfo = device.getDeviceInfo()
+        return _storage.addDevice(deviceInfo)
     }
 
-    private fun addOrUpdateAirPlayDevice(name: String, addresses: Array<InetAddress>, port: Int) {
-        return addOrUpdateCastDevice<AirPlayCastingDevice>(name,
-            deviceFactory = { AirPlayCastingDevice(name, addresses, port) },
-            deviceUpdater = { d ->
-                if (d.isReady) {
-                    return@addOrUpdateCastDevice false;
-                }
-
-                val changed = addresses.contentEquals(addresses) || d.name != name || d.port != port;
-                if (changed) {
-                    d.name = name;
-                    d.port = port;
-                    d.addresses = addresses;
-                }
-
-                return@addOrUpdateCastDevice changed;
-            }
-        );
+    fun getRememberedCastingDevices(): List<CastingDevice> {
+        return _storage.getDevices().map { deviceFromInfo(it) }
     }
 
-    private fun addOrUpdateFastCastDevice(name: String, addresses: Array<InetAddress>, port: Int) {
-        return addOrUpdateCastDevice<FCastCastingDevice>(name,
-            deviceFactory = { FCastCastingDevice(name, addresses, port) },
-            deviceUpdater = { d ->
-                if (d.isReady) {
-                    return@addOrUpdateCastDevice false;
-                }
-
-                val changed = addresses.contentEquals(addresses) || d.name != name || d.port != port;
-                if (changed) {
-                    d.name = name;
-                    d.port = port;
-                    d.addresses = addresses;
-                }
-
-                return@addOrUpdateCastDevice changed;
-            }
-        );
+    fun getRememberedCastingDeviceNames(): List<String> {
+        return _storage.getDeviceNames()
     }
 
-    private inline fun <reified TCastDevice> addOrUpdateCastDevice(name: String, deviceFactory: () -> TCastDevice, deviceUpdater: (device: TCastDevice) -> Boolean) where TCastDevice : CastingDevice {
-        var invokeEvents: (() -> Unit)? = null;
-
-        synchronized(devices) {
-            val device = devices[name];
-            if (device != null) {
-                if (device !is TCastDevice) {
-                    Logger.w(TAG, "Device name conflict between device types. Ignoring device.");
-                } else {
-                    val changed = deviceUpdater(device as TCastDevice);
-                    if (changed) {
-                        invokeEvents = {
-                            onDeviceChanged.emit(device);
-                        }
-                    } else {
-
-                    }
-                }
-            } else {
-                val newDevice = deviceFactory();
-                this.devices[name] = newDevice;
-
-                invokeEvents = {
-                    onDeviceAdded.emit(newDevice);
-                };
-            }
-        }
-
-        invokeEvents?.let { _scopeMain.launch { it(); }; };
+    fun removeRememberedDevice(device: CastingDevice) {
+        val name = device.name ?: return
+        _storage.removeDevice(name)
     }
 
-    fun enableDeveloper(enableDev: Boolean){
+    fun enableDeveloper(enableDev: Boolean) {
         _castServer.removeAllHandlers("dev");
-        if(enableDev) {
+        if (enableDev) {
             _castServer.addHandler(HttpFunctionHandler("GET", "/dashPlayer") { context ->
                 if (context.query.containsKey("dashUrl")) {
                     val dashUrl = context.query["dashUrl"];
-                    val html = "<div>\n" +
-                            " <video id=\"test\" width=\"1280\" height=\"720\" controls>\n" +
-                            " </video>\n" +
-                            " \n" +
-                            " \n" +
-                            "    <script src=\"https://cdn.dashjs.org/latest/dash.all.min.js\"></script>\n" +
-                            "    <script>\n" +
-                            "    <!--setup the video element and attach it to the Dash player-->\n" +
-                            "            (function(){\n" +
-                            "                var url = \"${dashUrl}\";\n" +
-                            "                var player = dashjs.MediaPlayer().create();\n" +
-                            "                player.initialize(document.querySelector(\"#test\"), url, true);\n" +
-                            "            })();\n" +
-                            "    </script>\n" +
-                            "</div>";
+                    val html =
+                        "<div>\n" + " <video id=\"test\" width=\"1280\" height=\"720\" controls>\n" + " </video>\n" + " \n" + " \n" + "    <script src=\"https://cdn.dashjs.org/latest/dash.all.min.js\"></script>\n" + "    <script>\n" + "    <!--setup the video element and attach it to the Dash player-->\n" + "            (function(){\n" + "                var url = \"${dashUrl}\";\n" + "                var player = dashjs.MediaPlayer().create();\n" + "                player.initialize(document.querySelector(\"#test\"), url, true);\n" + "            })();\n" + "    </script>\n" + "</div>";
                     context.respondCode(200, html, "text/html");
                 }
             }).withTag("dev");
         }
     }
 
-    @Serializable
-    private data class FCastNetworkConfig(
-        val name: String,
-        val addresses: List<String>,
-        val services: List<FCastService>
-    )
-
-    @Serializable
-    private data class FCastService(
-        val port: Int,
-        val type: Int
-    )
-
     companion object {
-        val instance: StateCasting = StateCasting();
-
-        private val representationRegex = Regex("<Representation .*?mimeType=\"(.*?)\".*?>(.*?)<\\/Representation>", RegexOption.DOT_MATCHES_ALL)
-        private val mediaInitializationRegex = Regex("(media|initiali[sz]ation)=\"([^\"]+)\"", RegexOption.DOT_MATCHES_ALL);
+        var instance: StateCasting = if (Settings.instance.casting.experimentalCasting) {
+            StateCastingExp()
+        } else {
+            StateCastingLegacy()
+        }
+        private val representationRegex = Regex(
+            "<Representation .*?mimeType=\"(.*?)\".*?>(.*?)<\\/Representation>",
+            RegexOption.DOT_MATCHES_ALL
+        )
+        private val mediaInitializationRegex =
+            Regex("(media|initiali[sz]ation)=\"([^\"]+)\"", RegexOption.DOT_MATCHES_ALL);
 
         private val TAG = "StateCasting";
     }
-}
-
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/casting/StateCastingExp.kt b/app/src/main/java/com/futo/platformplayer/casting/StateCastingExp.kt
new file mode 100644
index 00000000..0c908074
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/casting/StateCastingExp.kt
@@ -0,0 +1,174 @@
+package com.futo.platformplayer.casting
+
+import android.content.Context
+import android.util.Log
+import com.futo.platformplayer.BuildConfig
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.CastingDeviceInfo
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import org.fcast.sender_sdk.DeviceInfo as RsDeviceInfo
+import org.fcast.sender_sdk.ProtocolType
+import org.fcast.sender_sdk.CastContext
+import org.fcast.sender_sdk.NsdDeviceDiscoverer
+
+class StateCastingExp : StateCasting() {
+    private val _context = CastContext()
+    var _deviceDiscoverer: NsdDeviceDiscoverer? = null
+
+    class DiscoveryEventHandler(
+        private val onDeviceAdded: (RsDeviceInfo) -> Unit,
+        private val onDeviceRemoved: (String) -> Unit,
+        private val onDeviceUpdated: (RsDeviceInfo) -> Unit,
+    ) : org.fcast.sender_sdk.DeviceDiscovererEventHandler {
+        override fun deviceAvailable(deviceInfo: RsDeviceInfo) {
+            onDeviceAdded(deviceInfo)
+        }
+
+        override fun deviceChanged(deviceInfo: RsDeviceInfo) {
+            onDeviceUpdated(deviceInfo)
+        }
+
+        override fun deviceRemoved(deviceName: String) {
+            onDeviceRemoved(deviceName)
+        }
+    }
+
+    init {
+        if (BuildConfig.DEBUG) {
+            org.fcast.sender_sdk.initLogger(org.fcast.sender_sdk.LogLevelFilter.DEBUG)
+        }
+    }
+
+    override fun handleUrl(url: String) {
+        try {
+            val foundDeviceInfo = org.fcast.sender_sdk.deviceInfoFromUrl(url)!!
+            val foundDevice = _context.createDeviceFromInfo(foundDeviceInfo)
+            connectDevice(CastingDeviceExp(foundDevice))
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to handle URL: $e")
+        }
+    }
+
+    override fun onStop() {
+        val ad = activeDevice ?: return
+        _resumeCastingDevice = ad.getDeviceInfo()
+        Log.i(TAG, "_resumeCastingDevice set to '${ad.name}'")
+        Logger.i(TAG, "Stopping active device because of onStop.")
+        try {
+            ad.disconnect()
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to disconnect from device: $e")
+        }
+    }
+
+    @Synchronized
+    override fun start(context: Context) {
+        if (_started)
+            return
+        _started = true
+
+        Log.i(TAG, "_resumeCastingDevice set null start")
+        _resumeCastingDevice = null
+
+        Logger.i(TAG, "CastingService starting...")
+
+        _castServer.start()
+        enableDeveloper(true)
+
+        Logger.i(TAG, "CastingService started.")
+
+        _deviceDiscoverer = NsdDeviceDiscoverer(
+            context,
+            DiscoveryEventHandler(
+                { deviceInfo -> // Added
+                    Logger.i(TAG, "Device added: ${deviceInfo.name}")
+                    val device = _context.createDeviceFromInfo(deviceInfo)
+                    val deviceHandle = CastingDeviceExp(device)
+                    devices[deviceHandle.device.name()] = deviceHandle
+                    invokeInMainScopeIfRequired {
+                        onDeviceAdded.emit(deviceHandle)
+                    }
+                },
+                { deviceName -> // Removed
+                    invokeInMainScopeIfRequired {
+                        if (devices.containsKey(deviceName)) {
+                            val device = devices.remove(deviceName)
+                            if (device != null) {
+                                onDeviceRemoved.emit(device)
+                            }
+                        }
+                    }
+                },
+                { deviceInfo -> // Updated
+                    Logger.i(TAG, "Device updated: $deviceInfo")
+                    val handle = devices[deviceInfo.name]
+                    if (handle != null && handle is CastingDeviceExp) {
+                        handle.device.setPort(deviceInfo.port)
+                        handle.device.setAddresses(deviceInfo.addresses)
+                        invokeInMainScopeIfRequired {
+                            onDeviceChanged.emit(handle)
+                        }
+                    }
+                },
+            )
+        )
+    }
+
+    @Synchronized
+    override fun stop() {
+        if (!_started) {
+            return
+        }
+
+        _started = false
+
+        Logger.i(TAG, "CastingService stopping.")
+
+        _scopeIO.cancel()
+        _scopeMain.cancel()
+
+        Logger.i(TAG, "Stopping active device because StateCasting is being stopped.")
+        val d = activeDevice
+        activeDevice = null
+        try {
+            d?.disconnect()
+        } catch (e: Throwable) {
+            Logger.e(TAG, "Failed to disconnect device: $e")
+        }
+
+        _castServer.stop()
+        _castServer.removeAllHandlers()
+
+        Logger.i(TAG, "CastingService stopped.")
+
+        _deviceDiscoverer = null
+    }
+
+    override fun startUpdateTimeJob(
+        onTimeJobTimeChanged_s: Event1<Long>,
+        setTime: (Long) -> Unit
+    ): Job? = null
+
+    override fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDeviceExp {
+        val rsAddrs =
+            deviceInfo.addresses.map { org.fcast.sender_sdk.tryIpAddrFromStr(it) } // Throws!
+        val rsDeviceInfo = RsDeviceInfo(
+            name = deviceInfo.name,
+            protocol = when (deviceInfo.type) {
+                com.futo.platformplayer.casting.CastProtocolType.CHROMECAST -> ProtocolType.CHROMECAST
+                com.futo.platformplayer.casting.CastProtocolType.FCAST -> ProtocolType.F_CAST
+                else -> throw IllegalArgumentException()
+            },
+            addresses = rsAddrs,
+            port = deviceInfo.port.toUShort(),
+        )
+
+        return CastingDeviceExp(_context.createDeviceFromInfo(rsDeviceInfo))
+    }
+
+    companion object {
+        private val TAG = "StateCastingExp"
+    }
+}
diff --git a/app/src/main/java/com/futo/platformplayer/casting/StateCastingLegacy.kt b/app/src/main/java/com/futo/platformplayer/casting/StateCastingLegacy.kt
new file mode 100644
index 00000000..735f992e
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/casting/StateCastingLegacy.kt
@@ -0,0 +1,397 @@
+package com.futo.platformplayer.casting
+
+import android.content.Context
+import android.net.Uri
+import android.net.nsd.NsdManager
+import android.net.nsd.NsdServiceInfo
+import android.os.Build
+import android.util.Base64
+import android.util.Log
+import com.futo.platformplayer.constructs.Event1
+import com.futo.platformplayer.logging.Logger
+import com.futo.platformplayer.models.CastingDeviceInfo
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import java.net.InetAddress
+import kotlinx.coroutines.delay
+
+class StateCastingLegacy : StateCasting() {
+    private var _nsdManager: NsdManager? = null
+
+    private val _discoveryListeners = mapOf(
+        "_googlecast._tcp" to createDiscoveryListener(::addOrUpdateChromeCastDevice),
+        "_airplay._tcp" to createDiscoveryListener(::addOrUpdateAirPlayDevice),
+        "_fastcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice),
+        "_fcast._tcp" to createDiscoveryListener(::addOrUpdateFastCastDevice)
+    )
+
+    override fun handleUrl(url: String) {
+        val uri = Uri.parse(url)
+        if (uri.scheme != "fcast") {
+            throw Exception("Expected scheme to be FCast")
+        }
+
+        val type = uri.host
+        if (type != "r") {
+            throw Exception("Expected type r")
+        }
+
+        val connectionInfo = uri.pathSegments[0]
+        val json =
+            Base64.decode(connectionInfo, Base64.URL_SAFE or Base64.NO_PADDING or Base64.NO_WRAP)
+                .toString(Charsets.UTF_8)
+        val networkConfig = Json.decodeFromString<FCastNetworkConfig>(json)
+        val tcpService = networkConfig.services.first { v -> v.type == 0 }
+
+        val foundInfo = addRememberedDevice(
+            CastingDeviceInfo(
+                name = networkConfig.name,
+                type = CastProtocolType.FCAST,
+                addresses = networkConfig.addresses.toTypedArray(),
+                port = tcpService.port
+            )
+        )
+
+        connectDevice(deviceFromInfo(foundInfo))
+    }
+
+    override fun onStop() {
+        val ad = activeDevice ?: return;
+        _resumeCastingDevice = ad.getDeviceInfo()
+        Log.i(TAG, "_resumeCastingDevice set to '${ad.name}'")
+        Logger.i(TAG, "Stopping active device because of onStop.");
+        ad.disconnect();
+    }
+
+    @Synchronized
+    override fun start(context: Context) {
+        if (_started)
+            return;
+        _started = true;
+
+        Log.i(TAG, "_resumeCastingDevice set null start")
+        _resumeCastingDevice = null;
+
+        Logger.i(TAG, "CastingService starting...");
+
+        _castServer.start();
+        enableDeveloper(true);
+
+        Logger.i(TAG, "CastingService started.");
+
+        _nsdManager = context.getSystemService(Context.NSD_SERVICE) as NsdManager
+        startDiscovering()
+    }
+
+    @Synchronized
+    private fun startDiscovering() {
+        _nsdManager?.apply {
+            _discoveryListeners.forEach {
+                discoverServices(it.key, NsdManager.PROTOCOL_DNS_SD, it.value)
+            }
+        }
+    }
+
+    @Synchronized
+    private fun stopDiscovering() {
+        _nsdManager?.apply {
+            _discoveryListeners.forEach {
+                try {
+                    stopServiceDiscovery(it.value)
+                } catch (e: Throwable) {
+                    Logger.w(TAG, "Failed to stop service discovery", e)
+                }
+            }
+        }
+    }
+
+    @Synchronized
+    override fun stop() {
+        if (!_started)
+            return;
+
+        _started = false;
+
+        Logger.i(TAG, "CastingService stopping.")
+
+        stopDiscovering()
+        _scopeIO.cancel();
+        _scopeMain.cancel();
+
+        Logger.i(TAG, "Stopping active device because StateCasting is being stopped.")
+        val d = activeDevice;
+        activeDevice = null;
+        d?.disconnect();
+
+        _castServer.stop();
+        _castServer.removeAllHandlers();
+
+        Logger.i(TAG, "CastingService stopped.")
+
+        _nsdManager = null
+    }
+
+    private fun createDiscoveryListener(addOrUpdate: (String, Array<InetAddress>, Int) -> Unit): NsdManager.DiscoveryListener {
+        return object : NsdManager.DiscoveryListener {
+            override fun onDiscoveryStarted(regType: String) {
+                Log.d(TAG, "Service discovery started for $regType")
+            }
+
+            override fun onDiscoveryStopped(serviceType: String) {
+                Log.i(TAG, "Discovery stopped: $serviceType")
+            }
+
+            override fun onServiceLost(service: NsdServiceInfo) {
+                Log.e(TAG, "service lost: $service")
+                // TODO: Handle service lost, e.g., remove device
+            }
+
+            override fun onStartDiscoveryFailed(serviceType: String, errorCode: Int) {
+                Log.e(TAG, "Discovery failed for $serviceType: Error code:$errorCode")
+                try {
+                    _nsdManager?.stopServiceDiscovery(this)
+                } catch (e: Throwable) {
+                    Logger.w(TAG, "Failed to stop service discovery", e)
+                }
+            }
+
+            override fun onStopDiscoveryFailed(serviceType: String, errorCode: Int) {
+                Log.e(TAG, "Stop discovery failed for $serviceType: Error code:$errorCode")
+                try {
+                    _nsdManager?.stopServiceDiscovery(this)
+                } catch (e: Throwable) {
+                    Logger.w(TAG, "Failed to stop service discovery", e)
+                }
+            }
+
+            override fun onServiceFound(service: NsdServiceInfo) {
+                Log.v(TAG, "Service discovery success for ${service.serviceType}: $service")
+                val addresses = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                    service.hostAddresses.toTypedArray()
+                } else {
+                    arrayOf(service.host)
+                }
+                addOrUpdate(service.serviceName, addresses, service.port)
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+                    _nsdManager?.registerServiceInfoCallback(
+                        service,
+                        { it.run() },
+                        object : NsdManager.ServiceInfoCallback {
+                            override fun onServiceUpdated(serviceInfo: NsdServiceInfo) {
+                                Log.v(TAG, "onServiceUpdated: $serviceInfo")
+                                addOrUpdate(
+                                    serviceInfo.serviceName,
+                                    serviceInfo.hostAddresses.toTypedArray(),
+                                    serviceInfo.port
+                                )
+                            }
+
+                            override fun onServiceLost() {
+                                Log.v(TAG, "onServiceLost: $service")
+                                // TODO: Handle service lost
+                            }
+
+                            override fun onServiceInfoCallbackRegistrationFailed(errorCode: Int) {
+                                Log.v(TAG, "onServiceInfoCallbackRegistrationFailed: $errorCode")
+                            }
+
+                            override fun onServiceInfoCallbackUnregistered() {
+                                Log.v(TAG, "onServiceInfoCallbackUnregistered")
+                            }
+                        })
+                } else {
+                    _nsdManager?.resolveService(service, object : NsdManager.ResolveListener {
+                        override fun onResolveFailed(serviceInfo: NsdServiceInfo, errorCode: Int) {
+                            Log.v(TAG, "Resolve failed: $errorCode")
+                        }
+
+                        override fun onServiceResolved(serviceInfo: NsdServiceInfo) {
+                            Log.v(TAG, "Resolve Succeeded: $serviceInfo")
+                            addOrUpdate(
+                                serviceInfo.serviceName,
+                                arrayOf(serviceInfo.host),
+                                serviceInfo.port
+                            )
+                        }
+                    })
+                }
+            }
+        }
+    }
+
+    override fun startUpdateTimeJob(
+        onTimeJobTimeChanged_s: Event1<Long>,
+        setTime: (Long) -> Unit
+    ): Job? {
+        val d = activeDevice;
+        if (d is CastingDeviceLegacyWrapper && (d.inner is AirPlayCastingDevice || d.inner is ChromecastCastingDevice)) {
+            return _scopeMain.launch {
+                while (true) {
+                    val device = instance.activeDevice
+                    if (device == null || !device.isPlaying) {
+                        break
+                    }
+
+                    delay(1000)
+                    val time_ms = (device.expectedCurrentTime * 1000.0).toLong()
+                    setTime(time_ms)
+                    onTimeJobTimeChanged_s.emit(device.expectedCurrentTime.toLong())
+                }
+            }
+        }
+        return null
+    }
+
+    override fun deviceFromInfo(deviceInfo: CastingDeviceInfo): CastingDevice {
+        return CastingDeviceLegacyWrapper(
+            when (deviceInfo.type) {
+                CastProtocolType.CHROMECAST -> {
+                    ChromecastCastingDevice(deviceInfo);
+                }
+
+                CastProtocolType.AIRPLAY -> {
+                    AirPlayCastingDevice(deviceInfo);
+                }
+
+                CastProtocolType.FCAST -> {
+                    FCastCastingDevice(deviceInfo);
+                }
+            }
+        )
+    }
+
+    private fun addOrUpdateChromeCastDevice(
+        name: String,
+        addresses: Array<InetAddress>,
+        port: Int
+    ) {
+        return addOrUpdateCastDevice(
+            name,
+            deviceFactory = {
+                CastingDeviceLegacyWrapper(
+                    ChromecastCastingDevice(
+                        name,
+                        addresses,
+                        port
+                    )
+                )
+            },
+            deviceUpdater = { d ->
+                if (d.isReady || d !is CastingDeviceLegacyWrapper || d.inner !is ChromecastCastingDevice) {
+                    return@addOrUpdateCastDevice false;
+                }
+
+                val changed =
+                    addresses.contentEquals(d.inner.addresses) || d.name != name || d.inner.port != port;
+                if (changed) {
+                    d.inner.name = name;
+                    d.inner.addresses = addresses;
+                    d.inner.port = port;
+                }
+
+                return@addOrUpdateCastDevice changed;
+            }
+        );
+    }
+
+    private fun addOrUpdateAirPlayDevice(name: String, addresses: Array<InetAddress>, port: Int) {
+        return addOrUpdateCastDevice(
+            name,
+            deviceFactory = {
+                CastingDeviceLegacyWrapper(
+                    AirPlayCastingDevice(
+                        name,
+                        addresses,
+                        port
+                    )
+                )
+            },
+            deviceUpdater = { d ->
+                if (d.isReady || d !is CastingDeviceLegacyWrapper || d.inner !is AirPlayCastingDevice) {
+                    return@addOrUpdateCastDevice false;
+                }
+
+                val changed =
+                    addresses.contentEquals(addresses) || d.name != name || d.inner.port != port;
+                if (changed) {
+                    d.inner.name = name;
+                    d.inner.port = port;
+                    d.inner.addresses = addresses;
+                }
+
+                return@addOrUpdateCastDevice changed;
+            }
+        );
+    }
+
+    private fun addOrUpdateFastCastDevice(name: String, addresses: Array<InetAddress>, port: Int) {
+        return addOrUpdateCastDevice(
+            name,
+            deviceFactory = { CastingDeviceLegacyWrapper(FCastCastingDevice(name, addresses, port)) },
+            deviceUpdater = { d ->
+                if (d.isReady || d !is CastingDeviceLegacyWrapper || d.inner !is FCastCastingDevice) {
+                    return@addOrUpdateCastDevice false;
+                }
+
+                val changed =
+                    addresses.contentEquals(addresses) || d.name != name || d.inner.port != port;
+                if (changed) {
+                    d.inner.name = name;
+                    d.inner.port = port;
+                    d.inner.addresses = addresses;
+                }
+
+                return@addOrUpdateCastDevice changed;
+            }
+        );
+    }
+
+    private inline fun addOrUpdateCastDevice(
+        name: String,
+        deviceFactory: () -> CastingDevice,
+        deviceUpdater: (device: CastingDevice) -> Boolean
+    ) {
+        var invokeEvents: (() -> Unit)? = null;
+
+        synchronized(devices) {
+            val device = devices[name];
+            if (device != null) {
+                val changed = deviceUpdater(device);
+                if (changed) {
+                    invokeEvents = {
+                        onDeviceChanged.emit(device);
+                    }
+                }
+            } else {
+                val newDevice = deviceFactory();
+                this.devices[name] = newDevice
+
+                invokeEvents = {
+                    onDeviceAdded.emit(newDevice);
+                };
+            }
+        }
+
+        invokeEvents?.let { _scopeMain.launch { it(); }; };
+    }
+
+    @Serializable
+    private data class FCastNetworkConfig(
+        val name: String,
+        val addresses: List<String>,
+        val services: List<FCastService>
+    )
+
+    @Serializable
+    private data class FCastService(
+        val port: Int,
+        val type: Int
+    )
+
+    companion object {
+        private val TAG = "StateCastingLegacy"
+    }
+}
diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/CastingAddDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/CastingAddDialog.kt
index 9eb71145..ea8029ce 100644
--- a/app/src/main/java/com/futo/platformplayer/dialogs/CastingAddDialog.kt
+++ b/app/src/main/java/com/futo/platformplayer/dialogs/CastingAddDialog.kt
@@ -8,11 +8,13 @@ import android.view.View
 import android.view.WindowManager
 import android.widget.*
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.CastProtocolType
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.models.CastingDeviceInfo
 import com.futo.platformplayer.toInetAddress
+import com.futo.platformplayer.logging.Logger
 
 
 class CastingAddDialog(context: Context?) : AlertDialog(context) {
@@ -38,7 +40,13 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
         _buttonConfirm = findViewById(R.id.button_confirm);
         _buttonTutorial = findViewById(R.id.button_tutorial)
 
-        ArrayAdapter.createFromResource(context, R.array.casting_device_type_array, R.layout.spinner_item_simple).also { adapter ->
+        val deviceTypeArray =  if (Settings.instance.casting.experimentalCasting) {
+            R.array.exp_casting_device_type_array
+        } else {
+            R.array.casting_device_type_array
+        }
+
+        ArrayAdapter.createFromResource(context, deviceTypeArray, R.layout.spinner_item_simple).also { adapter ->
             adapter.setDropDownViewResource(R.layout.spinner_dropdownitem_simple);
             _spinnerType.adapter = adapter;
         };
@@ -101,7 +109,11 @@ class CastingAddDialog(context: Context?) : AlertDialog(context) {
 
             _textError.visibility = View.GONE;
             val castingDeviceInfo = CastingDeviceInfo(name, castProtocolType, arrayOf(ip), port.toInt());
-            StateCasting.instance.addRememberedDevice(castingDeviceInfo);
+            try {
+                StateCasting.instance.addRememberedDevice(castingDeviceInfo)
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to add remembered device: $e")
+            }
             performDismiss();
         };
 
diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt
index 2bb87111..28f2f989 100644
--- a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt
+++ b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectCastingDialog.kt
@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
-import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
@@ -18,7 +17,6 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.activities.MainActivity
 import com.futo.platformplayer.casting.CastConnectionState
-import com.futo.platformplayer.casting.CastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StateApp
@@ -108,15 +106,16 @@ class ConnectCastingDialog(context: Context?) : AlertDialog(context) {
         synchronized(StateCasting.instance.devices) {
             _devices.addAll(StateCasting.instance.devices.values.mapNotNull { it.name })
         }
-
         _rememberedDevices.addAll(StateCasting.instance.getRememberedCastingDeviceNames())
+
         updateUnifiedList()
 
         StateCasting.instance.onDeviceAdded.subscribe(this) { d ->
             val name = d.name
-            if (name != null)
+            if (name != null) {
                 _devices.add(name)
-            updateUnifiedList()
+                updateUnifiedList()
+            }
         }
 
         StateCasting.instance.onDeviceChanged.subscribe(this) { d ->
diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt
index 862f8333..90f09a05 100644
--- a/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt
+++ b/app/src/main/java/com/futo/platformplayer/dialogs/ConnectedCastingDialog.kt
@@ -12,12 +12,11 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
 import com.futo.platformplayer.R
+import com.futo.platformplayer.Settings
 import com.futo.platformplayer.activities.MainActivity
-import com.futo.platformplayer.casting.AirPlayCastingDevice
 import com.futo.platformplayer.casting.CastConnectionState
+import com.futo.platformplayer.casting.CastProtocolType
 import com.futo.platformplayer.casting.CastingDevice
-import com.futo.platformplayer.casting.ChromecastCastingDevice
-import com.futo.platformplayer.casting.FCastCastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.fragment.mainactivity.main.VideoDetailFragment
 import com.futo.platformplayer.logging.Logger
@@ -69,18 +68,18 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
 
         _buttonPlay = findViewById(R.id.button_play);
         _buttonPlay.setOnClickListener {
-            StateCasting.instance.activeDevice?.resumeVideo()
+            StateCasting.instance.resumeVideo()
         }
 
         _buttonPause = findViewById(R.id.button_pause);
         _buttonPause.setOnClickListener {
-            StateCasting.instance.activeDevice?.pauseVideo()
+            StateCasting.instance.pauseVideo()
         }
 
         _buttonStop = findViewById(R.id.button_stop);
         _buttonStop.setOnClickListener {
             (ownerActivity as MainActivity?)?.getFragment<VideoDetailFragment>()?.closeVideoDetails()
-            StateCasting.instance.activeDevice?.stopVideo()
+            StateCasting.instance.stopVideo()
         }
 
         _buttonNext = findViewById(R.id.button_next);
@@ -90,7 +89,11 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
 
         _buttonClose.setOnClickListener { dismiss(); };
         _buttonDisconnect.setOnClickListener {
-            StateCasting.instance.activeDevice?.stopCasting();
+            try {
+                StateCasting.instance.activeDevice?.disconnect()
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Active device failed to disconnect: $e")
+            }
             dismiss();
         };
 
@@ -99,12 +102,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
                 return@OnChangeListener
             }
 
-            val activeDevice = StateCasting.instance.activeDevice ?: return@OnChangeListener;
-            try {
-                activeDevice.seekVideo(value.toDouble());
-            } catch (e: Throwable) {
-                Logger.e(TAG, "Failed to change volume.", e);
-            }
+            StateCasting.instance.videoSeekTo(value.toDouble())
         });
 
         //TODO: Check if volume slider is properly hidden in all cases
@@ -113,14 +111,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
                 return@OnChangeListener
             }
 
-            val activeDevice = StateCasting.instance.activeDevice ?: return@OnChangeListener;
-            if (activeDevice.canSetVolume) {
-                try {
-                    activeDevice.changeVolume(value.toDouble());
-                } catch (e: Throwable) {
-                    Logger.e(TAG, "Failed to change volume.", e);
-                }
-            }
+            StateCasting.instance.changeVolume(value.toDouble())
         });
 
         setLoading(false);
@@ -172,15 +163,25 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
     private fun updateDevice() {
         val d = StateCasting.instance.activeDevice ?: return;
 
-        if (d is ChromecastCastingDevice) {
-            _imageDevice.setImageResource(R.drawable.ic_chromecast);
-            _textType.text = "Chromecast";
-        } else if (d is AirPlayCastingDevice) {
-            _imageDevice.setImageResource(R.drawable.ic_airplay);
-            _textType.text = "AirPlay";
-        } else if (d is FCastCastingDevice) {
-            _imageDevice.setImageResource(R.drawable.ic_fc);
-            _textType.text = "FastCast";
+        when (d.protocolType) {
+            CastProtocolType.CHROMECAST -> {
+                _imageDevice.setImageResource(R.drawable.ic_chromecast);
+                _textType.text = "Chromecast";
+            }
+            CastProtocolType.AIRPLAY -> {
+                _imageDevice.setImageResource(R.drawable.ic_airplay);
+                _textType.text = "AirPlay";
+            }
+            CastProtocolType.FCAST -> {
+                _imageDevice.setImageResource(
+                    if (Settings.instance.casting.experimentalCasting) {
+                        R.drawable.ic_exp_fc
+                    } else {
+                        R.drawable.ic_fc
+                    }
+                )
+                _textType.text = "FCast";
+            }
         }
 
         _textName.text = d.name;
@@ -192,7 +193,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
         _sliderPosition.value = d.time.toFloat().coerceAtLeast(0.0f).coerceAtMost(dur)
         _sliderPosition.valueTo = dur
 
-        if (d.canSetVolume) {
+        if (d.canSetVolume()) {
             _layoutVolumeAdjustable.visibility = View.VISIBLE;
             _layoutVolumeFixed.visibility = View.GONE;
         } else {
@@ -214,8 +215,7 @@ class ConnectedCastingDialog(context: Context?) : AlertDialog(context) {
             CastConnectionState.CONNECTED -> {
                 enableControls(interactiveControls)
             }
-            CastConnectionState.CONNECTING,
-            CastConnectionState.DISCONNECTED -> {
+            CastConnectionState.CONNECTING, CastConnectionState.DISCONNECTED -> {
                 disableControls(interactiveControls)
             }
         }
diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
index 0818f9ed..317373e7 100644
--- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
+++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt
@@ -576,9 +576,8 @@ class VideoDetailView : ConstraintLayout {
                 if(chapter?.type == ChapterType.SKIPPABLE) {
                     _layoutSkip.visibility = VISIBLE;
                 } else if(chapter?.type == ChapterType.SKIP || chapter?.type == ChapterType.SKIPONCE) {
-                    val ad = StateCasting.instance.activeDevice
-                    if (ad != null) {
-                        ad.seekVideo(chapter.timeEnd)
+                    if (StateCasting.instance.activeDevice != null) {
+                        StateCasting.instance.videoSeekTo(chapter.timeEnd)
                     } else {
                         _player.seekTo((chapter.timeEnd * 1000).toLong());
                     }
@@ -886,7 +885,7 @@ class VideoDetailView : ConstraintLayout {
             if (ad != null) {
                 val currentChapter = _cast.getCurrentChapter((ad.time * 1000).toLong());
                 if(currentChapter?.type == ChapterType.SKIPPABLE) {
-                    ad.seekVideo(currentChapter.timeEnd);
+                    StateCasting.instance.videoSeekTo(currentChapter.timeEnd);
                 }
             } else {
                 val currentChapter = _player.getCurrentChapter(_player.position);
@@ -2368,11 +2367,11 @@ class VideoDetailView : ConstraintLayout {
             ?.distinct()
             ?.toList() ?: listOf() else audioSources?.toList() ?: listOf();
 
-        val canSetSpeed = !_isCasting || StateCasting.instance.activeDevice?.canSetSpeed == true
+        val canSetSpeed = !_isCasting || StateCasting.instance.activeDevice?.canSetSpeed() == true
         val currentPlaybackRate = if (_isCasting) StateCasting.instance.activeDevice?.speed else _player.getPlaybackRate()
         val qualityPlaybackSpeedTitle = if (canSetSpeed) SlideUpMenuTitle(this.context).apply { setTitle(context.getString(R.string.playback_rate) + " (${String.format("%.2f", currentPlaybackRate)})"); } else null;
         _overlay_quality_selector = SlideUpMenuOverlay(this.context, _overlay_quality_container, context.getString(
-                    R.string.quality), null, true,
+                R.string.quality), null, true,
             qualityPlaybackSpeedTitle,
             if (canSetSpeed) SlideUpMenuButtonList(this.context, null, "playback_rate").apply {
                 val playbackSpeeds = Settings.instance.playback.getPlaybackSpeeds();
@@ -2393,7 +2392,7 @@ class VideoDetailView : ConstraintLayout {
                     val newPlaybackSpeed = playbackSpeedString.toDouble();
                     if (_isCasting) {
                         val ad = StateCasting.instance.activeDevice ?: return@subscribe
-                        if (!ad.canSetSpeed) {
+                        if (!ad.canSetSpeed()) {
                             return@subscribe
                         }
 
diff --git a/app/src/main/java/com/futo/platformplayer/models/CastingDeviceInfo.kt b/app/src/main/java/com/futo/platformplayer/models/CastingDeviceInfo.kt
index a530e415..4bb5fa5d 100644
--- a/app/src/main/java/com/futo/platformplayer/models/CastingDeviceInfo.kt
+++ b/app/src/main/java/com/futo/platformplayer/models/CastingDeviceInfo.kt
@@ -3,16 +3,9 @@ package com.futo.platformplayer.models
 import com.futo.platformplayer.casting.CastProtocolType
 
 @kotlinx.serialization.Serializable
-class CastingDeviceInfo {
-    var name: String;
-    var type: CastProtocolType;
-    var addresses: Array<String>;
-    var port: Int;
-
-    constructor(name: String, type: CastProtocolType, addresses: Array<String>, port: Int) {
-        this.name = name;
-        this.type = type;
-        this.addresses = addresses;
-        this.port = port;
-    }
-}
\ No newline at end of file
+class CastingDeviceInfo(
+    var name: String,
+    var type: CastProtocolType,
+    var addresses: Array<String>,
+    var port: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/DeviceViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/DeviceViewHolder.kt
index 133dd26b..32fb5367 100644
--- a/app/src/main/java/com/futo/platformplayer/views/adapters/DeviceViewHolder.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/adapters/DeviceViewHolder.kt
@@ -4,21 +4,19 @@ import android.graphics.drawable.Animatable
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
-import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.futo.platformplayer.R
-import com.futo.platformplayer.casting.AirPlayCastingDevice
+import com.futo.platformplayer.Settings
+import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.casting.CastConnectionState
+import com.futo.platformplayer.casting.CastProtocolType
 import com.futo.platformplayer.casting.CastingDevice
-import com.futo.platformplayer.casting.ChromecastCastingDevice
-import com.futo.platformplayer.casting.FCastCastingDevice
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
-import com.futo.platformplayer.constructs.Event2
-import androidx.core.view.isVisible
-import com.futo.platformplayer.UIDialogs
+import com.futo.platformplayer.logging.Logger
 
 class DeviceViewHolder : ViewHolder {
     private val _layoutDevice: FrameLayout;
@@ -56,16 +54,18 @@ class DeviceViewHolder : ViewHolder {
 
         val connect = {
             device?.let { dev ->
-                if (dev.isReady) {
-                    StateCasting.instance.activeDevice?.stopCasting()
-                    StateCasting.instance.connectDevice(dev)
-                    onConnect.emit(dev)
-                } else {
-                    try {
-                        view.context?.let { UIDialogs.toast(it, "Device not ready, may be offline") }
-                    } catch (e: Throwable) {
-                        //Ignored
+                try {
+                    if (dev.isReady) {
+                        StateCasting.instance.activeDevice?.stopPlayback()
+                        StateCasting.instance.connectDevice(dev)
+                        onConnect.emit(dev)
+                    } else {
+                        view.context?.let {
+                            UIDialogs.toast(it, "Device not ready, may be offline")
+                        }
                     }
+                } catch (e: Throwable) {
+                    Logger.e(TAG, "Failed to connect: $e")
                 }
             }
         }
@@ -81,15 +81,25 @@ class DeviceViewHolder : ViewHolder {
     }
 
     fun bind(d: CastingDevice, isOnlineDevice: Boolean, isPinnedDevice: Boolean) {
-        if (d is ChromecastCastingDevice) {
-            _imageDevice.setImageResource(R.drawable.ic_chromecast);
-            _textType.text = "Chromecast";
-        } else if (d is AirPlayCastingDevice) {
-            _imageDevice.setImageResource(R.drawable.ic_airplay);
-            _textType.text = "AirPlay";
-        } else if (d is FCastCastingDevice) {
-            _imageDevice.setImageResource(R.drawable.ic_fc);
-            _textType.text = "FCast";
+        when (d.protocolType) {
+            CastProtocolType.CHROMECAST -> {
+                _imageDevice.setImageResource(R.drawable.ic_chromecast);
+                _textType.text = "Chromecast";
+            }
+            CastProtocolType.AIRPLAY -> {
+                _imageDevice.setImageResource(R.drawable.ic_airplay);
+                _textType.text = "AirPlay";
+            }
+            CastProtocolType.FCAST -> {
+                _imageDevice.setImageResource(
+                    if (Settings.instance.casting.experimentalCasting) {
+                        R.drawable.ic_exp_fc
+                    } else {
+                        R.drawable.ic_fc
+                    }
+                )
+                _textType.text = "FCast";
+            }
         }
 
         _textName.text = d.name;
@@ -136,4 +146,8 @@ class DeviceViewHolder : ViewHolder {
 
         device = d;
     }
+
+    companion object {
+        private val TAG = "DeviceViewHolder"
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/views/casting/CastButton.kt b/app/src/main/java/com/futo/platformplayer/views/casting/CastButton.kt
index f187230c..acffc619 100644
--- a/app/src/main/java/com/futo/platformplayer/views/casting/CastButton.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/casting/CastButton.kt
@@ -2,12 +2,7 @@ package com.futo.platformplayer.views.casting
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.LayoutInflater
 import android.view.View
-import android.widget.FrameLayout
-import android.widget.ImageButton
-import android.widget.LinearLayout
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
diff --git a/app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt b/app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt
index 161f3dc3..4dc307b5 100644
--- a/app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/casting/CastView.kt
@@ -21,14 +21,13 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.api.media.models.chapters.IChapter
 import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails
-import com.futo.platformplayer.casting.AirPlayCastingDevice
-import com.futo.platformplayer.casting.ChromecastCastingDevice
+import com.futo.platformplayer.casting.CastConnectionState
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.constructs.Event2
 import com.futo.platformplayer.formatDuration
-import com.futo.platformplayer.states.StateHistory
+import com.futo.platformplayer.logging.Logger
 import com.futo.platformplayer.states.StatePlayer
 import com.futo.platformplayer.views.TargetTapLoaderView
 import com.futo.platformplayer.views.behavior.GestureControlView
@@ -36,7 +35,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 class CastView : ConstraintLayout {
@@ -99,19 +97,30 @@ class CastView : ConstraintLayout {
             val d = StateCasting.instance.activeDevice ?: return@subscribe;
             _speedHoldWasPlaying = d.isPlaying
             _speedHoldPrevRate = d.speed
-            if (d.canSetSpeed)
-                d.changeSpeed(Settings.instance.playback.getHoldPlaybackSpeed())
-            d.resumeVideo()
+            try {
+                if (d.canSetSpeed()) {
+                    d.changeSpeed(Settings.instance.playback.getHoldPlaybackSpeed())
+                }
+                d.resumePlayback()
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to change playback speed to hold playback speed: $e")
+            }
         }
         _gestureControlView.onSpeedHoldEnd.subscribe {
-            val d = StateCasting.instance.activeDevice ?: return@subscribe;
-            if (!_speedHoldWasPlaying) d.pauseVideo()
-            d.changeSpeed(_speedHoldPrevRate)
+            try {
+                val d = StateCasting.instance.activeDevice ?: return@subscribe;
+                if (!_speedHoldWasPlaying) {
+                    d.pausePlayback()
+                }
+                d.changeSpeed(_speedHoldPrevRate)
+            } catch (e: Throwable) {
+                Logger.e(TAG, "Failed to change playback speed to previous hold playback speed: $e")
+            }
         }
 
         _gestureControlView.onSeek.subscribe {
             val d = StateCasting.instance.activeDevice ?: return@subscribe;
-            StateCasting.instance.videoSeekTo(d.expectedCurrentTime + it / 1000);
+            StateCasting.instance.videoSeekTo( d.expectedCurrentTime + it / 1000);
         };
 
         _buttonLoop.setOnClickListener {
@@ -220,22 +229,9 @@ class CastView : ConstraintLayout {
         stopTimeJob()
 
         if(isPlaying) {
-            val d = StateCasting.instance.activeDevice;
-            if (d is AirPlayCastingDevice || d is ChromecastCastingDevice) {
-                _updateTimeJob = _scope.launch {
-                    while (true) {
-                        val device = StateCasting.instance.activeDevice;
-                        if (device == null || !device.isPlaying) {
-                            break;
-                        }
-
-                        delay(1000);
-                        val time_ms = (device.expectedCurrentTime * 1000.0).toLong()
-                        setTime(time_ms);
-                        onTimeJobTimeChanged_s.emit(device.expectedCurrentTime.toLong())
-                    }
-                }
-            }
+            StateCasting.instance.startUpdateTimeJob(
+                onTimeJobTimeChanged_s
+            ) { setTime(it) }
 
             if (!_inPictureInPicture) {
                 _buttonPause.visibility = View.VISIBLE;
@@ -333,4 +329,8 @@ class CastView : ConstraintLayout {
         _loaderGame.visibility = View.VISIBLE
         _loaderGame.startLoader(expectedDurationMs.toLong())
     }
+
+    companion object {
+        private val TAG = "CastView";
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_exp_fc.xml b/app/src/main/res/drawable/ic_exp_fc.xml
new file mode 100644
index 00000000..355f8836
--- /dev/null
+++ b/app/src/main/res/drawable/ic_exp_fc.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="111.96dp"
+    android:height="114.46dp"
+    android:viewportWidth="111.96"
+    android:viewportHeight="114.46">
+  <path
+      android:pathData="m84.76,5.58c2.06,-2.06 0.6,-5.58 -2.31,-5.58H3.27C1.46,-0 -0,1.46 -0,3.27V82.45c0,2.91 3.52,4.37 5.58,2.31L20.37,69.98c0.61,-0.61 0.96,-1.45 0.96,-2.31V24.6c0,-1.81 1.46,-3.27 3.27,-3.27h43.07c0.87,0 1.7,-0.34 2.31,-0.96z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="m45.68,73.5v17.18c0,0.68 -0.55,1.23 -1.23,1.23L27.56,91.9c-0.68,0 -1.23,-0.55 -1.23,-1.23v-17.18c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM45.68,51.16v17.18c0,0.68 -0.55,1.23 -1.23,1.23L27.56,69.57c-0.68,0 -1.23,-0.55 -1.23,-1.23L26.33,51.16c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM67.73,51.16v17.18c0,0.68 -0.55,1.23 -1.23,1.23L49.61,69.57c-0.68,0 -1.23,-0.55 -1.23,-1.23L48.38,51.16c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM67.73,28.83v17.18c0,0.68 -0.55,1.23 -1.23,1.23L49.61,47.24c-0.68,0 -1.23,-0.55 -1.23,-1.23L48.38,28.83c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM89.77,51.16v17.18c0,0.68 -0.55,1.23 -1.23,1.23h-16.89c-0.68,0 -1.23,-0.55 -1.23,-1.23L70.43,51.16c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM67.73,73.5v17.18c0,0.68 -0.55,1.23 -1.23,1.23L49.61,91.9c-0.68,0 -1.23,-0.55 -1.23,-1.23v-17.18c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM89.77,28.83v17.18c0,0.68 -0.55,1.23 -1.23,1.23h-16.89c-0.68,0 -1.23,-0.55 -1.23,-1.23L70.43,28.83c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM45.68,28.83v17.18c0,0.68 -0.55,1.23 -1.23,1.23L27.56,47.24c-0.68,0 -1.23,-0.55 -1.23,-1.23L26.33,28.83c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM45.68,95.83v17.18c0,0.68 -0.55,1.23 -1.23,1.23L27.56,114.24c-0.68,0 -1.23,-0.55 -1.23,-1.23L26.33,95.83c0,-0.68 0.55,-1.23 1.23,-1.23h16.89c0.68,0 1.23,0.55 1.23,1.23zM111.77,28.83v17.18c0,0.68 -0.55,1.23 -1.23,1.23L93.65,47.24c-0.68,0 -1.23,-0.55 -1.23,-1.23L92.43,28.83c0,-0.68 0.55,-1.23 1.23,-1.23L110.55,27.6c0.68,0 1.23,0.55 1.23,1.23z"
+      android:strokeWidth="0"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6bc87252..92c52cf4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,6 +82,8 @@
     <string name="allow_ipv6_description">If casting over IPV6 is allowed, can cause issues on some networks</string>
     <string name="allow_ipv4">Allow Link Local IPV4</string>
     <string name="allow_ipv4_description">If casting over IPV4 link local is allowed, can cause issues on some networks</string>
+    <string name="experimental_cast">Experimental</string>
+    <string name="experimental_cast_description">Use experimental casting backend (requires restart)</string>
     <string name="discover">Discover</string>
     <string name="find_new_video_sources_to_add">Find new video sources to add</string>
     <string name="these_sources_have_been_disabled">These sources have been disabled</string>
@@ -1104,6 +1106,10 @@
         <item>ChromeCast</item>
         <item>AirPlay</item>
     </string-array>
+    <string-array name="exp_casting_device_type_array" translatable="false">
+        <item>FCast</item>
+        <item>ChromeCast</item>
+    </string-array>
     <string-array name="log_levels">
         <item>None</item>
         <item>Error</item>

From 7597f5136c306904ad3a991b749b708938079f06 Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Fri, 26 Sep 2025 13:46:43 +0200
Subject: [PATCH 39/46] Fix Android getting stuck.

---
 app/src/main/java/com/futo/platformplayer/Extensions_V8.kt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt b/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
index fc1f5cf3..220802b0 100644
--- a/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
+++ b/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
@@ -204,8 +204,12 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
             override fun onFulfilled(p0: V8Value?) {
                 if(p0 is V8ValueError)
                     promiseException = ScriptExecutionException(plugin.config, p0.message);
-                else
+                else {
+                    if (p0 is V8ValueObject) {
+                        p0.setWeak()
+                    }
                     promiseResult = p0 as T;
+                }
                 latch.countDown();
             }
             override fun onRejected(p0: V8Value?) {

From 1ef566ab16a6350547f8492752acbafafb607aaf Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 29 Sep 2025 12:31:17 +0200
Subject: [PATCH 40/46] Async fixes, local file playback support

---
 app/src/main/assets/scripts/source.js         |   1 +
 .../com/futo/platformplayer/Extensions_V8.kt  |  49 +++++--
 .../platformplayer/activities/MainActivity.kt |  16 ++-
 .../LocalVideoUnMuxedSourceDescriptor.kt      |  20 ++-
 .../models/streams/sources/AudioUrlSource.kt  |   3 +-
 .../models/streams/sources/VideoUrlSource.kt  |   3 +-
 .../models/video/LocalPlatformVideoDetails.kt | 122 ++++++++++++++++++
 .../models/LocalVideoMuxedSourceDescriptor.kt |  18 ++-
 .../models/sources/LocalAudioContentSource.kt |  33 +++++
 .../models/sources/LocalAudioFileSource.kt    |  34 +++++
 .../models/sources/LocalVideoContentSource.kt |  33 +++++
 .../models/sources/LocalVideoFileSource.kt    |   3 +
 .../futo/platformplayer/engine/V8Plugin.kt    |   2 +
 .../views/video/FutoVideoPlayerBase.kt        |  42 ++++++
 app/src/stable/assets/sources/odysee          |   2 +-
 app/src/stable/assets/sources/rumble          |   2 +-
 app/src/stable/assets/sources/soundcloud      |   2 +-
 app/src/stable/assets/sources/youtube         |   2 +-
 app/src/unstable/AndroidManifest.xml          |  10 ++
 app/src/unstable/assets/sources/odysee        |   2 +-
 app/src/unstable/assets/sources/rumble        |   2 +-
 app/src/unstable/assets/sources/soundcloud    |   2 +-
 app/src/unstable/assets/sources/youtube       |   2 +-
 23 files changed, 376 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/com/futo/platformplayer/api/media/models/video/LocalPlatformVideoDetails.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioContentSource.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioFileSource.kt
 create mode 100644 app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoContentSource.kt

diff --git a/app/src/main/assets/scripts/source.js b/app/src/main/assets/scripts/source.js
index 4156abca..821fa656 100644
--- a/app/src/main/assets/scripts/source.js
+++ b/app/src/main/assets/scripts/source.js
@@ -67,6 +67,7 @@ class ScriptException extends Error {
             super(arguments[0]);
             this.plugin_type = "ScriptException";
             this.message = arguments[0];
+            this.msg = arguments[0];
         }
         else {
             super(msg);
diff --git a/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt b/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
index fc1f5cf3..e08cb7e9 100644
--- a/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
+++ b/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
@@ -194,7 +194,6 @@ fun V8ObjectToHashMap(obj: V8ValueObject?): HashMap<String, String> {
     return map;
 }
 
-
 fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
     val latch = CountDownLatch(1);
     var promiseResult: T? = null;
@@ -204,16 +203,19 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
             override fun onFulfilled(p0: V8Value?) {
                 if(p0 is V8ValueError)
                     promiseException = ScriptExecutionException(plugin.config, p0.message);
-                else
+                else {
+                    if(p0 is V8ValueObject)
+                        p0.setWeak();
                     promiseResult = p0 as T;
+                }
                 latch.countDown();
             }
             override fun onRejected(p0: V8Value?) {
-                promiseException = (NotImplementedError("onRejected promise not implemented.."));
+                promiseException = p0?.toException(plugin.config);
                 latch.countDown();
             }
             override fun onCatch(p0: V8Value?) {
-                promiseException = (NotImplementedError("onCatch promise not implemented.."));
+                promiseException = p0?.toException(plugin.config);
                 latch.countDown();
             }
         });
@@ -223,8 +225,25 @@ fun <T: V8Value> V8ValuePromise.toV8ValueBlocking(plugin: V8Plugin): T {
         promiseException =  CancellationException("Cancelled by system");
         latch.countDown();
     }
-    plugin.unbusy {
-        latch.await();
+    //Logger.i("V8", "V8ValueBlocking started (Busy) [" + blockCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString()+ ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString());
+
+
+    if(!promise.isPending) {
+        try {
+            Logger.i("V8", "V8Promise resolved synchronously");
+            if(promise.isFulfilled)
+                promiseResult = promise.getResult<T>();
+            else
+                promiseException = promise.getResult<V8Value>().toException(plugin.config);
+        }
+        catch(ex: Throwable) {
+            promiseException = ex;
+        }
+    }
+    else {
+        plugin.unbusy {
+            latch.await();
+        }
     }
     if(promiseException != null)
         throw promiseException!!;
@@ -250,11 +269,11 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
             }
             override fun onRejected(p0: V8Value?) {
                 plugin.resolvePromise(promise);
-                underlyingDef.completeExceptionally(NotImplementedError("onRejected promise not implemented.."));
+                underlyingDef.completeExceptionally(p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented.."));
             }
             override fun onCatch(p0: V8Value?) {
                 plugin.resolvePromise(promise);
-                underlyingDef.completeExceptionally(NotImplementedError("onCatch promise not implemented.."));
+                underlyingDef.completeExceptionally(p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented.."));
             }
         });
     }
@@ -265,6 +284,20 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
     return def;
 }
 
+fun V8Value.toException(config: IV8PluginConfig): Throwable {
+    val p0 = this;
+    if(p0 is V8ValueObject) {
+        val pluginType = p0.getOrDefault(config, "plugin_type", "Promise Exception", "")?.let { if(!it.isNullOrBlank()) it + "" else "" }
+        val msg = p0.getOrDefault<String?>(config, "msg", "Promise Exception", null)
+            ?: p0.getOrDefault(config, "message", "Promise Exception", "");
+        return Exception("Promise Failed: " + pluginType + msg);
+    }
+    else if(p0 is V8ValueString)
+        return Exception("Promise Failed:" + p0.value);
+    else
+        return NotImplementedError("onCatch promise not implemented..");
+}
+
 class V8Deferred<T>(val deferred: Deferred<T>, val estDuration: Int = -1): Deferred<T> by deferred {
 
     fun <R> convert(conversion: (result: T)->R): V8Deferred<R>{
diff --git a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
index 5e4e1e42..d824d18c 100644
--- a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
+++ b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt
@@ -39,6 +39,7 @@ import com.futo.platformplayer.R
 import com.futo.platformplayer.Settings
 import com.futo.platformplayer.UIDialogs
 import com.futo.platformplayer.api.http.ManagedHttpClient
+import com.futo.platformplayer.api.media.models.video.LocalVideoDetails
 import com.futo.platformplayer.casting.StateCasting
 import com.futo.platformplayer.constructs.Event1
 import com.futo.platformplayer.dp
@@ -768,7 +769,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             if (targetData != null) {
                 lifecycleScope.launch(Dispatchers.Main) {
                     try {
-                        handleUrlAll(targetData)
+                        handleUrlAll(targetData, intent)
                     } catch (e: Throwable) {
                         Logger.e(TAG, "Unhandled exception in handleUrlAll", e)
                     }
@@ -779,8 +780,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         }
     }
 
-    suspend fun handleUrlAll(url: String) {
+    suspend fun handleUrlAll(url: String, openIntent: Intent? = null) {
         val uri = Uri.parse(url)
+        val intent = openIntent ?: this.intent;
         when (uri.scheme) {
             "grayjay" -> {
                 if (url.startsWith("grayjay://license/")) {
@@ -807,11 +809,11 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
             }
 
             "content" -> {
-                if (!handleContent(url, intent.type)) {
+                if (!handleContent(url, intent?.type)) {
                     UIDialogs.showSingleButtonDialog(
                         this,
                         R.drawable.ic_play,
-                        getString(R.string.unknown_content_format) + " [${url}]\n[${intent.type}]",
+                        getString(R.string.unknown_content_format) + " [${url}]\n[${intent?.type}]",
                         "Ok",
                         { });
                 }
@@ -932,6 +934,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher {
         } else if (file.lowercase().endsWith(".txt") || mime == "text/plain") {
             return handleUnknownText(String(data));
         }
+        else if (mime?.let { it.startsWith("video/") || it.startsWith("audio/") } ?: false) {
+            val mediaItem = LocalVideoDetails.fromContent(file, mime);
+            navigateWhenReady(_fragVideoDetail, mediaItem);
+            return true;
+        }
+
         return false;
     }
 
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/streams/LocalVideoUnMuxedSourceDescriptor.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/streams/LocalVideoUnMuxedSourceDescriptor.kt
index b5d28c6f..9d923d60 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/models/streams/LocalVideoUnMuxedSourceDescriptor.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/models/streams/LocalVideoUnMuxedSourceDescriptor.kt
@@ -2,10 +2,24 @@ package com.futo.platformplayer.api.media.models.streams
 
 import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioContentSource
 import com.futo.platformplayer.downloads.VideoLocal
 
 
-class LocalVideoUnMuxedSourceDescriptor(private val video: VideoLocal) : VideoUnMuxedSourceDescriptor() {
-    override val videoSources: Array<IVideoSource> get() = video.videoSource.toTypedArray();
-    override val audioSources: Array<IAudioSource> get() = video.audioSource.toTypedArray();
+class LocalVideoUnMuxedSourceDescriptor : VideoUnMuxedSourceDescriptor {
+    override val videoSources: Array<IVideoSource>;
+    override val audioSources: Array<IAudioSource>;
+
+    constructor(video: VideoLocal) {
+        videoSources = video.videoSource.toTypedArray();
+        audioSources = video.audioSource.toTypedArray();
+    }
+    constructor(audio: LocalAudioContentSource) {
+        videoSources = arrayOf()
+        audioSources = arrayOf(audio);
+    }
+    constructor(videoSources: Array<IVideoSource>, audioSources: Array<IAudioSource>) {
+        this.videoSources = videoSources;
+        this.audioSources = audioSources;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/AudioUrlSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/AudioUrlSource.kt
index a4d2cb55..9c5075b4 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/AudioUrlSource.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/AudioUrlSource.kt
@@ -14,7 +14,8 @@ class AudioUrlSource(
     override val language: String = Language.UNKNOWN,
     override val duration: Long? = null,
     override var priority: Boolean = false,
-    override var original: Boolean = false
+    override var original: Boolean = false,
+    var isLocal: Boolean = false
 ) : IAudioUrlSource, IStreamMetaDataSource{
     override var streamMetaData: StreamMetaData? = null;
 
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/VideoUrlSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/VideoUrlSource.kt
index 490b8d4c..ebc112ec 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/VideoUrlSource.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/models/streams/sources/VideoUrlSource.kt
@@ -14,7 +14,8 @@ open class VideoUrlSource(
     override val codec : String = "",
     override val bitrate : Int? = 0,
 
-    override var priority: Boolean = false
+    override var priority: Boolean = false,
+    var isLocal: Boolean = false
 ) : IVideoUrlSource, IStreamMetaDataSource {
     override var streamMetaData: StreamMetaData? = null;
 
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/models/video/LocalPlatformVideoDetails.kt b/app/src/main/java/com/futo/platformplayer/api/media/models/video/LocalPlatformVideoDetails.kt
new file mode 100644
index 00000000..52659b46
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/api/media/models/video/LocalPlatformVideoDetails.kt
@@ -0,0 +1,122 @@
+package com.futo.platformplayer.api.media.models.video
+
+import android.annotation.SuppressLint
+import android.net.Uri
+import android.provider.MediaStore
+import android.provider.OpenableColumns
+import androidx.core.net.toUri
+import com.futo.platformplayer.api.media.IPlatformClient
+import com.futo.platformplayer.api.media.PlatformID
+import com.futo.platformplayer.api.media.Serializer
+import com.futo.platformplayer.api.media.models.PlatformAuthorLink
+import com.futo.platformplayer.api.media.models.Thumbnails
+import com.futo.platformplayer.api.media.models.comments.IPlatformComment
+import com.futo.platformplayer.api.media.models.contents.ContentType
+import com.futo.platformplayer.api.media.models.contents.IPlatformContent
+import com.futo.platformplayer.api.media.models.playback.IPlaybackTracker
+import com.futo.platformplayer.api.media.models.ratings.IRating
+import com.futo.platformplayer.api.media.models.ratings.RatingLikes
+import com.futo.platformplayer.api.media.models.streams.IVideoSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.LocalVideoUnMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.AudioUrlSource
+import com.futo.platformplayer.api.media.models.streams.sources.IDashManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.LocalAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.SubtitleRawSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
+import com.futo.platformplayer.api.media.platforms.local.models.LocalVideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioContentSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
+import com.futo.platformplayer.api.media.structures.IPager
+import com.futo.platformplayer.others.Language
+import com.futo.platformplayer.serializers.OffsetDateTimeNullableSerializer
+import com.futo.platformplayer.states.StateApp
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
+import java.time.OffsetDateTime
+
+@kotlinx.serialization.Serializable
+open class LocalVideoDetails(
+    override val id: PlatformID,
+    override val name: String,
+    override val thumbnails: Thumbnails,
+    override val author: PlatformAuthorLink,
+    override val url: String,
+    override val duration: Long,
+
+    val mimeType: String? = null,
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
+    override val datetime: OffsetDateTime?
+) : IPlatformVideo, IPlatformVideoDetails {
+    final override val contentType: ContentType get() = ContentType.MEDIA;
+
+    override var playbackTime: Long = -1;
+    @kotlinx.serialization.Serializable(with = OffsetDateTimeNullableSerializer::class)
+    override var playbackDate: OffsetDateTime? = null;
+
+    override val isLive: Boolean get() = false;
+
+    override val dash: IDashManifestSource? get() = null;
+    override val hls: IHLSManifestSource? get() = null;
+    override val live: IVideoSource? get() = null;
+
+
+    override val shareUrl: String = ""
+    override val viewCount: Long = -1
+    override val rating: IRating = RatingLikes(0)
+    override val description: String = "";
+    override val video: IVideoSourceDescriptor = (if(mimeType?.startsWith("audio/") ?: false)
+        (LocalVideoUnMuxedSourceDescriptor(
+            arrayOf(),
+            arrayOf(LocalAudioContentSource(url, mimeType ?: "", name))
+        ))
+        else (LocalVideoMuxedSourceDescriptor(
+            LocalVideoContentSource(url, mimeType ?: "", name)
+        ))
+    );
+    override val preview: ISerializedVideoSourceDescriptor? = null;
+
+    override val subtitles: List<SubtitleRawSource> = listOf()
+    override val isShort: Boolean = false
+
+    fun toJson() : String {
+        return Json.encodeToString(this);
+    }
+    fun fromJson(str : String) : SerializedPlatformVideoDetails {
+        return Serializer.json.decodeFromString<SerializedPlatformVideoDetails>(str);
+    }
+
+    override fun getComments(client: IPlatformClient): IPager<IPlatformComment>? = null;
+    override fun getPlaybackTracker(): IPlaybackTracker? = null;
+    override fun getContentRecommendations(client: IPlatformClient): IPager<IPlatformContent>? = null;
+
+    companion object {
+        fun fromFile(name: String, filePath: String, mimeType: String? = null) : LocalVideoDetails {
+            if(filePath.startsWith("content://"))
+                return fromContent(filePath, mimeType);
+
+            return LocalVideoDetails(PlatformID("FILE", filePath, null, 0, -1),
+                name, Thumbnails(), PlatformAuthorLink.UNKNOWN, filePath, -1, mimeType, null);
+        }
+        fun fromContent(contentUrl: String, mimeType: String? = null) : LocalVideoDetails {
+            var nameToUse = getFileNameFromContentUrl(contentUrl) ?: "File";
+
+            return LocalVideoDetails(PlatformID("FILE", contentUrl, null, 0, -1),
+                nameToUse, Thumbnails(), PlatformAuthorLink.UNKNOWN, contentUrl, -1, mimeType, null);
+        }
+
+        @SuppressLint("Range")
+        private fun getFileNameFromContentUrl(url: String): String? {
+            val cursor = StateApp.instance.context.contentResolver.query(url.toUri(), null, null, null, null);
+            cursor?.moveToFirst();
+            val fileName = cursor?.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+            cursor?.close();
+            return fileName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoMuxedSourceDescriptor.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoMuxedSourceDescriptor.kt
index da8ae431..0170f2fa 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoMuxedSourceDescriptor.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/LocalVideoMuxedSourceDescriptor.kt
@@ -1,13 +1,23 @@
 package com.futo.platformplayer.api.media.platforms.local.models
 
 import com.futo.platformplayer.api.media.models.streams.VideoMuxedSourceDescriptor
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
 import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
 import com.futo.platformplayer.api.media.models.streams.sources.LocalVideoSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
 import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
 import com.futo.platformplayer.downloads.VideoLocal
 
-class LocalVideoMuxedSourceDescriptor(
-    private val video: LocalVideoFileSource
-) : VideoMuxedSourceDescriptor() {
-    override val videoSources: Array<IVideoSource> get() = arrayOf(video);
+class LocalVideoMuxedSourceDescriptor: VideoMuxedSourceDescriptor {
+    override val videoSources: Array<IVideoSource>;
+
+    constructor(video: LocalVideoFileSource) {
+        videoSources = arrayOf(video);
+    }
+    constructor(video: LocalVideoContentSource) {
+        videoSources = arrayOf(video);
+    }
+    constructor(videoSources: Array<IVideoSource>) {
+        this.videoSources = videoSources;
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioContentSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioContentSource.kt
new file mode 100644
index 00000000..06f1c50c
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioContentSource.kt
@@ -0,0 +1,33 @@
+package com.futo.platformplayer.api.media.platforms.local.models.sources
+
+import android.content.Context
+import android.provider.MediaStore
+import android.provider.MediaStore.Video
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
+import com.futo.platformplayer.helpers.VideoHelper
+import com.futo.platformplayer.others.Language
+import java.io.File
+
+class LocalAudioContentSource : IAudioSource {
+
+    override val name: String;
+    override val container: String;
+    override val codec: String = ""
+    override val bitrate: Int = 0
+    override val duration: Long;
+    override val priority: Boolean = false;
+    override val language: String = Language.UNKNOWN
+    override val original: Boolean = false;
+
+    var contentUrl: String;
+
+    constructor(contentUrl: String, mime: String, name: String? = null) {
+        this.name = name ?: "File";
+        container = mime;
+        duration = 0;
+
+        this.contentUrl = contentUrl;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioFileSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioFileSource.kt
new file mode 100644
index 00000000..ae822837
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalAudioFileSource.kt
@@ -0,0 +1,34 @@
+package com.futo.platformplayer.api.media.platforms.local.models.sources
+
+import android.content.Context
+import android.provider.MediaStore
+import android.provider.MediaStore.Video
+import com.futo.platformplayer.api.media.models.streams.sources.IAudioSource
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
+import com.futo.platformplayer.helpers.VideoHelper
+import com.futo.platformplayer.others.Language
+import java.io.File
+
+class LocalAudioFileSource: IAudioSource {
+
+
+    override val name: String;
+    override val container: String;
+    override val codec: String = ""
+    override val bitrate: Int = 0
+    override val duration: Long;
+    override val priority: Boolean = false;
+    override val language: String = Language.UNKNOWN;
+    override val original: Boolean = false;
+
+    var file: File;
+
+    constructor(file: File) {
+        this.file = file;
+        name = file.name;
+        container = VideoHelper.videoExtensionToMimetype(file.extension) ?: "";
+        duration = 0;
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoContentSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoContentSource.kt
new file mode 100644
index 00000000..d8507fab
--- /dev/null
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoContentSource.kt
@@ -0,0 +1,33 @@
+package com.futo.platformplayer.api.media.platforms.local.models.sources
+
+import android.content.Context
+import android.provider.MediaStore
+import android.provider.MediaStore.Video
+import com.futo.platformplayer.api.media.models.streams.sources.IVideoSource
+import com.futo.platformplayer.api.media.models.streams.sources.VideoUrlSource
+import com.futo.platformplayer.helpers.VideoHelper
+import java.io.File
+
+class LocalVideoContentSource: IVideoSource {
+
+
+    override val name: String;
+    override val width: Int;
+    override val height: Int;
+    override val container: String;
+    override val codec: String = ""
+    override val bitrate: Int = 0
+    override val duration: Long;
+    override val priority: Boolean = false;
+
+    var contentUrl: String;
+
+    constructor(contentUrl: String, mime: String, name: String? = null) {
+        this.name = name ?: "File";
+        width = 0;
+        height = 0;
+        container = mime;
+        duration = 0;
+        this.contentUrl = contentUrl;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt
index 9e2f7792..4b4ff583 100644
--- a/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt
+++ b/app/src/main/java/com/futo/platformplayer/api/media/platforms/local/models/sources/LocalVideoFileSource.kt
@@ -20,7 +20,10 @@ class LocalVideoFileSource: IVideoSource {
     override val duration: Long;
     override val priority: Boolean = false;
 
+    var file: File;
+
     constructor(file: File) {
+        this.file = file;
         name = file.name;
         width = 0;
         height = 0;
diff --git a/app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt b/app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt
index 9b888bff..9b350458 100644
--- a/app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt
+++ b/app/src/main/java/com/futo/platformplayer/engine/V8Plugin.kt
@@ -242,10 +242,12 @@ class V8Plugin {
     }
     fun <T> busy(handle: ()->T): T {
         _busyLock.lock();
+        //Logger.i(TAG, "Busy Enter [" + _busyLock.holdCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString())
         try {
             return handle();
         }
         finally {
+            //Logger.i(TAG, "Busy Leave [" + _busyLock.holdCount + "]" + Thread.currentThread().stackTrace.drop(3)?.firstOrNull()?.toString() + ", " + Thread.currentThread().stackTrace.drop(4)?.firstOrNull()?.toString()+ ", " + Thread.currentThread().stackTrace.drop(5)?.firstOrNull()?.toString())
             _busyLock.unlock();
         }
         /*
diff --git a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt
index ff147b65..37cbe052 100644
--- a/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt
+++ b/app/src/main/java/com/futo/platformplayer/views/video/FutoVideoPlayerBase.kt
@@ -64,6 +64,10 @@ import com.futo.platformplayer.api.media.platforms.js.models.sources.JSDashManif
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSHLSManifestAudioSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSSource
 import com.futo.platformplayer.api.media.platforms.js.models.sources.JSVideoUrlRangeSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioContentSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalAudioFileSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoContentSource
+import com.futo.platformplayer.api.media.platforms.local.models.sources.LocalVideoFileSource
 import com.futo.platformplayer.api.media.structures.IPager
 import com.futo.platformplayer.constructs.Event0
 import com.futo.platformplayer.constructs.Event1
@@ -480,6 +484,8 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
             is IHLSManifestSource -> { swapVideoSourceHLS(videoSource); true; }
             is IVideoUrlWidevineSource -> { swapVideoSourceUrlWidevine(videoSource); true; }
             is IVideoUrlSource -> { swapVideoSourceUrl(videoSource); true; }
+            is LocalVideoFileSource -> { swapVideoSourceLocalFile(videoSource); true; }
+            is LocalVideoContentSource -> { swapVideoSourceLocalContent(videoSource); true; }
             null -> { _lastVideoMediaSource = null; true;}
             else -> throw IllegalArgumentException("Unsupported video source [${videoSource.javaClass.simpleName}]");
         }
@@ -496,6 +502,8 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
             is JSDashManifestRawAudioSource -> swapAudioSourceDashRaw(audioSource, play, resume, swapId);
             is IAudioUrlWidevineSource -> { swapAudioSourceUrlWidevine(audioSource); true; }
             is IAudioUrlSource -> { swapAudioSourceUrl(audioSource); true; }
+            is LocalAudioFileSource -> { swapAudioSourceLocalFile(audioSource); true; }
+            is LocalAudioContentSource -> { swapAudioSourceLocalContent(audioSource); true; }
             null -> { _lastAudioMediaSource = null; true; }
             else -> throw IllegalArgumentException("Unsupported video source [${audioSource.javaClass.simpleName}]");
         }
@@ -514,6 +522,23 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
             .createMediaSource(MediaItem.fromUri(Uri.fromFile(file)));
     }
     @OptIn(UnstableApi::class)
+    private fun swapVideoSourceLocalFile(videoSource: LocalVideoFileSource) {
+        Logger.i(TAG, "Loading VideoSource [Local]");
+        val file = videoSource.file;
+        if(!file.exists())
+            throw IllegalArgumentException("File for this video does not exist");
+        _lastVideoMediaSource = ProgressiveMediaSource.Factory(DefaultDataSource.Factory(context))
+            .createMediaSource(MediaItem.fromUri(Uri.fromFile(file)));
+    }
+    @OptIn(UnstableApi::class)
+    private fun swapVideoSourceLocalContent(videoSource: LocalVideoContentSource) {
+        Logger.i(TAG, "Loading VideoSource [Local]");
+        if(!videoSource.contentUrl.startsWith("content://"))
+            throw IllegalArgumentException("Not a content uri");
+        _lastVideoMediaSource = ProgressiveMediaSource.Factory(DefaultDataSource.Factory(context))
+            .createMediaSource(MediaItem.fromUri(videoSource.contentUrl));
+    }
+    @OptIn(UnstableApi::class)
     private fun swapVideoSourceUrlRange(videoSource: JSVideoUrlRangeSource) {
         Logger.i(TAG, "Loading JSVideoUrlRangeSource");
         if(videoSource.hasItag) {
@@ -707,6 +732,23 @@ abstract class FutoVideoPlayerBase : RelativeLayout {
             .createMediaSource(MediaItem.fromUri(Uri.fromFile(file)));
     }
     @OptIn(UnstableApi::class)
+    private fun swapAudioSourceLocalFile(audioSource: LocalAudioFileSource) {
+        Logger.i(TAG, "Loading VideoSource [Local]");
+        val file = audioSource.file;
+        if(!file.exists())
+            throw IllegalArgumentException("File for this video does not exist");
+        _lastAudioMediaSource = ProgressiveMediaSource.Factory(DefaultDataSource.Factory(context))
+            .createMediaSource(MediaItem.fromUri(Uri.fromFile(file)));
+    }
+    @OptIn(UnstableApi::class)
+    private fun swapAudioSourceLocalContent(audioSource: LocalAudioContentSource) {
+        Logger.i(TAG, "Loading VideoSource [Local]");
+        if(!audioSource.contentUrl.startsWith("content://"))
+            throw IllegalArgumentException("Not a content uri");
+        _lastAudioMediaSource = ProgressiveMediaSource.Factory(DefaultDataSource.Factory(context))
+            .createMediaSource(MediaItem.fromUri(audioSource.contentUrl));
+    }
+    @OptIn(UnstableApi::class)
     private fun swapAudioSourceUrlRange(audioSource: JSAudioUrlRangeSource) {
         Logger.i(TAG, "Loading JSAudioUrlRangeSource");
         if(audioSource.hasItag) {
diff --git a/app/src/stable/assets/sources/odysee b/app/src/stable/assets/sources/odysee
index 736c6b95..89ad7e9a 160000
--- a/app/src/stable/assets/sources/odysee
+++ b/app/src/stable/assets/sources/odysee
@@ -1 +1 @@
-Subproject commit 736c6b953a4613145e32010ff5ee5b08be1baac6
+Subproject commit 89ad7e9a4bae727164099fbd853f031c4902b674
diff --git a/app/src/stable/assets/sources/rumble b/app/src/stable/assets/sources/rumble
index 3368dfaa..3a7087cc 160000
--- a/app/src/stable/assets/sources/rumble
+++ b/app/src/stable/assets/sources/rumble
@@ -1 +1 @@
-Subproject commit 3368dfaa2ccaaa060cbbc0e91c86200e4d927b6e
+Subproject commit 3a7087ccb0a8626e354e80673fb1e73d1527175b
diff --git a/app/src/stable/assets/sources/soundcloud b/app/src/stable/assets/sources/soundcloud
index 048acef1..49db9e3e 160000
--- a/app/src/stable/assets/sources/soundcloud
+++ b/app/src/stable/assets/sources/soundcloud
@@ -1 +1 @@
-Subproject commit 048acef152823d2621da177d3b4e1535cf4ca8ac
+Subproject commit 49db9e3e15725c2e58c1fca565922aea738230d1
diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index f1465628..72c0cf18 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit f1465628ecb67c9bceb96aed667355e6ddbb49d3
+Subproject commit 72c0cf181dede3e41846c8f017ce061ff1fcd231
diff --git a/app/src/unstable/AndroidManifest.xml b/app/src/unstable/AndroidManifest.xml
index ba96bb29..dae2026f 100644
--- a/app/src/unstable/AndroidManifest.xml
+++ b/app/src/unstable/AndroidManifest.xml
@@ -8,6 +8,16 @@
         <receiver android:name=".receivers.InstallReceiver" />
 
         <activity android:name=".activities.MainActivity" android:launchMode="singleInstance">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.OPENABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="video/*" />
+                <data android:mimeType="audio/*" />
+            </intent-filter>
+
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
diff --git a/app/src/unstable/assets/sources/odysee b/app/src/unstable/assets/sources/odysee
index 736c6b95..89ad7e9a 160000
--- a/app/src/unstable/assets/sources/odysee
+++ b/app/src/unstable/assets/sources/odysee
@@ -1 +1 @@
-Subproject commit 736c6b953a4613145e32010ff5ee5b08be1baac6
+Subproject commit 89ad7e9a4bae727164099fbd853f031c4902b674
diff --git a/app/src/unstable/assets/sources/rumble b/app/src/unstable/assets/sources/rumble
index 3368dfaa..3a7087cc 160000
--- a/app/src/unstable/assets/sources/rumble
+++ b/app/src/unstable/assets/sources/rumble
@@ -1 +1 @@
-Subproject commit 3368dfaa2ccaaa060cbbc0e91c86200e4d927b6e
+Subproject commit 3a7087ccb0a8626e354e80673fb1e73d1527175b
diff --git a/app/src/unstable/assets/sources/soundcloud b/app/src/unstable/assets/sources/soundcloud
index 048acef1..49db9e3e 160000
--- a/app/src/unstable/assets/sources/soundcloud
+++ b/app/src/unstable/assets/sources/soundcloud
@@ -1 +1 @@
-Subproject commit 048acef152823d2621da177d3b4e1535cf4ca8ac
+Subproject commit 49db9e3e15725c2e58c1fca565922aea738230d1
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index f1465628..72c0cf18 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit f1465628ecb67c9bceb96aed667355e6ddbb49d3
+Subproject commit 72c0cf181dede3e41846c8f017ce061ff1fcd231

From 77348b37870500fdcae4dee1cdec2c0701677770 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 29 Sep 2025 13:06:42 +0200
Subject: [PATCH 41/46] Refs

---
 app/src/stable/assets/sources/youtube   | 2 +-
 app/src/unstable/assets/sources/youtube | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index 72c0cf18..c3a31f65 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 72c0cf181dede3e41846c8f017ce061ff1fcd231
+Subproject commit c3a31f6510659362e28607e85d4e8047c403c14c
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index 72c0cf18..c3a31f65 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit 72c0cf181dede3e41846c8f017ce061ff1fcd231
+Subproject commit c3a31f6510659362e28607e85d4e8047c403c14c

From 817c90f3af125b58f19111175be757fc2b6dd751 Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Mon, 29 Sep 2025 13:15:06 +0200
Subject: [PATCH 42/46] Translation fix.

---
 app/src/main/res/values-it/strings.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 263067ba..a5783903 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -311,7 +311,6 @@
     <string name="background_update">Aggiornamento in Secondo Piano</string>
     <string name="background_download">Download in Secondo Piano</string>
     <string name="backup">Backup</string>
-    <string name="Browse">Navigazione</string>
     <string name="byte_range_concurrency">Concorrenza ByteRange</string>
     <string name="byte_range_download">Download ByteRange</string>
     <string name="casting">Trasmissione</string>
@@ -332,7 +331,6 @@
     <string name="clear_payment">Cancella Pagamento</string>
     <string name="clears_cookies_when_you_log_out">Cancella i cookie quando effettui la disconnessione</string>
     <string name="clears_in_app_browser_cookies">Cancella i cookie del browser in-app</string>
-    <string name="configure_Browse_behavior">Configura il comportamento di navigazione</string>
     <string name="time_bar">Barra minutaggio</string>
     <string name="configure_if_historical_time_bar_should_be_shown">Configura se la barra del minutaggio cronologica deve essere mostrate</string>
     <string name="configure_casting">Configurazione trasmissione</string>

From 986652adabe3ef12a0c22163ba589f02bab3b898 Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 29 Sep 2025 15:01:04 +0200
Subject: [PATCH 43/46] Refs

---
 app/src/stable/assets/sources/youtube   | 2 +-
 app/src/unstable/assets/sources/youtube | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube
index c3a31f65..07101fbc 160000
--- a/app/src/stable/assets/sources/youtube
+++ b/app/src/stable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit c3a31f6510659362e28607e85d4e8047c403c14c
+Subproject commit 07101fbc34506defad5b77d8ee66da956b5dac18
diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube
index c3a31f65..07101fbc 160000
--- a/app/src/unstable/assets/sources/youtube
+++ b/app/src/unstable/assets/sources/youtube
@@ -1 +1 @@
-Subproject commit c3a31f6510659362e28607e85d4e8047c403c14c
+Subproject commit 07101fbc34506defad5b77d8ee66da956b5dac18

From 9f07673d856fe53e87f63d74f122f7d033cd368e Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Mon, 29 Sep 2025 15:27:51 +0200
Subject: [PATCH 44/46] Updated compile SDK.

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5b375434..3325b9ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,7 @@ protobuf {
 
 android {
     namespace 'com.futo.platformplayer'
-    compileSdk 34
+    compileSdk 36
     flavorDimensions "buildType"
     productFlavors {
         stable {

From 547fe7bc131d3c73f2726a26997162487d76f162 Mon Sep 17 00:00:00 2001
From: Koen J <koen@disper.io>
Date: Mon, 29 Sep 2025 15:46:45 +0200
Subject: [PATCH 45/46] Updated target SDK.

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3325b9ac..501231f9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -97,7 +97,7 @@ android {
 
     defaultConfig {
         minSdk 28
-        targetSdk 34
+        targetSdk 35
         versionCode gitVersionCode
         versionName gitVersionName
 

From 26b547020004888445beeba0d2c4d4d1d9bc3d2d Mon Sep 17 00:00:00 2001
From: Kelvin <kelvin@futo.org>
Date: Mon, 29 Sep 2025 18:45:42 +0200
Subject: [PATCH 46/46] Fix crash fix on async promise handling

---
 .../com/futo/platformplayer/Extensions_V8.kt  | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt b/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
index e08cb7e9..bee729a4 100644
--- a/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
+++ b/app/src/main/java/com/futo/platformplayer/Extensions_V8.kt
@@ -12,6 +12,7 @@ import com.futo.platformplayer.engine.V8Plugin
 import com.futo.platformplayer.engine.exceptions.ScriptExecutionException
 import com.futo.platformplayer.engine.exceptions.ScriptImplementationException
 import com.futo.platformplayer.logging.Logger
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -21,7 +22,6 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.selects.SelectClause0
 import kotlinx.coroutines.selects.SelectClause1
-import java.util.concurrent.CancellationException
 import java.util.concurrent.CountDownLatch
 import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
@@ -268,12 +268,25 @@ fun <T: V8Value> V8ValuePromise.toV8ValueAsync(plugin: V8Plugin): V8Deferred<T>
                 underlyingDef.complete(p0 as T);
             }
             override fun onRejected(p0: V8Value?) {
-                plugin.resolvePromise(promise);
-                underlyingDef.completeExceptionally(p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented.."));
+                try {
+                    plugin.resolvePromise(promise);
+                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onRejected promise not implemented..");
+                    Logger.i("V8", "Promise rejected, setting exception");
+                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                }
+                catch(ex: Throwable) {
+                    Logger.e("V8", "Rejection handling failed?" , ex);
+                }
             }
             override fun onCatch(p0: V8Value?) {
-                plugin.resolvePromise(promise);
-                underlyingDef.completeExceptionally(p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented.."));
+                try {
+                    plugin.resolvePromise(promise);
+                    val exceptionFound = p0?.toException(plugin.config) ?: NotImplementedError("onCatch promise not implemented..");
+                    underlyingDef.completeExceptionally(CancellationException(exceptionFound.message, exceptionFound));
+                }
+                catch(ex: Throwable) {
+                    Logger.e("V8", "Catching handling failed?" , ex);
+                }
             }
         });
     }
@@ -290,10 +303,10 @@ fun V8Value.toException(config: IV8PluginConfig): Throwable {
         val pluginType = p0.getOrDefault(config, "plugin_type", "Promise Exception", "")?.let { if(!it.isNullOrBlank()) it + "" else "" }
         val msg = p0.getOrDefault<String?>(config, "msg", "Promise Exception", null)
             ?: p0.getOrDefault(config, "message", "Promise Exception", "");
-        return Exception("Promise Failed: " + pluginType + msg);
+        return Throwable("Promise Failed: " + pluginType + msg);
     }
     else if(p0 is V8ValueString)
-        return Exception("Promise Failed:" + p0.value);
+        return Throwable("Promise Failed:" + p0.value);
     else
         return NotImplementedError("onCatch promise not implemented..");
 }