Redid many layouts in message_list_item. Removed obsolete UI elements. (20c92f50) · Commits · e / os / Mail

k9mail/src/main/java/io/eelo/mail/fragment/MessageListAdapter.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -94,8 +94,6 @@ public class MessageListAdapter extends CursorAdapter
		{
		view.findViewById(R.id.preview).setVisibility(View.GONE);
		holder.preview = (TextView) view.findViewById(R.id.sender_compact);
		holder.flagged = (CheckBox) view.findViewById(R.id.flagged_center_right);
		view.findViewById(R.id.flagged_bottom_right).setVisibility(View.GONE);


		}
		@@ -103,8 +101,6 @@ public class MessageListAdapter extends CursorAdapter
		{
		view.findViewById(R.id.sender_compact).setVisibility(View.GONE);
		holder.preview = (TextView) view.findViewById(R.id.preview);
		holder.flagged = (CheckBox) view.findViewById(R.id.flagged_bottom_right);
		view.findViewById(R.id.flagged_center_right).setVisibility(View.GONE);

		}

		@@ -147,8 +143,6 @@ public class MessageListAdapter extends CursorAdapter
		fontSizes.setViewTextSize(holder.threadCount, fontSizes.getMessageListSubject()); // thread count is next to subject
		view.findViewById(R.id.selected_checkbox_wrapper).setVisibility((fragment.checkboxes) ? View.VISIBLE : View.GONE);

		holder.flagged.setVisibility(View.GONE);

		holder.selected = (CheckBox) view.findViewById(R.id.selected_checkbox);
		holder.selected.setOnClickListener(holder);

		@@ -205,8 +199,6 @@ public class MessageListAdapter extends CursorAdapter
		}
		if (fragment.stars)
		{
		holder.flagged.setChecked(flagged);

		if (flagged)
		{
		holder.starImageView.setVisibility(View.VISIBLE);

k9mail/src/main/java/io/eelo/mail/fragment/MessageViewHolder.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ public class MessageViewHolder implements View.OnClickListener
		public TextView date;
		public ImageView starImageView;
		public TextView threadCount;
		public CheckBox flagged;
		public CheckBox selected;
		public int position = -1;
		public RoundedQuickContactBadge contactBadge;
		@@ -40,10 +39,6 @@ public class MessageViewHolder implements View.OnClickListener
		case R.id.selected_checkbox:
		fragment.toggleMessageSelectWithAdapterPosition(position);
		break;
		case R.id.flagged_bottom_right:
		case R.id.flagged_center_right:
		fragment.toggleMessageFlagWithAdapterPosition(position);
		break;
		}
		}
		}

k9mail/src/main/res/drawable-xhdpi/item_pressed.9.png

−66 B (97 B)

Loading image diff...

k9mail/src/main/res/layout/message_list_item.xml

