msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Accessibility cleanup

Browse Source
pull/170/head
M66B 5 years ago
parent 3a9dc2f153
commit 5462c1a1d6
3 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File

13
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -264,7 +264,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private ImageButton ibExpander;
private ImageView ibFlagged;
private ImageButton ibAvatar;
private View vwSeen;
private ImageButton ibAuth;
private ImageView ivPriorityHigh;
private ImageView ivPriorityLow;
@ -388,7 +387,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibExpander = itemView.findViewById(R.id.ibExpander);
ibFlagged = itemView.findViewById(R.id.ibFlagged);
ibAvatar = itemView.findViewById(R.id.ibAvatar);
vwSeen = itemView.findViewById(R.id.vwSeen);
ibAuth = itemView.findViewById(R.id.ibAuth);
ivPriorityHigh = itemView.findViewById(R.id.ivPriorityHigh);
ivPriorityLow = itemView.findViewById(R.id.ivPriorityLow);
@ -833,8 +831,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (ibExpander.getTag() == null || (boolean) ibExpander.getTag() != expanded) {
ibExpander.setTag(expanded);
ibExpander.setImageLevel(expanded ? 0 /* less */ : 1 /* more */);
ibExpander.setContentDescription(context.getString(
expanded ? R.string.title_accessibility_expanded : R.string.title_accessibility_collapsed));
}
if (viewType == ViewType.THREAD)
ibExpander.setVisibility(EntityFolder.DRAFTS.equals(message.folderType) ? View.INVISIBLE : View.VISIBLE);
@ -844,9 +840,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// Photo
ibAvatar.setVisibility(avatars ? View.INVISIBLE : View.GONE);
vwSeen.setContentDescription(context.getString(
message.unseen > 0 ? R.string.title_accessibility_unseen : R.string.title_accessibility_seen));
// Line 1
ibAuth.setVisibility(authentication && !authenticated ? View.VISIBLE : View.GONE);
ivPriorityHigh.setVisibility(EntityMessage.PRIORITIY_HIGH.equals(message.priority) ? View.VISIBLE : View.GONE);
@ -1082,10 +1075,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
int color = (message.color == null || !pro ? colorAccent : message.color);
ibFlagged.setImageResource(flagged > 0 ? R.drawable.baseline_star_24 : R.drawable.baseline_star_border_24);
ibFlagged.setImportantForAccessibility(
flagged == 0 ? View.IMPORTANT_FOR_ACCESSIBILITY_NO : View.IMPORTANT_FOR_ACCESSIBILITY_AUTO);
ibFlagged.setContentDescription(context.getString(
flagged > 0 ? R.string.title_accessibility_flagged : R.string.title_accessibility_unflagged));
ibFlagged.setImageTintList(ColorStateList.valueOf(flagged > 0 ? color : textColorSecondary));
ibFlagged.setEnabled(message.uid != null || message.accountProtocol != EntityAccount.TYPE_IMAP);
@ -2610,8 +2599,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibExpander.setTag(expanded);
ibExpander.setImageLevel(expanded ? 0 /* less*/ : 1 /* more */);
ibExpander.setContentDescription(context.getString(
expanded ? R.string.title_accessibility_expanded : R.string.title_accessibility_collapsed));
if (expanded)
bindExpanded(message, true);

19
app/src/main/res/layout/include_message_compact.xml
Unescape View File

