Merge pull request #193 from Leptopoda/feature

SystemTheme TextColor correction

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Jun 16 11:20:59 EDT 2018
+#Wed Jun 20 23:45:07 CEST 2018
 version_minor=9
-version_build=1
+version_build=16
 version_patch=2
-version_store=40
 version_major=1
+version_store=40

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

@@ -41,7 +41,4 @@
     <color name="warning_color">#FFC107</color>
     <!-- green_500 -->
     <color name="success_color">#4CAF50</color>
-
-    <!-- dark gray -->
-    <color name="theme_system_primary_color">#212121</color>
 </resources>

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

@@ -33,9 +33,7 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="ThemeSystem" parent="Theme.AppCompat.DayNight">
-        <item name="colorPrimary">@color/theme_system_primary_color</item>
-    </style>
+    <style name="ThemeSystem" parent="Theme.AppCompat.DayNight.DarkActionBar"/>
 
     <style name="ThemeSystemNoActionBar" parent="ThemeSystem">
         <item name="windowActionBar">false</item>

app/src/test/java/com/vrem/wifianalyzer/MainReloadTest.java

@@ -81,7 +81,7 @@ public void testShouldNotReloadWithNoThemeChanges() {
     @Test
     public void testShouldReloadWithThemeChange() {
         // setup
-        ThemeStyle expected = ThemeStyle.LIGHT;
+        ThemeStyle expected = ThemeStyle.SYSTEM;
         when(settings.getThemeStyle()).thenReturn(expected);
         // execute
         boolean actual = fixture.shouldReload(settings);

app/src/test/java/com/vrem/wifianalyzer/settings/SettingsTest.java

@@ -140,11 +140,11 @@ public void testGetConnectionViewType() {
     @Test
     public void testGetThemeStyle() {
         // setup
-        when(repository.getStringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal())).thenReturn(ThemeStyle.LIGHT.ordinal());
+        when(repository.getStringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal())).thenReturn(ThemeStyle.SYSTEM.ordinal());
         // execute
         ThemeStyle actual = fixture.getThemeStyle();
         // validate
-        assertEquals(ThemeStyle.LIGHT, actual);
+        assertEquals(ThemeStyle.SYSTEM, actual);
         verify(repository).getStringAsInteger(R.string.theme_key, ThemeStyle.DARK.ordinal());
     }
 

app/src/test/java/com/vrem/wifianalyzer/settings/ThemeStyleTest.java

@@ -61,8 +61,8 @@ public void testGetTheme() {
 
     @Test
     public void testGetThemeNoActionBar() {
-        assertEquals(R.style.ThemeLightNoActionBar, ThemeStyle.LIGHT.getThemeNoActionBar());
         assertEquals(R.style.ThemeDarkNoActionBar, ThemeStyle.DARK.getThemeNoActionBar());
+        assertEquals(R.style.ThemeLightNoActionBar, ThemeStyle.LIGHT.getThemeNoActionBar());
         assertEquals(R.style.ThemeSystemNoActionBar, ThemeStyle.SYSTEM.getThemeNoActionBar());
     }
 

app/src/test/java/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilderTest.java

@@ -239,7 +239,7 @@ public void testSetGridLabelRenderColorsWithDarkTheme() {
     public void testSetGridLabelRenderColorsWithLightTheme() {
         // setup
         when(graphView.getGridLabelRenderer()).thenReturn(gridLabelRenderer);
-        fixture = new GraphViewBuilder(content, NUM_HORIZONTAL_LABELS, GraphConstants.MAX_Y_DEFAULT, ThemeStyle.LIGHT);
+        fixture = new GraphViewBuilder(content, NUM_HORIZONTAL_LABELS, GraphConstants.MAX_Y_DEFAULT, ThemeStyle.SYSTEM);
         // execute
         fixture.setGridLabelRenderer(graphView);
         // validate