+76 −102

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@
		<LinearLayout
		android:id="@+id/selected_checkbox_wrapper"
		android:layout_width="wrap_content"

		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:baselineAligned="false"
		@@ -24,8 +23,6 @@
		android:clickable="false"
		android:focusable="false"
		android:gravity="center"
		android:paddingLeft="4dp"
		android:paddingRight="0dp"
		android:visibility="visible" />

		</LinearLayout>
		@@ -36,143 +33,120 @@
		android:layout_width="40dip"
		android:layout_height="40dip"
		android:layout_gravity="center_vertical"
		android:layout_marginBottom="3dip"
		android:layout_marginLeft="4dp"
		android:layout_marginRight="8dip"
		android:layout_marginTop="4dip"
		android:layout_margin="@dimen/margin_small"
		android:background="@android:color/transparent"
		android:src="@drawable/ic_contact_picture" />

		<RelativeLayout
		android:id="@+id/list_item_inner"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="center_vertical"
		android:clickable="false"
		android:focusable="false"
		android:layout_marginStart="@dimen/margin_small"
		android:focusableInTouchMode="false"
		android:gravity="center_vertical"
		android:paddingBottom="6dp"
		android:paddingTop="5dip">

		<TextView
		android:id="@+id/preview"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="false"
		android:layout_alignParentLeft="true"
		android:layout_alignWithParentIfMissing="false"
		android:layout_below="@+id/subject_wrapper"
		android:layout_marginLeft="1dip"
		android:layout_marginRight="3dip"
		android:layout_toLeftOf="@+id/flagged_bottom_right"
		android:bufferType="spannable"
		android:gravity="top"
		android:longClickable="false"
		android:singleLine="false"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorPrimary" />
		android:gravity="center_vertical">

		<LinearLayout
		<RelativeLayout
		android:id="@+id/subject_wrapper"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="false"
		android:layout_alignParentLeft="false"
		android:layout_alignParentRight="false"
		android:layout_alignParentTop="true"
		android:layout_centerInParent="true"
		android:layout_toLeftOf="@+id/date"
		android:gravity="center_vertical">
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/star_image_view"
		android:layout_width="16dp"
		android:layout_height="16dp"
		android:layout_centerVertical="true"
		android:layout_alignParentStart="true"
		android:layout_marginEnd="@dimen/margin_small"
		android:src="@drawable/ic_star" />

		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:id="@+id/right_chevron_image_view"
		android:layout_centerVertical="true"
		android:layout_alignParentEnd="true"
		android:src="?attr/chevronRight" />

		<TextView
		android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:layout_centerVertical="true"
		android:layout_toStartOf="@id/right_chevron_image_view"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary" />

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_centerVertical="true"
		android:layout_toEndOf="@id/star_image_view"
		android:layout_toStartOf="@id/date"
		android:gravity="center_vertical">

		<TextView
		android:id="@+id/sender_compact"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginBottom="1dip"
		android:layout_marginLeft="1dip"
		android:layout_weight="0.3"
		android:ellipsize="end"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="?android:attr/textColorPrimary" />

		<TextView
		android:id="@+id/subject"
		android:layout_width="0dp"
		android:layout_height="wrap_content"
		android:layout_marginBottom="1dip"
		android:layout_marginLeft="1dip"
		android:layout_weight="0.7"
		android:ellipsize="marquee"
		android:singleLine="true"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textColor="?android:attr/textColorPrimary" />

		<TextView
		android:id="@+id/thread_count"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="3dip"
		android:layout_marginRight="4dip"
		android:background="?attr/messageListThreadCountBackground"
		android:focusable="false"
		android:paddingBottom="1dip"
		android:paddingLeft="4dip"
		android:paddingRight="4dip"
		android:textColor="?attr/messageListThreadCountForegroundColor" />

		</LinearLayout>

		<CheckBox
		android:id="@+id/flagged_center_right"
		style="?android:attr/starStyle"
		android:layout_width="wrap_content"
		</RelativeLayout>

		<RelativeLayout
		android:id="@+id/preview_wrapper"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:layout_centerVertical="true"
		android:focusable="false"
		android:paddingLeft="2dip"
		android:paddingRight="4dip"
		android:paddingTop="3dip"
		android:visibility="gone" />
		android:layout_below="@id/subject_wrapper"
		android:layout_marginTop="@dimen/margin_small"
		android:orientation="horizontal">

		<TextView
		android:id="@+id/date"
		android:id="@+id/preview"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignTop="@+id/subject_wrapper"
		android:layout_alignWithParentIfMissing="true"
		android:layout_alignParentStart="true"
		android:layout_centerVertical="true"
		android:layout_toLeftOf="@+id/flagged_center_right"
		android:paddingLeft="3dip"
		android:paddingRight="8dip"
		android:singleLine="true"
		android:layout_toStartOf="@id/thread_count"
		android:bufferType="spannable"
		android:gravity="top"
		android:longClickable="false"
		android:singleLine="false"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary" />

		<CheckBox
		android:id="@+id/flagged_bottom_right"
		style="?android:attr/starStyle"
		<TextView
		android:id="@+id/thread_count"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentRight="true"
		android:layout_below="@+id/date"
		android:layout_alignParentEnd="true"
		android:layout_centerVertical="true"
		android:background="?attr/messageListThreadCountBackground"
		android:focusable="false"
		android:gravity="center_vertical"
		android:paddingLeft="2dip"
		android:paddingRight="4dip"
		android:paddingTop="5dip"
		android:visibility="visible" />

		android:padding="@dimen/padding_small"
		android:textColor="?attr/messageListThreadCountForegroundColor" />

		</RelativeLayout>

		</RelativeLayout>

		</LinearLayout>