github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2024-11-24 10:54:36 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UI] Fix timetable lesson height. Add missing timetable settings.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2022-10-18 11:49:46 +02:00
parent 6f12227c2e
commit 2ec06bc39a
No known key found for this signature in database
GPG Key ID: 70CB8A85BA1633CB
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/pl/szczodrzynski/edziennik/ui/settings/cards/SettingsRegisterCard.kt
View File

@ -54,6 +54,13 @@ class SettingsRegisterCard(util: SettingsUtil) : SettingsCard(util) {
}
override fun getItems() = listOfNotNull(
util.createActionItem(
text = R.string.menu_timetable_config,
icon = CommunityMaterial.Icon3.cmd_timetable
) {
TimetableConfigDialog(activity, reloadOnDismiss = false).show()
},
util.createActionItem(
text = R.string.menu_agenda_config,
icon = CommunityMaterial.Icon.cmd_calendar_outline
@ -70,7 +77,7 @@ class SettingsRegisterCard(util: SettingsUtil) : SettingsCard(util) {
util.createActionItem(
text = R.string.menu_messages_config,
icon = CommunityMaterial.Icon.cmd_calendar_outline
icon = CommunityMaterial.Icon.cmd_email_outline
) {
MessagesConfigDialog(activity, reloadOnDismiss = false).show()
},

2
app/src/main/java/pl/szczodrzynski/edziennik/ui/timetable/TimetableDayFragment.kt
View File

@ -85,7 +85,7 @@ class TimetableDayFragment : LazyFragment(), CoroutineScope {
startHour = startHour,
endHour = endHour,
dividerHeight = 1.dp,
halfHourHeight = if (app.profile.loginStoreType == LOGIN_TYPE_USOS) 45.dp else 30.dp,
halfHourHeight = if (app.profile.loginStoreType == LOGIN_TYPE_USOS) 45.dp else 60.dp,
hourDividerColor = R.attr.hourDividerColor.resolveAttr(context),
halfHourDividerColor = R.attr.halfHourDividerColor.resolveAttr(context),
hourLabelWidth = 40.dp,