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

Add dark theme (#133)

Browse Source
This commit is contained in:
Mikołaj Pich
2018-06-14 11:40:46 +02:00
committed by Rafał Borcz
parent b63e28f9a9
commit 11578aa735
49 changed files with 221 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/drawable-night/ic_border.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="270"
android:centerColor="@android:color/transparent"
android:centerX="0.01"
android:startColor="#494949" />
</shape>

2
app/src/main/res/drawable/ic_border.xml
View File

@ -6,4 +6,4 @@
android:centerColor="@android:color/transparent"
android:centerX="0.01"
android:startColor="#60606060" />
</shape>
</shape>

4
app/src/main/res/drawable/ic_menu_attendance_24dp.xml
View File

@ -5,8 +5,8 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#ffffff"
android:fillColor="#000"
android:pathData="M22 13l-1 1-2-2 1-1 2 2m-10 6l6-6 2 2-6
6h-2v-2M4 2h14a2 2 0 0 1 2 2v4l-4 4h-4v4l-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2m0 4v4h6V6H4m8
0v4h6V6h-6m-8 6v4h6v-4H4z" />
</vector>
</vector>

2
app/src/main/res/drawable/ic_menu_exams_24dp.xml
View File

@ -4,7 +4,7 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#FFF"
android:fillColor="#000"
android:pathData="M17,12h-5v5h5v-5zM16,1v2L8,3L8,1L6,1v2L5,3a2,2 0,0 0,-2 2v14c0,1.1 0.9,2
2,2h14a2,2 0,0 0,2 -2L21,5a2,2 0,0 0,-2 -2h-1L18,1h-2zM19,19L5,19L5,8h14v11z" />
</vector>

4
app/src/main/res/drawable/ic_menu_grade_26dp.xml
View File

@ -4,8 +4,8 @@
android:viewportHeight="26"
android:viewportWidth="26">
<path
android:fillColor="#FFF"
android:fillColor="#000"
android:pathData="M13 11h2v2h-2m0 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2V7h4V5h-4a2 2 0 0 0-2
2v6c0 1.1 0.9 2 2 2m8 2H7V3h14m0-2H7a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V3a2
2 0 0 0-2-2M3 5H1v16a2 2 0 0 0 2 2h16v-2H3V5z" />
</vector>
</vector>

4
app/src/main/res/drawable/ic_menu_other_24dp.xml
View File

@ -5,7 +5,7 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#ffffff"
android:fillColor="#000"
android:pathData="M19.4 13l 0.1-1-0.1-1 2.1-1.5c 0.2-0.1 0.3-0.4 0.1-0.7l-2-3.5c-0.1-0.3-0.4
-0.4-0.6-0.3l-2.4 1.1c-0.5-0.4-1.2-0.8-1.8-1l-0.3-2.6c0-0.3-0.2-0.5-0.5-0.5h-4c-0.3 0-0.5
0.2-0.5 0.5L9.2 5c-0.7 0.3-1.3 0.6-1.8 1L5 5a 0.5 0.5 0 0 0-0.6 0.2l-2 3.5c-0.2 0.3-0.2 0.6
@ -13,4 +13,4 @@
0.3l2.4-1.1c 0.5 0.4 1.2 0.8 1.8 1l 0.3 2.6c0 0.3 0.2 0.5 0.5 0.5h4c 0.3 0 0.5-0.2 0.5-0.5l
0.3-2.6c 0.7-0.3 1.3-0.6 1.8-1L19 19c 0.2 0.1 0.5 0 0.6-0.2l2-3.5c 0.1-0.2 0.1-0.5-0.1-0.7L19.4
13zM12 16a4 4 0 0 1-4-4c0-2.2 1.8-4 4-4s4 1.8 4 4a4 4 0 0 1-4 4z" />
</vector>
</vector>

4
app/src/main/res/drawable/ic_menu_timetable_24dp.xml
View File

@ -5,7 +5,7 @@
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#ffffff"
android:fillColor="#000"
android:pathData="M14 14H7v2h7m5 3H5V8h14m0-5h-1V1h-2v2H8V1H6v2H5a2
2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2m-2 7H7v2h10v-2z" />
</vector>
</vector>

12
app/src/main/res/drawable/ic_wrench_24dp.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="#000000"
android:pathData="M6 2l4 4-1 3-3 1-4-4c0 2 0 5 2 7 3 2 6 0 7 1l6 7h4v-4l-7-6c-1-1
1-4-1-7-2-2-5-2-7-2zm14 17l-1 1-1-1 1-1 1 1z" />
</vector>

1
app/src/main/res/layout/attendance_dialog.xml
View File

@ -144,6 +144,7 @@
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:text="@string/generic_dialog_close"
android:textColor="?android:attr/android:textColorSecondary"
android:textAllCaps="true"
android:textSize="15sp" />

6
app/src/main/res/layout/attendance_header.xml
View File

@ -39,7 +39,7 @@
android:layout_marginTop="5dp"
android:maxLines="1"
android:text="@string/app_name"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="14sp" />
<TextView
@ -54,7 +54,7 @@
android:layout_marginTop="5dp"
android:maxLines="1"
android:text="@string/app_name"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="14sp" />
<TextView
@ -69,7 +69,7 @@
android:gravity="end"
android:maxLines="2"
android:text="@string/attendance_no_entries"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="16sp" />
<ImageView

3
app/src/main/res/layout/attendance_subitem.xml
View File

@ -13,7 +13,6 @@
android:foreground="?attr/selectableItemBackgroundBorderless"
card_view:cardElevation="0dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -61,7 +60,7 @@
android:layout_alignStart="@id/attendance_subItem_lesson"
android:maxLines="1"
android:text="@string/grades_text"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp" />
<ImageView

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

@ -4,5 +4,5 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/colorPrimaryDark"
android:textSize="14sp" />
android:textColor="?attr/colorPrimary"
android:textSize="14sp" />

1
app/src/main/res/layout/exams_dialog.xml
View File

@ -169,6 +169,7 @@
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:text="@string/generic_dialog_close"
android:textColor="?android:attr/android:textColorSecondary"
android:textAllCaps="true"
android:textSize="15sp" />

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

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#EEE"
android:background="?attr/colorControlHighlight"
android:minHeight="40dp"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
@ -32,4 +32,4 @@
android:text="@string/app_name"
android:textSize="13sp" />
</RelativeLayout>
</RelativeLayout>

2
app/src/main/res/layout/exams_subitem.xml
View File

@ -53,4 +53,4 @@
android:text="@string/app_name"
android:textSize="13sp" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</android.support.v7.widget.CardView>

8
app/src/main/res/layout/fragment_attendance_tab.xml
View File

@ -1,6 +1,6 @@
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/attendance_tab_fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -25,7 +25,7 @@
android:layout_height="match_parent"
android:gravity="center">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/attendance_tab_fragment_no_item_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -34,7 +34,7 @@
android:layout_marginTop="40dp"
android:minHeight="100dp"
android:minWidth="100dp"
android:tint="@android:color/black"
app:tint="?android:attr/textColorPrimary"
app:srcCompat="@drawable/ic_menu_attendance_24dp"
tools:ignore="contentDescription" />
@ -43,8 +43,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="46dp"
android:text="@string/attendance_no_entries"
android:gravity="center"
android:text="@string/attendance_no_entries"
android:textSize="20sp" />
</RelativeLayout>

6
app/src/main/res/layout/fragment_exams_tab.xml
View File

@ -25,7 +25,7 @@
android:layout_height="match_parent"
android:gravity="center">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/exams_tab_fragment_no_item_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -34,8 +34,8 @@
android:layout_marginTop="40dp"
android:minHeight="100dp"
android:minWidth="100dp"
android:tint="@android:color/black"
app:srcCompat="@drawable/ic_menu_exams_24dp"
app:tint="?android:attr/textColorPrimary"
tools:ignore="contentDescription" />
<TextView
@ -61,4 +61,4 @@
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>

6
app/src/main/res/layout/fragment_grades.xml
View File

@ -144,7 +144,7 @@
android:layout_height="match_parent"
android:gravity="center">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/grade_fragment_no_item_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -153,8 +153,8 @@
android:layout_marginTop="40dp"
android:minHeight="100dp"
android:minWidth="100dp"
android:tint="@android:color/black"
app:srcCompat="@drawable/ic_menu_grade_26dp"
app:tint="?android:attr/textColorPrimary"
tools:ignore="contentDescription" />
<TextView
@ -168,4 +168,4 @@
</RelativeLayout>
</FrameLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.design.widget.CoordinatorLayout>
</android.support.design.widget.CoordinatorLayout>

6
app/src/main/res/layout/fragment_timetable_tab.xml
View File

@ -25,7 +25,7 @@
android:layout_height="match_parent"
android:gravity="center">
<ImageView
<android.support.v7.widget.AppCompatImageView
android:id="@+id/timetable_tab_fragment_no_item_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -34,8 +34,8 @@
android:layout_marginTop="40dp"
android:minHeight="100dp"
android:minWidth="100dp"
android:tint="@android:color/black"
app:srcCompat="@drawable/ic_menu_timetable_24dp"
app:tint="?android:attr/textColorPrimary"
tools:ignore="contentDescription" />
<TextView
@ -53,8 +53,8 @@
android:layout_height="wrap_content"
android:layout_below="@id/timetable_tab_fragment_no_item_image"
android:layout_marginTop="15dp"
android:gravity="center_horizontal"
android:text="@string/app_name"
android:textAlignment="center"
android:textSize="20sp" />
</RelativeLayout>

1
app/src/main/res/layout/grades_dialog.xml
View File

@ -177,6 +177,7 @@
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:text="@string/generic_dialog_close"
android:textColor="?android:attr/android:textColorSecondary"
android:textAllCaps="true"
android:textSize="15sp" />

8
app/src/main/res/layout/grades_header.xml
View File

@ -29,7 +29,7 @@
android:layout_below="@+id/grade_header_subject_text"
android:layout_marginTop="5dp"
android:text="@string/app_name"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp" />
<TextView
@ -43,7 +43,7 @@
android:layout_toEndOf="@+id/grade_header_average_text"
android:layout_toRightOf="@+id/grade_header_average_text"
android:text="@string/app_name"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp" />
<TextView
@ -55,7 +55,7 @@
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:text="@string/info_grades_predicted_rating"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp" />
<TextView
@ -67,7 +67,7 @@
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:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp" />
<ImageView

2
app/src/main/res/layout/grades_summary_header.xml
View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#EEE"
android:background="?attr/colorControlHighlight"
android:paddingBottom="7dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"

5
app/src/main/res/layout/timetable_dialog.xml
View File

@ -48,7 +48,7 @@
android:layout_below="@+id/timetable_dialog_details"
android:layout_marginTop="10dp"
android:text="@string/timetable_dialog_description"
android:textColor="@color/colorPrimaryDark"
android:textColor="@color/colorPrimary"
android:textSize="17sp" />
<TextView
@ -60,7 +60,7 @@
android:layout_below="@+id/timetable_dialog_description"
android:layout_marginTop="3dp"
android:text="@string/generic_app_no_data"
android:textColor="@color/colorPrimaryDark"
android:textColor="@color/colorPrimary"
android:textIsSelectable="true"
android:textSize="12sp" />
@ -192,6 +192,7 @@
android:background="?attr/selectableItemBackground"
android:focusable="true"
android:text="@string/generic_dialog_close"
android:textColor="?android:attr/android:textColorSecondary"
android:textAllCaps="true"
android:textSize="15sp" />

6
app/src/main/res/layout/timetable_header.xml
View File

@ -39,7 +39,7 @@
android:layout_marginTop="5dp"
android:maxLines="1"
android:text="@string/app_name"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="14sp" />
<TextView
@ -54,7 +54,7 @@
android:gravity="end"
android:maxLines="2"
android:text="@string/app_name"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="16sp" />
<ImageView
@ -68,4 +68,4 @@
tools:ignore="contentDescription" />
</RelativeLayout>
</FrameLayout>
</FrameLayout>

7
app/src/main/res/layout/timetable_subitem.xml
View File

@ -13,7 +13,6 @@
android:foreground="?attr/selectableItemBackgroundBorderless"
card_view:cardElevation="0dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -61,7 +60,7 @@
android:layout_alignStart="@id/timetable_subItem_lesson"
android:maxLines="1"
android:text="@string/grades_text"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp" />
<TextView
@ -77,7 +76,7 @@
android:layout_toRightOf="@+id/timetable_subItem_time"
android:maxLines="1"
android:text="@string/grades_text"
android:textColor="@color/secondary_text"
android:textColor="?android:attr/android:textColorSecondary"
android:textSize="12sp"
tool:ignore="all"/>
@ -92,4 +91,4 @@
tool:ignore="contentDescription"/>
</RelativeLayout>
</android.support.v7.widget.CardView>
</android.support.v7.widget.CardView>

2
app/src/main/res/layout/timetable_widget.xml
View File

@ -72,4 +72,4 @@
android:text="@string/widget_timetable_no_lesson"
android:textColor="@android:color/black"
android:textSize="20sp" />
</FrameLayout>
</FrameLayout>

17
app/src/main/res/values-night/styles.xml Normal file
View File

@ -0,0 +1,17 @@
<resources>
<style name="WulkanowyTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorPrimary</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomNavBackground">@color/bottom_nav_background</item>
</style>
<style name="WulkanowyTheme.DarkActionBar" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorPrimary</item>
</style>
</resources>

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

@ -9,4 +9,10 @@
<item>12 godzin</item>
<item>24 godzin</item>
</string-array>
</resources>
<string-array name="theme_entries">
<item>Wyłączony</item>
<item>Włączony</item>
<item>Automatyczny</item>
<item>Używaj ustawień systemowych</item>
</string-array>
</resources>

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

@ -129,6 +129,7 @@
<string name="pref_grades_summary_line_show">Pokazuj podsumowanie w ocenach</string>
<string name="pref_attendance_present_show">Pokazuj obecność we frekwencji</string>
<string name="required_restart">Wymagany restart</string>
<string name="pref_view_theme_dark">Ciemny motyw (Beta)</string>
<string name="pref_notify_header">Powiadomienia</string>
<string name="pref_notify_switch">Pokazuj powiadomienia</string>

4
app/src/main/res/values/attrs.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<attr name="bottomNavBackground" format="reference" />
</resources>

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

@ -10,8 +10,11 @@
<color name="three_grade">#FFE68C</color>
<color name="two_grade">#CE9AD2</color>
<color name="one_grade">#d32f2f</color>
<color name="default_grade">#cdcdcd</color>
<color name="secondary_text">#4c4c4c</color>
<color name="second_text_color">#333</color>
<color name="default_grade">#cdcdcd</color>
<color name="free_day">#eee</color>
<color name="bottom_nav_background">#303030</color>
<color name="bottom_nav_background_inverse">#ffffff</color>
</resources>

16
app/src/main/res/values/prefernces_array.xml
View File

@ -12,6 +12,20 @@
<item>2</item>
<item>3</item>
</string-array>
<string-array name="theme_entries">
<item>Off</item>
<item>On</item>
<item>Auto</item>
<item>Follow system settings</item>
</string-array>
<string-array name="theme_values" translatable="false">
<item>1</item>
<item>2</item>
<item>0</item>
<item>-1</item>
</string-array>
<string-array name="services_interval_entries">
<item>10 minutes</item>
<item>30 minutes</item>
@ -30,4 +44,4 @@
<item>720</item>
<item>1440</item>
</string-array>
</resources>
</resources>

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

@ -125,6 +125,8 @@
<string name="pref_attendance_present_show">Show present in attendance</string>
<string name="required_restart">Required restart</string>
<string name="pref_view_theme_dark">Dark theme (Beta)</string>
<string name="pref_notify_header">Notifications</string>
<string name="pref_notify_switch">Show the notifications</string>

5
app/src/main/res/values/styles.xml
View File

@ -1,6 +1,6 @@
<resources>
<style name="WulkanowyTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
<style name="WulkanowyTheme" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorPrimary</item>
@ -14,9 +14,10 @@
<item name="subtitleTextColor">@android:color/primary_text_dark</item>
<item name="android:colorBackground">@android:color/white</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomNavBackground">@color/bottom_nav_background_inverse</item>
</style>
<style name="WulkanowyTheme.LoginTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<style name="WulkanowyTheme.DarkActionBar" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorPrimary</item>

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

@ -18,6 +18,13 @@
android:key="attendance_present"
android:summary="@string/required_restart"
android:title="@string/pref_attendance_present_show" />
<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" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_services_header">
<SwitchPreference