@ -9,7 +9,6 @@
android:layout_width="6dp"
android:layout_height="0dp"
android:background="?attr/colorAccent"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -18,7 +17,6 @@
android:id="@+id/paddingTop"
android:layout_width="match_parent"
android:layout_height="12dp"
android:importantForAccessibility="no"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -41,7 +39,6 @@
android:id="@+id/paddingStart"
android:layout_width="6dp"
android:layout_height="0dp"
android:importantForAccessibility="no"
android:visibility="gone"
app:layout_constraintStart_toEndOf="@+id/ibExpander"
app:layout_constraintTop_toTopOf="parent" />
@ -53,7 +50,6 @@
android:layout_marginStart="6dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_avatar"
android:importantForAccessibility="no"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintDimensionRatio="1:1"
@ -61,13 +57,6 @@
app:layout_constraintTop_toBottomOf="@id/paddingTop"
app:srcCompat="@drawable/baseline_person_24" />
<View
android:id="@+id/vwSeen"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="@+id/ibAvatar"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
<ImageButton
android:id="@+id/ibAuth"
android:layout_width="21dp"
@ -77,7 +66,7 @@
android:contentDescription="@string/title_legend_auth"
android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/vwSeen"
app:layout_constraintStart_toEndOf="@id/ibAvatar"
app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/baseline_flag_24" />
@ -174,7 +163,7 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
app:layout_constraintBottom_toBottomOf="@+id/tvSubject"
app:layout_constraintStart_toEndOf="@id/vwSeen"
app:layout_constraintStart_toEndOf="@id/ibAvatar"
app:layout_constraintTop_toTopOf="@+id/tvSubject"
app:srcCompat="@drawable/baseline_edit_24" />
@ -277,7 +266,7 @@
android:text="Folder"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintStart_toEndOf="@id/vwSeen"
app:layout_constraintStart_toEndOf="@id/ibAvatar"
app:layout_constraintTop_toBottomOf="@id/tvSubject" />
<TextView
@ -341,7 +330,6 @@
android:id="@+id/paddingEnd"
android:layout_width="6dp"
android:layout_height="0dp"
android:importantForAccessibility="no"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintEnd_toEndOf="parent"
@ -351,7 +339,6 @@
android:id="@+id/paddingBottom"
android:layout_width="match_parent"
android:layout_height="12dp"
android:importantForAccessibility="no"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

19
app/src/main/res/layout/include_message_normal.xml
Unescape View File

@ -8,7 +8,6 @@
android:layout_width="6dp"
android:layout_height="0dp"
android:background="?attr/colorAccent"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -17,7 +16,6 @@
android:id="@+id/paddingTop"
android:layout_width="match_parent"
android:layout_height="3dp"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -39,7 +37,6 @@
android:id="@+id/paddingStart"
android:layout_width="6dp"
android:layout_height="0dp"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintStart_toEndOf="@+id/ibExpander"
app:layout_constraintTop_toTopOf="parent" />
@ -50,7 +47,6 @@
android:layout_height="0dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_avatar"
android:importantForAccessibility="no"
android:paddingStart="6dp"
android:paddingEnd="6dp"
android:scaleType="centerCrop"
@ -60,13 +56,6 @@
app:layout_constraintTop_toBottomOf="@id/paddingTop"
app:srcCompat="@drawable/baseline_person_24" />
<View
android:id="@+id/vwSeen"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintStart_toEndOf="@+id/ibAvatar"
app:layout_constraintTop_toBottomOf="@id/paddingTop" />
<ImageButton
android:id="@+id/ibAuth"
android:layout_width="21dp"
@ -76,7 +65,7 @@
android:contentDescription="@string/title_legend_auth"
android:tint="@color/colorError"
app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
app:layout_constraintStart_toEndOf="@id/vwSeen"
app:layout_constraintStart_toEndOf="@id/ibAvatar"
app:layout_constraintTop_toTopOf="@+id/tvFrom"
app:srcCompat="@drawable/baseline_flag_24" />
@ -177,7 +166,7 @@
android:text="Subject"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintEnd_toStartOf="@+id/ibFlagged"
app:layout_constraintStart_toEndOf="@id/vwSeen"
app:layout_constraintStart_toEndOf="@id/ibAvatar"
app:layout_constraintTop_toBottomOf="@id/tvFrom" />
<ImageButton
@ -198,7 +187,7 @@
android:layout_height="21dp"
android:layout_marginStart="6dp"
app:layout_constraintBottom_toBottomOf="@+id/tvFolder"
app:layout_constraintStart_toEndOf="@id/vwSeen"
app:layout_constraintStart_toEndOf="@id/ibAvatar"
app:layout_constraintTop_toTopOf="@+id/tvFolder"
app:srcCompat="@drawable/baseline_edit_24" />
@ -338,7 +327,6 @@
android:id="@+id/paddingEnd"
android:layout_width="6dp"
android:layout_height="0dp"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@+id/paddingBottom"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -347,7 +335,6 @@
android:id="@+id/paddingBottom"
android:layout_width="match_parent"
android:layout_height="3dp"
android:importantForAccessibility="no"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvError" />

Write Preview
Loading…
Cancel
Save