mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added button disabled ref hint, srcCompat everywhere

This commit is contained in:
M66B 2019-08-22 14:48:59 +02:00
parent 99f747510a
commit a43535018c
18 changed files with 190 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -168,6 +168,7 @@ public class FragmentCompose extends FragmentBase {
private TextView tvNoInternet;
private TextView tvSignature;
private TextView tvReference;
private ImageButton ibCloseRefHint;
private ImageButton ibReferenceEdit;
private ImageButton ibReferenceImages;
private BottomNavigationView edit_bar;
@ -179,7 +180,7 @@ public class FragmentCompose extends FragmentBase {
private Group grpAttachments;
private Group grpBody;
private Group grpSignature;
private Group grpReference;
private Group grpReferenceHint;
private ContentResolver resolver;
private AdapterAttachment adapter;
@ -260,6 +261,7 @@ public class FragmentCompose extends FragmentBase {
tvNoInternet = view.findViewById(R.id.tvNoInternet);
tvSignature = view.findViewById(R.id.tvSignature);
tvReference = view.findViewById(R.id.tvReference);
ibCloseRefHint = view.findViewById(R.id.ibCloseRefHint);
ibReferenceEdit = view.findViewById(R.id.ibReferenceEdit);
ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
edit_bar = view.findViewById(R.id.edit_bar);
@ -272,7 +274,7 @@ public class FragmentCompose extends FragmentBase {
grpAttachments = view.findViewById(R.id.grpAttachments);
grpBody = view.findViewById(R.id.grpBody);
grpSignature = view.findViewById(R.id.grpSignature);
grpReference = view.findViewById(R.id.grpReference);
grpReferenceHint = view.findViewById(R.id.grpReferenceHint);
resolver = getContext().getContentResolver();
@ -339,6 +341,15 @@ public class FragmentCompose extends FragmentBase {
}
});
ibCloseRefHint.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
prefs.edit().putBoolean("compose_reference", false).apply();
grpReferenceHint.setVisibility(View.GONE);
}
});
ibReferenceEdit.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -425,9 +436,10 @@ public class FragmentCompose extends FragmentBase {
tvNoInternet.setVisibility(View.GONE);
grpBody.setVisibility(View.GONE);
grpSignature.setVisibility(View.GONE);
grpReference.setVisibility(View.GONE);
grpReferenceHint.setVisibility(View.GONE);
ibReferenceEdit.setVisibility(View.GONE);
ibReferenceImages.setVisibility(View.GONE);
tvReference.setVisibility(View.GONE);
edit_bar.setVisibility(View.GONE);
bottom_navigation.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
@ -2957,8 +2969,12 @@ public class FragmentCompose extends FragmentBase {
boolean ref_has_images = args.getBoolean("ref_has_images");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean ref_hint = prefs.getBoolean("compose_reference", true);
tvReference.setText(text[1]);
grpReference.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
tvReference.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
grpReferenceHint.setVisibility(text[1] == null || !ref_hint ? View.GONE : View.VISIBLE);
ibReferenceEdit.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
ibReferenceImages.setVisibility(ref_has_images && !show_images ? View.VISIBLE : View.GONE);

4
app/src/main/res/layout/fragment_answer.xml
View File

@ -64,9 +64,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_setup_help"
android:src="@drawable/baseline_info_24"
app:layout_constraintBottom_toBottomOf="@id/etText"
app:layout_constraintEnd_toEndOf="@id/etText" />
app:layout_constraintEnd_toEndOf="@id/etText"
app:srcCompat="@drawable/baseline_info_24" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation"

66
app/src/main/res/layout/fragment_compose.xml
View File

@ -258,6 +258,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSignature" />
<ImageButton
android:id="@+id/ibCloseRefHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:contentDescription="@string/title_no_format"
app:layout_constraintBottom_toBottomOf="@+id/tvReferenceHint"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvReferenceHint"
app:srcCompat="@drawable/baseline_close_24" />
<TextView
android:id="@+id/tvReferenceHint"
android:layout_width="0dp"
@ -269,9 +280,36 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintEnd_toStartOf="@+id/ibReferenceEdit"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@id/ibCloseRefHint"
app:layout_constraintTop_toBottomOf="@id/vSeparatorSignature" />
<ImageButton
android:id="@+id/ibReferenceEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_edit"
app:layout_constraintEnd_toStartOf="@+id/ibReferenceImages"
app:layout_constraintTop_toBottomOf="@id/vSeparatorSignature"
app:srcCompat="@drawable/baseline_edit_24" />
<ImageButton
android:id="@+id/ibReferenceImages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_show_images"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorSignature"
app:srcCompat="@drawable/baseline_image_24" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_reference"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="ibCloseRefHint,tvReferenceHint,ibReferenceEdit,ibReferenceImages" />
<TextView
android:id="@+id/tvReference"
android:layout_width="0dp"
@ -284,27 +322,7 @@
android:textIsSelectable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvReferenceHint" />
<ImageButton
android:id="@+id/ibReferenceEdit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_edit"
app:layout_constraintEnd_toStartOf="@+id/ibReferenceImages"
app:layout_constraintTop_toTopOf="@id/tvReferenceHint"
app:srcCompat="@drawable/baseline_edit_24" />
<ImageButton
android:id="@+id/ibReferenceImages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_show_images"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvReferenceHint"
app:srcCompat="@drawable/baseline_image_24" />
app:layout_constraintTop_toBottomOf="@id/barrier_reference" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpHeader"
@ -343,10 +361,10 @@
app:constraint_referenced_ids="vSeparatorSignature,tvSignature" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpReference"
android:id="@+id/grpReferenceHint"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvReferenceHint,tvReference" />
app:constraint_referenced_ids="ibCloseRefHint,tvReferenceHint" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

4
app/src/main/res/layout/fragment_identity.xml
View File

@ -147,10 +147,10 @@
android:layout_marginStart="12dp"
android:background="@null"
android:contentDescription="@string/title_legend_default_color"
android:src="@drawable/baseline_delete_24"
app:layout_constraintBottom_toBottomOf="@id/btnColor"
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toTopOf="@id/btnColor" />
app:layout_constraintTop_toTopOf="@id/btnColor"
app:srcCompat="@drawable/baseline_delete_24" />
<TextView
android:id="@+id/tvColorHint"

40
app/src/main/res/layout/fragment_messages.xml
View File

@ -55,10 +55,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_close_hint"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="@id/tvHintSupport"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvHintSupport" />
app:layout_constraintTop_toTopOf="@id/tvHintSupport"
app:srcCompat="@drawable/baseline_close_24" />
<View
android:id="@+id/vSeparatorHintSupport"
@ -87,10 +87,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_close_hint"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="@id/tvHintSwipe"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvHintSwipe" />
app:layout_constraintTop_toTopOf="@id/tvHintSwipe"
app:srcCompat="@drawable/baseline_close_24" />
<View
android:id="@+id/vSeparatorHintSwipe"
@ -119,10 +119,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_close_hint"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="@id/tvHintSelect"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvHintSelect" />
app:layout_constraintTop_toTopOf="@id/tvHintSelect"
app:srcCompat="@drawable/baseline_close_24" />
<View
android:id="@+id/vSeparatorHintSelect"
@ -186,10 +186,10 @@
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="@dimen/fab_padding"
android:src="@drawable/baseline_reply_24"
android:tint="@color/colorActionForeground"
app:layout_constraintBottom_toTopOf="@+id/seekBar"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/baseline_reply_24" />
<ImageButton
android:id="@+id/ibDown"
@ -197,12 +197,12 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:padding="12dp"
android:src="@drawable/baseline_vertical_align_bottom_24"
android:tint="?attr/colorSeparator"
app:layout_constraintBottom_toTopOf="@+id/seekBar"
app:layout_constraintEnd_toStartOf="@+id/ibUp"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@drawable/baseline_vertical_align_bottom_24" />
<ImageButton
android:id="@+id/ibUp"
@ -210,12 +210,12 @@
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:padding="12dp"
android:src="@drawable/baseline_vertical_align_top_24"
android:tint="?attr/colorSeparator"
app:layout_constraintBottom_toTopOf="@+id/seekBar"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toEndOf="@+id/ibDown" />
app:layout_constraintStart_toEndOf="@+id/ibDown"
app:srcCompat="@drawable/baseline_vertical_align_top_24" />
<SeekBar
android:id="@+id/seekBar"
@ -277,10 +277,10 @@
android:layout_gravity="end|bottom"
android:layout_marginEnd="@dimen/fab_padding"
android:layout_marginBottom="90dp"
android:src="@drawable/baseline_more_vert_24"
android:tint="@color/colorActionForeground"
android:tooltipText="@string/title_more"
app:backgroundTint="?attr/colorAccent" />
app:backgroundTint="?attr/colorAccent"
app:srcCompat="@drawable/baseline_more_vert_24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSearch"
@ -288,10 +288,10 @@
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="@dimen/fab_padding"
android:src="@drawable/baseline_youtube_searched_for_24"
android:tint="@color/colorActionForeground"
android:tooltipText="@string/title_search_server"
app:backgroundTint="?attr/colorAccent" />
app:backgroundTint="?attr/colorAccent"
app:srcCompat="@drawable/baseline_youtube_searched_for_24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabCompose"
@ -299,10 +299,10 @@
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:layout_margin="@dimen/fab_padding"
android:src="@drawable/baseline_edit_24"
android:tint="@color/colorActionForeground"
android:tooltipText="@string/title_compose"
app:backgroundTint="?attr/colorAccent" />
app:backgroundTint="?attr/colorAccent"
app:srcCompat="@drawable/baseline_edit_24" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabError"
@ -310,8 +310,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|bottom"
android:layout_margin="@dimen/fab_padding"
android:src="@drawable/baseline_warning_24"
android:tint="@color/colorActionForeground"
android:tooltipText="@string/title_compose"
app:backgroundTint="@color/colorError" />
app:backgroundTint="@color/colorError"
app:srcCompat="@drawable/baseline_warning_24" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
app/src/main/res/layout/fragment_options_behavior.xml
View File

@ -195,11 +195,11 @@
android:layout_width="21dp"
android:layout_height="21dp"
android:contentDescription="@string/title_legend_auth"
android:src="@drawable/baseline_flag_24"
android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/swAuthentication"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/swAuthentication" />
app:layout_constraintTop_toTopOf="@+id/swAuthentication"
app:srcCompat="@drawable/baseline_flag_24" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swAuthentication"

28
app/src/main/res/layout/fragment_setup.xml
View File

@ -37,10 +37,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_close_hint"
android:src="@drawable/baseline_close_24"
app:layout_constraintBottom_toBottomOf="@id/tvWelcome"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tvWelcome" />
app:layout_constraintTop_toTopOf="@id/tvWelcome"
app:srcCompat="@drawable/baseline_close_24" />
<View
android:id="@+id/vSeparatorWelcome"
@ -57,10 +57,10 @@
android:layout_height="30dp"
android:layout_marginTop="12dp"
android:contentDescription="@string/title_setup_quick"
android:src="@drawable/baseline_fast_forward_24"
android:tint="?android:attr/textColorPrimary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorWelcome" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorWelcome"
app:srcCompat="@drawable/baseline_fast_forward_24" />
<TextView
android:layout_width="0dp"
@ -129,9 +129,9 @@
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="1"
android:src="@drawable/baseline_looks_one_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorAccount"
app:srcCompat="@drawable/baseline_looks_one_24" />
<TextView
android:layout_width="0dp"
@ -227,9 +227,9 @@
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="2"
android:src="@drawable/baseline_looks_two_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorIdentity"
app:srcCompat="@drawable/baseline_looks_two_24" />
<TextView
android:layout_width="0dp"
@ -325,9 +325,9 @@
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="3"
android:src="@drawable/baseline_looks_3_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorPermissions" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorPermissions"
app:srcCompat="@drawable/baseline_looks_3_24" />
<TextView
android:layout_width="0dp"
@ -390,9 +390,9 @@
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="4"
android:src="@drawable/baseline_looks_4_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorDoze" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorDoze"
app:srcCompat="@drawable/baseline_looks_4_24" />
<TextView
android:layout_width="0dp"
@ -468,9 +468,9 @@
android:layout_height="24dp"
android:layout_marginTop="12dp"
android:contentDescription="5"
android:src="@drawable/baseline_looks_5_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorInbox" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorInbox"
app:srcCompat="@drawable/baseline_looks_5_24" />
<TextView
android:layout_width="0dp"

16
app/src/main/res/layout/include_message_addresses.xml
View File

@ -19,11 +19,11 @@
android:layout_height="24dp"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/title_legend_expander"
android:src="@drawable/expander"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress" />
app:layout_constraintTop_toBottomOf="@id/vSeparatorAddress"
app:srcCompat="@drawable/expander" />
<ImageButton
android:id="@+id/ibSearchContact"
@ -31,9 +31,9 @@
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/baseline_search_24"
app:layout_constraintEnd_toStartOf="@+id/ibNotifyContact"
app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress"
app:srcCompat="@drawable/baseline_search_24" />
<ImageButton
android:id="@+id/ibNotifyContact"
@ -42,9 +42,9 @@
android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_notify"
android:src="@drawable/baseline_notifications_24"
app:layout_constraintEnd_toStartOf="@+id/ibAddContact"
app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress"
app:srcCompat="@drawable/baseline_notifications_24" />
<ImageButton
android:id="@+id/ibAddContact"
@ -53,9 +53,9 @@
android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_contacts"
android:src="@drawable/baseline_import_contacts_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress" />
app:layout_constraintTop_toBottomOf="@id/ivExpanderAddress"
app:srcCompat="@drawable/baseline_import_contacts_24" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_action"

48
app/src/main/res/layout/include_message_compact.xml
View File

@ -30,11 +30,11 @@
android:layout_marginStart="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_expander"
android:src="@drawable/expander"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toTopOf="@id/paddingTop" />
app:layout_constraintTop_toTopOf="@id/paddingTop"
app:srcCompat="@drawable/expander" />
<View
android:id="@+id/paddingStart"
@ -50,11 +50,11 @@
android:layout_height="24dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_avatar"
android:src="@drawable/baseline_person_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toEndOf="@id/paddingStart"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
app:layout_constraintTop_toBottomOf="@id/paddingTop"
app:srcCompat="@drawable/baseline_person_24" />
<TextView
android:id="@+id/tvFrom"
@ -105,10 +105,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_folder_type"
android:src="@drawable/baseline_edit_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/paddingStart"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_edit_24" />
<ImageView
android:id="@+id/ivAuth"
@ -116,11 +116,11 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_auth"
android:src="@drawable/baseline_flag_24"
android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivType"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_flag_24" />
<ImageView
android:id="@+id/ivSnoozed"
@ -128,10 +128,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_snoozed"
android:src="@drawable/baseline_timelapse_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivAuth"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_timelapse_24" />
<ImageView
android:id="@+id/ivBrowsed"
@ -139,10 +139,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_browsed"
android:src="@drawable/baseline_playlist_add_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivSnoozed"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_playlist_add_24" />
<ImageView
android:id="@+id/ivAnswered"
@ -150,10 +150,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_answered"
android:src="@drawable/baseline_reply_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivBrowsed"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_reply_24" />
<ImageView
android:id="@+id/ivPlain"
@ -161,10 +161,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_plain_only"
android:src="@drawable/baseline_notes_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivAnswered"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_notes_24" />
<ImageView
android:id="@+id/ivReceipt"
@ -172,10 +172,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_receipt"
android:src="@drawable/baseline_playlist_add_check_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivPlain"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_playlist_add_check_24" />
<ImageView
android:id="@+id/ivAttachments"
@ -183,10 +183,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_attachment"
android:src="@drawable/baseline_attachment_24"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/ivReceipt"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_attachment_24" />
<TextView
android:id="@+id/tvSubject"
@ -239,10 +239,10 @@
android:layout_height="15dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_thread"
android:src="@drawable/baseline_message_24"
app:layout_constraintBottom_toBottomOf="@id/tvSubject"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
app:layout_constraintTop_toTopOf="@+id/tvSubject" />
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_message_24" />
<ImageView
android:id="@+id/ivFlagged"
@ -253,11 +253,11 @@
android:contentDescription="@string/title_legend_flagged"
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:src="@drawable/baseline_star_24"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@id/tvSubject"
app:layout_constraintEnd_toStartOf="@id/paddingEnd"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
app:layout_constraintTop_toBottomOf="@id/paddingTop"
app:srcCompat="@drawable/baseline_star_24" />
<TextView
android:id="@+id/tvPreview"

12
app/src/main/res/layout/include_message_navigation.xml
View File

@ -25,10 +25,10 @@
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_decrypt"
android:src="@drawable/baseline_no_encryption_24"
android:tint="@color/bottomnav_foreground"
app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_no_encryption_24" />
<ImageButton
android:id="@+id/ibImages"
@ -37,10 +37,10 @@
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_show_images"
android:src="@drawable/baseline_image_24"
android:tint="@color/bottomnav_foreground"
app:layout_constraintEnd_toStartOf="@+id/ibFull"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_image_24" />
<ImageButton
android:id="@+id/ibFull"
@ -48,8 +48,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:contentDescription="@string/title_legend_show_full"
android:src="@drawable/baseline_fullscreen_24"
android:tint="@color/bottomnav_foreground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_fullscreen_24" />
</androidx.constraintlayout.widget.ConstraintLayout>

48
app/src/main/res/layout/include_message_normal.xml
View File

@ -28,11 +28,11 @@
android:layout_marginStart="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_expander"
android:src="@drawable/expander"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toTopOf="@id/paddingTop" />
app:layout_constraintTop_toTopOf="@id/paddingTop"
app:srcCompat="@drawable/expander" />
<View
android:id="@+id/paddingStart"
@ -49,11 +49,11 @@
android:contentDescription="@string/title_legend_avatar"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:src="@drawable/baseline_person_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toEndOf="@id/paddingStart"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
app:layout_constraintTop_toBottomOf="@id/paddingTop"
app:srcCompat="@drawable/baseline_person_24" />
<TextView
android:id="@+id/tvFrom"
@ -118,11 +118,11 @@
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_flagged"
android:padding="6dp"
android:src="@drawable/baseline_star_24"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintEnd_toStartOf="@id/paddingEnd"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
app:layout_constraintTop_toBottomOf="@id/paddingTop"
app:srcCompat="@drawable/baseline_star_24" />
<ImageView
android:id="@+id/ivType"
@ -130,10 +130,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_folder_type"
android:src="@drawable/baseline_edit_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivAvatar"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_edit_24" />
<ImageView
android:id="@+id/ivAuth"
@ -141,11 +141,11 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_auth"
android:src="@drawable/baseline_flag_24"
android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivType"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_flag_24" />
<ImageView
android:id="@+id/ivSnoozed"
@ -153,10 +153,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_snoozed"
android:src="@drawable/baseline_timelapse_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivAuth"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_timelapse_24" />
<ImageView
android:id="@+id/ivBrowsed"
@ -164,10 +164,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_browsed"
android:src="@drawable/baseline_playlist_add_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivSnoozed"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_playlist_add_24" />
<ImageView
android:id="@+id/ivAnswered"
@ -175,10 +175,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_answered"
android:src="@drawable/baseline_reply_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivBrowsed"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_reply_24" />
<ImageView
android:id="@+id/ivPlain"
@ -186,10 +186,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_plain_only"
android:src="@drawable/baseline_notes_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivAnswered"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_notes_24" />
<ImageView
android:id="@+id/ivReceipt"
@ -197,10 +197,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_receipt"
android:src="@drawable/baseline_playlist_add_check_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivPlain"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_playlist_add_check_24" />
<ImageView
android:id="@+id/ivAttachments"
@ -208,10 +208,10 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_attachment"
android:src="@drawable/baseline_attachment_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/ivReceipt"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_attachment_24" />
<TextView
android:id="@+id/tvFolder"
@ -247,10 +247,10 @@
android:layout_height="15dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_thread"
android:src="@drawable/baseline_message_24"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintEnd_toStartOf="@+id/ivFlagged"
app:layout_constraintTop_toTopOf="@+id/tvFolder" />
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_message_24" />
<TextView
android:id="@+id/tvPreview"

16
app/src/main/res/layout/item_account.xml
View File

@ -38,10 +38,10 @@
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_connection_state"
android:src="@drawable/baseline_cloud_off_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_cloud_off_24" />
<ImageView
android:id="@+id/ivPrimary"
@ -49,10 +49,10 @@
android:layout_height="24dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_primary"
android:src="@drawable/baseline_star_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintStart_toEndOf="@id/ivState"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_star_24" />
<ImageView
android:id="@+id/ivNotify"
@ -60,10 +60,10 @@
android:layout_height="24dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_notify"
android:src="@drawable/baseline_notifications_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintStart_toEndOf="@id/ivPrimary"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_notifications_24" />
<TextView
android:id="@+id/tvName"
@ -87,10 +87,10 @@
android:layout_height="24dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_sync_state"
android:src="@drawable/baseline_sync_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_sync_24" />
<TextView
android:id="@+id/tvUser"

12
app/src/main/res/layout/item_identity.xml
View File

@ -38,10 +38,10 @@
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_connection_state"
android:src="@drawable/baseline_cloud_off_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintStart_toEndOf="@id/vwColor"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_cloud_off_24" />
<ImageView
android:id="@+id/ivPrimary"
@ -49,10 +49,10 @@
android:layout_height="24dp"
android:layout_marginStart="6dp"
android:contentDescription="@string/title_legend_primary"
android:src="@drawable/baseline_star_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintStart_toEndOf="@id/ivState"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_star_24" />
<TextView
android:id="@+id/tvName"
@ -76,10 +76,10 @@
android:layout_height="24dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_legend_sync_state"
android:src="@drawable/baseline_sync_24"
app:layout_constraintBottom_toBottomOf="@+id/tvName"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvName" />
app:layout_constraintTop_toTopOf="@+id/tvName"
app:srcCompat="@drawable/baseline_sync_24" />
<TextView
android:id="@+id/tvUser"

4
app/src/main/res/layout/item_image.xml
View File

@ -19,10 +19,10 @@
android:adjustViewBounds="true"
android:contentDescription="@string/title_legend_show_images"
android:scaleType="centerInside"
app:srcCompat="@mipmap/ic_launcher"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@mipmap/ic_launcher" />
<TextView
android:id="@+id/tvCaption"

8
app/src/main/res/layout/item_nav.xml
View File

@ -58,20 +58,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:src="@drawable/baseline_open_in_new_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ivWarning"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/baseline_open_in_new_24" />
<ImageView
android:id="@+id/ivWarning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:src="@drawable/baseline_warning_24"
android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/baseline_warning_24" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

4
app/src/main/res/layout/item_operation.xml
View File

@ -19,9 +19,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/title_legend_synchronizing"
android:src="@drawable/baseline_compare_arrows_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/baseline_compare_arrows_24" />
<TextView
android:id="@+id/tvFolder"

4
app/src/main/res/layout/item_order.xml
View File

@ -17,10 +17,10 @@
android:id="@+id/ivDragHandle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/baseline_drag_handle_24"
app:layout_constraintBottom_toBottomOf="@+id/tvTitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tvTitle" />
app:layout_constraintTop_toTopOf="@+id/tvTitle"
app:srcCompat="@drawable/baseline_drag_handle_24" />
<TextView
android:id="@+id/tvTitle"

4
app/src/main/res/layout/item_rule.xml
View File

@ -47,9 +47,9 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:contentDescription="@string/title_legend_stop"
android:src="@drawable/baseline_stop_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/baseline_stop_24" />
<TextView
android:id="@+id/tvCondition"