Skip to content

Commit

Permalink
[Regression] Revert "Removed remember popup properties setting"
Browse files Browse the repository at this point in the history
This reverts commit 314615b.
  • Loading branch information
Stypox committed Nov 15, 2020
1 parent 4c7b5d4 commit 7476498
Show file tree
Hide file tree
Showing 67 changed files with 153 additions and 3 deletions.
11 changes: 8 additions & 3 deletions app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -1626,10 +1626,13 @@ private void initPopup() {

updateScreenSize();

final boolean popupRememberSizeAndPos = PlayerHelper.isRememberingPopupDimensions(service);
final float defaultSize = service.getResources().getDimension(R.dimen.popup_default_width);
final SharedPreferences sharedPreferences =
PreferenceManager.getDefaultSharedPreferences(service);
popupWidth = sharedPreferences.getFloat(POPUP_SAVED_WIDTH, defaultSize);
popupWidth = popupRememberSizeAndPos
? sharedPreferences.getFloat(POPUP_SAVED_WIDTH, defaultSize)
: defaultSize;
popupHeight = getMinimumVideoHeight(popupWidth);

popupLayoutParams = new WindowManager.LayoutParams(
Expand All @@ -1643,8 +1646,10 @@ private void initPopup() {

final int centerX = (int) (screenWidth / 2f - popupWidth / 2f);
final int centerY = (int) (screenHeight / 2f - popupHeight / 2f);
popupLayoutParams.x = sharedPreferences.getInt(POPUP_SAVED_X, centerX);
popupLayoutParams.y = sharedPreferences.getInt(POPUP_SAVED_Y, centerY);
popupLayoutParams.x = popupRememberSizeAndPos
? sharedPreferences.getInt(POPUP_SAVED_X, centerX) : centerX;
popupLayoutParams.y = popupRememberSizeAndPos
? sharedPreferences.getInt(POPUP_SAVED_Y, centerY) : centerY;

checkPopupPositionBounds();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,10 @@ public static boolean isBrightnessGestureEnabled(@NonNull final Context context)
return isBrightnessGestureEnabled(context, true);
}

public static boolean isRememberingPopupDimensions(@NonNull final Context context) {
return isRememberingPopupDimensions(context, true);
}

public static boolean isAutoQueueEnabled(@NonNull final Context context) {
return isAutoQueueEnabled(context, false);
}
Expand Down Expand Up @@ -390,6 +394,12 @@ private static boolean isBrightnessGestureEnabled(@NonNull final Context context
.getBoolean(context.getString(R.string.brightness_gesture_control_key), b);
}

private static boolean isRememberingPopupDimensions(@NonNull final Context context,
final boolean b) {
return getPreferences(context)
.getBoolean(context.getString(R.string.popup_remember_size_pos_key), b);
}

private static boolean isUsingInexactSeek(@NonNull final Context context) {
return getPreferences(context)
.getBoolean(context.getString(R.string.use_inexact_seek_key), false);
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@
<string name="show_higher_resolutions_title">عرض أعلى جودة</string>
<string name="show_higher_resolutions_summary">بعض الأجهزة فقط تدعم تشغيل مقاطع الفيديو 2K/4K</string>
<string name="default_video_format_title">تنسيق الفيديو الافتراضي</string>
<string name="popup_remember_size_pos_title">تذكر خصائص النوافذ المنبثقة</string>
<string name="popup_remember_size_pos_summary">تذكر آخر مكان و حجم للنافذة المنبثقة</string>
<string name="player_gesture_controls_title">اعدادات إيماءة المشغل</string>
<string name="player_gesture_controls_summary">استخدم الإيماءات للتحكم في سطوع وصوت المشغل</string>
<string name="show_search_suggestions_title">اقتراحات البحث</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-b+zh+HANS+CN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@
<string name="show_higher_resolutions_title">使用更高的分辨率</string>
<string name="show_higher_resolutions_summary">仅某些设备支持播放2K / 4K视频</string>
<string name="clear">清除</string>
<string name="popup_remember_size_pos_title">记住悬浮窗属性</string>
<string name="popup_remember_size_pos_summary">记住最后一次使用悬浮窗的大小和位置</string>
<string name="settings_category_popup_title">悬浮窗</string>
<string name="popup_resizing_indicator_title">调整大小</string>
<string name="use_external_video_player_summary">隐藏部分没有音频的分辨率</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-be/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
<string name="light_theme_title">Светлая</string>
<string name="dark_theme_title">Цёмная</string>
<string name="black_theme_title">Чорная</string>
<string name="popup_remember_size_pos_title">Аднавіць акно</string>
<string name="popup_remember_size_pos_summary">Запамінаць памер і становішча ўсплываючага акна</string>
<string name="use_inexact_seek_title">Хуткі пошук пазіцыі</string>
<string name="use_inexact_seek_summary">Недакладны пошук дазваляе плэеру шукаць пазіцыю хутчэй, але менш дакладна</string>
<string name="download_thumbnail_title">Загружаць мініяцюры</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
<string name="light_theme_title">Светла</string>
<string name="dark_theme_title">Тъмна</string>
<string name="black_theme_title">Черна</string>
<string name="popup_remember_size_pos_title">Помни размера и позицията на прозореца</string>
<string name="popup_remember_size_pos_summary">Използвай размера и позицията на прозореца от предишния път</string>
<string name="player_gesture_controls_title">Контролиране на плейъра чрез жестове</string>
<string name="player_gesture_controls_summary">Позволи използване на жестове за контрол на яркостта и силата на звука на плейъра</string>
<string name="show_search_suggestions_title">Предложения за търсене</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
<string name="light_theme_title">উজ্জ্বল</string>
<string name="dark_theme_title">অন্ধকার</string>
<string name="black_theme_title">কালো</string>
<string name="popup_remember_size_pos_title">পপআপ আকার এবং অবস্থান মনে রাখো</string>
<string name="popup_remember_size_pos_summary">শেষ আকার এবং পপআপ সেট অবস্থান মনে রাখো</string>
<string name="download_dialog_title">ডাউনলোড</string>
<string name="show_next_and_similar_title">পরবর্তী এবং অনুরূপ ভিডিওগুলি দেখাও</string>
<string name="unsupported_url">URL সমর্থিত নয়</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-bn-rIN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@
<string name="seek_duration_title">দ্রুত-ফরওয়ার্ড/-পুনরায় সন্ধান সময়কাল</string>
<string name="use_inexact_seek_summary">অনির্দিষ্ট সন্ধান প্লেয়ারকে আরো দ্রুত গতিতে সন্ধান করার সুবিধা দেয়, কিন্তু এটি সম্পূর্ণ নির্ভুল নাও হতে পারে ৷ ৫, ১৫ ও ২৫ সেকেন্ডের জন্য এটা কাজ করবে না ৷</string>
<string name="use_inexact_seek_title">দ্রুত টানা ব্যাবহার করুন</string>
<string name="popup_remember_size_pos_summary">শেষ আকার এবং পপআপ সেট অবস্থান মনে রাখো</string>
<string name="popup_remember_size_pos_title">পপআপ আকার এবং অবস্থান মনে রাখো</string>
<string name="black_theme_title">কালো</string>
<string name="dark_theme_title">অন্ধকার</string>
<string name="light_theme_title">উজ্জ্বল</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@
<string name="seek_duration_title">দ্রুত-ফরওয়ার্ড/-পুনরায় সন্ধান সময়কাল</string>
<string name="use_inexact_seek_summary">অনির্দিষ্ট সন্ধান প্লেয়ারকে আরো দ্রুত গতিতে সন্ধান করার সুবিধা দেয়, কিন্তু এটি সম্পূর্ণ নির্ভুল নাও হতে পারে ৷ ৫, ১৫ ও ২৫ সেকেন্ডের জন্য এটা কাজ করবে না ৷</string>
<string name="use_inexact_seek_title">দ্রুত টানা ব্যাবহার করুন</string>
<string name="popup_remember_size_pos_summary">শেষ আকার এবং পপআপ সেট অবস্থান মনে রাখো</string>
<string name="popup_remember_size_pos_title">পপআপ আকার এবং অবস্থান মনে রাখো</string>
<string name="black_theme_title">কালো</string>
<string name="dark_theme_title">অন্ধকার</string>
<string name="light_theme_title">উজ্জ্বল</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@
<string name="kore_not_found">No s\'ha trobat l\'aplicació Kore. Voleu instal·lar-la\?</string>
<string name="show_play_with_kodi_title">Mostra «Reprodueix amb el Kodi»</string>
<string name="show_play_with_kodi_summary">Mostra una opció per reproduir un vídeo amb el centre multimèdia Kodi</string>
<string name="popup_remember_size_pos_title">Reproductor emergent intel·ligent</string>
<string name="popup_remember_size_pos_summary">Recorda la darrera mida i posició del reproductor emergent</string>
<string name="use_inexact_seek_title">Cerca ràpida poc precisa</string>
<string name="use_inexact_seek_summary">La cerca poc precisa permet que el reproductor cerqui una posició més ràpidament amb menys precisió. Cerques de 5, 15 o 25 segons no hi funcionaran.</string>
<string name="download_thumbnail_title">Carrega les miniatures</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-ckb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
<string name="live_streams_not_supported">پەخشی ڕاستەوخۆ پشتگیری ناکرێ لەئێستادا</string>
<string name="channel_unsubscribed">به‌شداریت نەما له‌ كه‌ناڵ</string>
<string name="player_stream_failure">ناتوانرێ ئەم پەخشە کارپێبکرێ</string>
<string name="popup_remember_size_pos_title">بیرهاتنه‌وه‌ی شوێن و قه‌باره‌ی په‌نجه‌ره‌ی بچووک</string>
<string name="player_recoverable_failure">گێڕانەوەی کارپێکەر بۆکاتی پێش کێشە</string>
<string name="minimize_on_exit_none_description">هیچیان</string>
<string name="pause_downloads_on_mobile_desc">بەسوودە بۆ کاتی گۆڕینی هێڵ بۆ داتای مۆبایل, لەگەڵ ئەوەشدا زۆربەی داگرتنەکان ڕاناگرێت</string>
Expand Down Expand Up @@ -341,6 +342,7 @@
<string name="recaptcha_done_button">تەواو</string>
<string name="detail_likes_img_view_description">بەدڵبوون</string>
<string name="error_unable_to_load_license">ناتوانرێ مۆڵەت باربکرێ</string>
<string name="popup_remember_size_pos_summary">بیرهاتنه‌وه‌ی كۆتا قه‌باره‌ و شوێنی په‌نجه‌ره‌ی بچووك</string>
<string name="create">دروستکردن</string>
<string name="import_network_expensive_warning">ئەوە بزانە ئەم کردارە پێویستی بە هێڵێکی گران هەیە.
\n
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
<string name="show_higher_resolutions_title">Zobrazovat vyšší rozlišení</string>
<string name="show_higher_resolutions_summary">Pouze některá zařízení dokáží přehrát 2K/4K videa</string>
<string name="default_video_format_title">Výchozí formát videa</string>
<string name="popup_remember_size_pos_title">Pamatovat si vlastnosti vyskakovacího okna</string>
<string name="popup_remember_size_pos_summary">Pamatovat si poslední velikost a pozici vyskakovacího okna</string>
<string name="popup_mode_share_menu_title">Režim vyskakovacího okna</string>
<string name="subscribe_button_title">Odebírat</string>
<string name="subscribed_button_title">Odebíráno</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
<string name="light_theme_title">Lyst</string>
<string name="dark_theme_title">Mørkt</string>
<string name="black_theme_title">Sort</string>
<string name="popup_remember_size_pos_title">Husk størrelse og placering af pop op</string>
<string name="popup_remember_size_pos_summary">Husk sidste størrelse og placering af pop op-afspiller</string>
<string name="use_inexact_seek_title">Brug hurtig og upræcis søgning</string>
<string name="use_inexact_seek_summary">Upræcis søgning lader afspilleren finde placeringer hurtigere, men mindre præcist</string>
<string name="download_thumbnail_title">Indlæs miniaturebilleder</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@
<string name="show_higher_resolutions_summary">Nur manche Geräte können Videos in 2K/4K abspielen</string>
<string name="controls_background_title">Hintergrund</string>
<string name="controls_popup_title">Pop-up</string>
<string name="popup_remember_size_pos_title">Pop-up Eigenschaften merken</string>
<string name="use_external_video_player_summary">Entfernt Tonspur bei manchen Auflösungen</string>
<string name="popup_remember_size_pos_summary">Letzte Größe und Position des Pop-ups merken</string>
<string name="player_gesture_controls_title">Gestensteuerung</string>
<string name="player_gesture_controls_summary">Helligkeit und Lautstärke mittels Gesten einstellen</string>
<string name="show_search_suggestions_title">Suchvorschläge</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@
<string name="default_popup_resolution_title">Προεπιλεγμένη ανάλυση αναδυόμενου παραθύρου</string>
<string name="show_higher_resolutions_title">Εμφάνιση υψηλότερων αναλύσεων</string>
<string name="default_video_format_title">Προεπιλεγμένη μορφή βίντεο</string>
<string name="popup_remember_size_pos_title">Ενθύμιση τις ιδιότητες του αναδυόμενου παραθύρου</string>
<string name="popup_remember_size_pos_summary">Ενθύμιση του τελευταίου μεγέθους και θέσης του παραθύρου</string>
<string name="use_inexact_seek_title">Χρήση γρήγορης ανακριβούς αναζήτησης</string>
<string name="use_inexact_seek_summary">Η μην ακριβής αναζήτηση επιτρέπει στην εφαρμογή να αναζητεί θέσεις στο βίντεο γρηγορότερα με μειωμένη ακρίβεια. Δε λειτουργεί για διαστήματα των 5, 15 ή 25 δευτερολέπτων.</string>
<string name="download_thumbnail_title">Φόρτωση μικρογραφιών</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-eo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
<string name="show_higher_resolutions_summary">Nur kelkaj aparatoj povas ludi 2K / 4K filmetojn</string>
<string name="default_video_format_title">Defaŭlta fomato de filmeto</string>
<string name="black_theme_title">Nigra</string>
<string name="popup_remember_size_pos_title">Memoru ŝprucfenestran grandecon kaj pozicion</string>
<string name="popup_remember_size_pos_summary">Memoru lastan grandecon kaj pozicion de ŝprucfenestro</string>
<string name="use_inexact_seek_title">Uzi rapide, ne precizan serĉon</string>
<string name="use_inexact_seek_summary">Ne preciza serĉo permesas al la ludanto serĉi poziciojn pli rapide kun malalta precizeco. Serĉi por 5, 15 kaj 25 sekundoj ne funckios kun tio opcio.</string>
<string name="download_thumbnail_title">Ŝarĝi bildetojn</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@
<string name="filter">Filtro</string>
<string name="refresh">Actualizar</string>
<string name="clear">Limpiar</string>
<string name="popup_remember_size_pos_title">Recordar propiedades del reproductor emergente</string>
<string name="popup_remember_size_pos_summary">Recordar el último tamaño y posición del reproductor emergente</string>
<string name="settings_category_popup_title">Emergente</string>
<string name="popup_resizing_indicator_title">Redimensionando</string>
<string name="use_external_video_player_summary">Quita el audio en algunas resoluciones</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@
<string name="light_theme_title">Hele</string>
<string name="dark_theme_title">Tume</string>
<string name="black_theme_title">Must</string>
<string name="popup_remember_size_pos_title">Pea hüpikakna suurus ja asukoht meeles</string>
<string name="popup_remember_size_pos_summary">Pea hüpikakna viimane suurus ja asukoht meeles</string>
<string name="use_inexact_seek_title">Kasuta ebatäpset kerimist</string>
<string name="use_inexact_seek_summary">Ebatäpne kerimine lubab pleieril otsida asukohta kiiremini täpsuse arvel</string>
<string name="download_thumbnail_title">Laadi pisipildid</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
<string name="default_video_format_title">Hobetsitako bideo-formatua</string>
<string name="theme_title">Gaia</string>
<string name="black_theme_title">Beltza</string>
<string name="popup_remember_size_pos_title">Gogoratu laster-leihoaren tamaina eta posizioa</string>
<string name="popup_remember_size_pos_summary">Gogoratu laster-leihoaren azken tamaina eta posizioa</string>
<string name="player_gesture_controls_title">Erreproduzigailuaren keinu bidezko kontrola</string>
<string name="player_gesture_controls_summary">Erabili keinuak erreproduzigailuaren distira eta bolumena kontrolatzeko</string>
<string name="show_search_suggestions_title">Bilaketa-iradokizunak</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@
<string name="popup_mode_share_menu_title">حالت تصویر در تصویر</string>
<string name="default_popup_resolution_title">اندازه پیش فرض پنجره جداگانه</string>
<string name="controls_popup_title">تصویر در تصویر</string>
<string name="popup_remember_size_pos_title">به یاد نگه داشتن خصوصیات</string>
<string name="popup_remember_size_pos_summary">به یاد داشتن آخرین اندازه و موقعیت قبلی پنجره جداگانه</string>
<string name="use_inexact_seek_title">زمان فعلی پخش کننده را به صورت تقریبی و سریع جلو ببر</string>
<string name="use_inexact_seek_summary">این گزینه باعث می شود هنگام جلو/عقب کردن زمان تصویر، به جای زمان دقیق انتخاب شده، به زمان غیر دقیق و نزدیک به مکان انتخاب شده برود که این کار سریع تر انجام می شود.</string>
<string name="app_ui_crash">کاره یا رابط کاربری با خطا مواجه شد</string>
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
<string name="light_theme_title">Kirkas</string>
<string name="dark_theme_title">Tumma</string>
<string name="black_theme_title">Musta</string>
<string name="popup_remember_size_pos_title">Muista ponnahdusikkunan ominaisuudet</string>
<string name="popup_remember_size_pos_summary">Muista ponnahdusikkunan viimeisin koko ja sijainti</string>
<string name="player_gesture_controls_title">Soittimen eleohjaus</string>
<string name="player_gesture_controls_summary">Käytä eleitä ohjataksesi soittimen kirkkautta ja äänentasoa</string>
<string name="show_search_suggestions_title">Hakuehdotukset</string>
Expand Down
Loading

0 comments on commit 7476498

Please sign in to comment.