Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always preview #1260

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ private static String getPrefKey(@StringRes final int prefKey) {

@NonNull private static final AtomicReference<Locale> mDefaultLocale = new AtomicReference<>();

public static boolean pref_always_preview_mode() {
return getBoolean(R.string.pref_always_preview_mode_key, false);
}

@Nullable
public static String getString(
final int id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,7 @@ public void handleMessage(@NonNull final Message msg) {

@UiThread
public void reset(@NonNull final RedditPreparedPost newPost) {

if(newPost != mPost) {

mThumbnailView.setImageBitmap(null);
mImagePreviewImageView.setImageBitmap(null);
mImagePreviewPlayOverlay.setVisibility(GONE);
Expand All @@ -364,34 +362,32 @@ public void reset(@NonNull final RedditPreparedPost newPost) {
mCommentsText.setText(String.valueOf(newPost.src.getSrc().getNum_comments()));
}

final boolean showInlinePreview = newPost.shouldShowInlinePreview();

final boolean alwaysPreviewMode = PrefsUtility.pref_always_preview_mode();
final boolean showInlinePreview = alwaysPreviewMode ||
newPost.shouldShowInlinePreview();
final boolean showThumbnail = !showInlinePreview && newPost.hasThumbnail;

if(showInlinePreview) {
downloadInlinePreview(newPost, mUsageId);

} else {
mImagePreviewLoadingSpinner.setVisibility(GONE);
mImagePreviewOuter.setVisibility(GONE);
setBottomMargin(false);
}

if(showThumbnail) {

final Bitmap thumbnail = newPost.getThumbnail(this, mUsageId);
mThumbnailView.setImageBitmap(thumbnail);

mThumbnailView.setVisibility(VISIBLE);
mThumbnailView.setMinimumWidth(mThumbnailSizePrefPixels);

General.setLayoutWidthHeight(
mThumbnailView,
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT);
mThumbnailView,
ViewGroup.LayoutParams.WRAP_CONTENT,
ViewGroup.LayoutParams.MATCH_PARENT);

mInnerView.setMinimumHeight(mThumbnailSizePrefPixels);

} else {
mThumbnailView.setMinimumWidth(0);
mThumbnailView.setVisibility(GONE);
Expand Down
2 changes: 1 addition & 1 deletion src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -576,4 +576,4 @@
<string name="pref_behaviour_sharing_include_desc_title">تضمين العنوان/الوصف عند النشر</string>
<string name="share_comments_for">تعليقات ل%s</string>
<string name="share_comment_by_on_reddit">التعليق من قبل %s في ريديت</string>
</resources>
</resources>
8 changes: 7 additions & 1 deletion src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,12 @@
<string name="pref_behaviour_hide_read_posts_title">Skrýt přečtené články</string>
<!-- 2019-10-01 -->
<string name="post_text_copied_to_clipboard">Self-text příspěvku zkopírován do schránky</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Rozvržení</string>
<string name="pref_always_preview_mode_title">Vždy režim náhledu</string>
<string name="pref_always_preview_mode_summary">Vždy zobrazujte příspěvky s náhledy obrázků místo miniatur</string>

<!-- Weblate 2020-01-25 -->
<string name="pref_behaviour_notifications_title">Oznámení</string>
<string name="pref_cache_maxage_entry_title">Smazat praporky v mezipaměti (přečteno, upvoted, atd.) po</string>
Expand Down Expand Up @@ -962,4 +968,4 @@
<string name="accessibility_subtitle_controversiality_withperiod">Kontroverzní s hlasy.</string>
<string name="error_comment_submit_title">Chyba při odesílání komentáře</string>
<string name="sort_posts_controversial_year">Kontroverzní: Tento rok</string>
</resources>
</resources>
8 changes: 7 additions & 1 deletion src/main/res/values-eo/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,12 @@
<string name="download_link_message">Tio ĉi estas elŝut-ligilo. Ĉu vi volas malfermi ĝin per ekstera foliumilo?</string>
<!--2017-05-21-->
<string name="pref_behaviour_self_post_tap_actions_title">Frapeto sur memafiŝo</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Aranĝo</string>
<string name="pref_always_preview_mode_title">Ĉiam Antaŭrigarda Reĝimo</string>
<string name="pref_always_preview_mode_summary">Ĉiam montri afiŝojn kun bildaj antaŭrigardoj anstataŭ etbildoj</string>

<!-- 2017-06-05 -->
<string name="pref_menus_show_popular_main_menu_title">Montri /r/popular en ĉefmenuo</string>
<string name="pref_behaviour_video_playback_controls_title">Aktivigi filmet-ludadajn stirilojn</string>
Expand Down Expand Up @@ -944,4 +950,4 @@
<string name="error_archived_reply">Ĉi tio estas enarkivigita kaj ne plu alrespondebla.</string>
<string name="pref_appearance_comment_header_items_controversiality">Indikilo de debatateco (†)</string>
<string name="pref_appearance_android_status_hide_on_media">Dum spektado de aŭdvidaĵo</string>
</resources>
</resources>
8 changes: 7 additions & 1 deletion src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,12 @@
<string name="button_next_comment_parent">Comentario padre siguiente</string>
<string name="button_prev_comment_parent">Comentario padre anterior</string>
<string name="pref_appearance_comments_show_floating_toolbar_title">Mostrar botones de navegación sobre los comentarios</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Diseño</string>
<string name="pref_always_preview_mode_title">Modo de vista previa siempre</string>
<string name="pref_always_preview_mode_summary">Mostrar siempre publicaciones con vistas previas de imágenes en lugar de miniaturas</string>

<!--2017-05-08-->
<string name="download_link_title">Descargar archivo</string>
<string name="download_link_message">Esto es un enlace de descarga. ¿Deseas abrir esto en un navegador externo?</string>
Expand Down Expand Up @@ -942,4 +948,4 @@
<string name="sort_posts_comments_week">Comentarios: Esta semana</string>
<string name="pref_appearance_comment_header_items_controversiality">Indicador de controversia (†)</string>
<string name="search_results_location_only">Buscar en %s</string>
</resources>
</resources>
6 changes: 6 additions & 0 deletions src/main/res/values-eu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,12 @@
<string name="mainmenu_random_nsfw">Ausazko NSFW Subreddita</string>
<string name="pref_appearance_bottom_toolbar_title">Erakutsi tresna-barra behean</string>
<string name="pref_behaviour_video_mute_default_title">Mututu bideoak modu lehenetsian</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Diseinua</string>
<string name="pref_always_preview_mode_title">Betiko Aurreikuspen Modua</string>
<string name="pref_always_preview_mode_summary">Mezuak beti irudiaren aurrebistarekin erakutsi, tamaina txikiko irudiak baino</string>

<string name="prefs_category_images_video">Irudiak/Bideoa</string>
<string name="notification_channel_name_reddit_messages">Sarrerako Reddit mezuak</string>
<string name="post_text_copied_to_clipboard">Argitalpena testu propioa arbelera kopiatuta</string>
Expand Down
8 changes: 7 additions & 1 deletion src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,12 @@
<string name="pref_behaviour_sharing_share_dialog_title">Käytä sisäänrakennettua jakonäkymää</string>
<string name="pref_behaviour_sharing_share_dialog_dialogtitle">Valitse sovellus jakamista varten</string>
<string name="notification_channel_name_reddit_messages">Saapuvat Reddit-viestit</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Asettelu</string>
<string name="pref_always_preview_mode_title">Aina esikatselutila</string>
<string name="pref_always_preview_mode_summary">Näytä aina viestit kuvan esikatseluilla pikkukuvien sijaan</string>

<string name="prefs_category_images_video">Kuvat/Video</string>
<string name="pref_behaviour_video_mute_default_title">Mykistä videot oletuksena</string>
<string name="pref_appearance_bottom_toolbar_title">Näytä työkalupalkki alhaalla</string>
Expand Down Expand Up @@ -786,4 +792,4 @@
<string name="error_bad_captcha_message">Syöttämäsi CAPTCHA on väärä. Yritä uudelleen.</string>
<string name="error_bad_captcha_title">Väärä CAPTCHA</string>
<string name="error_403_message">Redditin mukaan nykyisellä käyttäjällä ei ole lupaa tehdä sitä.</string>
</resources>
</resources>
8 changes: 7 additions & 1 deletion src/main/res/values-in/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,12 @@
<string name="pref_appearance_show_aspect_ratio_indicator_summary">Tampilkan indikator pemuatan media jika tersedia</string>
<string name="pref_appearance_bottom_toolbar_title">Tampilkan bilah alat di bawah</string>
<string name="pref_behaviour_video_mute_default_title">Matikan suara video secara bawaan</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Tata Letak</string>
<string name="pref_always_preview_mode_title">Selalu Mode Pratinjau</string>
<string name="pref_always_preview_mode_summary">Selalu tampilkan postingan dengan pratinjau gambar alih-alih thumbnail</string>

<string name="prefs_category_images_video">Gambar/Video</string>
<string name="notification_channel_name_reddit_messages">Pesan Masuk Reddit</string>
<string name="post_text_copied_to_clipboard">Pos teks self disalin ke papan klip</string>
Expand Down Expand Up @@ -949,4 +955,4 @@
<string name="sort_posts_new_month">Baru: Bulang Ini</string>
<string name="sort_posts_hot_all">Terhangat: Sepanjang Waktu</string>
<string name="pref_appearance_android_status_hide_on_media">Saat melihat media</string>
</resources>
</resources>
6 changes: 6 additions & 0 deletions src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,12 @@
<string name="pref_appearance_show_aspect_ratio_indicator_summary">Mostra un indicatore di caricamento del contenuto, se disponibile</string>
<string name="pref_appearance_bottom_toolbar_title">Mostra barra degli strumenti in basso</string>
<string name="pref_behaviour_video_mute_default_title">Muta i video in modo predefinito</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Layout</string>
<string name="pref_always_preview_mode_title">Sempre Modalità Anteprima</string>
<string name="pref_always_preview_mode_summary">Visualizza sempre i post con anteprime delle immagini invece delle miniature</string>

<string name="prefs_category_images_video">Immagini/Video</string>
<string name="notification_channel_name_reddit_messages">Messaggi di Reddit in arrivo</string>
<string name="post_text_copied_to_clipboard">Testo del post copiato negli appunti</string>
Expand Down
8 changes: 7 additions & 1 deletion src/main/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,12 @@
<string name="error_toast_no_share_app_installed">Nėra įdiegtos tinkamos programos, kuria būtų galima tai bendrinti.</string>
<string name="pref_behaviour_sharing_share_dialog_title">Naudoti integruotą bendrinimo dialogo langą</string>
<string name="notification_channel_name_reddit_messages">Įeinančios Reddit žinutės</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Išdėstymas</string>
<string name="pref_always_preview_mode_title">Visada Peržiūros Režimas</string>
<string name="pref_always_preview_mode_summary">Visada rodyti įrašus su vaizdų peržiūromis vietoj miniatiūrų</string>

<string name="prefs_category_images_video">Vaizdai/Vaizdo įrašai</string>
<string name="pref_behaviour_video_mute_default_title">Nutildyti vaizdo įrašus pagal automatiškai</string>
<string name="pref_appearance_bottom_toolbar_title">Rodyti įrankių juostą apačioje</string>
Expand Down Expand Up @@ -836,4 +842,4 @@
<string name="sort_posts_relevance_all">Aktualu: per visą laiką</string>
<string name="accessibility_subtitle_author_admin_withperiod">Autorius: %s, administratorius.</string>
<string name="no_posts_yet">Kol kas jokių įrašų.</string>
</resources>
</resources>
8 changes: 7 additions & 1 deletion src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,12 @@
<string name="pref_behaviour_hide_read_posts_title">Ukryj przeczytane posty</string>
<string name="pref_menus_mainmenu_shortcutitems_title">Skróty</string>
<string name="mainmenu_random_nsfw">Losowy subreddit NSFW</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Układ</string>
<string name="pref_always_preview_mode_title">Zawsze Tryb Podglądu</string>
<string name="pref_always_preview_mode_summary">Zawsze wyświetlaj posty z podglądami obrazów zamiast miniatur</string>

<string name="prefs_category_images_video">Obrazy/Wideo</string>
<string name="post_text_copied_to_clipboard">Post skopiowany do schowka</string>
<string name="pref_behaviour_sharing_share_dialog_dialogtitle">Wybierz aplikację do udostępnienia</string>
Expand Down Expand Up @@ -879,4 +885,4 @@
<string name="reddit_login_browser_popup_line_2">Po zakończeniu logowania, powinieneś zostać przekierowany z powrotem do RedReadera. Jeśli logowanie nie powiedzie się, możesz spróbować użyć innej przeglądarki korzystając z poniższego pola wyboru.</string>
<string name="reddit_login_browser_popup_line_1">Aby się zalogować, zostaniesz przeniesiony do Reddita w przeglądarce.</string>
<string name="image_gallery_no_image_present_message">Podany obraz nie został odnaleziony. Mógł zostać usunięty.</string>
</resources>
</resources>
6 changes: 6 additions & 0 deletions src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,12 @@
<string name="action_copy_selftext">Копировать собственный текст</string>
<string name="post_text_copied_to_clipboard">Текст сообщения скопирован в буфер обмена</string>
<string name="notification_channel_name_reddit_messages">Входящие сообщения Reddit</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Макет</string>
<string name="pref_always_preview_mode_title">Всегда Режим Предпросмотра</string>
<string name="pref_always_preview_mode_summary">Всегда отображать посты с предпросмотром изображений вместо миниатюр</string>

<string name="prefs_category_images_video">Изображения/Видео</string>
<string name="pref_behaviour_video_mute_default_title">Видео без звука по умолчанию</string>
<string name="pref_appearance_bottom_toolbar_title">Показывать панель инструментов внизу</string>
Expand Down
8 changes: 7 additions & 1 deletion src/main/res/values-uk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,12 @@
<string name="error_toast_no_share_app_installed">Застосунків, через які можливе поширення, не встановлено.</string>
<string name="pref_behaviour_sharing_share_dialog_dialogtitle">Оберіть застосунок для поширення</string>
<string name="post_text_copied_to_clipboard">Текст допису скопійовано до буфера обміну</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Макет</string>
<string name="pref_always_preview_mode_title">Завжди Режим Попереднього Перегляду</string>
<string name="pref_always_preview_mode_summary">Завжди відображати пости з попереднім переглядом зображень замість мініатюр</string>

<string name="prefs_category_images_video">Зображення/Відео</string>
<string name="pref_appearance_bottom_toolbar_title">Показувати панель інструментів знизу</string>
<string name="pref_appearance_show_aspect_ratio_indicator_title">Показувати індикатор співвідношення сторін</string>
Expand Down Expand Up @@ -837,4 +843,4 @@
<string name="pref_appearance_comment_header_items_controversiality">Суперечливий індикатор (†)</string>
<string name="search_results_location_only">Пошук у %s</string>
<string name="search_results_query_and_location">Пошук «%1$s» у %2$s</string>
</resources>
</resources>
8 changes: 7 additions & 1 deletion src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,12 @@
<string name="pref_appearance_show_aspect_ratio_indicator_summary">在可用时显示加载中媒体的外观</string>
<string name="pref_appearance_bottom_toolbar_title">在底部显示工具栏</string>
<string name="pref_behaviour_video_mute_default_title">默认将视频静音</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">布局</string>
<string name="pref_always_preview_mode_title">始终预览模式</string>
<string name="pref_always_preview_mode_summary">始终以图片预览显示帖子,而不是缩略图</string>

<string name="prefs_category_images_video">图片/视频</string>
<string name="notification_channel_name_reddit_messages">传入的Reddit消息</string>
<string name="post_text_copied_to_clipboard">帖子self-text已复制到剪贴板</string>
Expand Down Expand Up @@ -834,4 +840,4 @@
<string name="pref_appearance_android_status_hide_on_media">查看媒体文件时</string>
<string name="pref_appearance_android_status_never_hide">从不</string>
<string name="error_archived_reply">帖子已经存档,不能再回复。</string>
</resources>
</resources>
6 changes: 6 additions & 0 deletions src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1088,6 +1088,12 @@
<string name="pref_behaviour_video_mute_default_key" translatable="false">pref_behaviour_video_mute_default</string>
<string name="pref_behaviour_video_mute_default_title">Mute videos by default</string>

<!-- 2024-12-02 -->
<string name="pref_layout_category_title">Layout</string>
<string name="pref_always_preview_mode_key">pref_always_preview_mode</string>
<string name="pref_always_preview_mode_title">Always Preview Mode</string>
<string name="pref_always_preview_mode_summary">Always display posts with image previews instead of thumbnails</string>

<string name="prefs_category_images_video">Images/Video</string>

<string name="notification_channel_name_reddit_messages">Incoming Reddit Messages</string>
Expand Down
11 changes: 11 additions & 0 deletions src/main/res/xml/prefs_images_video.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceCategory
android:title="@string/pref_layout_category_title">

<CheckBoxPreference
android:key="pref_always_preview_mode"
android:title="@string/pref_always_preview_mode_title"
android:summary="@string/pref_always_preview_mode_summary"
android:defaultValue="false" />

</PreferenceCategory>

<PreferenceCategory android:title="@string/pref_header_inline_image_previews">

<ListPreference android:title="@string/pref_images_inline_image_previews_title"
Expand Down
Loading