Skip to content

SystemTheme TextColor correction #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 20, 2018
Merged

SystemTheme TextColor correction #193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dee6408
Merge pull request #1 from VREMSoftwareDevelopment/feature
Leptopoda Jun 17, 2018
279cc0f
temporaly removed light theme
Leptopoda Jun 17, 2018
92687ab
fixed text color when system theme is in light/day mode
Leptopoda Jun 17, 2018
3008849
removed unnecessary code
Leptopoda Jun 17, 2018
e09cc68
removed forgotten line in the themeStyleTest
Leptopoda Jun 17, 2018
e3f820b
changed tests according to the removed light theme
Leptopoda Jun 17, 2018
fab1684
removed forgotten string
Leptopoda Jun 17, 2018
a9ad44b
Merge pull request #3 from VREMSoftwareDevelopment/feature
Leptopoda Jun 18, 2018
f8887cf
removed light theme
Leptopoda Jun 18, 2018
8fae0af
reimplemented LightTheme
Leptopoda Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 0 additions & 3 deletions app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 1 addition & 3 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/com/vrem/wifianalyzer/MainReloadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions app/src/test/java/com/vrem/wifianalyzer/settings/SettingsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/com/vrem/wifianalyzer/settings/ThemeStyleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/test/java/com/vrem/wifianalyzer/wifi/graphutils/GraphViewBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down