github/wulkanowy-mirror
Archived
1
0
Fork 1
Code Activity

Add counting of the full-year average to the summary of grades (#322)

Browse Source
This commit is contained in:
Rafał Borcz
2019-04-18 00:32:43 +02:00
committed by Mikołaj Pich
parent 74e98e4430
commit 034b99c7ab
11 changed files with 275 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/values-pl/strings.xml
View File

@ -239,11 +239,11 @@
<!--Preferences-->
<string name="pref_view_header">Wygląd</string>
<string name="pref_view_list">Domyślny widok</string>
<string name="pref_view_summary">Pokazuj podsumowanie w ocenach</string>
<string name="pref_view_grade_average_mode">Obliczanie średniej końcoworocznej</string>
<string name="pref_view_present">Pokazuj obecność we frekwencji</string>
<string name="pref_view_theme_dark">Ciemny motyw (Beta)</string>
<string name="pref_view_expand_grade">Rozwiń oceny</string>
<string name="pref_grade_color_scheme">Schemat kolorów ocen</string>
<string name="pref_view_grade_color_scheme">Schemat kolorów ocen</string>
<string name="pref_notify_header">Powiadomienia</string>
<string name="pref_notify_switch">Pokazuj powiadomienia</string>

5
app/src/main/res/values-pl/value_prefernces.xml
View File

@ -30,4 +30,9 @@
<item>Wulkanowy</item>
<item>Kolory ocen w dzienniku</item>
</string-array>
<string-array name="grade_average_mode_entries">
<item>Średnia ocen z 2 semestru</item>
<item>Średnia ocen z całego roku</item>
</string-array>
</resources>

1
app/src/main/res/values/preferences_keys.xml
View File

@ -5,6 +5,7 @@
<string name="pref_key_theme">theme</string>
<string name="pref_key_grade_color_scheme">grade_color_scheme</string>
<string name="pref_key_expand_grade">expand_grade</string>
<string name="pref_key_grade_average_mode">grade_average_mode</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>

4
app/src/main/res/values/strings.xml
View File

@ -224,11 +224,11 @@
<!--Preferences-->
<string name="pref_view_header">Appearance</string>
<string name="pref_view_list">Default view</string>
<string name="pref_view_summary">Show the summary in the grades</string>
<string name="pref_view_grade_average_mode">Calculation of the end-of-year average</string>
<string name="pref_view_present">Show presence in attendance</string>
<string name="pref_view_theme_dark">Dark theme (Beta)</string>
<string name="pref_view_expand_grade">Expand grades</string>
<string name="pref_grade_color_scheme">Grades color scheme</string>
<string name="pref_view_grade_color_scheme">Grades color scheme</string>
<string name="pref_notify_header">Notifications</string>
<string name="pref_notify_switch">Show notifications</string>

9
app/src/main/res/values/value_prefernces.xml
View File

@ -70,4 +70,13 @@
<item>material</item>
<item>grade_color</item>
</string-array>
<string-array name="grade_average_mode_entries">
<item>Average grades from the 2nd semester</item>
<item>Average of grades from the whole year</item>
</string-array>
<string-array name="grade_average_mode_values" translatable="false">
<item>only_one_semester</item>
<item>all_year</item>
</string-array>
</resources>

10
app/src/main/res/xml/scheme_preferences.xml
View File

@ -36,7 +36,7 @@
android:entryValues="@array/grade_color_scheme_values"
android:key="@string/pref_key_grade_color_scheme"
android:summary="%s"
android:title="@string/pref_grade_color_scheme"
android:title="@string/pref_view_grade_color_scheme"
app:iconSpaceReserved="false" />
</PreferenceCategory>
<PreferenceCategory
@ -97,6 +97,14 @@
android:summary="%s"
android:title="@string/pref_other_grade_modifier_minus"
app:iconSpaceReserved="false" />
<ListPreference
android:defaultValue="only_one_semester"
android:entries="@array/grade_average_mode_entries"
android:entryValues="@array/grade_average_mode_values"
android:key="@string/pref_key_grade_average_mode"
android:summary="%s"
android:title="@string/pref_view_grade_average_mode"
app:iconSpaceReserved="false" />
<SwitchPreference
android:defaultValue="true"
android:key="@string/pref_key_fill_message_content"