Added hints

pull/162/head
M66B 5 years ago
parent a654bcca93
commit 5548f2fbdb

@ -2542,7 +2542,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
}); });
if (!full) { if (full) {
TextView tvDark = dview.findViewById(R.id.tvDark);
tvDark.setVisibility(Helper.isDarkTheme(context) ? View.VISIBLE : View.GONE);
} else {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean disable_tracking = prefs.getBoolean("disable_tracking", true); boolean disable_tracking = prefs.getBoolean("disable_tracking", true);

@ -20,6 +20,17 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvDark"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_ask_show_html_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvMessage" />
<CheckBox <CheckBox
android:id="@+id/cbNotAgain" android:id="@+id/cbNotAgain"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -28,6 +39,6 @@
android:text="@string/title_no_ask_again" android:text="@string/title_no_ask_again"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvMessage" /> app:layout_constraintTop_toBottomOf="@id/tvDark" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>

@ -24,6 +24,7 @@
android:id="@+id/ivTracking" android:id="@+id/ivTracking"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:tint="?attr/colorWarning"
app:layout_constraintBottom_toBottomOf="@+id/tvTracking" app:layout_constraintBottom_toBottomOf="@+id/tvTracking"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvTracking" app:layout_constraintTop_toTopOf="@+id/tvTracking"

@ -207,6 +207,7 @@
<string name="title_advanced_section_display">Display</string> <string name="title_advanced_section_display">Display</string>
<string name="title_advanced_section_behavior">Behavior</string> <string name="title_advanced_section_behavior">Behavior</string>
<string name="title_advanced_section_notifications">Notifications</string> <string name="title_advanced_section_notifications">Notifications</string>
<string name="title_advanced_section_privacy">Privacy</string>
<string name="title_advanced_section_misc">Miscellaneous</string> <string name="title_advanced_section_misc">Miscellaneous</string>
<string name="title_advanced_enabled">Enabled</string> <string name="title_advanced_enabled">Enabled</string>
@ -281,7 +282,6 @@
<string name="title_advanced_autounstar">Automatically remove stars from messages on moving messages</string> <string name="title_advanced_autounstar">Automatically remove stars from messages on moving messages</string>
<string name="title_advanced_automove">Confirm moving messages</string> <string name="title_advanced_automove">Confirm moving messages</string>
<string name="title_advanced_discard_delete">On discard draft permanently delete draft</string> <string name="title_advanced_discard_delete">On discard draft permanently delete draft</string>
<string name="title_advanced_tracking">Automatically recognize and disable tracking images</string>
<string name="title_advanced_badge">Show launcher icon with number of new messages</string> <string name="title_advanced_badge">Show launcher icon with number of new messages</string>
<string name="title_advanced_unseen_ignored">Let the number of new messages match the number of notifications</string> <string name="title_advanced_unseen_ignored">Let the number of new messages match the number of notifications</string>
@ -302,6 +302,9 @@
<string name="title_advanced_sound">Select notification sound</string> <string name="title_advanced_sound">Select notification sound</string>
<string name="title_advanced_alert_once" translatable="false">MIUI notification sound workaround</string> <string name="title_advanced_alert_once" translatable="false">MIUI notification sound workaround</string>
<string name="title_advanced_tracking">Automatically recognize and disable tracking images</string>
<string name="title_advanced_recents">Hide from screen with recent apps</string>
<string name="title_advanced_badge_hint">Only available on supported launchers</string> <string name="title_advanced_badge_hint">Only available on supported launchers</string>
<string name="title_advanced_notify_action_hint">At most three actions will be shown</string> <string name="title_advanced_notify_action_hint">At most three actions will be shown</string>
<string name="title_advanced_notify_remove_hint">New message notifications will always be removed on being swiped away and on marking messages read</string> <string name="title_advanced_notify_remove_hint">New message notifications will always be removed on being swiped away and on marking messages read</string>
@ -562,6 +565,7 @@
<string name="title_ask_delete_rule">Delete rule permanently?</string> <string name="title_ask_delete_rule">Delete rule permanently?</string>
<string name="title_ask_discard">Discard draft?</string> <string name="title_ask_discard">Discard draft?</string>
<string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string> <string name="title_ask_show_html">Showing the original message can leak privacy sensitive information</string>
<string name="title_ask_show_html_remark">Displaying the original message with a dark background is not possible because it can cause invisible dark texts and images</string>
<string name="title_ask_show_image">Showing images can leak privacy sensitive information</string> <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
<string name="title_ask_show_image_hint">Images recognized as tracking images will not be shown</string> <string name="title_ask_show_image_hint">Images recognized as tracking images will not be shown</string>
<string name="title_ask_delete_ref">Delete replied/forwarded message text? This cannot be undone.</string> <string name="title_ask_delete_ref">Delete replied/forwarded message text? This cannot be undone.</string>
@ -571,6 +575,7 @@
<string name="title_ask_help">Help improve FairEmail</string> <string name="title_ask_help">Help improve FairEmail</string>
<string name="title_ask_reporting">Send error reports?</string> <string name="title_ask_reporting">Send error reports?</string>
<string name="title_reporting_why">Error reporting will help improve FairEmail</string> <string name="title_reporting_why">Error reporting will help improve FairEmail</string>
<string name="title_download_message">Downloading &#8230;</string>
<string name="title_compose">Compose</string> <string name="title_compose">Compose</string>
<string name="title_from">From:</string> <string name="title_from">From:</string>
@ -774,7 +779,7 @@
<string name="title_legend_download">Download content</string> <string name="title_legend_download">Download content</string>
<string name="title_legend_external_image">External image placeholder</string> <string name="title_legend_external_image">External image placeholder</string>
<string name="title_legend_embedded_image">Embedded image placeholder</string> <string name="title_legend_embedded_image">Embedded image placeholder</string>
<string name="title_legend_tracking_pixel">Tracking pixel</string> <string name="title_legend_tracking_pixel">Tracking image</string>
<string name="title_legend_broken_image">Broken image</string> <string name="title_legend_broken_image">Broken image</string>
<string name="title_legend_pick">Pick contact</string> <string name="title_legend_pick">Pick contact</string>

Loading…
Cancel
Save