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

student-15047 commented 2025-12-05 17:22:52 +00:00

Contributor

Copy Link

No description provided.

student-15047 added 3 commits 2025-12-05 17:22:53 +00:00

I configured the server connection and improved the logic 09e97f9d67

I merge fork f5ff5dbca8

Merge remote-tracking branch 'origin/main' ... f632ddbe2b

# 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

student-18211 merged commit 32cdc2b3a6 into main 2025-12-05 17:24:18 +00:00

student-18211 referenced this issue from a commit 2025-12-05 17:24:19 +00:00

Merge pull request 'add booking to main branch' (#4) from student-15047/NTO-2025-Android-TeamTask:main into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

student-18211

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: student-18211/NTO-2025-Android-TeamTask#4

Allow edits from maintainers