diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java index 6f4213fdf7..4a02415eff 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java @@ -2271,11 +2271,7 @@ public class CardBrowser extends NavigationDrawerActivity implements // if in multi-select mode, be sure to show the checkboxes if(mInMultiSelectMode) { checkBox.setVisibility(View.VISIBLE); - if (mCheckedCards.contains(card)) { - checkBox.setChecked(true); - } else { - checkBox.setChecked(false); - } + checkBox.setChecked(mCheckedCards.contains(card)); // this prevents checkboxes from showing an animation from selected -> unselected when // checkbox was selected, then selection mode was ended and now restarted checkBox.jumpDrawablesToCurrentState(); diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.java b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.java index e8f712f5cb..0868d40b58 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/ModelFieldEditor.java @@ -431,11 +431,7 @@ public class ModelFieldEditor extends AnkiActivity implements LocaleSelectionDia // Get the current field JSONObject field = mNoteFields.getJSONObject(mCurrentPos); // If the sticky setting is enabled then disable it, otherwise enable it - if (field.getBoolean("sticky")) { - field.put("sticky", false); - } else { - field.put("sticky", true); - } + field.put("sticky", !field.getBoolean("sticky")); } diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Statistics.java b/AnkiDroid/src/main/java/com/ichi2/anki/Statistics.java index 7cc3477f9a..90bcbda6c5 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/Statistics.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/Statistics.java @@ -183,24 +183,21 @@ public class Statistics extends NavigationDrawerActivity implements DeckDropDown } int itemId = item.getItemId(); if (itemId == R.id.item_time_month) { - if (item.isChecked()) item.setChecked(false); - else item.setChecked(true); + item.setChecked(!item.isChecked()); if (mTaskHandler.getStatType() != Stats.AxisType.TYPE_MONTH) { mTaskHandler.setStatType(Stats.AxisType.TYPE_MONTH); mSectionsPagerAdapter.notifyDataSetChanged(); } return true; } else if (itemId == R.id.item_time_year) { - if (item.isChecked()) item.setChecked(false); - else item.setChecked(true); + item.setChecked(!item.isChecked()); if (mTaskHandler.getStatType() != Stats.AxisType.TYPE_YEAR) { mTaskHandler.setStatType(Stats.AxisType.TYPE_YEAR); mSectionsPagerAdapter.notifyDataSetChanged(); } return true; } else if (itemId == R.id.item_time_all) { - if (item.isChecked()) item.setChecked(false); - else item.setChecked(true); + item.setChecked(!item.isChecked()); if (mTaskHandler.getStatType() != Stats.AxisType.TYPE_LIFE) { mTaskHandler.setStatType(Stats.AxisType.TYPE_LIFE); mSectionsPagerAdapter.notifyDataSetChanged(); diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/AudioView.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/AudioView.java index 601ff6371d..9c1dd528e6 100644 --- a/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/AudioView.java +++ b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/AudioView.java @@ -351,11 +351,7 @@ public class AudioView extends LinearLayout { public void update() { - if (mStatus == Status.RECORDING) { - setEnabled(false); - } else { - setEnabled(true); - } + setEnabled(mStatus != Status.RECORDING); // It doesn't need to update itself on any other state changes }