remember last selected menu item

VREMSoftwareDevelopment · VREMSoftwareDevelopment · commit a2d97c4bb96c · 2019-06-28T18:26:37.000-04:00
diff --git a/app/build.properties b/app/build.properties
@@ -1,25 +1,7 @@
-#
-# WiFiAnalyzer
-# Copyright (C) 2019  VREM Software Development <VREMSoftwareDevelopment@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>
-#
-
 #Build Properties
-#Sat Jun 15 11:08:13 EDT 2019
+#Tue Jun 25 13:42:39 EDT 2019
 version_minor=0
-version_build=11
+version_build=12
 version_patch=4
-version_major=2
 version_store=45
+version_major=2
diff --git a/app/src/main/java/com/vrem/wifianalyzer/MainActivity.java b/app/src/main/java/com/vrem/wifianalyzer/MainActivity.java
@@ -53,7 +53,7 @@ public class MainActivity extends AppCompatActivity implements NavigationMenuCon
     private MainReload mainReload;
     private DrawerNavigation drawerNavigation;
     private NavigationMenuController navigationMenuController;
-    private NavigationMenu startNavigationMenu;
+    private NavigationMenu navigationMenu;
     private OptionMenu optionMenu;
     private String currentCountryCode;
     private PermissionChecker permissionChecker;
