Change 'show completed' to 'hide completed'

app/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenu.java

@@ -70,11 +70,11 @@ public class ListHabitsMenu extends BaseMenu
         MenuItem nightModeItem = menu.findItem(R.id.actionToggleNightMode);
         nightModeItem.setChecked(themeSwitcher.isNightMode());
 
-        MenuItem showArchivedItem = menu.findItem(R.id.actionShowArchived);
-        showArchivedItem.setChecked(showArchived);
+        MenuItem hideArchivedItem = menu.findItem(R.id.actionHideArchived);
+        hideArchivedItem.setChecked(!showArchived);
 
-        MenuItem showCompletedItem = menu.findItem(R.id.actionShowCompleted);
-        showCompletedItem.setChecked(showCompleted);
+        MenuItem hideCompletedItem = menu.findItem(R.id.actionHideCompleted);
+        hideCompletedItem.setChecked(!showCompleted);
     }
 
     @Override
@@ -102,12 +102,12 @@ public class ListHabitsMenu extends BaseMenu
                 screen.showSettingsScreen();
                 return true;
 
-            case R.id.actionShowArchived:
+            case R.id.actionHideArchived:
                 toggleShowArchived();
                 invalidate();
                 return true;
 
-            case R.id.actionShowCompleted:
+            case R.id.actionHideCompleted:
                 toggleShowCompleted();
                 invalidate();
                 return true;

app/src/main/res/menu/list_habits.xml

@@ -35,16 +35,16 @@
         app:showAsAction="ifRoom">
         <menu>
             <item
-                android:id="@+id/actionShowArchived"
+                android:id="@+id/actionHideArchived"
                 android:checkable="true"
                 android:enabled="true"
-                android:title="@string/show_archived"/>
+                android:title="@string/hide_archived"/>
 
             <item
-                android:id="@+id/actionShowCompleted"
+                android:id="@+id/actionHideCompleted"
                 android:checkable="true"
                 android:enabled="true"
-                android:title="@string/show_completed"/>
+                android:title="@string/hide_completed"/>
         </menu>
     </item>
 

app/src/main/res/values/strings.xml

@@ -94,7 +94,6 @@
     <string name="links">Links</string>
     <string name="behavior">Behavior</string>
     <string name="name">Name</string>
-    <string name="show_archived">Show archived</string>
     <string name="settings">Settings</string>
     <string name="snooze_interval">Snooze interval</string>
 
@@ -182,5 +181,6 @@
     <string name="reminder_sound">Reminder sound</string>
     <string name="none">None</string>
     <string name="filter">Filter</string>
-    <string name="show_completed">Show completed</string>
+    <string name="hide_completed">Hide completed</string>
+    <string name="hide_archived">Hide archived</string>
 </resources>

app/src/test/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java

@@ -80,9 +80,9 @@ public class ListHabitsMenuTest extends BaseUnitTest
         Menu androidMenu = mock(Menu.class);
         when(androidMenu.findItem(R.id.actionToggleNightMode)).thenReturn(
             nightModeItem);
-        when(androidMenu.findItem(R.id.actionShowArchived)).thenReturn
+        when(androidMenu.findItem(R.id.actionHideArchived)).thenReturn
             (showArchivedItem);
-        when(androidMenu.findItem(R.id.actionShowCompleted)).thenReturn
+        when(androidMenu.findItem(R.id.actionHideCompleted)).thenReturn
             (showCompletedItem);
 
         menu.onCreate(androidMenu);
@@ -134,14 +134,14 @@ public class ListHabitsMenuTest extends BaseUnitTest
     @Test
     public void testOnSelected_showArchived()
     {
-        onItemSelected(R.id.actionShowArchived);
+        onItemSelected(R.id.actionHideArchived);
         verify(preferences).setShowArchived(true);
         verify(adapter).setFilter(matcherCaptor.capture());
         verify(adapter).refresh();
         assertTrue(matcherCaptor.getValue().isArchivedAllowed());
         reset(adapter);
 
-        onItemSelected(R.id.actionShowArchived);
+        onItemSelected(R.id.actionHideArchived);
         verify(preferences).setShowArchived(false);
         verify(adapter).setFilter(matcherCaptor.capture());
         verify(adapter).refresh();
@@ -151,14 +151,14 @@ public class ListHabitsMenuTest extends BaseUnitTest
     @Test
     public void testOnSelected_showCompleted()
     {
-        onItemSelected(R.id.actionShowCompleted);
+        onItemSelected(R.id.actionHideCompleted);
         verify(preferences).setShowCompleted(true);
         verify(adapter).setFilter(matcherCaptor.capture());
         verify(adapter).refresh();
         assertTrue(matcherCaptor.getValue().isCompletedAllowed());
         reset(adapter);
 
-        onItemSelected(R.id.actionShowCompleted);
+        onItemSelected(R.id.actionHideCompleted);
         verify(preferences).setShowCompleted(false);
         verify(adapter).setFilter(matcherCaptor.capture());
         verify(adapter).refresh();