1
0

Services refactor (#168)

This commit is contained in:
Mikołaj Pich
2018-11-01 19:27:02 +01:00
committed by Rafał Borcz
parent ab71dd3fde
commit 70879945f2
52 changed files with 899 additions and 188 deletions

View File

@ -62,6 +62,16 @@
</plurals>
<!--Grade notify-->
<string name="notify_grade_channel">Nowe oceny</string>
<plurals name="notify_grade_new_items">
<item quantity="one">Dostałeś %1$d ocenę</item>
<item quantity="few">"Dostałeś %1$d oceny</item>
<item quantity="many">Dostałeś %1$d ocen</item>
<item quantity="other">Dostałeś %1$d ocen</item>
</plurals>
<!--Timetable-->
<string name="timetable_lesson">Lekcja</string>
<string name="timetable_room">Sala</string>
@ -128,24 +138,12 @@
<string name="pref_notify_header">Powiadomienia</string>
<string name="pref_notify_switch">Pokazuj powiadomienia</string>
<string name="pref_services_header">Usługi</string>
<string name="pref_services_header">Synchronizacja</string>
<string name="pref_services_switch">Automatyczna aktualizacja</string>
<string name="pref_services_suspended">Zawieszone na wakacjach</string>
<string name="pref_services_suspended">Zawieszona na wakacjach</string>
<string name="pref_services_interval">Interwał aktualizacji</string>
<string name="pref_services_wifi">Tylko WiFi</string>
<string name="pref_restart">Wymagany restart</string>
<!--Grade notify-->
<string name="notify_grade_chanel">Nowe oceny</string>
<plurals name="notify_grade_new_items">
<item quantity="one">Dostałeś %1$d ocenę</item>
<item quantity="few">"Dostałeś %1$d oceny</item>
<item quantity="many">Dostałeś %1$d ocen</item>
<item quantity="other">Dostałeś %1$d ocen</item>
</plurals>
<!--Colors-->
<string name="all_black">Czarny</string>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="services_interval_entries">
<item>10 minut</item>
<item>15 minut</item>
<item>30 minut</item>
<item>1 godzinę</item>
<item>1 godzina</item>
<item>2 godziny</item>
<item>6 godzin</item>
<item>12 godzin</item>

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="pref_key_start_menu">start_menu</string>
<string name="pref_key_attendance_present">attendance_present</string>
<string name="pref_key_theme">theme</string>
<string name="pref_key_services_enable">services_enable</string>
<string name="pref_key_services_interval">services_interval</string>
<string name="pref_key_services_wifi_only">services_disable_wifi_only</string>
<string name="pref_key_notifications_enable">notifications_enable</string>
</resources>

View File

@ -57,6 +57,13 @@
<item quantity="other">New grades</item>
</plurals>
<!--Grade notify-->
<string name="notify_grade_channel">New grades</string>
<plurals name="notify_grade_new_items">
<item quantity="one">You received %1$d grade</item>
<item quantity="other">You received %1$d grades</item>
</plurals>
<!--Timetable-->
<string name="timetable_lesson">Lesson</string>
@ -124,22 +131,12 @@
<string name="pref_notify_header">Notifications</string>
<string name="pref_notify_switch">Show notifications</string>
<string name="pref_services_header">Services</string>
<string name="pref_services_header">Synchronization</string>
<string name="pref_services_switch">Automatic update</string>
<string name="pref_services_suspended">Suspended on holiday</string>
<string name="pref_services_interval">Updates interval</string>
<string name="pref_services_wifi">Only WiFi</string>
<string name="pref_restart">Restart required</string>
<!--Grade notify-->
<string name="notify_grade_chanel">New grades</string>
<plurals name="notify_grade_new_items">
<item quantity="one">You received %1$d grade</item>
<item quantity="other">You received %1$d grades</item>
</plurals>
<!--Colors-->
<string name="all_black">Black</string>

View File

@ -27,7 +27,7 @@
</string-array>
<string-array name="services_interval_entries">
<item>10 minutes</item>
<item>15 minutes</item>
<item>30 minutes</item>
<item>1 hour</item>
<item>2 hours</item>
@ -36,7 +36,7 @@
<item>24 hours</item>
</string-array>
<string-array name="services_interval_value" translatable="false">
<item>10</item>
<item>15</item>
<item>30</item>
<item>60</item>
<item>120</item>

View File

@ -1,29 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">
<PreferenceCategory
android:title="@string/pref_view_header"
app:iconSpaceReserved="false">
android:title="@string/pref_view_header"
app:iconSpaceReserved="false">
<ListPreference
android:defaultValue="0"
android:entries="@array/startup_tab_entries"
android:entryValues="@array/startup_tab_value"
android:key="start_menu"
android:summary="%s"
android:title="@string/pref_view_list"
app:iconSpaceReserved="false"/>
android:defaultValue="0"
android:entries="@array/startup_tab_entries"
android:entryValues="@array/startup_tab_value"
android:key="@string/pref_key_start_menu"
android:summary="%s"
android:title="@string/pref_view_list"
app:iconSpaceReserved="false" />
<ListPreference
android:defaultValue="1"
android:entries="@array/theme_entries"
android:entryValues="@array/theme_values"
android:key="theme"
android:summary="%s"
android:title="@string/pref_view_theme_dark"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="attendance_present"
android:title="@string/pref_view_present"
app:iconSpaceReserved="false"/>
android:defaultValue="true"
android:key="@string/pref_key_attendance_present"
android:title="@string/pref_view_present"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_services_header"
app:iconSpaceReserved="false">
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_services_enable"
android:title="@string/pref_services_switch"
app:iconSpaceReserved="false" />
<ListPreference
android:defaultValue="1"
android:entries="@array/theme_entries"
android:entryValues="@array/theme_values"
android:key="theme"
android:summary="%s"
android:title="@string/pref_view_theme_dark"
app:iconSpaceReserved="false"/>
android:defaultValue="60"
android:dependency="services_enable"
android:entries="@array/services_interval_entries"
android:entryValues="@array/services_interval_value"
android:key="@string/pref_key_services_interval"
android:summary="%s"
android:title="@string/pref_services_interval"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="false"
android:dependency="services_enable"
android:key="@string/pref_key_services_wifi_only"
android:title="@string/pref_services_wifi"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_notify_header"
app:iconSpaceReserved="false">
<SwitchPreference
android:defaultValue="true"
android:dependency="services_enable"
android:key="@string/pref_key_notifications_enable"
android:title="@string/pref_notify_switch"
app:iconSpaceReserved="false" />
</PreferenceCategory>
</PreferenceScreen>