sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Separate calculated average settings (#1558)

Browse Source
This commit is contained in:
Damian Czupryn 2021-10-09 01:55:00 +02:00 committed by GitHub
parent ebf9e741c2
commit 2ab0a57a41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,6 +668,7 @@
<string name="pref_attendance_appearance_view">Attendance</string> <string name="pref_attendance_appearance_view">Attendance</string>
<string name="pref_timetable_appearance_view">Timetable</string> <string name="pref_timetable_appearance_view">Timetable</string>
<string name="pref_grades_advanced_header">Grades</string> <string name="pref_grades_advanced_header">Grades</string>
<string name="pref_counted_average_advanced_header">Calculated average</string>
<string name="pref_messages_advanced_header">Messages</string> <string name="pref_messages_advanced_header">Messages</string>
<string name="pref_appearance_category">Appearance &amp; Behavior</string> <string name="pref_appearance_category">Appearance &amp; Behavior</string>

16
app/src/main/res/xml/scheme_preferences_advanced.xml
View File

@ -19,18 +19,16 @@
app:key="@string/pref_key_grade_modifier_minus" app:key="@string/pref_key_grade_modifier_minus"
app:title="@string/pref_other_grade_modifier_minus" app:title="@string/pref_other_grade_modifier_minus"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
</PreferenceCategory>
<PreferenceCategory
app:iconSpaceReserved="false"
app:title="@string/pref_counted_average_advanced_header">
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:defaultValue="@bool/pref_default_grade_average_force_calc" app:defaultValue="@bool/pref_default_grade_average_force_calc"
app:iconSpaceReserved="false" app:iconSpaceReserved="false"
app:key="@string/pref_key_grade_average_force_calc" app:key="@string/pref_key_grade_average_force_calc"
app:singleLineTitle="false" app:singleLineTitle="false"
app:title="@string/pref_view_grade_average_force_calc" /> app:title="@string/pref_view_grade_average_force_calc" />
<SwitchPreferenceCompat
app:defaultValue="@bool/pref_default_optional_arithmetic_average"
app:iconSpaceReserved="false"
app:key="@string/pref_key_optional_arithmetic_average"
app:singleLineTitle="false"
app:title="@string/pref_other_optional_arithmetic_average" />
<ListPreference <ListPreference
app:defaultValue="@string/pref_default_grade_average_mode" app:defaultValue="@string/pref_default_grade_average_mode"
app:entries="@array/grade_average_mode_entries" app:entries="@array/grade_average_mode_entries"
@ -39,6 +37,12 @@
app:key="@string/pref_key_grade_average_mode" app:key="@string/pref_key_grade_average_mode"
app:title="@string/pref_view_grade_average_mode" app:title="@string/pref_view_grade_average_mode"
app:useSimpleSummaryProvider="true" /> app:useSimpleSummaryProvider="true" />
<SwitchPreferenceCompat
app:defaultValue="@bool/pref_default_optional_arithmetic_average"
app:iconSpaceReserved="false"
app:key="@string/pref_key_optional_arithmetic_average"
app:singleLineTitle="false"
app:title="@string/pref_other_optional_arithmetic_average" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
app:iconSpaceReserved="false" app:iconSpaceReserved="false"