forked from github/wulkanowy-mirror
Refactor grade module (#156)
This commit is contained in:

committed by
Mikołaj Pich

parent
357b2350cb
commit
f2b7c0e781
@ -1,8 +1,8 @@
|
||||
<resources>
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<!--BottomNav-->
|
||||
<dimen name="bottom_navigation_margin_top_active" tools:override="true">8dp</dimen>
|
||||
<dimen name="bottom_navigation_margin_top_inactive" tools:override="true">8dp</dimen>
|
||||
|
||||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
<dimen name="widget_bar_height">60dp</dimen>
|
||||
<!--Timetable Widget-->
|
||||
<dimen name="timetable_widget_bar_height">60dp</dimen>
|
||||
</resources>
|
||||
|
@ -34,14 +34,16 @@
|
||||
<string name="grade_switch_semester">Change semester</string>
|
||||
<string name="grade_no_items">No grades</string>
|
||||
<string name="grade_weight">Weight</string>
|
||||
<string name="grade_comment">Comment</string>
|
||||
<string name="grade_no_new_items">No new grades</string>
|
||||
<string name="grade_number_new_items">Number of new ratings: %1$d</string>
|
||||
<string name="grade_average">Average: %1$.2f</string>
|
||||
<string name="grade_no_average">No average</string>
|
||||
<string name="grade_predicted">Predicted: %1$s</string>
|
||||
<string name="grade_final">Final: %1$s</string>
|
||||
<string name="grade_summary_final_grade">Final grade</string>
|
||||
<string name="grade_summary_predicted_grade">Predicted grade</string>
|
||||
<string name="grade_summary_calculated_average">Calculated average</string>
|
||||
<string name="grade_summary_predicted_average">Predicted average</string>
|
||||
<string name="grade_summary_final_average">Final average</string>
|
||||
<string name="grade_menu_summary">Summary</string>
|
||||
<plurals name="grade_number_item">
|
||||
@ -94,6 +96,7 @@
|
||||
<string name="all_color">Color</string>
|
||||
<string name="all_details">Details</string>
|
||||
<string name="all_close">Close</string>
|
||||
<string name="all_cancel">Cancel</string>
|
||||
<string name="all_no_data">No data</string>
|
||||
<string name="all_subject">Subject</string>
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
<resources>
|
||||
|
||||
<style name="WulkanowyTheme" parent="@style/Theme.AppCompat.DayNight">
|
||||
<style name="WulkanowyTheme" parent="@style/Base.Theme.AppCompat.Light">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorPrimary</item>
|
||||
@ -15,27 +15,18 @@
|
||||
<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>
|
||||
<item name="android:windowAnimationStyle">@null</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>
|
||||
<item name="actionMenuTextColor">@android:color/primary_text_dark</item>
|
||||
<item name="android:textColorPrimary">@android:color/primary_text_light</item>
|
||||
<item name="android:textColorSecondary">@android:color/primary_text_light</item>
|
||||
<item name="android:textColorSecondaryInverse">@android:color/primary_text_dark</item>
|
||||
<item name="android:textColorTertiary">@android:color/primary_text_light</item>
|
||||
<item name="android:textColorTertiaryInverse">@android:color/primary_text_dark</item>
|
||||
<item name="titleTextColor">@android:color/primary_text_dark</item>
|
||||
<item name="subtitleTextColor">@android:color/primary_text_dark</item>
|
||||
<item name="android:colorBackground">@android:color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="WulkanowyTheme.SplashTheme" parent="WulkanowyTheme">
|
||||
<style name="WulkanowyTheme.SplashScreen" parent="WulkanowyTheme.NoActionBar">
|
||||
<item name="android:windowBackground">@drawable/layer_splash_background</item>
|
||||
</style>
|
||||
|
||||
<style name="WulkanowyTheme.NoActionBar" parent="WulkanowyTheme">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
</style>
|
||||
|
||||
<style name="DialogFragmentTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
|
||||
<item name="android:textColorTertiary">@android:color/primary_text_light</item>
|
||||
<item name="windowActionBar">false</item>
|
||||
|
Reference in New Issue
Block a user