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

Add option to change grade (background) color scheme (#259)

Browse Source
This commit is contained in:
Mikołaj Pich
2019-03-03 15:11:20 +01:00
committed by Rafał Borcz
parent 1b30b00bb8
commit cae4f140e6
17 changed files with 104 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/dialog_grade.xml
View File

@ -26,9 +26,9 @@
android:layout_gravity="end"
android:background="@color/grade_default"
android:gravity="center"
android:text="@string/app_name"
android:textColor="@color/grade_text"
android:textSize="30sp" />
android:textSize="30sp"
tools:text="6" />
<TextView
android:id="@+id/gradeDialogSubject"

4
app/src/main/res/layout/item_grade_details.xml
View File

@ -21,9 +21,9 @@
android:background="@color/grade_default"
android:gravity="center"
android:maxLength="5"
android:text="@string/app_name"
android:textColor="@color/grade_text"
android:textSize="16sp" />
android:textSize="16sp"
tools:text="6" />
<TextView
android:id="@+id/gradeItemDescription"

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

@ -251,6 +251,7 @@
<string name="pref_view_grade_modifier_plus">Wartość plusa</string>
<string name="pref_view_grade_modifier_minus">Wartość minusa</string>
<string name="pref_view_expand_grade">Rozwiń oceny</string>
<string name="pref_grade_color_scheme">Schemat kolorów ocen</string>
<string name="pref_notify_header">Powiadomienia</string>
<string name="pref_notify_switch">Pokazuj powiadomienia</string>

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

@ -9,16 +9,24 @@
<item>12 godzin</item>
<item>24 godzin</item>
</string-array>
<string-array name="theme_entries">
<item>Wyłączony</item>
<item>Włączony</item>
<item>Automatyczny</item>
<item>Używaj ustawień systemowych</item>
</string-array>
<string-array name="grade_modifier_entries">
<item>Domyślna</item>
<item>0,25</item>
<item>0,33</item>
<item>0,5</item>
</string-array>
<string-array name="grade_color_scheme_entries">
<item>Dzienniczek+</item>
<item>Wulkanowy</item>
<item>Kolory ocen w dzienniku</item>
</string-array>
</resources>

27
app/src/main/res/values/colors.xml
View File

@ -5,16 +5,29 @@
<color name="colorPrimaryLight">#ff6659</color>
<color name="colorBackgroundBottomNav">#f0f0f0</color>
<color name="grade_six">#03a9f4</color>
<color name="grade_five">#4caf50</color>
<color name="grade_four">#92c400</color>
<color name="grade_three">#ffa000</color>
<color name="grade_two">#ff5722</color>
<color name="grade_one">#d32f2f</color>
<color name="grade_default">#607d8b</color>
<color name="grade_text">#ffffff</color>
<color name="grade_black">#424242</color>
<color name="grade_red">#F44336</color>
<color name="grade_blue">#2196F3</color>
<color name="grade_green">#8BC34A</color>
<color name="grade_purple">#7E57C2</color>
<color name="grade_material_six">#03a9f4</color>
<color name="grade_material_five">#4caf50</color>
<color name="grade_material_four">#92c400</color>
<color name="grade_material_three">#ffa000</color>
<color name="grade_material_two">#ff5722</color>
<color name="grade_material_one">#d32f2f</color>
<color name="grade_vulcan_six">#91b43c</color>
<color name="grade_vulcan_five">#2cbd92</color>
<color name="grade_vulcan_four">#50b6d6</color>
<color name="grade_vulcan_three">#d2ab24</color>
<color name="grade_vulcan_two">#9071b3</color>
<color name="grade_vulcan_one">#d65757</color>
<color name="bottom_nav_background">#303030</color>
<color name="bottom_nav_background_inverse">#ffffff</color>

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_modifier_plus">grade_modifier_plus</string>
<string name="pref_key_grade_modifier_minus">grade_modifier_minus</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_services_enable">services_enable</string>
<string name="pref_key_services_interval">services_interval</string>

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

@ -234,6 +234,7 @@
<string name="pref_view_grade_modifier_plus">Value of the plus</string>
<string name="pref_view_grade_modifier_minus">Value of the minus</string>
<string name="pref_view_expand_grade">Expand grades</string>
<string name="pref_grade_color_scheme">Grades color scheme</string>
<string name="pref_notify_header">Notifications</string>
<string name="pref_notify_switch">Show notifications</string>

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

@ -57,4 +57,15 @@
<item>0.33</item>
<item>0.5</item>
</string-array>
<string-array name="grade_color_scheme_entries">
<item>Dzienniczek+</item>
<item>Wulkanowy</item>
<item>Grade colors in register</item>
</string-array>
<string-array name="grade_color_scheme_values" translatable="false">
<item>vulcan</item>
<item>material</item>
<item>grade_color</item>
</string-array>
</resources>

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

@ -30,6 +30,14 @@
android:key="@string/pref_key_expand_grade"
android:title="@string/pref_view_expand_grade"
app:iconSpaceReserved="false" />
<ListPreference
android:defaultValue="vulcan"
android:entries="@array/grade_color_scheme_entries"
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"
app:iconSpaceReserved="false" />
<ListPreference
android:defaultValue="0.0"
android:entries="@array/grade_modifier_entries"