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

Add info about predicted and final ratings (#88)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-04-27 00:03:37 +02:00
committed by Rafał Borcz
parent 176d17e1ec
commit 7dde13585c
13 changed files with 170 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/res/layout/grade_header.xml
View File

@ -46,6 +46,30 @@
android:textColor="@color/secondary_text"
android:textSize="12sp" />
<TextView
android:id="@+id/grade_header_predicted_rating_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/grade_header_average_text"
android:layout_marginTop="5dp"
android:text="@string/info_grades_predicted_rating"
android:textColor="@color/secondary_text"
android:textSize="12sp" />
<TextView
android:id="@+id/grade_header_final_rating_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/grade_header_average_text"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:layout_marginTop="5dp"
android:layout_toEndOf="@+id/grade_header_predicted_rating_text"
android:layout_toRightOf="@+id/grade_header_predicted_rating_text"
android:text="@string/info_grades_final_rating"
android:textColor="@color/secondary_text"
android:textSize="12sp" />
<ImageView
android:id="@+id/grade_header_alert_image"
android:layout_width="wrap_content"
@ -55,4 +79,4 @@
android:layout_marginTop="10dp"
app:srcCompat="@drawable/ic_alert_24dp"
tool:ignore="contentDescription" />
</RelativeLayout>
</RelativeLayout>

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

@ -72,6 +72,8 @@
<string name="info_average_grades">Średnia: %1$.2f</string>
<string name="info_no_average">Brak średniej</string>
<string name="info_grades_predicted_rating">Przewidywana: %1$s</string>
<string name="info_grades_final_rating">Końcowa: %1$s</string>
<string name="info_free_week">Brak lekcji w tym tygodniu</string>
<string name="timetable_subitem_room">Sala %s</string>
@ -114,11 +116,15 @@
<item quantity="many">%1$d nieobecności</item>
</plurals>
<string name="pref_view">Widok</string>
<string name="pref_view_header">Widok</string>
<string name="pref_tab_list">Domyślny widok</string>
<string name="pref_notify">Powiadomienia</string>
<string name="pref_grades_summary_line_show">Pokazuj podsumowanie w ocenach</string>
<string name="pref_notify_header">Powiadomienia</string>
<string name="pref_notify_switch">Pokazuj powiadomienia</string>
<string name="pref_services">Usługi</string>
<string name="pref_services_header">Usługi</string>
<string name="pref_services_switch">Włącz odświeżanie danych w tle</string>
<string name="pref_services_interval">Interwał między odświeżaniem danych</string>
<string name="pref_services_mobile_data">Synchronizacja tylko przez WiFi</string>

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

@ -72,6 +72,8 @@
<string name="info_average_grades">Average: %1$.2f</string>
<string name="info_no_average">No average</string>
<string name="info_grades_predicted_rating">Predicted: %1$s</string>
<string name="info_grades_final_rating">Final: %1$s</string>
<string name="info_free_week">No lesson in this week</string>
<string name="timetable_subitem_room">Room %s</string>
@ -110,11 +112,14 @@
<item quantity="other">%1$d absences</item>
</plurals>
<string name="pref_view_header">View</string>
<string name="pref_tab_list">Default view after startup</string>
<string name="pref_view">View</string>
<string name="pref_notify">Notifications</string>
<string name="pref_grades_summary_line_show">Show summary in grades</string>
<string name="pref_notify_header">Notifications</string>
<string name="pref_notify_switch">Show the notifications</string>
<string name="pref_services">Services</string>
<string name="pref_services_header">Services</string>
<string name="pref_services_switch">Enable background data refreshing</string>
<string name="pref_services_interval">Interval between data refreshing</string>
<string name="pref_services_mobile_data">Synchronization via WiFi only</string>

12
app/src/main/res/xml/preferences.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory android:title="@string/pref_view">
<PreferenceCategory android:title="@string/pref_view_header">
<ListPreference
android:defaultValue="2"
android:entries="@array/startup_tab_entries"
@ -8,8 +8,12 @@
android:key="startup_tab"
android:summary="%s"
android:title="@string/pref_tab_list" />
<SwitchPreference
android:defaultValue="false"
android:key="grades_summary"
android:title="@string/pref_grades_summary_line_show"/>
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_services">
<PreferenceCategory android:title="@string/pref_services_header">
<SwitchPreference
android:defaultValue="true"
android:key="services_enable"
@ -28,11 +32,11 @@
android:title="@string/pref_services_mobile_data"
android:dependency="services_enable" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_notify">
<PreferenceCategory android:title="@string/pref_notify_header">
<SwitchPreference
android:defaultValue="true"
android:dependency="services_enable"
android:key="notify_enable"
android:title="@string/pref_notify_switch" />
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>