Skip to content
This repository was archived by the owner on Feb 13, 2020. It is now read-only.

Commit dee6408

Browse files
authored
Merge pull request #1 from VREMSoftwareDevelopment/feature
Feature
2 parents 648404e + 7e2e24b commit dee6408

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

app/build.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Sat Jun 16 07:46:36 EDT 2018
2+
#Sat Jun 16 11:20:59 EDT 2018
33
version_minor=9
4-
version_build=0
4+
version_build=1
55
version_patch=2
6-
version_major=1
76
version_store=40
7+
version_major=1

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<string name="theme_light">"Hell"</string>
9696
<string name="theme_system">"System"</string>
9797

98-
9998
<string name="wifi_off_on_exit_title">"WLAN beim Verlassen deaktivieren"</string>
10099

101100
<string name="keep_screen_on_title">"Bildschirm angeschaltet lassen"</string>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<string name="theme_title">"Цветовая тема"</string>
9494
<string name="theme_dark">"Темная"</string>
9595
<string name="theme_light">"Светлая"</string>
96-
<string name="theme_system">"System"</string>
96+
<string name="theme_system">"Система"</string>
9797

9898
<string name="wifi_off_on_exit_title">"WiFi выключен при выходе"</string>
9999

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<string name="theme_title">"主题"</string>
9494
<string name="theme_dark">"深"</string>
9595
<string name="theme_light">"浅"</string>
96-
<string name="theme_system">"System"</string>
96+
<string name="theme_system">"系统"</string>
9797

9898
<string name="wifi_off_on_exit_title">"退出时关闭WiFi"</string>
9999

app/src/main/res/values-zh-rTW/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<string name="theme_title">"主題"</string>
9393
<string name="theme_dark">"深"</string>
9494
<string name="theme_light">"淺"</string>
95-
<string name="theme_system">"System"</string>
95+
<string name="theme_system">"系統"</string>
9696

9797
<string name="wifi_off_on_exit_title">"退出時關閉WiFi"</string>
9898

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@
4343
<color name="success_color">#4CAF50</color>
4444

4545
<!-- dark gray -->
46-
<color name="theme_color">#212121</color>
46+
<color name="theme_system_primary_color">#212121</color>
4747
</resources>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</style>
3535

3636
<style name="ThemeSystem" parent="Theme.AppCompat.DayNight">
37-
<item name="colorPrimary">@color/theme_color</item>
37+
<item name="colorPrimary">@color/theme_system_primary_color</item>
3838
</style>
3939

4040
<style name="ThemeSystemNoActionBar" parent="ThemeSystem">

0 commit comments

Comments
 (0)