sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[APIv2] Move onSuccess from callback to an argument

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-11-05 18:20:41 +01:00
parent a049effa61
commit b72324805f
4 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/idziennik/data/IdziennikData.kt
View File

@ -41,43 +41,43 @@ class IdziennikData(val data: DataIdziennik, val onSuccess: () -> Unit) {
when (endpointId) { when (endpointId) {
ENDPOINT_IDZIENNIK_WEB_TIMETABLE -> { ENDPOINT_IDZIENNIK_WEB_TIMETABLE -> {
data.startProgress(R.string.edziennik_progress_endpoint_timetable) data.startProgress(R.string.edziennik_progress_endpoint_timetable)
IdziennikWebTimetable(data) { onSuccess() } IdziennikWebTimetable(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_WEB_GRADES -> { ENDPOINT_IDZIENNIK_WEB_GRADES -> {
data.startProgress(R.string.edziennik_progress_endpoint_grades) data.startProgress(R.string.edziennik_progress_endpoint_grades)
IdziennikWebGrades(data) { onSuccess() } IdziennikWebGrades(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> { ENDPOINT_IDZIENNIK_WEB_PROPOSED_GRADES -> {
data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades) data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
IdziennikWebProposedGrades(data) { onSuccess() } IdziennikWebProposedGrades(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_WEB_EXAMS -> { ENDPOINT_IDZIENNIK_WEB_EXAMS -> {
data.startProgress(R.string.edziennik_progress_endpoint_exams) data.startProgress(R.string.edziennik_progress_endpoint_exams)
IdziennikWebExams(data) { onSuccess() } IdziennikWebExams(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_WEB_NOTICES -> { ENDPOINT_IDZIENNIK_WEB_NOTICES -> {
data.startProgress(R.string.edziennik_progress_endpoint_notices) data.startProgress(R.string.edziennik_progress_endpoint_notices)
IdziennikWebNotices(data) { onSuccess() } IdziennikWebNotices(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> { ENDPOINT_IDZIENNIK_WEB_ANNOUNCEMENTS -> {
data.startProgress(R.string.edziennik_progress_endpoint_announcements) data.startProgress(R.string.edziennik_progress_endpoint_announcements)
IdziennikWebAnnouncements(data) { onSuccess() } IdziennikWebAnnouncements(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> { ENDPOINT_IDZIENNIK_WEB_ATTENDANCE -> {
data.startProgress(R.string.edziennik_progress_endpoint_attendance) data.startProgress(R.string.edziennik_progress_endpoint_attendance)
IdziennikWebAttendance(data) { onSuccess() } IdziennikWebAttendance(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> { ENDPOINT_IDZIENNIK_API_CURRENT_REGISTER -> {
data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
IdziennikApiCurrentRegister(data) { onSuccess() } IdziennikApiCurrentRegister(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> { ENDPOINT_IDZIENNIK_API_MESSAGES_INBOX -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
IdziennikApiMessagesInbox(data) { onSuccess() } IdziennikApiMessagesInbox(data, onSuccess)
} }
ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> { ENDPOINT_IDZIENNIK_API_MESSAGES_SENT -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
IdziennikApiMessagesSent(data) { onSuccess() } IdziennikApiMessagesSent(data, onSuccess)
} }
else -> onSuccess() else -> onSuccess()
} }

52
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/librus/data/LibrusData.kt
View File

@ -45,96 +45,96 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
*/ */
ENDPOINT_LIBRUS_API_ME -> { ENDPOINT_LIBRUS_API_ME -> {
data.startProgress(R.string.edziennik_progress_endpoint_student_info) data.startProgress(R.string.edziennik_progress_endpoint_student_info)
LibrusApiMe(data) { onSuccess() } LibrusApiMe(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_SCHOOLS -> { ENDPOINT_LIBRUS_API_SCHOOLS -> {
data.startProgress(R.string.edziennik_progress_endpoint_school_info) data.startProgress(R.string.edziennik_progress_endpoint_school_info)
LibrusApiSchools(data) { onSuccess() } LibrusApiSchools(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_CLASSES -> { ENDPOINT_LIBRUS_API_CLASSES -> {
data.startProgress(R.string.edziennik_progress_endpoint_classes) data.startProgress(R.string.edziennik_progress_endpoint_classes)
LibrusApiClasses(data) { onSuccess() } LibrusApiClasses(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES -> { ENDPOINT_LIBRUS_API_VIRTUAL_CLASSES -> {
data.startProgress(R.string.edziennik_progress_endpoint_teams) data.startProgress(R.string.edziennik_progress_endpoint_teams)
LibrusApiVirtualClasses(data) { onSuccess() } LibrusApiVirtualClasses(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_UNITS -> { ENDPOINT_LIBRUS_API_UNITS -> {
data.startProgress(R.string.edziennik_progress_endpoint_units) data.startProgress(R.string.edziennik_progress_endpoint_units)
LibrusApiUnits(data) { onSuccess() } LibrusApiUnits(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_USERS -> { ENDPOINT_LIBRUS_API_USERS -> {
data.startProgress(R.string.edziennik_progress_endpoint_teachers) data.startProgress(R.string.edziennik_progress_endpoint_teachers)
LibrusApiUsers(data) { onSuccess() } LibrusApiUsers(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_SUBJECTS -> { ENDPOINT_LIBRUS_API_SUBJECTS -> {
data.startProgress(R.string.edziennik_progress_endpoint_subjects) data.startProgress(R.string.edziennik_progress_endpoint_subjects)
LibrusApiSubjects(data) { onSuccess() } LibrusApiSubjects(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_CLASSROOMS -> { ENDPOINT_LIBRUS_API_CLASSROOMS -> {
data.startProgress(R.string.edziennik_progress_endpoint_classrooms) data.startProgress(R.string.edziennik_progress_endpoint_classrooms)
LibrusApiClassrooms(data) { onSuccess() } LibrusApiClassrooms(data, onSuccess)
} }
// TODO push config // TODO push config
// TODO timetable // TODO timetable
ENDPOINT_LIBRUS_API_NORMAL_GRADES -> { ENDPOINT_LIBRUS_API_NORMAL_GRADES -> {
data.startProgress(R.string.edziennik_progress_endpoint_grades) data.startProgress(R.string.edziennik_progress_endpoint_grades)
LibrusApiGrades(data) { onSuccess() } LibrusApiGrades(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_NORMAL_GC -> { ENDPOINT_LIBRUS_API_NORMAL_GC -> {
data.startProgress(R.string.edziennik_progress_endpoint_grade_categories) data.startProgress(R.string.edziennik_progress_endpoint_grade_categories)
LibrusApiGradeCategories(data) { onSuccess() } LibrusApiGradeCategories(data, onSuccess)
} }
// TODO grades // TODO grades
ENDPOINT_LIBRUS_API_EVENT_TYPES -> { ENDPOINT_LIBRUS_API_EVENT_TYPES -> {
data.startProgress(R.string.edziennik_progress_endpoint_event_types) data.startProgress(R.string.edziennik_progress_endpoint_event_types)
LibrusApiEventTypes(data) { onSuccess() } LibrusApiEventTypes(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_EVENTS -> { ENDPOINT_LIBRUS_API_EVENTS -> {
data.startProgress(R.string.edziennik_progress_endpoint_events) data.startProgress(R.string.edziennik_progress_endpoint_events)
LibrusApiEvents(data) { onSuccess() } LibrusApiEvents(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_HOMEWORK -> { ENDPOINT_LIBRUS_API_HOMEWORK -> {
data.startProgress(R.string.edziennik_progress_endpoint_homework) data.startProgress(R.string.edziennik_progress_endpoint_homework)
LibrusApiHomework(data) { onSuccess() } LibrusApiHomework(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_LUCKY_NUMBER -> { ENDPOINT_LIBRUS_API_LUCKY_NUMBER -> {
data.startProgress(R.string.edziennik_progress_endpoint_lucky_number) data.startProgress(R.string.edziennik_progress_endpoint_lucky_number)
LibrusApiLuckyNumber(data) { onSuccess() } LibrusApiLuckyNumber(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_NOTICE_TYPES -> { ENDPOINT_LIBRUS_API_NOTICE_TYPES -> {
data.startProgress(R.string.edziennik_progress_endpoint_notice_types) data.startProgress(R.string.edziennik_progress_endpoint_notice_types)
LibrusApiNoticeTypes(data) { onSuccess() } LibrusApiNoticeTypes(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_NOTICES -> { ENDPOINT_LIBRUS_API_NOTICES -> {
data.startProgress(R.string.edziennik_progress_endpoint_notices) data.startProgress(R.string.edziennik_progress_endpoint_notices)
LibrusApiNotices(data) { onSuccess() } LibrusApiNotices(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES -> { ENDPOINT_LIBRUS_API_ATTENDANCE_TYPES -> {
data.startProgress(R.string.edziennik_progress_endpoint_attendance_types) data.startProgress(R.string.edziennik_progress_endpoint_attendance_types)
LibrusApiAttendanceTypes(data) { onSuccess() } LibrusApiAttendanceTypes(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_ATTENDANCES -> { ENDPOINT_LIBRUS_API_ATTENDANCES -> {
data.startProgress(R.string.edziennik_progress_endpoint_attendance) data.startProgress(R.string.edziennik_progress_endpoint_attendance)
LibrusApiAttendances(data) { onSuccess() } LibrusApiAttendances(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_ANNOUNCEMENTS -> { ENDPOINT_LIBRUS_API_ANNOUNCEMENTS -> {
data.startProgress(R.string.edziennik_progress_endpoint_announcements) data.startProgress(R.string.edziennik_progress_endpoint_announcements)
LibrusApiAnnouncements(data) { onSuccess() } LibrusApiAnnouncements(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_PT_MEETINGS -> { ENDPOINT_LIBRUS_API_PT_MEETINGS -> {
data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings) data.startProgress(R.string.edziennik_progress_endpoint_pt_meetings)
LibrusApiPtMeetings(data) { onSuccess() } LibrusApiPtMeetings(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> { ENDPOINT_LIBRUS_API_TEACHER_FREE_DAY_TYPES -> {
data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types) data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_day_types)
LibrusApiTeacherFreeDayTypes(data) { onSuccess() } LibrusApiTeacherFreeDayTypes(data, onSuccess)
} }
ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> { ENDPOINT_LIBRUS_API_TEACHER_FREE_DAYS -> {
data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days) data.startProgress(R.string.edziennik_progress_endpoint_teacher_free_days)
LibrusApiTeacherFreeDays(data) { onSuccess() } LibrusApiTeacherFreeDays(data, onSuccess)
} }
/** /**
@ -142,11 +142,11 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
*/ */
ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK -> { ENDPOINT_LIBRUS_SYNERGIA_HOMEWORK -> {
data.startProgress(R.string.edziennik_progress_endpoint_homework) data.startProgress(R.string.edziennik_progress_endpoint_homework)
LibrusSynergiaHomework(data) { onSuccess() } LibrusSynergiaHomework(data, onSuccess)
} }
ENDPOINT_LIBRUS_SYNERGIA_INFO -> { ENDPOINT_LIBRUS_SYNERGIA_INFO -> {
data.startProgress(R.string.edziennik_progress_endpoint_student_info) data.startProgress(R.string.edziennik_progress_endpoint_student_info)
LibrusSynergiaInfo(data) { onSuccess() } LibrusSynergiaInfo(data, onSuccess)
} }
/** /**
@ -154,11 +154,11 @@ class LibrusData(val data: DataLibrus, val onSuccess: () -> Unit) {
*/ */
ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> { ENDPOINT_LIBRUS_MESSAGES_RECEIVED -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED) { onSuccess() } LibrusMessagesGetList(data, type = Message.TYPE_RECEIVED, onSuccess = onSuccess)
} }
ENDPOINT_LIBRUS_MESSAGES_SENT -> { ENDPOINT_LIBRUS_MESSAGES_SENT -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
LibrusMessagesGetList(data, type = Message.TYPE_SENT) { onSuccess() } LibrusMessagesGetList(data, type = Message.TYPE_SENT, onSuccess = onSuccess)
} }
else -> onSuccess() else -> onSuccess()

2
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/mobidziennik/data/MobidziennikData.kt
View File

@ -42,7 +42,7 @@ class MobidziennikData(val data: DataMobidziennik, val onSuccess: () -> Unit) {
when (endpointId) { when (endpointId) {
ENDPOINT_MOBIDZIENNIK_API_MAIN -> { ENDPOINT_MOBIDZIENNIK_API_MAIN -> {
data.startProgress(R.string.edziennik_progress_endpoint_data) data.startProgress(R.string.edziennik_progress_endpoint_data)
MobidziennikApi(data) { onSuccess() } MobidziennikApi(data, onSuccess)
} }
ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX -> { ENDPOINT_MOBIDZIENNIK_WEB_MESSAGES_INBOX -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)

18
app/src/main/java/pl/szczodrzynski/edziennik/api/v2/vulcan/data/VulcanData.kt
View File

@ -38,39 +38,39 @@ class VulcanData(val data: DataVulcan, val onSuccess: () -> Unit) {
when (endpointId) { when (endpointId) {
ENDPOINT_VULCAN_API_DICTIONARIES -> { ENDPOINT_VULCAN_API_DICTIONARIES -> {
data.startProgress(R.string.edziennik_progress_endpoint_dictionaries) data.startProgress(R.string.edziennik_progress_endpoint_dictionaries)
VulcanApiDictionaries(data) { onSuccess() } VulcanApiDictionaries(data, onSuccess)
} }
ENDPOINT_VULCAN_API_GRADES -> { ENDPOINT_VULCAN_API_GRADES -> {
data.startProgress(R.string.edziennik_progress_endpoint_grades) data.startProgress(R.string.edziennik_progress_endpoint_grades)
VulcanApiGrades(data) { onSuccess() } VulcanApiGrades(data, onSuccess)
} }
ENDPOINT_VULCAN_API_GRADES_SUMMARY -> { ENDPOINT_VULCAN_API_GRADES_SUMMARY -> {
data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades) data.startProgress(R.string.edziennik_progress_endpoint_proposed_grades)
VulcanApiProposedGrades(data) { onSuccess() } VulcanApiProposedGrades(data, onSuccess)
} }
ENDPOINT_VULCAN_API_EVENTS -> { ENDPOINT_VULCAN_API_EVENTS -> {
data.startProgress(R.string.edziennik_progress_endpoint_events) data.startProgress(R.string.edziennik_progress_endpoint_events)
VulcanApiEvents(data, isHomework = false) { onSuccess() } VulcanApiEvents(data, isHomework = false, onSuccess = onSuccess)
} }
ENDPOINT_VULCAN_API_HOMEWORK -> { ENDPOINT_VULCAN_API_HOMEWORK -> {
data.startProgress(R.string.edziennik_progress_endpoint_homework) data.startProgress(R.string.edziennik_progress_endpoint_homework)
VulcanApiEvents(data, isHomework = true) { onSuccess() } VulcanApiEvents(data, isHomework = true, onSuccess = onSuccess)
} }
ENDPOINT_VULCAN_API_NOTICES -> { ENDPOINT_VULCAN_API_NOTICES -> {
data.startProgress(R.string.edziennik_progress_endpoint_notices) data.startProgress(R.string.edziennik_progress_endpoint_notices)
VulcanApiNotices(data) { onSuccess() } VulcanApiNotices(data, onSuccess)
} }
ENDPOINT_VULCAN_API_ATTENDANCE -> { ENDPOINT_VULCAN_API_ATTENDANCE -> {
data.startProgress(R.string.edziennik_progress_endpoint_attendance) data.startProgress(R.string.edziennik_progress_endpoint_attendance)
VulcanApiAttendance(data) { onSuccess() } VulcanApiAttendance(data, onSuccess)
} }
ENDPOINT_VULCAN_API_MESSAGES_INBOX -> { ENDPOINT_VULCAN_API_MESSAGES_INBOX -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_inbox)
VulcanApiMessagesInbox(data) { onSuccess() } VulcanApiMessagesInbox(data, onSuccess)
} }
ENDPOINT_VULCAN_API_MESSAGES_SENT -> { ENDPOINT_VULCAN_API_MESSAGES_SENT -> {
data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox) data.startProgress(R.string.edziennik_progress_endpoint_messages_outbox)
VulcanApiMessagesSent(data) { onSuccess() } VulcanApiMessagesSent(data, onSuccess)
} }
else -> onSuccess() else -> onSuccess()
} }