@@ -91,9 +91,9 @@ protected void onCreate(Bundle savedInstanceState) {
         Toolbar toolbar = ActivityUtils.setupToolbar(this);
         drawerNavigation = new DrawerNavigation(this, toolbar);
 
-        startNavigationMenu = settings.getStartMenu();
+        navigationMenu = settings.getSelectedMenu();
         NavigationMenuController navigationMenuController = new NavigationMenuController(this);
-        navigationMenuController.setCurrentNavigationMenu(startNavigationMenu);
+        navigationMenuController.setCurrentNavigationMenu(navigationMenu);
         setNavigationMenuController(navigationMenuController);
         onNavigationItemSelected(getCurrentMenuItem());
 
@@ -169,10 +169,10 @@ private void reloadActivity() {
     @Override
     public void onBackPressed() {
         if (!closeDrawer()) {
-            if (startNavigationMenu.equals(getCurrentNavigationMenu())) {
+            if (navigationMenu.equals(getCurrentNavigationMenu())) {
                 super.onBackPressed();
             } else {
-                setCurrentNavigationMenu(startNavigationMenu);
+                setCurrentNavigationMenu(navigationMenu);
                 onNavigationItemSelected(getCurrentMenuItem());
             }
         }
@@ -264,6 +264,7 @@ public NavigationMenu getCurrentNavigationMenu() {
     @Override
     public void setCurrentNavigationMenu(@NonNull NavigationMenu navigationMenu) {
         navigationMenuController.setCurrentNavigationMenu(navigationMenu);
+        MainContext.INSTANCE.getSettings().saveSelectedMenu(navigationMenu);
     }
 
     @NonNull
diff --git a/app/src/main/java/com/vrem/wifianalyzer/settings/Settings.java b/app/src/main/java/com/vrem/wifianalyzer/settings/Settings.java
@@ -24,6 +24,7 @@
 import com.vrem.util.EnumUtils;
 import com.vrem.util.LocaleUtils;
 import com.vrem.wifianalyzer.R;
+import com.vrem.wifianalyzer.navigation.NavigationGroup;
 import com.vrem.wifianalyzer.navigation.NavigationMenu;
 import com.vrem.wifianalyzer.wifi.accesspoint.AccessPointViewType;
 import com.vrem.wifianalyzer.wifi.accesspoint.ConnectionViewType;
@@ -140,8 +141,14 @@ public ThemeStyle getThemeStyle() {
     }
 
     @NonNull
-    public NavigationMenu getStartMenu() {
-        return find(NavigationMenu.class, R.string.start_menu_key, NavigationMenu.ACCESS_POINTS);
+    public NavigationMenu getSelectedMenu() {
+        return find(NavigationMenu.class, R.string.selected_menu_key, NavigationMenu.ACCESS_POINTS);
+    }
+
+    public void saveSelectedMenu(@NonNull NavigationMenu navigationMenu) {
+        if (NavigationGroup.GROUP_FEATURE.getNavigationMenus().contains(navigationMenu)) {
+            repository.save(R.string.selected_menu_key, navigationMenu.ordinal());
+        }
     }
 
     @NonNull
@@ -196,4 +203,5 @@ private <T extends Enum> Set<T> findSet(@NonNull Class<T> enumType, int key, @No
     private <T extends Enum> void saveSet(int key, @NonNull Set<T> values) {
         repository.saveStringSet(key, EnumUtils.find(values));
     }
+
 }
diff --git a/app/src/main/java/com/vrem/wifianalyzer/settings/StartMenuPreference.java b/app/src/main/java/com/vrem/wifianalyzer/settings/StartMenuPreference.java
diff --git a/app/src/main/res/drawable/ic_dashboard.xml b/app/src/main/res/drawable/ic_dashboard.xml
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Signalstärke (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Beim Start anzeigen"</string>
-
     <string name="country_code_title">"Land"</string>
 
     <string name="scan_speed_title">"Scan-Intervall"</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Intensidad de señal (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Mostrar al inicio"</string>
-
     <string name="country_code_title">"País"</string>
 
     <string name="scan_speed_title">"Intervalo de exploración"</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Intensité du signal (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Page d\'accueil"</string>
-
     <string name="country_code_title">"Pays"</string>
 
     <string name="scan_speed_title">"Fréquence d\'analyse"</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Potenza Segnale (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Schermata di avvio"</string>
-
     <string name="country_code_title">"Paese"</string>
 
     <string name="scan_speed_title">"Intervallo scansioni"</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Siła Sygnału (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Start"</string>
-
     <string name="country_code_title">"Kraj"</string>
 
     <string name="scan_speed_title">"Interwał Skanowania"</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Intensidade do Sinal (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Página inicial"</string>
-
     <string name="country_code_title">"País"</string>
 
     <string name="scan_speed_title">"Intervalo de escaneamento"</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"Уровень сигнала (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Начать"</string>
-
     <string name="country_code_title">"Страна"</string>
 
     <string name="scan_speed_title">"Интервал сканирования"</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -58,8 +58,6 @@
     <string name="graph_axis_y">"信号强度 (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"开始"</string>
-
     <string name="country_code_title">"国家"</string>
 
     <string name="scan_speed_title">"扫描间隔"</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -57,8 +57,6 @@
     <string name="graph_axis_y">"訊號強度 (dBm)"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"開始"</string>
-
     <string name="country_code_title">"國家"</string>
 
     <string name="scan_speed_title">"掃描間隔"</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -69,9 +69,7 @@
     <string name="mc_flag" translatable="false">"802.11mc"</string>
 
     <!-- settings start -->
-    <string name="start_menu_title">"Start"</string>
-    <string name="start_menu_summary" translatable="false">"%s"</string>
-    <string name="start_menu_key" translatable="false">"start_menu"</string>
+    <string name="selected_menu_key" translatable="false">"selected_menu"</string>
 
     <string name="country_code_title">"Country"</string>
     <string name="country_code_summary" translatable="false">"%s"</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -128,12 +128,6 @@
             android:key="@string/keep_screen_on_key"
             android:title="@string/keep_screen_on_title"/>
 
-        <com.vrem.wifianalyzer.settings.StartMenuPreference
-            android:icon="@drawable/ic_dashboard"
-            android:key="@string/start_menu_key"
-            android:persistent="true"
-            android:summary="@string/start_menu_summary"
-            android:title="@string/start_menu_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory>
diff --git a/app/src/test/java/com/vrem/wifianalyzer/MainActivityTest.java b/app/src/test/java/com/vrem/wifianalyzer/MainActivityTest.java
@@ -26,6 +26,7 @@
 import com.vrem.wifianalyzer.navigation.NavigationMenu;
 import com.vrem.wifianalyzer.navigation.NavigationMenuController;
 import com.vrem.wifianalyzer.navigation.options.OptionMenu;
+import com.vrem.wifianalyzer.settings.Settings;
 import com.vrem.wifianalyzer.wifi.scanner.ScannerService;
 
 import org.junit.After;
@@ -204,12 +205,14 @@ public void testGetCurrentNavigationMenu() {
     public void testSetCurrentNavigationMenu() {
         // setup
         NavigationMenu navigationMenu = NavigationMenu.CHANNEL_GRAPH;
+        Settings settings = MainContextHelper.INSTANCE.getSettings();
         NavigationMenuController navigationMenuController = mock(NavigationMenuController.class);
         fixture.setNavigationMenuController(navigationMenuController);
         // execute
         fixture.setCurrentNavigationMenu(navigationMenu);
         // validate
         verify(navigationMenuController).setCurrentNavigationMenu(navigationMenu);
+        verify(settings).saveSelectedMenu(navigationMenu);
     }
 
     @Test
diff --git a/app/src/test/java/com/vrem/wifianalyzer/settings/SettingsTest.java b/app/src/test/java/com/vrem/wifianalyzer/settings/SettingsTest.java
@@ -50,6 +50,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
@@ -371,14 +373,30 @@ public void testGetLanguageLocale() {
     }
 
     @Test
-    public void testGetStartMenu() {
+    public void testGetSelectedMenu() {
         // setup
-        when(repository.getStringAsInteger(R.string.start_menu_key, NavigationMenu.ACCESS_POINTS.ordinal())).thenReturn(NavigationMenu.CHANNEL_GRAPH.ordinal());
+        when(repository.getStringAsInteger(R.string.selected_menu_key, NavigationMenu.ACCESS_POINTS.ordinal())).thenReturn(NavigationMenu.CHANNEL_GRAPH.ordinal());
         // execute
-        NavigationMenu actual = fixture.getStartMenu();
+        NavigationMenu actual = fixture.getSelectedMenu();
         // validate
         assertEquals(NavigationMenu.CHANNEL_GRAPH, actual);
-        verify(repository).getStringAsInteger(R.string.start_menu_key, NavigationMenu.ACCESS_POINTS.ordinal());
+        verify(repository).getStringAsInteger(R.string.selected_menu_key, NavigationMenu.ACCESS_POINTS.ordinal());
+    }
+
+    @Test
+    public void testSaveSelectedMenu() {
+        // execute
+        fixture.saveSelectedMenu(NavigationMenu.CHANNEL_GRAPH);
+        // validate
+        verify(repository).save(R.string.selected_menu_key, NavigationMenu.CHANNEL_GRAPH.ordinal());
+    }
+
+    @Test
+    public void testSaveSelectedMenuWithNotAllowedMenu() {
+        // execute
+        fixture.saveSelectedMenu(NavigationMenu.ABOUT);
+        // validate
+        verify(repository, never()).save(anyInt(), anyInt());
     }
 
     @Test
diff --git a/app/src/test/java/com/vrem/wifianalyzer/settings/StartMenuPreferenceTest.java b/app/src/test/java/com/vrem/wifianalyzer/settings/StartMenuPreferenceTest.java
