student-18211/NTO-2025-Android-TeamTask
1
0
Fork 2
forked from Olympic/NTO-2025-Android-TeamTask
Code Pull Requests Activity

add booking to main branch #4

Merged
student-18211 merged 3 commits from student-15047/NTO-2025-Android-TeamTask:main into main 2025-12-05 17:24:18 +00:00
Conversation 0 Commits 3 Files Changed 14 +481 -17

3 Commits

Author SHA1 Message Date
Артём
f632ddbe2b Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	app/src/main/java/ru/myitschool/work/ui/screen/NavigationGraph.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookIntent.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookScreen.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookState.kt
#	app/src/main/java/ru/myitschool/work/ui/screen/book/BookViewModel.kt
#	app/src/main/res/values/strings.xml
 2025-12-05 18:31:20 +03:00
Артём
f5ff5dbca8 I merge fork 2025-12-05 18:28:06 +03:00
Артём
09e97f9d67 I configured the server connection and improved the logic 2025-12-04 23:19:42 +03:00