karolina/avh-plan-android
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dialogs now use MaterialComponents styling, many elements now have rounded borders

Browse Source
This commit is contained in:
Deniz Düzgören
2019-10-13 19:27:06 +02:00
parent 37cf130ba0
commit bbecb640ea
12 changed files with 134 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/values/strings.xml
+3 -2
View File
@@ -53,9 +53,9 @@
<string name="grade_help_dialog_text">Enter your current grade to have it appear in your personal plan and be notified about any information.\n\nNote:\n\nIn junior phase, put the number and letter together, as in \"5a\".\n\nIn E-Phase, separate them by a space, as in \"18 a\".\n\nIn Q1/Q2, only put in the number, as in \"17\".\n\nEntering multiple grades is not recommended.</string>
<string name="courses_help_dialog_title">How to enter your courses</string>
<string name="courses_help_dialog_text">You need to enter the course abbreviation for every course you want in your personal plan and want to be notified about. You can find them on your time table.\n\nHere\'s a few examples:\n\nMathematics in 5th grade (juniors) would be MAT.\n\nAdvanced English in E-Phase (seniors) for the English profile may be ENP1.\n\nBasic Biology in Q1 could be bio1.\n\nIn most cases, entering courses while in junior phase is redundant.\nSeparate multiple courses by spaces, commas are optional.\nCapitalisation is required.</string>
<string name="experimental_menu_dialog_title">Experimental Menu</string>
<string name="experimental_menu_dialog_title">Testing Menu</string>
<string name="statistics_dialog_title">Statistics Menu</string>
<string name="experimental_menu_dialog_text">This menu is currently intended for testing only. Additional features may be added in the future. Feel free to try arbitrary codes.</string>
<string name="experimental_menu_dialog_text">This menu is intended for testing only.</string>
<string name="apply">Apply</string>
<string name="invalid_code">Invalid code</string>
<string name="no_personal_substitutions">No substitutions for you</string>
@@ -174,4 +174,5 @@
<string name="ordering_systems_dialog_text">You may pick between two ordering systems that dictate the order in which the items on the substitution plan will appear in.\n\nThe default \'app-specific\' is an algorithm implemented in this app that provides a consistently-sorted substitution plan ordered just like the substitution plan on the website used to; sorted by classes, then by time.\n\n\'Website original\' offers the items on the substitution plan just like they\'re presented on the school website, but since these are not guaranteed to be consistent, \'app-specific\' is picked by default.</string>
<string name="error_please_try_again">An error occurred, please try again</string>
<string name="thanks_for_using">Thanks for using the app!</string>
<string name="congratulations_for_nothing">Congratulations! You have achieved nothing.</string>
</resources>
app/src/main/res/values/styles.xml
+5 -5
View File
@@ -19,11 +19,7 @@
<item name="android:statusBarColor">@color/colorBackground</item>
<item name="android:windowLightStatusBar" tools:targetApi="23">@bool/isLight</item>
<item name="android:windowLightNavigationBar" tools:targetApi="27">@bool/isLight</item>
</style>
<style name="AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
<item name="android:background">@color/colorBackgroundLight</item>
<item name="android:textColorPrimary">@color/colorText</item>
<item name="alertDialogTheme">@style/AppTheme0.AlertDialogTheme</item>
</style>
<!-- Launch / splash screen -->
@@ -33,4 +29,8 @@
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<style name="AppTheme0.AlertDialogTheme" parent="ThemeOverlay.MaterialComponents.MaterialAlertDialog">
<item name="dialogCornerRadius">12dp</item>
</style>
</resources>