Merge pull request #6490 from thundernest/show_remote_images_button (e8e1b3c0) · Commits · e / os / Mail

app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ public class MessageTopView extends LinearLayout {
		private ViewGroup containerView;
		private Button mDownloadRemainder;
		private AttachmentViewCallback attachmentCallback;
		private View extraHeaderContainer;
		private Button showPicturesButton;
		private boolean isShowingProgress;
		private boolean showPicturesButtonClicked;
		@@ -78,6 +79,7 @@ public class MessageTopView extends LinearLayout {
		mDownloadRemainder = findViewById(R.id.download_remainder);
		mDownloadRemainder.setVisibility(View.GONE);

		extraHeaderContainer = findViewById(R.id.extra_header_container);
		showPicturesButton = findViewById(R.id.show_pictures);
		setShowPicturesButtonListener();

		@@ -264,11 +266,11 @@ public class MessageTopView extends LinearLayout {
		}

		private void showShowPicturesButton() {
		showPicturesButton.setVisibility(View.VISIBLE);
		extraHeaderContainer.setVisibility(View.VISIBLE);
		}

		private void hideShowPicturesButton() {
		showPicturesButton.setVisibility(View.GONE);
		extraHeaderContainer.setVisibility(View.GONE);
		}

		private boolean shouldAutomaticallyLoadPictures(ShowPictures showPicturesSetting, Message message) {

app/ui/legacy/src/main/res/layout/message.xml

+19 −13

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		<com.fsck.k9.ui.messageview.MessageTopView
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:tools="http://schemas.android.com/tools"
		xmlns:custom="http://schemas.android.com/apk/res-auto"
		xmlns:app="http://schemas.android.com/apk/res-auto"
		android:id="@+id/message_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		@@ -25,19 +25,25 @@
		<!-- Header area -->
		<include layout="@layout/message_view_header"/>

		<FrameLayout
		android:id="@+id/extra_header_container"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:background="?attr/extraMessageHeaderBackground"
		android:paddingVertical="4dp"
		android:visibility="gone"
		tools:visibility="visible">

		<Button
		android:id="@+id/show_pictures"
		style="?android:attr/buttonStyleSmall"
		style="@style/Widget.MaterialComponents.Button.OutlinedButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="end"
		android:layout_marginBottom="4dip"
		android:layout_marginLeft="6dip"
		android:layout_marginRight="6dip"
		android:layout_marginTop="4dip"
		android:text="@string/message_view_show_pictures_action"
		android:visibility="gone"
		tools:visibility="visible"/>
		android:layout_gravity="center_horizontal"
		android:text="@string/message_view_show_remote_images_action"
		app:icon="@drawable/ic_attachment_image" />

		</FrameLayout>

		<Space
		android:id="@+id/line_of_death"
		@@ -50,7 +56,7 @@
		android:layout_height="match_parent"
		android:inAnimation="@anim/fade_in"
		android:outAnimation="@anim/fade_out"
		custom:previewInitialChild="1">
		app:previewInitialChild="1">

		<View
		android:layout_width="wrap_content"

app/ui/legacy/src/main/res/values-ar/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@
		<string name="message_view_cc_label">نسخة كربونية :</string>
		<string name="message_view_bcc_label">نسخة مخفية:</string>
		<string name="message_view_status_attachment_not_saved">غير قادر على حفظ المُرفَق.</string>
		<string name="message_view_show_pictures_action">اظهر الصور</string>
		<string name="message_view_no_viewer">يتعذر إيجاب تطبيق لعرض <xliff:g id="mimetype">%s</xliff:g>.</string>
		<string name="message_view_download_remainder">تنزيل الرسالة كاملةً</string>
		<string name="message_view_sender_label">عبر %1$s</string>

app/ui/legacy/src/main/res/values-be/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,6 @@ K-9 Mail - шматфункцыянальны свабодны паштовы к
		<string name="message_view_cc_label">Копія:</string>
		<string name="message_view_bcc_label">Схаваная копія:</string>
		<string name="message_view_status_attachment_not_saved">Немагчыма захаваць далучаныя файлы.</string>
		<string name="message_view_show_pictures_action">Прагляд малюнкаў</string>
		<string name="message_view_no_viewer">Няма праграмы для прагляду <xliff:g id="mimetype">%s</xliff:g>.</string>
		<string name="message_view_download_remainder">Спампаваць ліст цалкам</string>
		<string name="message_view_sender_label">ад %1$s</string>

app/ui/legacy/src/main/res/values-bg/strings.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,6 @@ K-9 Mail е мощен, безплатен имейл клиент за Андр
		<string name="message_view_cc_label">Копие:</string>
		<string name="message_view_bcc_label">Bcc:</string>
		<string name="message_view_status_attachment_not_saved">Не може да запази прикачения файл.</string>
		<string name="message_view_show_pictures_action">Покажи картинките</string>
		<string name="message_view_no_viewer">Не може да намери програма за <xliff:g id="mimetype">%s</xliff:g>.</string>
		<string name="message_view_download_remainder">Свали цялото съобщение</string>
		<string name="message_view_sender_label">през %1$s</string>