wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4157 from k9mail/remove_message_list_checkboxes

Browse source 
Remove selection checkboxes in message list
This commit is contained in:
cketti 2019-08-31 17:15:24 +02:00 committed by GitHub
commit 581937a7e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 3 additions and 103 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/core/src/main/java/com/fsck/k9/K9.kt
View file

@ -193,9 +193,6 @@ object K9 : KoinComponent {
@JvmStatic
var lockScreenNotificationVisibility = LockScreenNotificationVisibility.MESSAGE_COUNT
@JvmStatic
var isShowMessageListCheckboxes = true
@JvmStatic
var isShowMessageListStars = true
@ -368,7 +365,6 @@ object K9 : KoinComponent {
isCountSearchMessages = storage.getBoolean("countSearchMessages", true)
isHideSpecialAccounts = storage.getBoolean("hideSpecialAccounts", false)
isMessageListSenderAboveSubject = storage.getBoolean("messageListSenderAboveSubject", false)
isShowMessageListCheckboxes = storage.getBoolean("messageListCheckboxes", false)
isShowMessageListStars = storage.getBoolean("messageListStars", true)
messageListPreviewLines = storage.getInt("messageListPreviewLines", 2)
@ -459,7 +455,6 @@ object K9 : KoinComponent {
editor.putBoolean("hideSpecialAccounts", isHideSpecialAccounts)
editor.putBoolean("messageListStars", isShowMessageListStars)
editor.putInt("messageListPreviewLines", messageListPreviewLines)
editor.putBoolean("messageListCheckboxes", isShowMessageListCheckboxes)
editor.putBoolean("showCorrespondentNames", isShowCorrespondentNames)
editor.putBoolean("showContactName", isShowContactName)
editor.putBoolean("showContactPicture", isShowContactPicture)

3
app/core/src/main/java/com/fsck/k9/preferences/GlobalSettings.java
View file

@ -148,9 +148,6 @@ public class GlobalSettings {
s.put("measureAccounts", Settings.versions(
new V(1, new BooleanSetting(true))
));
s.put("messageListCheckboxes", Settings.versions(
new V(1, new BooleanSetting(false))
));
s.put("messageListPreviewLines", Settings.versions(
new V(1, new IntegerRangeSetting(1, 100, 2))
));

7
app/ui/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
View file

@ -145,13 +145,10 @@ class MessageListAdapter internal constructor(
holder.preview.setLines(max(appearance.previewLines, 1))
appearance.fontSizes.setViewTextSize(holder.preview, appearance.fontSizes.messageListPreview)
appearance.fontSizes.setViewTextSize(holder.threadCount, appearance.fontSizes.messageListSubject) // thread count is next to subject
holder.selectedCheckbox.isVisible = appearance.checkboxes
holder.flagged.isVisible = appearance.stars
holder.flagged.setOnClickListener(holder)
holder.selected.setOnClickListener(holder)
view.tag = holder
return view
@ -194,9 +191,6 @@ class MessageListAdapter internal constructor(
val selected = selected.contains(uniqueId)
holder.chip.setBackgroundColor(account.chipColor)
if (appearance.checkboxes) {
holder.selected.isChecked = selected
}
if (appearance.stars) {
holder.flagged.isChecked = flagged
}
@ -381,6 +375,5 @@ class MessageListAdapter internal constructor(
}
interface MessageListItemActionListener {
fun toggleMessageSelectWithAdapterPosition(position: Int)
fun toggleMessageFlagWithAdapterPosition(position: Int)
}

4
app/ui/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
View file

@ -606,7 +606,6 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
private MessageListAppearance getMessageListAppearance() {
return new MessageListAppearance(
K9.getFontSizes(),
K9.isShowMessageListCheckboxes(),
K9.getMessageListPreviewLines(),
K9.isShowMessageListStars(),
K9.isMessageListSenderAboveSubject(),
@ -1463,8 +1462,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
setFlag(adapterPosition,Flag.FLAGGED, !flagged);
}
@Override
public void toggleMessageSelectWithAdapterPosition(int adapterPosition) {
private void toggleMessageSelectWithAdapterPosition(int adapterPosition) {
Cursor cursor = (Cursor) adapter.getItem(adapterPosition);
long uniqueId = cursor.getLong(uniqueIdColumn);

7
app/ui/src/main/java/com/fsck/k9/fragment/MessageViewHolder.kt
View file

@ -23,17 +23,12 @@ class MessageViewHolder(
val chip: View = view.findViewById(R.id.chip)
val threadCount: TextView = view.findViewById(R.id.thread_count)
val flagged: CheckBox = view.findViewById(R.id.star)
val selected: CheckBox = view.findViewById(R.id.selected_checkbox)
val attachment: ImageView = view.findViewById(R.id.attachment)
val status: ImageView = view.findViewById(R.id.status)
val selectedCheckbox: View = view.findViewById(R.id.selected_checkbox_wrapper)
override fun onClick(view: View) {
if (position != -1) {
val id = view.id
if (id == R.id.selected_checkbox) {
itemActionListener.toggleMessageSelectWithAdapterPosition(position)
} else if (id == R.id.star) {
if (view.id == R.id.star) {
itemActionListener.toggleMessageFlagWithAdapterPosition(position)
}
}

3
app/ui/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt
View file

@ -4,11 +4,10 @@ import com.fsck.k9.FontSizes
data class MessageListAppearance(
val fontSizes: FontSizes,
val checkboxes: Boolean,
val previewLines: Int,
val stars: Boolean,
val senderAboveSubject: Boolean,
val showContactPicture: Boolean,
val showingThreadedList: Boolean,
val backGroundAsReadIndicator: Boolean
)
)

2
app/ui/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
View file

@ -27,7 +27,6 @@ class GeneralSettingsDataStore(
"hide_special_accounts" -> K9.isHideSpecialAccounts
"folderlist_wrap_folder_name" -> K9.isWrapFolderNames
"messagelist_stars" -> K9.isShowMessageListStars
"messagelist_checkboxes" -> K9.isShowMessageListCheckboxes
"messagelist_show_correspondent_names" -> K9.isShowCorrespondentNames
"messagelist_sender_above_subject" -> K9.isMessageListSenderAboveSubject
"messagelist_show_contact_name" -> K9.isShowContactName
@ -61,7 +60,6 @@ class GeneralSettingsDataStore(
"hide_special_accounts" -> K9.isHideSpecialAccounts = value
"folderlist_wrap_folder_name" -> K9.isWrapFolderNames = value
"messagelist_stars" -> K9.isShowMessageListStars = value
"messagelist_checkboxes" -> K9.isShowMessageListCheckboxes = value
"messagelist_show_correspondent_names" -> K9.isShowCorrespondentNames = value
"messagelist_sender_above_subject" -> K9.isMessageListSenderAboveSubject = value
"messagelist_show_contact_name" -> K9.isShowContactName = value

25
app/ui/src/main/res/layout/message_list_item.xml
View file

@ -15,31 +15,6 @@
android:layout_marginRight="4dp"
/>
<LinearLayout
android:id="@+id/selected_checkbox_wrapper"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_gravity="center"
android:visibility="visible"
android:textColor="?android:attr/textColorPrimary"
android:baselineAligned="false">
<CheckBox
android:id="@+id/selected_checkbox"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:focusable="false"
android:clickable="false"
android:paddingLeft="4dp"
android:paddingRight="0dp"
android:visibility="visible"
/>
</LinearLayout>
<com.fsck.k9.ui.ContactBadge
android:id="@+id/contact_badge"
android:layout_marginRight="8dip"

2
app/ui/src/main/res/values/strings.xml
View file

@ -305,8 +305,6 @@ Please submit bug reports, contribute new features and ask questions at
<string name="global_settings_flag_label">Show stars</string>
<string name="global_settings_flag_summary">Stars indicate flagged messages</string>
<string name="global_settings_checkbox_label">Multi-select checkboxes</string>
<string name="global_settings_checkbox_summary">Always show multi-select checkboxes</string>
<string name="global_settings_preview_lines_label">Preview lines</string>
<string name="global_settings_show_correspondent_names_label">Show correspondent names</string>
<string name="global_settings_show_correspondent_names_summary">Show correspondent names rather than their email addresses</string>

5
app/ui/src/main/res/xml/general_settings.xml
View file

@ -130,11 +130,6 @@
android:summary="@string/global_settings_flag_summary"
android:title="@string/global_settings_flag_label" />
<CheckBoxPreference
android:key="messagelist_checkboxes"
android:summary="@string/global_settings_checkbox_summary"
android:title="@string/global_settings_checkbox_label" />
<CheckBoxPreference
android:key="messagelist_show_correspondent_names"
android:summary="@string/global_settings_show_correspondent_names_summary"

43
app/ui/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
View file

@ -75,45 +75,6 @@ class MessageListAdapterTest : RobolectricTest() {
assertEquals(SOME_CHIP_COLOR, view.accountChipView.backgroundColor)
}
@Test
fun withoutCheckboxes_shouldHideSelectionCheckbox() {
val adapter = createAdapter(checkboxes = false)
val view = adapter.createAndBindView()
assertTrue(view.selectionCheckBoxContainer.isGone)
}
@Test
fun withCheckboxes_shouldShowSelectionCheckbox() {
val adapter = createAdapter(checkboxes = true)
val view = adapter.createAndBindView()
assertTrue(view.selectionCheckBoxContainer.isVisible)
}
@Test
fun withCheckboxesAndMessageSelected_shouldCheckSelectionCheckBox() {
val cursor = createCursor(id = 23)
val adapter = createAdapter(checkboxes = true)
adapter.selected = setOf(23)
val view = adapter.createAndBindView(cursor)
assertTrue(view.selectionCheckBox.isChecked)
}
@Test
fun withCheckboxesAndMessageNotSelected_shouldNotCheckSelectionCheckBox() {
val adapter = createAdapter(checkboxes = true)
val cursor = createCursor(id = 23)
val view = adapter.createAndBindView(cursor)
assertFalse(view.selectionCheckBox.isChecked)
}
@Test
fun withoutStars_shouldHideStarCheckBox() {
val adapter = createAdapter(stars = false)
@ -475,7 +436,6 @@ class MessageListAdapterTest : RobolectricTest() {
fun createAdapter(
fontSizes: FontSizes = createFontSizes(),
checkboxes: Boolean = false,
previewLines: Int = 0,
stars: Boolean = true,
senderAboveSubject: Boolean = false,
@ -485,7 +445,6 @@ class MessageListAdapterTest : RobolectricTest() {
): MessageListAdapter {
val appearance = MessageListAppearance(
fontSizes,
checkboxes,
previewLines,
stars,
senderAboveSubject,
@ -566,8 +525,6 @@ class MessageListAdapterTest : RobolectricTest() {
fun secondLine(senderOrSubject: String, preview: String)= "$senderOrSubject $preview"
val View.accountChipView: View get() = findViewById(R.id.chip)
val View.selectionCheckBoxContainer: View get() = findViewById(R.id.selected_checkbox_wrapper)
val View.selectionCheckBox: CheckBox get() = findViewById(R.id.selected_checkbox)
val View.starView: CheckBox get() = findViewById(R.id.star)
val View.contactPictureView: ContactBadge get() = findViewById(R.id.contact_badge)
val View.threadCountView: TextView get() = findViewById(R.id.thread_count)