Sosees04ka/PIbd-32_Kashin_M.I_Mobile
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
90 Commits 5 Branches 0 Tags 3.1 MiB
Kotlin 100%
a4676f90eb
Go to file
Кашин Максим a4676f90eb Merge remote-tracking branch 'origin/lab5' into lab5 
# Conflicts:
#	app/src/main/java/com/example/myapplication/api/MyServerService.kt
#	app/src/main/java/com/example/myapplication/database/AppViewModelProvider.kt
#	app/src/main/java/com/example/myapplication/database/entities/composeui/edit/BikeEdit.kt
#	app/src/main/java/com/example/myapplication/database/entities/composeui/edit/BikeEditViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/bike/BikeListViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/bike/BikeViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/cart/CartViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/item/ItemEditViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/item/ItemListViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/rent/RentListViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/rent/RentViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/rent/ReportViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/user/CurrentUserViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/user/EntryUserViewModel.kt
#	app/src/main/java/com/example/myapplication/database/room/viewmodel/user/RegisterUserViewModel.kt
#	app/src/main/java/com/example/myapplication/ui/edit/ItemEdit.kt
#	app/src/main/java/com/example/myapplication/ui/list/BikeList.kt
#	app/src/main/java/com/example/myapplication/ui/list/ItemList.kt
#	app/src/main/java/com/example/myapplication/ui/navigation/MainNavbar.kt
#	app/src/main/java/com/example/myapplication/ui/view/BikeView.kt
#	app/src/main/res/xml/network_security_config.xml
#	server/data.json
2023-12-27 14:08:37 +04:00
.idea Заполнил красиво данные user и bike 2023-12-26 13:15:19 +04:00
app Merge remote-tracking branch 'origin/lab5' into lab5 2023-12-27 14:08:37 +04:00
gradle/wrapper так и живем 2023-12-20 13:10:55 +03:00
server Так, убрал анимацию пагинаций, вроде все работает, остался рефакторинг, отчет и пабеда.... 2023-12-27 14:07:10 +04:00
отчеты так и живем 2023-12-20 13:10:55 +03:00
.gitignore так и живем 2023-12-20 13:10:55 +03:00
build.gradle.kts так и живем 2023-12-20 13:10:55 +03:00
gradle.properties Базовый проект 2023-10-10 14:36:47 +03:00
gradlew Базовый проект 2023-10-10 14:36:47 +03:00
gradlew.bat Базовый проект 2023-10-10 14:36:47 +03:00
README.md Initial commit 2023-10-10 10:54:02 +04:00
settings.gradle.kts так и живем 2023-12-20 13:10:55 +03:00

README.md

PIbd-32_Kashin_M.I_Mobile