Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e8d299975a | |||
| b58bbf4421 | |||
| 6a39009c3b | |||
| 5c3621d7ec | |||
| 6b9b374c48 | |||
| 21597aebe4 | |||
| 0996e16a84 | |||
| f1f3dcf01f | |||
| ff959a86aa | |||
| d88daf5fd7 |
171
.idea/workspace.xml
generated
171
.idea/workspace.xml
generated
@ -9,42 +9,20 @@
|
||||
<option name="autoReloadType" value="NONE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="7c94e195-a540-483e-9a1c-11797aeb1741" name="Changes" comment="empty activity test">
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Basket/BasketItem.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/List_of_Services/AddService.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/List_of_Services/Service.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Orders/OrderItem.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Orders/Orders.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Profile/Login.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Profile/ProfileChange.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Profile/ProfileNotAuth.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Profile/Registration.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/TestServiceItem.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/UIComponents/MyTextField.kt" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/icon_calendar.xml" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/image_service.png" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/upload.xml" afterDir="false" />
|
||||
<list default="true" id="7c94e195-a540-483e-9a1c-11797aeb1741" name="Changes" comment="feature: lab5 done">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/App.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/App.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Basket/Basket.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Basket/Basket.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/List_of_Services/ListOfServices.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/List_of_Services/ListOfServices.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Navbar/NavBar.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Navbar/NavBar.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Navbar/NavController.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Navbar/NavController.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Navbar/NavItem.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Navbar/NavItem.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Profile/Profile.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/Profile/Profile.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/UIComponents/Button.kt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/UIComponents/SearchBar.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/UIComponents/SearchBar.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/ui/theme/Color.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/ui/theme/Color.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/ui/theme/Theme.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/ui/theme/Theme.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/ui/theme/Type.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/ui/theme/Type.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Basket/Basket.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Basket/Basket.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/List_of_Services/AddService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/List_of_Services/AddService.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/List_of_Services/ListOfServices.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/List_of_Services/ListOfServices.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Profile/Profile.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Profile/Profile.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Profile/ProfileChange.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Profile/ProfileChange.kt" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\Danil\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd]" />
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[6681ed71]" />
|
||||
<component name="ExternalProjectsData">
|
||||
<projectState path="$PROJECT_DIR$">
|
||||
<ProjectState />
|
||||
@ -53,8 +31,9 @@
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="Class" />
|
||||
<option value="resourceFile" />
|
||||
<option value="Class" />
|
||||
<option value="Kotlin Interface" />
|
||||
<option value="Kotlin Class" />
|
||||
</list>
|
||||
</option>
|
||||
@ -67,11 +46,14 @@
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="main" />
|
||||
<entry key="$PROJECT_DIR$" value="LabWork04" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="KotlinCodeInsightWorkspaceSettings">
|
||||
<option name="optimizeImportsOnTheFly" value="true" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
</component>
|
||||
@ -84,24 +66,35 @@
|
||||
"keyToString": {
|
||||
"ApkExportedModule": "My_Application.app",
|
||||
"ExportApk.ApkPathForMy_Application.app": "C:\\Users\\Danil\\Desktop\\MDP\\labs\\app",
|
||||
"PROJECT_TRUSTED_KEY": "true",
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"ToolWindowLogcat.ShowToolbar": "false",
|
||||
"cidr.known.project.marker": "true",
|
||||
"com.android.tools.idea.devicemanager.tab": "Physical",
|
||||
"last_opened_file_path": "C:/Users/Danil/Downloads/test",
|
||||
"project.structure.last.edited": "Build Variants",
|
||||
"last_opened_file_path": "C:/Users/Danil/Desktop/Новая папка",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.17",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"settings.editor.selected.configurable": "trusted.hosts"
|
||||
"settings.editor.selected.configurable": "emulator"
|
||||
},
|
||||
"keyToStringList": {
|
||||
"ExportApk.BuildVariants": [
|
||||
"release"
|
||||
],
|
||||
"com.android.tools.idea.sqlite.queryhistory": [
|
||||
"delete from tbl_service",
|
||||
"insert into tbl_user values (1, \"Danil\", \"Markov\", \"danil@mail.ru\", \"123\", \"ADMIN\", null)",
|
||||
"delete from tbl_user where userId = 6",
|
||||
"delete from tbl_user where userId = 4",
|
||||
"delete from tbl_user where userId = 2"
|
||||
]
|
||||
}
|
||||
}</component>
|
||||
<component name="PsdUISettings">
|
||||
<option name="MODULE_TAB" value="Signing Configs" />
|
||||
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
||||
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
@ -109,12 +102,17 @@
|
||||
<recent name="com.example.myapplication.Navbar" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\Danil\Desktop\MDP\labs\app\src\main\java\com\example\myapplication\business_logic" />
|
||||
<recent name="C:\Users\Danil\Desktop\MDP\labs\app\src\main\res\drawable" />
|
||||
<recent name="C:\Users\Danil\Desktop\MDP\labs\app\src\main\java\com\example\myapplication\UIComponents" />
|
||||
</key>
|
||||
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
|
||||
<recent name="com.example.myapplication.businessLogic.repository" />
|
||||
<recent name="com.example.myapplication.di" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="Android App.App">
|
||||
<configuration name="App" type="AndroidRunConfigurationType" factoryName="Android App" temporary="true">
|
||||
<component name="RunManager" selected="Android App.app">
|
||||
<configuration name="MainActivity" type="AndroidRunConfigurationType" factoryName="Android App" temporary="true">
|
||||
<module name="My_Application.app.main" />
|
||||
<option name="DEPLOY" value="true" />
|
||||
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
|
||||
@ -173,7 +171,7 @@
|
||||
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
|
||||
</Profilers>
|
||||
<option name="DEEP_LINK" value="" />
|
||||
<option name="ACTIVITY_CLASS" value="com.example.myapplication.App" />
|
||||
<option name="ACTIVITY_CLASS" value="com.example.myapplication.MainActivity" />
|
||||
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
|
||||
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
|
||||
<method v="2">
|
||||
@ -246,9 +244,18 @@
|
||||
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="build.gradle.kts" type="KotlinStandaloneScriptRunConfigurationType" temporary="true" nameIsGenerated="true">
|
||||
<module name="My_Application" />
|
||||
<option name="filePath" value="$PROJECT_DIR$/app/build.gradle.kts" />
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Android App.App" />
|
||||
<item itemvalue="Android App.MainActivity" />
|
||||
<item itemvalue="Kotlin script (Beta).build.gradle.kts" />
|
||||
<item itemvalue="Kotlin script (Beta).build.gradle.kts" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
@ -275,7 +282,63 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1696755925297</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="3" />
|
||||
<task id="LOCAL-00003" summary="feature: UI, lab2 maybe done">
|
||||
<created>1698677204522</created>
|
||||
<option name="number" value="00003" />
|
||||
<option name="presentableId" value="LOCAL-00003" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1698677204522</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00004" summary="feature: lab3 is done">
|
||||
<created>1699943645305</created>
|
||||
<option name="number" value="00004" />
|
||||
<option name="presentableId" value="LOCAL-00004" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1699943645305</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00005" summary="feature: lab3 is done">
|
||||
<created>1699948377847</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1699948377847</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00006" summary="feature: lab4 add repos">
|
||||
<created>1700908930838</created>
|
||||
<option name="number" value="00006" />
|
||||
<option name="presentableId" value="LOCAL-00006" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1700908930838</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00007" summary="feature&fix: lab4 add viewmodel, fix repos">
|
||||
<created>1700915139985</created>
|
||||
<option name="number" value="00007" />
|
||||
<option name="presentableId" value="LOCAL-00007" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1700915139985</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00008" summary="feature: lab4 maybe done">
|
||||
<created>1702138495251</created>
|
||||
<option name="number" value="00008" />
|
||||
<option name="presentableId" value="LOCAL-00008" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1702138495251</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00009" summary="feature: lab5 almost done, save commit">
|
||||
<created>1702979910728</created>
|
||||
<option name="number" value="00009" />
|
||||
<option name="presentableId" value="LOCAL-00009" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1702979910728</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00010" summary="feature: lab5 done">
|
||||
<created>1703256177985</created>
|
||||
<option name="number" value="00010" />
|
||||
<option name="presentableId" value="LOCAL-00010" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1703256177985</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="11" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
@ -291,6 +354,34 @@
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<MESSAGE value="empty activity test" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="empty activity test" />
|
||||
<MESSAGE value="feature: UI, lab2 maybe done" />
|
||||
<MESSAGE value="feature: lab3 is done" />
|
||||
<MESSAGE value="feature: lab4 add repos" />
|
||||
<MESSAGE value="feature&fix: lab4 add viewmodel, fix repos" />
|
||||
<MESSAGE value="feature: lab4 maybe done" />
|
||||
<MESSAGE value="feature: lab5 almost done, save commit" />
|
||||
<MESSAGE value="feature: lab5 done" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="feature: lab5 done" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/myapplication/composeui/Navbar/NavController.kt</url>
|
||||
<line>63</line>
|
||||
<option name="timeStamp" value="23" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/myapplication/businessLogic/viewmodel/BasketViewModel.kt</url>
|
||||
<line>131</line>
|
||||
<option name="timeStamp" value="52" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/myapplication/api/ServiceRemoteMediator.kt</url>
|
||||
<line>55</line>
|
||||
<option name="timeStamp" value="53" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
</component>
|
||||
</project>
|
||||
@ -1,6 +1,8 @@
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
id("org.jetbrains.kotlin.android")
|
||||
id ("kotlin-kapt")
|
||||
kotlin("plugin.serialization") version "1.4.21"
|
||||
}
|
||||
|
||||
android {
|
||||
@ -9,7 +11,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.example.myapplication"
|
||||
minSdk = 29
|
||||
minSdk = 26
|
||||
targetSdk = 34
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
@ -30,11 +32,11 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
jvmTarget = "17"
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
@ -49,26 +51,53 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
}
|
||||
|
||||
implementation("androidx.core:core-ktx:1.9.0")
|
||||
apply(plugin = "kotlin-kapt")
|
||||
dependencies {
|
||||
implementation("androidx.core:core-ktx:1.12.0")
|
||||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
|
||||
implementation("androidx.activity:activity-compose:1.7.2")
|
||||
implementation("androidx.activity:activity-compose:1.8.0")
|
||||
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
|
||||
implementation("androidx.compose.ui:ui")
|
||||
implementation("androidx.compose.ui:ui-graphics")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||
implementation("androidx.compose.material3:material3")
|
||||
//
|
||||
implementation("androidx.compose.material:material:1.5.2")
|
||||
implementation("androidx.navigation:navigation-compose:2.7.3")
|
||||
|
||||
implementation("androidx.compose.material:material")
|
||||
implementation("androidx.navigation:navigation-runtime-ktx:2.7.5")
|
||||
implementation("androidx.compose.material3:material3:1.1.2")
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
androidTestImplementation("androidx.test.ext:junit:1.1.5")
|
||||
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
|
||||
androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
|
||||
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
|
||||
|
||||
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||
implementation ("androidx.activity:activity-ktx:1.8.0")
|
||||
implementation ("androidx.fragment:fragment-ktx:1.6.2")
|
||||
implementation ("io.coil-kt:coil-compose:1.4.0")
|
||||
implementation ("com.google.code.gson:gson:2.9.0")
|
||||
implementation("androidx.navigation:navigation-compose:2.7.5")
|
||||
implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0-alpha03")
|
||||
|
||||
//Paging
|
||||
implementation ("androidx.paging:paging-compose:3.2.1")
|
||||
implementation ("androidx.paging:paging-runtime:3.2.1")
|
||||
|
||||
//ROOM
|
||||
val room_version = "2.5.2"
|
||||
implementation("androidx.room:room-runtime:$room_version")
|
||||
annotationProcessor("androidx.room:room-compiler:$room_version")
|
||||
kapt("androidx.room:room-compiler:$room_version")
|
||||
implementation("androidx.room:room-ktx:$room_version")
|
||||
implementation("androidx.room:room-paging:$room_version")
|
||||
|
||||
// retrofit
|
||||
val retrofitVersion = "2.9.0"
|
||||
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
|
||||
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
|
||||
implementation("androidx.paging:paging-compose:3.2.1")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
|
||||
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
|
||||
}
|
||||
@ -2,8 +2,10 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
<application
|
||||
android:name=".App"
|
||||
android:allowBackup="true"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:fullBackupContent="@xml/backup_rules"
|
||||
@ -14,7 +16,7 @@
|
||||
android:theme="@style/Theme.MyApplication"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".App"
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.MyApplication">
|
||||
|
||||
@ -1,33 +1,14 @@
|
||||
package com.example.myapplication
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.material.SnackbarDefaults.backgroundColor
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.darkColorScheme
|
||||
import androidx.compose.ui.Modifier
|
||||
import com.example.myapplication.Navbar.NavBar
|
||||
import com.example.myapplication.ui.theme.AppTheme
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import android.app.Application
|
||||
import com.example.myapplication.di.AppContainer
|
||||
import com.example.myapplication.di.AppDataContainer
|
||||
|
||||
class App : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContent {
|
||||
AppTheme (darkTheme = false){
|
||||
// A surface container using the 'background' color from the theme
|
||||
class App : Application() {
|
||||
lateinit var container: AppContainer
|
||||
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxSize()
|
||||
.background(BlueMain),
|
||||
) {
|
||||
NavBar();
|
||||
}
|
||||
}
|
||||
}
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
container = AppDataContainer(this)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,118 +0,0 @@
|
||||
package com.example.myapplication.Basket
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.horizontalScroll
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.TestServiceItem
|
||||
import com.example.myapplication.getServices
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
|
||||
@Composable
|
||||
fun Basket(navController : NavHostController){
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(15.dp)
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.icon_calendar),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.padding(5.dp)
|
||||
)
|
||||
LazyColumn(){
|
||||
val items = listOf<TestServiceItem>(getServices()[1])
|
||||
itemsIndexed(items){
|
||||
_, item ->
|
||||
BasketItem(item = item)
|
||||
}
|
||||
}
|
||||
Box(modifier = Modifier
|
||||
.clip(RoundedCornerShape(15.dp, 15.dp, 0.dp, 0.dp))
|
||||
.background(Color.Transparent)
|
||||
.height(130.dp),
|
||||
){
|
||||
Column (modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(100.dp)
|
||||
.background(Color.White)
|
||||
.padding(PaddingValues(15.dp)),
|
||||
){
|
||||
Row (
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
Text(
|
||||
text = "Total:",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
Text(
|
||||
text = "40$",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
}
|
||||
Row (
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
Text(
|
||||
text = "Date:",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
Text(
|
||||
text = "11.11.2023:",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = { /*TODO*/ },
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
.clip(CircleShape)
|
||||
.align(Alignment.BottomCenter),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(text = "Confirm order", style = MaterialTheme.typography.bodyMedium.copy(Color.White))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package com.example.myapplication.List_of_Services
|
||||
|
||||
import SearchBar
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.getServices
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
|
||||
@Composable
|
||||
fun ListOfServices(navController: NavHostController){
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(bottom = 60.dp)
|
||||
){
|
||||
SearchBar(
|
||||
modifier = Modifier)
|
||||
{
|
||||
searchText ->
|
||||
//TODO search logic
|
||||
}
|
||||
LazyColumn(modifier = Modifier.padding(15.dp, 0.dp)){
|
||||
var serviceList = getServices()
|
||||
itemsIndexed(serviceList){_, item ->
|
||||
Service(item)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,131 +0,0 @@
|
||||
package com.example.myapplication.List_of_Services
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.IntrinsicSize
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.RowScope
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.drawWithContent
|
||||
import androidx.compose.ui.draw.shadow
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.TestServiceItem
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextPrimary
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
import java.security.Provider.Service
|
||||
|
||||
@Composable
|
||||
fun Service(item: TestServiceItem){
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(0.dp, 0.dp, 0.dp, 10.dp)
|
||||
.height(150.dp)
|
||||
.shadow(
|
||||
elevation = 4.dp,
|
||||
shape = RoundedCornerShape(15.dp),
|
||||
clip = false
|
||||
),
|
||||
){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(145.dp)
|
||||
.background(color = Color.White, RoundedCornerShape(15.dp))
|
||||
.padding(15.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
Image(
|
||||
painter = painterResource(id = item.image),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
){
|
||||
var animalsString = ""
|
||||
item.name?.let {
|
||||
Text(
|
||||
text = it,
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
item.animals?.forEach { animal -> animalsString += "$animal, " }
|
||||
Text(
|
||||
text = animalsString,
|
||||
color = TextSecondary,
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.SpaceBetween,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
Text(
|
||||
text = "$${item.price}",
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
Button(
|
||||
onClick = { /*TODO*/ },
|
||||
modifier = Modifier
|
||||
.size(42.dp)
|
||||
.clip(CircleShape),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
){
|
||||
Text(text = "+")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
53
app/src/main/java/com/example/myapplication/MainActivity.kt
Normal file
53
app/src/main/java/com/example/myapplication/MainActivity.kt
Normal file
@ -0,0 +1,53 @@
|
||||
package com.example.myapplication
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.ui.Modifier
|
||||
import com.example.myapplication.composeui.Navbar.NavBar
|
||||
import com.example.myapplication.model.User
|
||||
import com.example.myapplication.ui.theme.AppTheme
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContent {
|
||||
AppTheme (darkTheme = false){
|
||||
// A surface container using the 'background' color from the theme
|
||||
|
||||
Surface(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain),
|
||||
) {
|
||||
NavBar();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
class GlobalUser private constructor() {
|
||||
private var user: User? = null
|
||||
|
||||
fun setUser(user: User?) {
|
||||
this.user = user
|
||||
}
|
||||
|
||||
fun getUser(): User? {
|
||||
return user
|
||||
}
|
||||
|
||||
companion object {
|
||||
private var instance: GlobalUser? = null
|
||||
|
||||
fun getInstance(): GlobalUser {
|
||||
return instance ?: synchronized(this) {
|
||||
instance ?: GlobalUser().also { instance = it }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
package com.example.myapplication.Navbar
|
||||
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import com.example.myapplication.Basket.Basket
|
||||
import com.example.myapplication.List_of_Services.AddService
|
||||
import com.example.myapplication.List_of_Services.ListOfServices
|
||||
import com.example.myapplication.Orders.Orders
|
||||
import com.example.myapplication.Profile.Login
|
||||
import com.example.myapplication.Profile.Profile
|
||||
import com.example.myapplication.Profile.ProfileChange
|
||||
import com.example.myapplication.Profile.ProfileNotAuth
|
||||
import com.example.myapplication.Profile.Registration
|
||||
|
||||
@Composable
|
||||
fun NavController(navController : NavHostController){
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = NavItem.Profile.route
|
||||
){
|
||||
composable(
|
||||
NavItem.ListOfServices.route
|
||||
){
|
||||
ListOfServices(navController)
|
||||
}
|
||||
composable(
|
||||
// "${NavItem.Basket.route}/{userId}"
|
||||
"${NavItem.Basket.route}"
|
||||
){
|
||||
Basket(navController)
|
||||
// backStackEntry ->
|
||||
// backStackEntry.arguments?.getString("userId")?.let {
|
||||
// Basket(
|
||||
// navController,
|
||||
// it.toLong()
|
||||
// )
|
||||
// }
|
||||
}
|
||||
composable(
|
||||
// "${NavItem.Profile.route}/{userId}"
|
||||
"${NavItem.Profile.route}"
|
||||
){
|
||||
Profile(navController)
|
||||
// backStackEntry ->
|
||||
// backStackEntry.arguments?.getString("userId")?.let {
|
||||
// Profile(
|
||||
// navController,
|
||||
// it.toLong()
|
||||
// )
|
||||
// }
|
||||
}
|
||||
composable(
|
||||
"${NavItem.ProfileChange.route}"
|
||||
){
|
||||
ProfileChange(navController)
|
||||
}
|
||||
composable(
|
||||
"${NavItem.Orders.route}"
|
||||
){
|
||||
Orders(navController)
|
||||
}
|
||||
composable(
|
||||
"${NavItem.ProfileNotAuth.route}"
|
||||
){
|
||||
ProfileNotAuth(navController)
|
||||
}
|
||||
composable(
|
||||
"${NavItem.Login.route}"
|
||||
){
|
||||
Login(navController)
|
||||
}
|
||||
composable(
|
||||
"${NavItem.Registration.route}"
|
||||
){
|
||||
Registration(navController)
|
||||
}
|
||||
composable(
|
||||
"${NavItem.AddService.route}"
|
||||
){
|
||||
AddService(navController)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,69 +0,0 @@
|
||||
package com.example.myapplication.Orders
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.alpha
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.shadow
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.modifier.modifierLocalConsumer
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.myapplication.ui.theme.TextPrimary
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
import java.util.Date
|
||||
|
||||
@Composable
|
||||
fun OrderItem (orderId: Int, date: String, price: Double, list: String){
|
||||
Column(modifier = Modifier.fillMaxWidth().clip(RoundedCornerShape(15.dp))){
|
||||
Column (
|
||||
modifier = Modifier
|
||||
.padding(0.dp, 0.dp, 0.dp, 0.dp)
|
||||
.shadow(
|
||||
elevation = 4.dp,
|
||||
shape = RoundedCornerShape(15.dp),
|
||||
clip = false
|
||||
)
|
||||
){
|
||||
Row (
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
modifier = Modifier
|
||||
.background(Color.White)
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 15.dp, vertical = 10.dp),
|
||||
){
|
||||
Text(text = "Order:$orderId", modifier = Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium)
|
||||
Text(text = "$price$", style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
Row (
|
||||
modifier = Modifier
|
||||
.background(Color.White)
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 15.dp),
|
||||
){
|
||||
Text(text = date, style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
}
|
||||
Row (
|
||||
modifier = Modifier
|
||||
.background(Color.White)
|
||||
.fillMaxWidth()
|
||||
.padding(15.dp)
|
||||
){
|
||||
Text(text = list, style = MaterialTheme.typography.bodyMedium.copy(TextSecondary))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,27 +0,0 @@
|
||||
package com.example.myapplication.Orders
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import java.util.Date
|
||||
|
||||
@Composable
|
||||
fun Orders (navController: NavController){
|
||||
Column (
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(15.dp)
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
OrderItem(orderId = 1, date = "11.11.2023", price = 40.0, list = "Inoculation x2")
|
||||
}
|
||||
}
|
||||
@ -1,81 +0,0 @@
|
||||
package com.example.myapplication.Profile
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.Navbar.NavItem
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
|
||||
@Composable
|
||||
fun ProfileNotAuth (navController: NavController){
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(15.dp)
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
verticalArrangement = Arrangement.Center,
|
||||
){
|
||||
Row (
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.padding(bottom = 15.dp)
|
||||
){
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.Login.route) },
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
.clip(CircleShape),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(
|
||||
text = "Login",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White)
|
||||
)
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.Registration.route) },
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
.clip(CircleShape),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(
|
||||
text = "Registration",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2,7 +2,6 @@ package com.example.myapplication
|
||||
|
||||
import android.os.Parcel
|
||||
import android.os.Parcelable
|
||||
import kotlin.collections.ArrayList
|
||||
|
||||
data class TestServiceItem(
|
||||
val image: Int,
|
||||
@ -43,17 +42,8 @@ data class TestServiceItem(
|
||||
|
||||
fun getServices(): List<TestServiceItem>{
|
||||
return listOf(
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats","Dogs", "Cats","Dogs", "Cats","Dogs", "Cats","Dogs", "Cats","Dogs", "Cats","Dogs", "Cats",), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
TestServiceItem(R.drawable.image_service, "Inoculation", arrayListOf("Dogs", "Cats"), 20.0),
|
||||
|
||||
)
|
||||
|
||||
|
||||
}
|
||||
163
app/src/main/java/com/example/myapplication/api/ServerService.kt
Normal file
163
app/src/main/java/com/example/myapplication/api/ServerService.kt
Normal file
@ -0,0 +1,163 @@
|
||||
package com.example.myapplication.api
|
||||
|
||||
import com.example.myapplication.api.model.BasketServiceRemote
|
||||
import com.example.myapplication.api.model.OrderRemote
|
||||
import com.example.myapplication.api.model.OrderServiceRemote
|
||||
import com.example.myapplication.api.model.ServiceRemote
|
||||
import com.example.myapplication.api.model.UserRemote
|
||||
import com.example.myapplication.api.model.UserRemoteSignIn
|
||||
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
|
||||
import kotlinx.serialization.json.Json
|
||||
import okhttp3.MediaType.Companion.toMediaType
|
||||
import okhttp3.OkHttpClient
|
||||
import retrofit2.Retrofit
|
||||
import retrofit2.http.Body
|
||||
import retrofit2.http.DELETE
|
||||
import retrofit2.http.GET
|
||||
import retrofit2.http.POST
|
||||
import retrofit2.http.PUT
|
||||
import retrofit2.http.Path
|
||||
import retrofit2.http.Query
|
||||
|
||||
interface ServerService {
|
||||
//SNEAKER
|
||||
@GET("service/get/{id}")
|
||||
suspend fun getService(
|
||||
@Path("id") id: Int,
|
||||
): ServiceRemote
|
||||
|
||||
@GET("service/getAll")
|
||||
suspend fun getServices(
|
||||
@Query("page") page: Int,
|
||||
@Query("size") size: Int,
|
||||
): List<ServiceRemote>
|
||||
|
||||
@POST("service/create")
|
||||
suspend fun createService(
|
||||
@Body service: ServiceRemote,
|
||||
): ServiceRemote
|
||||
|
||||
@PUT("service/update/{id}")
|
||||
suspend fun updateService(
|
||||
@Path("id") id: Int,
|
||||
@Body service: ServiceRemote
|
||||
): ServiceRemote
|
||||
|
||||
@DELETE("service/delete/{id}")
|
||||
suspend fun deleteService(
|
||||
@Path("id") id: Int
|
||||
)
|
||||
|
||||
//USER
|
||||
@POST("user/signup")
|
||||
suspend fun SignUp(
|
||||
@Body user: UserRemote,
|
||||
): UserRemote
|
||||
|
||||
@POST("user/signin")
|
||||
suspend fun SignIn(
|
||||
@Body user: UserRemoteSignIn
|
||||
): UserRemote
|
||||
|
||||
//BASKET
|
||||
@POST("basket/addServiceToBasket")
|
||||
suspend fun addServiceToBasket(
|
||||
@Body basketService: BasketServiceRemote
|
||||
)
|
||||
|
||||
@GET("basket/getUserBasketServices/{id}")
|
||||
suspend fun getUserBasketServices(
|
||||
@Path("id") id: Int
|
||||
): List<ServiceRemote>
|
||||
|
||||
@GET("basket/getUserBasket/{id}")
|
||||
suspend fun getUserBasket(
|
||||
@Path("id") id: Int
|
||||
): Int
|
||||
|
||||
@GET("basket/getQuantity/{basketId}/{serviceId}")
|
||||
suspend fun getQuantity(
|
||||
@Path("basketId") basketId: Int,
|
||||
@Path("serviceId") serviceId: Int,
|
||||
): Int
|
||||
|
||||
@PUT("basket/incrementQuantity/{basketId}/{serviceId}")
|
||||
suspend fun increment(
|
||||
@Path("basketId") basketId: Int,
|
||||
@Path("serviceId") serviceId: Int,
|
||||
)
|
||||
|
||||
@PUT("basket/decrementQuantity/{basketId}/{serviceId}")
|
||||
suspend fun decrement(
|
||||
@Path("basketId") basketId: Int,
|
||||
@Path("serviceId") serviceId: Int,
|
||||
)
|
||||
|
||||
@GET("basket/getService/{basketId}/{serviceId}")
|
||||
suspend fun getService(
|
||||
@Path("basketId") basketId: Int,
|
||||
@Path("serviceId") serviceId: Int,
|
||||
): Boolean
|
||||
|
||||
@GET("basket/removeService/{basketId}/{serviceId}")
|
||||
suspend fun deleteServiceFromBasket(
|
||||
@Path("basketId") basketId: Int,
|
||||
@Path("serviceId") serviceId: Int,
|
||||
)
|
||||
|
||||
@GET("basket/getUserPrice/{userId}")
|
||||
suspend fun getTotalPriceForUserBasket(
|
||||
@Path("userId") userId: Int
|
||||
): Double
|
||||
|
||||
@GET("basket/deleteAllServiceFromBasket/{basketId}")
|
||||
suspend fun deleteAllServiceFromBasket(
|
||||
@Path("basketId") basketId: Int
|
||||
)
|
||||
|
||||
//ORDER
|
||||
@POST("order/addServiceToOrder")
|
||||
suspend fun addServiceToOrder(
|
||||
@Body orderService: OrderServiceRemote
|
||||
)
|
||||
|
||||
@POST("order/create")
|
||||
suspend fun createOrder(
|
||||
@Body order: OrderRemote
|
||||
)
|
||||
|
||||
@GET("order/getUserOrders/{userId}")
|
||||
suspend fun getUserOrders(
|
||||
@Path("userId") userId: Int
|
||||
) : List<OrderRemote>
|
||||
|
||||
@GET("order/getServiceFromOrder/{orderId}")
|
||||
suspend fun getServiceFromOrder(
|
||||
@Path("orderId") orderId: Int
|
||||
) : List<ServiceRemote>
|
||||
|
||||
@GET("order/deleteOrder/{orderId}")
|
||||
suspend fun deleteOrder(
|
||||
@Path("orderId") orderId: Int
|
||||
)
|
||||
companion object {
|
||||
private const val BASE_URL = "https://ftkfjb1l-8080.euw.devtunnels.ms/api/"
|
||||
|
||||
@Volatile
|
||||
private var INSTANCE: ServerService? = null
|
||||
|
||||
fun getInstance(): ServerService {
|
||||
return INSTANCE ?: synchronized(this) {
|
||||
val client = OkHttpClient.Builder()
|
||||
.build()
|
||||
return Retrofit.Builder()
|
||||
.baseUrl(BASE_URL)
|
||||
.client(client)
|
||||
.addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
|
||||
.build()
|
||||
.create(ServerService::class.java)
|
||||
.also { INSTANCE = it }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,106 @@
|
||||
package com.example.myapplication.api
|
||||
|
||||
import android.net.http.HttpException
|
||||
import android.os.Build
|
||||
import androidx.annotation.RequiresExtension
|
||||
import androidx.paging.ExperimentalPagingApi
|
||||
import androidx.paging.LoadType
|
||||
import androidx.paging.PagingState
|
||||
import androidx.paging.RemoteMediator
|
||||
import androidx.room.withTransaction
|
||||
import com.example.myapplication.api.model.toService
|
||||
import com.example.myapplication.database.AppDatabase
|
||||
import com.example.myapplication.database.repository.RemoteKeysRepositoryImpl
|
||||
import com.example.myapplication.database.repository.ServiceRepositoryImpl
|
||||
import com.example.myapplication.model.RemoteKeyType
|
||||
import com.example.myapplication.model.RemoteKeys
|
||||
import com.example.myapplication.model.Service
|
||||
import java.io.IOException
|
||||
|
||||
@OptIn(ExperimentalPagingApi::class)
|
||||
class ServiceRemoteMediator(
|
||||
private val service: ServerService,
|
||||
private val serviceRepository: ServiceRepositoryImpl,
|
||||
private val database: AppDatabase,
|
||||
private val dbRemoteKeyRepository: RemoteKeysRepositoryImpl
|
||||
) : RemoteMediator<Int, Service>() {
|
||||
override suspend fun initialize(): InitializeAction {
|
||||
return InitializeAction.LAUNCH_INITIAL_REFRESH
|
||||
}
|
||||
@RequiresExtension(extension = Build.VERSION_CODES.S, version = 7)
|
||||
override suspend fun load(
|
||||
loadType: LoadType,
|
||||
state: PagingState<Int, Service>
|
||||
): MediatorResult {
|
||||
val page = when (loadType) {
|
||||
LoadType.REFRESH -> {
|
||||
val remoteKeys = getRemoteKeyClosestToCurrentPosition(state)
|
||||
remoteKeys?.nextKey?.minus(1) ?: 1
|
||||
}
|
||||
|
||||
LoadType.PREPEND -> {
|
||||
val remoteKeys = getRemoteKeyForFirstItem(state)
|
||||
remoteKeys?.prevKey
|
||||
?: return MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
|
||||
}
|
||||
|
||||
LoadType.APPEND -> {
|
||||
val remoteKeys = getRemoteKeyForLastItem(state)
|
||||
remoteKeys?.nextKey
|
||||
?: return MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
val services = service.getServices(page, state.config.pageSize).map { it.toService() }
|
||||
val endOfPaginationReached = services.isEmpty()
|
||||
database.withTransaction {
|
||||
if (loadType == LoadType.REFRESH) {
|
||||
dbRemoteKeyRepository.deleteRemoteKey(RemoteKeyType.SERVICE)
|
||||
serviceRepository.clearServices()
|
||||
}
|
||||
val prevKey = if (page == 1) null else page - 1
|
||||
val nextKey = if (endOfPaginationReached) null else page + 1
|
||||
val keys = services.map {
|
||||
RemoteKeys(
|
||||
entityId = it.serviceId!!,
|
||||
type = RemoteKeyType.SERVICE,
|
||||
prevKey = prevKey,
|
||||
nextKey = nextKey
|
||||
)
|
||||
}
|
||||
dbRemoteKeyRepository.createRemoteKeys(keys)
|
||||
serviceRepository.insertServices(services)
|
||||
}
|
||||
return MediatorResult.Success(endOfPaginationReached = endOfPaginationReached)
|
||||
} catch (exception: IOException) {
|
||||
return MediatorResult.Error(exception)
|
||||
} catch (exception: HttpException) {
|
||||
return MediatorResult.Error(exception)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyForLastItem(state: PagingState<Int, Service>): RemoteKeys? {
|
||||
return state.pages.lastOrNull { it.data.isNotEmpty() }?.data?.lastOrNull()
|
||||
?.let { service ->
|
||||
service.serviceId?.let { dbRemoteKeyRepository.getAllRemoteKeys(it, RemoteKeyType.SERVICE) }
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyForFirstItem(state: PagingState<Int, Service>): RemoteKeys? {
|
||||
return state.pages.firstOrNull { it.data.isNotEmpty() }?.data?.firstOrNull()
|
||||
?.let { service ->
|
||||
service.serviceId?.let { dbRemoteKeyRepository.getAllRemoteKeys(it, RemoteKeyType.SERVICE) }
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyClosestToCurrentPosition(
|
||||
state: PagingState<Int, Service>
|
||||
): RemoteKeys? {
|
||||
return state.anchorPosition?.let { position ->
|
||||
state.closestItemToPosition(position)?.serviceId?.let { serviceUid ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(serviceUid, RemoteKeyType.SERVICE)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class BasketRemote (
|
||||
val id: Int? = 0,
|
||||
val userId: Int = 0,
|
||||
)
|
||||
@ -0,0 +1,23 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.model.BasketService
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class BasketServiceRemote (
|
||||
val basketId: Int = 0,
|
||||
val serviceId: Int = 0,
|
||||
val quantity: Int = 0
|
||||
)
|
||||
|
||||
fun BasketServiceRemote.toBasketService(): BasketService = BasketService(
|
||||
basketId,
|
||||
serviceId,
|
||||
quantity
|
||||
)
|
||||
|
||||
fun BasketService.toBasketServiceRemote():BasketServiceRemote = BasketServiceRemote(
|
||||
basketId,
|
||||
serviceId,
|
||||
quantity
|
||||
)
|
||||
@ -0,0 +1,26 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.model.Order
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class OrderRemote(
|
||||
val id: Int? = 0,
|
||||
val date: Long = 0L,
|
||||
val total: Double = 0.0,
|
||||
val creatorUserId: Int = 0
|
||||
)
|
||||
|
||||
fun OrderRemote.toOrder(): Order = Order(
|
||||
id,
|
||||
date,
|
||||
total,
|
||||
creatorUserId
|
||||
)
|
||||
|
||||
fun Order.toOrderRemote():OrderRemote = OrderRemote(
|
||||
orderId,
|
||||
date,
|
||||
total,
|
||||
creatorUserId
|
||||
)
|
||||
@ -0,0 +1,23 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.model.OrderService
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class OrderServiceRemote (
|
||||
val orderId: Int = 0,
|
||||
val serviceId: Int = 0,
|
||||
val quantity: Int = 0
|
||||
)
|
||||
|
||||
fun OrderServiceRemote.toOrderService(): OrderService = OrderService(
|
||||
orderId,
|
||||
serviceId,
|
||||
quantity
|
||||
)
|
||||
|
||||
fun OrderService.toOrderServiceRemote():OrderServiceRemote = OrderServiceRemote(
|
||||
orderId,
|
||||
serviceId,
|
||||
quantity
|
||||
)
|
||||
@ -0,0 +1,26 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class ServiceRemote (
|
||||
val id: Int? = 0,
|
||||
val name: String = "",
|
||||
val price: Double = 0.0,
|
||||
val photo: Int? = 0
|
||||
)
|
||||
|
||||
fun ServiceRemote.toService(): Service = Service(
|
||||
id,
|
||||
name,
|
||||
price,
|
||||
photo
|
||||
)
|
||||
|
||||
fun Service.toServiceRemote():ServiceRemote = ServiceRemote(
|
||||
serviceId,
|
||||
name,
|
||||
price,
|
||||
photo
|
||||
)
|
||||
@ -0,0 +1,40 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.model.RoleEnum
|
||||
import com.example.myapplication.model.User
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class UserRemote (
|
||||
val id: Int? = 0,
|
||||
val name: String = "",
|
||||
val surname: String = "",
|
||||
val email: String = "",
|
||||
val password: String = "",
|
||||
val role: RoleEnum = RoleEnum.User,
|
||||
val photo: Int? = 0,
|
||||
val basketId: Int? = 0
|
||||
)
|
||||
|
||||
|
||||
fun UserRemote.toUser(): User = User(
|
||||
id,
|
||||
name,
|
||||
surname,
|
||||
email,
|
||||
password,
|
||||
role,
|
||||
photo,
|
||||
basketId
|
||||
)
|
||||
|
||||
fun User.toUserRemote():UserRemote = UserRemote(
|
||||
userId,
|
||||
name,
|
||||
surname,
|
||||
email,
|
||||
password,
|
||||
role,
|
||||
photo,
|
||||
basketId
|
||||
)
|
||||
@ -0,0 +1,9 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class UserRemoteSignIn(
|
||||
val email: String = "",
|
||||
val password: String = "",
|
||||
)
|
||||
@ -0,0 +1,76 @@
|
||||
package com.example.myapplication.api.repository
|
||||
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.model.toBasketServiceRemote
|
||||
import com.example.myapplication.api.model.toService
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.model.BasketService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.flowOf
|
||||
|
||||
class RestBasketRepository(
|
||||
private var service: ServerService
|
||||
): BasketRepository {
|
||||
override suspend fun insertBasketService(basketService: BasketService) {
|
||||
service.addServiceToBasket(basketService.toBasketServiceRemote())
|
||||
}
|
||||
|
||||
override suspend fun getBasketWithServices(id: Int): Flow<List<Service>> {
|
||||
val servicesRemoteList = service.getUserBasketServices(id)
|
||||
val servicesList = servicesRemoteList.map { it.toService() }
|
||||
return flowOf(servicesList.toList())
|
||||
}
|
||||
|
||||
override suspend fun getUserBasketId(id: Int): Flow<Int> {
|
||||
return flowOf(service.getUserBasket(id))
|
||||
}
|
||||
|
||||
override suspend fun getQuantity(basketId: Int, serviceId: Int): Int? {
|
||||
return service.getQuantity(basketId, serviceId)
|
||||
}
|
||||
//
|
||||
// override fun getAllBasket(): Flow<List<Basket>> {
|
||||
// TODO("Not yet implemented")
|
||||
// }
|
||||
//
|
||||
// override suspend fun delete(basket: Basket) {
|
||||
// TODO("Not yet implemented")
|
||||
// }
|
||||
//
|
||||
// override suspend fun createBasket(basket: Basket): Long {
|
||||
// TODO("Not yet implemented")
|
||||
// }
|
||||
//
|
||||
override suspend fun removeServiceFromBasket(basketId: Int, serviceId: Int) {
|
||||
service.deleteServiceFromBasket(basketId, serviceId)
|
||||
}
|
||||
//
|
||||
// override suspend fun updateServiceQuantity(basketId: Int, serviceId: Int, quantity: Int) {
|
||||
// TODO("Not yet implemented")
|
||||
// }
|
||||
//
|
||||
override suspend fun incrementServiceQuantity(basketId: Int, serviceId: Int) {
|
||||
service.increment(basketId, serviceId)
|
||||
}
|
||||
|
||||
override suspend fun decrementServiceQuantity(basketId: Int, serviceId: Int) {
|
||||
service.decrement(basketId, serviceId)
|
||||
}
|
||||
//
|
||||
// override suspend fun getQuantity(basketId: Int, serviceId: Int): Int? {
|
||||
// TODO("Not yet implemented")
|
||||
// }
|
||||
//
|
||||
override suspend fun existService(basketId: Int, serviceId: Int): Boolean {
|
||||
return service.getService(basketId, serviceId)
|
||||
}
|
||||
|
||||
override suspend fun getTotalPriceForUser(userId: Int): Double? {
|
||||
return service.getTotalPriceForUserBasket(userId)
|
||||
}
|
||||
|
||||
override suspend fun deleteAllServiceFromBasket(basketId: Int) {
|
||||
service.deleteAllServiceFromBasket(basketId)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.example.myapplication.api.repository
|
||||
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.model.toOrder
|
||||
import com.example.myapplication.api.model.toOrderRemote
|
||||
import com.example.myapplication.api.model.toOrderServiceRemote
|
||||
import com.example.myapplication.api.model.toService
|
||||
import com.example.myapplication.businessLogic.repository.OrderRepository
|
||||
import com.example.myapplication.model.Order
|
||||
import com.example.myapplication.model.OrderService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.flowOf
|
||||
|
||||
class RestOrderRepository(private val server: ServerService): OrderRepository {
|
||||
override suspend fun insert(order: Order) {
|
||||
server.createOrder(order.toOrderRemote())
|
||||
}
|
||||
|
||||
override suspend fun addServiceToOrder(orderService: OrderService) {
|
||||
server.addServiceToOrder(orderService.toOrderServiceRemote())
|
||||
}
|
||||
|
||||
override suspend fun delete(order: Order) {
|
||||
order.orderId?.let { this.server.deleteOrder(it) }
|
||||
}
|
||||
|
||||
override suspend fun getServiceFromOrder(id: Int): Flow<List<Service>> {
|
||||
val servicesRemoteList = server.getServiceFromOrder(id)
|
||||
val servicesList = servicesRemoteList.map { it.toService() }
|
||||
return flowOf(servicesList.toList())
|
||||
}
|
||||
|
||||
override suspend fun getUserOrders(id: Int): Flow<List<Order>> {
|
||||
val ordersRemoteList = server.getUserOrders(id)
|
||||
val ordersList = ordersRemoteList.map { it.toOrder() }
|
||||
return flowOf(ordersList.toList())
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
package com.example.myapplication.api.repository
|
||||
|
||||
import androidx.paging.ExperimentalPagingApi
|
||||
import androidx.paging.Pager
|
||||
import androidx.paging.PagingConfig
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.ServiceRemoteMediator
|
||||
import com.example.myapplication.api.model.toService
|
||||
import com.example.myapplication.api.model.toServiceRemote
|
||||
import com.example.myapplication.businessLogic.repository.ServiceRepository
|
||||
import com.example.myapplication.database.AppDatabase
|
||||
import com.example.myapplication.database.repository.RemoteKeysRepositoryImpl
|
||||
import com.example.myapplication.database.repository.ServiceRepositoryImpl
|
||||
import com.example.myapplication.di.AppContainer
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class RestServiceRepository(
|
||||
private val service: ServerService,
|
||||
private val dbServiceRepository: ServiceRepositoryImpl,
|
||||
private val database: AppDatabase,
|
||||
private val dbRemoteKeyRepository: RemoteKeysRepositoryImpl
|
||||
|
||||
) : ServiceRepository {
|
||||
|
||||
override suspend fun getAllServices(): Flow<PagingData<Service>> {
|
||||
val pagingSourceFactory = {
|
||||
dbServiceRepository.getAllServicesPagingSource()
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalPagingApi::class)
|
||||
return Pager(
|
||||
config = PagingConfig(
|
||||
pageSize = AppContainer.LIMIT,
|
||||
enablePlaceholders = false
|
||||
),
|
||||
remoteMediator = ServiceRemoteMediator(
|
||||
service,
|
||||
dbServiceRepository,
|
||||
database,
|
||||
dbRemoteKeyRepository,
|
||||
),
|
||||
pagingSourceFactory = pagingSourceFactory
|
||||
).flow
|
||||
}
|
||||
|
||||
override suspend fun getServiceById(id: Int): Service = service.getService(id).toService()
|
||||
override suspend fun insert(service: Service) {
|
||||
this.service.createService(service.toServiceRemote())
|
||||
}
|
||||
|
||||
override suspend fun update(service: Service) {
|
||||
service.serviceId?.let { this.service.updateService(it, service.toServiceRemote()) }
|
||||
}
|
||||
|
||||
override suspend fun delete(service: Service) {
|
||||
try {
|
||||
service.serviceId?.let { this.service.deleteService(it) }
|
||||
dbServiceRepository.invalidateService(service.serviceId!!)
|
||||
}catch (ex: Exception){}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.example.myapplication.api.repository
|
||||
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.model.UserRemoteSignIn
|
||||
import com.example.myapplication.api.model.toUser
|
||||
import com.example.myapplication.api.model.toUserRemote
|
||||
import com.example.myapplication.businessLogic.repository.UserRepository
|
||||
import com.example.myapplication.model.User
|
||||
|
||||
class RestUserRepository(
|
||||
private var service: ServerService
|
||||
): UserRepository {
|
||||
override suspend fun insert(user: User) {
|
||||
service.SignUp(user.toUserRemote())
|
||||
}
|
||||
|
||||
override suspend fun update(user: User) {
|
||||
println()
|
||||
}
|
||||
|
||||
override suspend fun delete(user: User) {
|
||||
println()
|
||||
}
|
||||
override suspend fun authUser(user: UserRemoteSignIn): User {
|
||||
return service.SignIn(user).toUser()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.example.myapplication.businessLogic.repository
|
||||
|
||||
import com.example.myapplication.model.BasketService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
interface BasketRepository {
|
||||
suspend fun insertBasketService(basketService: BasketService)
|
||||
suspend fun getBasketWithServices(id: Int): Flow<List<Service>>
|
||||
suspend fun getUserBasketId(id: Int): Flow<Int>
|
||||
suspend fun removeServiceFromBasket(basketId: Int, serviceId: Int)
|
||||
suspend fun incrementServiceQuantity(basketId: Int, serviceId: Int)
|
||||
suspend fun decrementServiceQuantity(basketId: Int, serviceId: Int)
|
||||
suspend fun getQuantity(basketId: Int, serviceId: Int): Int?
|
||||
suspend fun existService(basketId: Int, serviceId: Int): Boolean
|
||||
suspend fun getTotalPriceForUser(userId: Int): Double?
|
||||
suspend fun deleteAllServiceFromBasket(basketId: Int)
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package com.example.myapplication.businessLogic.repository
|
||||
|
||||
import com.example.myapplication.model.Order
|
||||
import com.example.myapplication.model.OrderService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
interface OrderRepository {
|
||||
suspend fun insert(order: Order)
|
||||
suspend fun addServiceToOrder(orderService: OrderService)
|
||||
suspend fun delete(order: Order)
|
||||
suspend fun getServiceFromOrder(id: Int): Flow<List<Service>>
|
||||
suspend fun getUserOrders(id: Int) : Flow<List<Order>>
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package com.example.myapplication.businessLogic.repository
|
||||
|
||||
import com.example.myapplication.model.RemoteKeyType
|
||||
import com.example.myapplication.model.RemoteKeys
|
||||
|
||||
interface RemoteKeyRepository {
|
||||
suspend fun getAllRemoteKeys(id: Int, type: RemoteKeyType): RemoteKeys?
|
||||
suspend fun createRemoteKeys(remoteKeys: List<RemoteKeys>)
|
||||
suspend fun deleteRemoteKey(type: RemoteKeyType)
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.example.myapplication.businessLogic.repository
|
||||
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
interface ServiceRepository {
|
||||
suspend fun insert(service: Service)
|
||||
suspend fun update(service: Service)
|
||||
suspend fun delete(service: Service)
|
||||
suspend fun getServiceById(id: Int): Service
|
||||
suspend fun getAllServices(): Flow<PagingData<Service>>
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package com.example.myapplication.businessLogic.repository
|
||||
|
||||
import com.example.myapplication.api.model.UserRemoteSignIn
|
||||
import com.example.myapplication.model.User
|
||||
|
||||
interface UserRepository {
|
||||
suspend fun insert(user: User)
|
||||
suspend fun update(user: User)
|
||||
suspend fun delete(user: User)
|
||||
suspend fun authUser(user: UserRemoteSignIn): User
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.example.myapplication.businessLogic.viewmodel
|
||||
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.viewmodel.CreationExtras
|
||||
import androidx.lifecycle.viewmodel.initializer
|
||||
import androidx.lifecycle.viewmodel.viewModelFactory
|
||||
import com.example.myapplication.App
|
||||
|
||||
object AppViewModelProvider {
|
||||
val Factory = viewModelFactory {
|
||||
initializer {
|
||||
ServiceViewModel(app().container.serviceRepo)
|
||||
}
|
||||
initializer {
|
||||
UserViewModel(app().container.userRepo, app().container.basketRepo)
|
||||
}
|
||||
initializer {
|
||||
OrderViewModel(app().container.orderRepo, app().container.basketRepo)
|
||||
}
|
||||
initializer {
|
||||
BasketViewModel(app().container.basketRepo, app().container.orderRepo,)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun CreationExtras.app(): App =
|
||||
(this[ViewModelProvider.AndroidViewModelFactory.APPLICATION_KEY] as App)
|
||||
@ -0,0 +1,134 @@
|
||||
package com.example.myapplication.businessLogic.viewmodel
|
||||
|
||||
import androidx.compose.runtime.State
|
||||
import androidx.compose.runtime.mutableDoubleStateOf
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.businessLogic.repository.OrderRepository
|
||||
import com.example.myapplication.model.BasketService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
data class ServiceWithQuantity(val service: Service, val quantityStateFlow: MutableStateFlow<Int>)
|
||||
|
||||
class BasketViewModel(private val basketRepository: BasketRepository, private val orderRepository: OrderRepository) : ViewModel() {
|
||||
private val _quantityMap = MutableStateFlow<Map<Int, MutableStateFlow<Int>>>(emptyMap())
|
||||
val quantityMap: StateFlow<Map<Int, MutableStateFlow<Int>>> get() = _quantityMap
|
||||
private val _total = mutableDoubleStateOf(0.00)
|
||||
val total: State<Double> get() = _total
|
||||
private val _myList = MutableStateFlow<List<Service>>(emptyList())
|
||||
val myList: StateFlow<List<Service>> get() = _myList
|
||||
private var _basketId = MutableStateFlow(0)
|
||||
val basketId: StateFlow<Int> get() = _basketId
|
||||
fun getQuantityState(basketId: Int, serviceId: Int): Flow<Int> {
|
||||
val quantityMap = _quantityMap.value.toMutableMap()
|
||||
val quantityStateFlow = quantityMap.getOrPut(serviceId) {
|
||||
MutableStateFlow(0)
|
||||
}
|
||||
|
||||
viewModelScope.launch {
|
||||
val quantityFromDb = basketRepository.getQuantity(basketId, serviceId)
|
||||
quantityFromDb?.let { quantityStateFlow.value = it }
|
||||
}
|
||||
|
||||
_quantityMap.value = quantityMap.toMap()
|
||||
|
||||
return quantityStateFlow
|
||||
}
|
||||
|
||||
suspend fun isServiceInBasket(basketId: Int, serviceId: Int): Boolean {
|
||||
return basketRepository.existService(basketId, serviceId)
|
||||
}
|
||||
|
||||
suspend fun addToBasket(serviceId: Int, quantity: Int) = viewModelScope.launch {
|
||||
val basketId = GlobalUser.getInstance().getUser()?.basketId
|
||||
val isServiceInBasket = isServiceInBasket(basketId!!, serviceId)
|
||||
|
||||
if (isServiceInBasket) {
|
||||
incrementServiceQuantity(basketId, serviceId)
|
||||
} else {
|
||||
basketRepository.insertBasketService(BasketService(basketId, serviceId, quantity))
|
||||
}
|
||||
}
|
||||
|
||||
fun getBasketServices() {
|
||||
viewModelScope.launch {
|
||||
val basketId = GlobalUser.getInstance().getUser()?.basketId!!
|
||||
basketRepository.getBasketWithServices(basketId)
|
||||
.collect{services ->
|
||||
_myList.value = services
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun getUsersBasket(id: Int) {
|
||||
viewModelScope.launch{
|
||||
val userBasketId = basketRepository.getUserBasketId(id).first()
|
||||
withContext(Dispatchers.Main) {
|
||||
_basketId.value = userBasketId
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun deleteServiceFromBasket(basketId: Int, serviceId: Int) {
|
||||
viewModelScope.launch {
|
||||
basketRepository.removeServiceFromBasket(basketId, serviceId)
|
||||
_quantityMap.value.toMutableMap().apply {
|
||||
remove(serviceId)
|
||||
}
|
||||
withContext(Dispatchers.Main){
|
||||
updateSubTotal(GlobalUser.getInstance().getUser()?.userId!!)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun incrementServiceQuantity(basketId: Int, serviceId: Int) {
|
||||
viewModelScope.launch {
|
||||
basketRepository.incrementServiceQuantity(basketId, serviceId)
|
||||
val currentQuantity = getQuantityState(basketId, serviceId).first()
|
||||
_quantityMap.value.toMutableMap().apply {
|
||||
put(serviceId, MutableStateFlow(currentQuantity + 1))
|
||||
}
|
||||
updateSubTotal(GlobalUser.getInstance().getUser()?.userId!!)
|
||||
}
|
||||
}
|
||||
|
||||
fun decrementOrRemoveServiceQuantity(basketId: Int, serviceId: Int) {
|
||||
viewModelScope.launch {
|
||||
val currentQuantity = getQuantityState(basketId, serviceId).first()
|
||||
if (currentQuantity > 1) {
|
||||
basketRepository.decrementServiceQuantity(basketId, serviceId)
|
||||
_quantityMap.value.toMutableMap().apply {
|
||||
put(serviceId, MutableStateFlow(currentQuantity - 1))
|
||||
}
|
||||
}
|
||||
else{
|
||||
basketRepository.removeServiceFromBasket(basketId, serviceId)
|
||||
_quantityMap.value.toMutableMap().apply {
|
||||
remove(serviceId, MutableStateFlow(currentQuantity - 1))
|
||||
}
|
||||
getBasketServices()
|
||||
}
|
||||
updateSubTotal(GlobalUser.getInstance().getUser()?.userId!!)
|
||||
}
|
||||
}
|
||||
|
||||
fun updateSubTotal(userId: Int) {
|
||||
viewModelScope.launch {
|
||||
_total.doubleValue = getTotal(userId)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun getTotal(userId: Int): Double {
|
||||
val price = basketRepository.getTotalPriceForUser(userId) ?: 0.00
|
||||
return price
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package com.example.myapplication.businessLogic.viewmodel
|
||||
|
||||
import androidx.compose.runtime.State
|
||||
import androidx.compose.runtime.mutableDoubleStateOf
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.businessLogic.repository.OrderRepository
|
||||
import com.example.myapplication.model.Order
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.launch
|
||||
import java.util.Date
|
||||
|
||||
class OrderViewModel(private val orderRepository: OrderRepository, private val basketRepository: BasketRepository) : ViewModel() {
|
||||
private var _selectedItems = MutableLiveData<List<Service>>()
|
||||
val selectedItems get() = _selectedItems
|
||||
private val _total = mutableDoubleStateOf(0.00)
|
||||
val total: State<Double> get() = _total
|
||||
private var _orders = MutableStateFlow<List<Order>>(emptyList())
|
||||
val orders: StateFlow<List<Order>> get() = _orders
|
||||
fun createOrder(): Boolean {
|
||||
viewModelScope.launch {
|
||||
val userId = GlobalUser.getInstance().getUser()?.userId!!
|
||||
val order = Order(
|
||||
date = Date().time,
|
||||
total = getTotal(userId),
|
||||
creatorUserId = userId
|
||||
)
|
||||
orderRepository.insert(order)
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
suspend fun getOrderWithServices(id: Int) : Flow<List<Service>> {
|
||||
return orderRepository.getServiceFromOrder(id)
|
||||
}
|
||||
|
||||
suspend fun getUserOrders(id: Int) {
|
||||
viewModelScope.launch {
|
||||
orderRepository.getUserOrders(id)
|
||||
.collect{items ->
|
||||
_orders.value = items
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun updateSelectedItems(items: List<Service>) {
|
||||
_selectedItems.value = items
|
||||
val userId = GlobalUser.getInstance().getUser()?.userId!!
|
||||
updateSubTotal(userId)
|
||||
}
|
||||
|
||||
fun updateSubTotal(userId: Int) {
|
||||
viewModelScope.launch {
|
||||
_total.value = getTotal(userId)
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun getTotal(basketId: Int): Double {
|
||||
return basketRepository.getTotalPriceForUser(basketId) ?: 0.00
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package com.example.myapplication.businessLogic.viewmodel
|
||||
|
||||
import androidx.compose.runtime.mutableDoubleStateOf
|
||||
import androidx.compose.runtime.mutableIntStateOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.businessLogic.repository.ServiceRepository
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class ServiceViewModel(private val serviceRepository: ServiceRepository): ViewModel() {
|
||||
var name = mutableStateOf("")
|
||||
var price = mutableDoubleStateOf(0.00)
|
||||
var photo = mutableIntStateOf(R.drawable.image_service)
|
||||
var service = mutableStateOf<Service>(Service(null,"", 0.0, null))
|
||||
private val _serviceList = MutableStateFlow<PagingData<Service>>(PagingData.empty())
|
||||
val serviceList: StateFlow<PagingData<Service>> get() = _serviceList
|
||||
fun insertService() = viewModelScope.launch {
|
||||
val service = Service(
|
||||
name = name.value,
|
||||
price = price.doubleValue,
|
||||
photo = photo.intValue
|
||||
)
|
||||
serviceRepository.insert(service)
|
||||
}
|
||||
|
||||
fun deleteService(service : Service) = viewModelScope.launch {
|
||||
serviceRepository.delete(service)
|
||||
}
|
||||
|
||||
fun updateService() = viewModelScope.launch {
|
||||
serviceRepository.update(service.value)
|
||||
}
|
||||
|
||||
fun getServiceList(){
|
||||
viewModelScope.launch {
|
||||
serviceRepository.getAllServices()
|
||||
.collect{services ->
|
||||
_serviceList.value = services
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
package com.example.myapplication.businessLogic.viewmodel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableIntStateOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.api.model.UserRemoteSignIn
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.businessLogic.repository.UserRepository
|
||||
import com.example.myapplication.model.RoleEnum
|
||||
import com.example.myapplication.model.User
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class UserViewModel(private val userRepository: UserRepository, private val basketRepository: BasketRepository): ViewModel() {
|
||||
var name = mutableStateOf("")
|
||||
var surname = mutableStateOf("")
|
||||
var email = mutableStateOf("")
|
||||
var password = mutableStateOf("")
|
||||
var photo = mutableIntStateOf(R.drawable.icon_profile)
|
||||
var isLoggedIn by mutableStateOf(false)
|
||||
var isBusy by mutableStateOf(false)
|
||||
// private val _loggedUser = MutableStateFlow(User(null,"null","null","null","null",RoleEnum.User))
|
||||
// val loggedUser: StateFlow<User> = _loggedUser.asStateFlow()
|
||||
|
||||
fun createUser() = viewModelScope.launch {
|
||||
val user = User(
|
||||
name = name.value,
|
||||
surname = surname.value,
|
||||
email = email.value,
|
||||
password = password.value,
|
||||
role = RoleEnum.User,
|
||||
photo = R.drawable.icon_profile
|
||||
)
|
||||
// isBusy = true
|
||||
userRepository.insert(user)
|
||||
// isBusy = false
|
||||
}
|
||||
|
||||
fun authUser() = viewModelScope.launch {
|
||||
// isBusy = true
|
||||
val user = userRepository.authUser(UserRemoteSignIn(email.value, password.value))
|
||||
// isLoggedIn = true
|
||||
// isBusy = false
|
||||
GlobalUser.getInstance().setUser(user)
|
||||
}
|
||||
|
||||
fun updateUser() = viewModelScope.launch {
|
||||
val updateUser = GlobalUser.getInstance().getUser()
|
||||
if(email.value != "")
|
||||
updateUser?.email = email.value
|
||||
else
|
||||
updateUser?.email = updateUser?.email.toString()
|
||||
if(name.value != "")
|
||||
updateUser?.name = name.value
|
||||
else
|
||||
updateUser?.name = updateUser?.name.toString()
|
||||
if(surname.value != "")
|
||||
updateUser?.surname = surname.value
|
||||
else
|
||||
updateUser?.surname = updateUser?.surname.toString()
|
||||
if(password.value != "")
|
||||
updateUser?.password = password.value
|
||||
else
|
||||
updateUser?.password = updateUser?.password.toString()
|
||||
//updateUser?.photo =
|
||||
if (updateUser != null) {
|
||||
userRepository.update(updateUser)
|
||||
}
|
||||
}
|
||||
|
||||
fun isValidEmail(): Boolean {
|
||||
return android.util.Patterns.EMAIL_ADDRESS.matcher(email.value).matches()
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
package com.example.myapplication.composeui.Basket
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.BasketViewModel
|
||||
import com.example.myapplication.businessLogic.viewmodel.OrderViewModel
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.composeui.Profile.Login
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
|
||||
@Composable
|
||||
fun Basket(navController : NavHostController,
|
||||
basketViewModel: BasketViewModel = viewModel(factory = AppViewModelProvider.Factory),
|
||||
orderViewModel: OrderViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val user = GlobalUser.getInstance().getUser()
|
||||
|
||||
if (user == null){
|
||||
Login(navController = navController)
|
||||
}else{
|
||||
basketViewModel.updateSubTotal(user.userId!!)
|
||||
val total = basketViewModel.total.value
|
||||
LaunchedEffect(basketViewModel){
|
||||
basketViewModel.getBasketServices()
|
||||
}
|
||||
val serviceList by basketViewModel.myList.collectAsState()
|
||||
orderViewModel.updateSelectedItems(serviceList)
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.Center
|
||||
){
|
||||
Text(
|
||||
text = "PetMed",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White, fontSize = TextUnit(8.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
for (item in serviceList){
|
||||
BasketItemUI(item = item)
|
||||
}
|
||||
Box(modifier = Modifier
|
||||
.padding(15.dp, 0.dp)
|
||||
.clip(RoundedCornerShape(15.dp, 15.dp, 0.dp, 0.dp))
|
||||
.background(Color.Transparent)
|
||||
.height(130.dp),
|
||||
){
|
||||
Column (modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(100.dp)
|
||||
.background(Color.White)
|
||||
.padding(PaddingValues(15.dp)),
|
||||
){
|
||||
Row (
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
Text(
|
||||
text = "Total: ",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
Text(
|
||||
text = "$$total",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = {
|
||||
orderViewModel.createOrder()
|
||||
navController.navigate(NavItem.ListOfServices.route)
|
||||
},
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
.clip(CircleShape)
|
||||
.align(Alignment.BottomCenter),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(text = "Confirm order", style = MaterialTheme.typography.bodyMedium.copy(Color.White))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.example.myapplication.Basket
|
||||
package com.example.myapplication.composeui.Basket
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
@ -13,21 +13,17 @@ import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableIntStateOf
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
@ -36,15 +32,24 @@ import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.myapplication.TestServiceItem
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.BasketViewModel
|
||||
import com.example.myapplication.businessLogic.viewmodel.OrderViewModel
|
||||
import com.example.myapplication.model.Service
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextPrimary
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun BasketItem(item: TestServiceItem){
|
||||
fun BasketItemUI(item: Service, basketViewModel: BasketViewModel = viewModel(factory = AppViewModelProvider.Factory), orderViewModel: OrderViewModel = viewModel(factory = AppViewModelProvider.Factory)) {
|
||||
val user = GlobalUser.getInstance().getUser()
|
||||
val basketId = user?.basketId!!
|
||||
val quantityState: Int by basketViewModel.getQuantityState(basketId, item.serviceId!!).collectAsState(0)
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(0.dp, 0.dp, 0.dp, 10.dp)
|
||||
@ -54,7 +59,7 @@ fun BasketItem(item: TestServiceItem){
|
||||
shape = RoundedCornerShape(15.dp),
|
||||
clip = false
|
||||
),
|
||||
){
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
@ -63,34 +68,28 @@ fun BasketItem(item: TestServiceItem){
|
||||
.padding(15.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
Image(
|
||||
painter = painterResource(id = item.image),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)
|
||||
) {
|
||||
item.photo?.let { painterResource(id = it) }?.let {
|
||||
Image(
|
||||
painter = it,
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
){
|
||||
var animalsString = ""
|
||||
item.name?.let {
|
||||
Text(
|
||||
text = it,
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
item.animals?.forEach { animal -> animalsString += "$animal, " }
|
||||
) {
|
||||
Text(
|
||||
text = animalsString,
|
||||
color = TextSecondary,
|
||||
text = item.name,
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
}
|
||||
@ -101,21 +100,24 @@ fun BasketItem(item: TestServiceItem){
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.SpaceBetween,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
) {
|
||||
Text(
|
||||
text = "$${item.price}",
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
Row(verticalAlignment = Alignment.CenterVertically){
|
||||
var num by remember { mutableIntStateOf(5) }
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(
|
||||
text = num.toString(),
|
||||
text = "$quantityState",
|
||||
color = TextPrimary
|
||||
)
|
||||
Column(verticalArrangement = Arrangement.SpaceAround){
|
||||
Column(verticalArrangement = Arrangement.SpaceAround) {
|
||||
Button(
|
||||
onClick = { num+=1 },
|
||||
onClick = {
|
||||
coroutineScope.launch {
|
||||
basketViewModel.incrementServiceQuantity(basketId, item.serviceId!!)
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.size(42.dp)
|
||||
.fillMaxWidth()
|
||||
@ -129,7 +131,11 @@ fun BasketItem(item: TestServiceItem){
|
||||
Text(text = "+")
|
||||
}
|
||||
Button(
|
||||
onClick = { num-=1 },
|
||||
onClick = {
|
||||
basketViewModel.viewModelScope.launch{
|
||||
basketViewModel.decrementOrRemoveServiceQuantity(basketId, item.serviceId!!)
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.size(42.dp)
|
||||
.fillMaxWidth()
|
||||
@ -1,12 +1,5 @@
|
||||
package com.example.myapplication.List_of_Services
|
||||
package com.example.myapplication.composeui.List_of_Services
|
||||
|
||||
import android.content.ContentResolver
|
||||
import android.content.Intent
|
||||
import android.graphics.BitmapFactory
|
||||
import android.provider.MediaStore
|
||||
import android.widget.Toast
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@ -20,63 +13,65 @@ import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.DropdownMenuItem
|
||||
import androidx.compose.material.ExperimentalMaterialApi
|
||||
import androidx.compose.material.ExposedDropdownMenuBox
|
||||
import androidx.compose.material.ExposedDropdownMenuDefaults
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.shadow
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.ImageBitmap
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.UIComponents.MyTextField
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.ServiceViewModel
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.composeui.UIComponents.MyTextField
|
||||
import com.example.myapplication.model.Service
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextPrimary
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@OptIn(ExperimentalMaterialApi::class, ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun AddService (navController: NavController){
|
||||
var serviceName = ""
|
||||
var price = ""
|
||||
var animals = ""
|
||||
val availableAnimals = listOf("Dogs", "Cats")
|
||||
var expanded by remember { mutableStateOf(false) }
|
||||
fun AddService (navController: NavController, service: Service, serviceViewModel: ServiceViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val create = service.serviceId == null
|
||||
LaunchedEffect(Dispatchers.Default){
|
||||
if(!create){
|
||||
serviceViewModel.service.value.serviceId = service.serviceId
|
||||
serviceViewModel.service.value.photo = service.photo
|
||||
}
|
||||
}
|
||||
Column (
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(15.dp)
|
||||
.padding(bottom = 60.dp),
|
||||
.padding(15.dp, 0.dp, 15.dp, 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.Center
|
||||
){
|
||||
Text(
|
||||
text = "PetMed",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White, fontSize = TextUnit(8.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(0.dp, 0.dp, 0.dp, 10.dp)
|
||||
@ -96,15 +91,29 @@ fun AddService (navController: NavController){
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
/* Image(
|
||||
bitmap = selectedImage!!,
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)*/
|
||||
if(create){
|
||||
Image(
|
||||
painter = painterResource(id = serviceViewModel.photo.intValue),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)
|
||||
}else{
|
||||
service.photo?.let { painterResource(id = it) }?.let {
|
||||
Image(
|
||||
painter = it,
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
@ -112,19 +121,17 @@ fun AddService (navController: NavController){
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
){
|
||||
var animalsString = ""
|
||||
serviceName?.let {
|
||||
if(create){
|
||||
Text(
|
||||
text = it,
|
||||
text = serviceViewModel.name.value,
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium)
|
||||
}else{
|
||||
Text(
|
||||
text = service.name,
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
animals?.forEach { animal -> animalsString += "$animal, " }
|
||||
Text(
|
||||
text = animalsString,
|
||||
color = TextSecondary,
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier
|
||||
@ -133,37 +140,42 @@ fun AddService (navController: NavController){
|
||||
verticalArrangement = Arrangement.SpaceBetween,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
Text(
|
||||
text = "${price}$",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
if(create){
|
||||
Text(
|
||||
text = serviceViewModel.price.doubleValue.toString(),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
}else{
|
||||
Text(
|
||||
text = service.price.toString(),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Column (
|
||||
){
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Service name"){
|
||||
newValue ->
|
||||
serviceName = newValue
|
||||
}
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
DropdownMenu(
|
||||
expanded = expanded,
|
||||
onDismissRequest = { expanded = false }
|
||||
) {
|
||||
availableAnimals.forEach {
|
||||
DropdownMenuItem(onClick = { animals += "$it, " }) {
|
||||
Text(it)
|
||||
}
|
||||
if(create){
|
||||
MyTextField(label = "Service name"){
|
||||
serviceViewModel.name.value = it
|
||||
}
|
||||
}else{
|
||||
MyTextField(label = service.name){
|
||||
serviceViewModel.service.value.name = it
|
||||
}
|
||||
}
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Price"){
|
||||
newValue ->
|
||||
price = newValue
|
||||
if(create){
|
||||
MyTextField(label = "Price"){
|
||||
serviceViewModel.price.doubleValue = it.toDouble()
|
||||
}
|
||||
}else{
|
||||
MyTextField(label = service.price.toString()){
|
||||
serviceViewModel.service.value.price = it.toDouble()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -187,7 +199,11 @@ fun AddService (navController: NavController){
|
||||
}
|
||||
Button(
|
||||
onClick = {
|
||||
|
||||
if (create)
|
||||
serviceViewModel.insertService()
|
||||
else
|
||||
serviceViewModel.service.let { serviceViewModel.updateService() }
|
||||
navController.navigate(NavItem.ListOfServices.route)
|
||||
},
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
@ -200,15 +216,11 @@ fun AddService (navController: NavController){
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(text = "Add service", style = MaterialTheme.typography.bodyMedium.copy(Color.White))
|
||||
if(create) {
|
||||
Text(text = "Add service", style = MaterialTheme.typography.bodyMedium.copy(Color.White))
|
||||
}else{
|
||||
Text(text = "Update service", style = MaterialTheme.typography.bodyMedium.copy(Color.White))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun loadSelectedImage(uri: android.net.Uri, contentResolver: ContentResolver): ImageBitmap {
|
||||
return withContext(Dispatchers.IO) {
|
||||
val inputStream = contentResolver.openInputStream(uri)
|
||||
val bitmap = BitmapFactory.decodeStream(inputStream)
|
||||
bitmap.asImageBitmap()
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,70 @@
|
||||
package com.example.myapplication.composeui.List_of_Services
|
||||
|
||||
import SearchBar
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.paging.compose.collectAsLazyPagingItems
|
||||
import androidx.paging.compose.itemKey
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.ServiceViewModel
|
||||
import com.example.myapplication.model.Service
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
|
||||
@Composable
|
||||
fun ListOfServices(navController: NavHostController, serviceViewModel: ServiceViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
LaunchedEffect(serviceViewModel){
|
||||
serviceViewModel.getServiceList()
|
||||
}
|
||||
val services = serviceViewModel.serviceList.collectAsLazyPagingItems()
|
||||
Column(modifier = Modifier.background(BlueMain).fillMaxSize().padding(bottom = 60.dp)){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.Center
|
||||
){
|
||||
Text(
|
||||
text = "PetMed",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White, fontSize = TextUnit(8.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
LazyColumn(
|
||||
){
|
||||
item{
|
||||
SearchBar(
|
||||
modifier = Modifier)
|
||||
{
|
||||
searchText ->
|
||||
//TODO search logic
|
||||
}
|
||||
}
|
||||
items(
|
||||
count = services.itemCount,
|
||||
key = services.itemKey { service -> service.serviceId!! }
|
||||
){
|
||||
index: Int ->
|
||||
val service: Service? = services[index]
|
||||
if (service != null){
|
||||
Service(navController, item = service)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,176 @@
|
||||
package com.example.myapplication.composeui.List_of_Services
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.widthIn
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Create
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.shadow
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalConfiguration
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.BasketViewModel
|
||||
import com.example.myapplication.businessLogic.viewmodel.ServiceViewModel
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.model.RoleEnum
|
||||
import com.example.myapplication.model.Service
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextPrimary
|
||||
import com.google.gson.Gson
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun Service(navController: NavHostController, item: Service, basketViewModel: BasketViewModel = viewModel(factory = AppViewModelProvider.Factory), serviceViewModel: ServiceViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val user = GlobalUser.getInstance().getUser()
|
||||
val basketId by basketViewModel.basketId.collectAsState()
|
||||
LaunchedEffect(basketViewModel){
|
||||
if(user!=null && basketId == 0) basketViewModel.getUsersBasket(user.userId!!)
|
||||
}
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.padding(10.dp, 0.dp, 10.dp, 10.dp)
|
||||
.height(150.dp)
|
||||
.shadow(
|
||||
elevation = 4.dp,
|
||||
shape = RoundedCornerShape(15.dp),
|
||||
clip = false
|
||||
),
|
||||
){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(145.dp)
|
||||
.background(color = Color.White, RoundedCornerShape(15.dp))
|
||||
.padding(15.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
){
|
||||
item.photo?.let { painterResource(id = it) }?.let {
|
||||
Image(
|
||||
painter = it,
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.heightIn(min = 100.dp)
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
contentScale = ContentScale.FillHeight,
|
||||
)
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
){
|
||||
Text(
|
||||
text = item.name,
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium)
|
||||
if(user?.role == RoleEnum.Admin){
|
||||
Button(
|
||||
onClick = {
|
||||
basketViewModel.viewModelScope.launch {
|
||||
serviceViewModel.deleteService(item)
|
||||
}
|
||||
},
|
||||
modifier = Modifier
|
||||
.size(42.dp)
|
||||
.clip(CircleShape),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
){
|
||||
Icon(imageVector = Icons.Default.Delete, contentDescription = null)
|
||||
}
|
||||
}
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxHeight()
|
||||
.widthIn(max = (LocalConfiguration.current.screenWidthDp / 3).dp),
|
||||
verticalArrangement = Arrangement.SpaceBetween,
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
Text(
|
||||
text = "$${item.price}",
|
||||
color = TextPrimary,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
Button(
|
||||
onClick = {
|
||||
if(user != null)
|
||||
basketViewModel.viewModelScope.launch {
|
||||
basketViewModel.addToBasket(item.serviceId!!, 1)
|
||||
}
|
||||
else
|
||||
navController.navigate(NavItem.Login.route)
|
||||
},
|
||||
modifier = Modifier
|
||||
.size(42.dp)
|
||||
.clip(CircleShape),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
){
|
||||
Text(text = "+")
|
||||
}
|
||||
if(user?.role == RoleEnum.Admin){
|
||||
Button(
|
||||
onClick = {
|
||||
serviceViewModel.service.value = item
|
||||
navController.navigate("add_service/${Gson().toJson(item)}")
|
||||
},
|
||||
modifier = Modifier
|
||||
.size(42.dp)
|
||||
.clip(CircleShape),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
){
|
||||
Icon(imageVector = Icons.Default.Create, contentDescription = null)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.example.myapplication.Navbar
|
||||
package com.example.myapplication.composeui.Navbar
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
@ -67,26 +67,32 @@ fun NavBar(){
|
||||
.clip(RoundedCornerShape(15.dp, 15.dp, 0.dp, 0.dp)),
|
||||
){
|
||||
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||
val currentDestination = navBackStackEntry?.destination
|
||||
val currentDestination = navBackStackEntry
|
||||
|
||||
items.forEach { screen ->
|
||||
val isSelected = currentDestination?.destination?.route == screen.route
|
||||
|
||||
BottomNavigationItem(
|
||||
selected = isSelected,
|
||||
icon = {
|
||||
Icon(painterResource(screen.icon),
|
||||
null,
|
||||
modifier = Modifier,
|
||||
GreenBtn)
|
||||
},
|
||||
selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
|
||||
modifier = Modifier
|
||||
.padding(15.dp),
|
||||
onClick = {
|
||||
navController.navigate(screen.route){
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
if (!isSelected) {
|
||||
navController.graph.startDestinationRoute?.let {
|
||||
navController.popBackStack(it, inclusive = true)
|
||||
}
|
||||
navController.navigate(screen.route) {
|
||||
launchSingleTop
|
||||
}
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
navController.navigate(screen.route)
|
||||
}
|
||||
}
|
||||
)
|
||||
@ -0,0 +1,70 @@
|
||||
package com.example.myapplication.composeui.Navbar
|
||||
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import com.example.myapplication.composeui.Basket.Basket
|
||||
import com.example.myapplication.composeui.List_of_Services.AddService
|
||||
import com.example.myapplication.composeui.List_of_Services.ListOfServices
|
||||
import com.example.myapplication.composeui.Orders.Orders
|
||||
import com.example.myapplication.composeui.Profile.Login
|
||||
import com.example.myapplication.composeui.Profile.Profile
|
||||
import com.example.myapplication.composeui.Profile.ProfileChange
|
||||
import com.example.myapplication.composeui.Profile.Registration
|
||||
import com.example.myapplication.model.Service
|
||||
import com.google.gson.Gson
|
||||
|
||||
@Composable
|
||||
fun NavController(navController : NavHostController){
|
||||
NavHost(
|
||||
navController = navController,
|
||||
startDestination = NavItem.ListOfServices.route,
|
||||
){
|
||||
composable(
|
||||
NavItem.ListOfServices.route
|
||||
){
|
||||
ListOfServices(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.Basket.route
|
||||
){
|
||||
Basket(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.Profile.route
|
||||
){
|
||||
Profile(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.ProfileChange.route
|
||||
){
|
||||
ProfileChange(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.Orders.route
|
||||
){
|
||||
Orders(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.Login.route
|
||||
){
|
||||
Login(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.Registration.route
|
||||
){
|
||||
Registration(navController)
|
||||
}
|
||||
composable(
|
||||
NavItem.AddService.route
|
||||
){
|
||||
backStackEntry ->
|
||||
val serviceItemString = backStackEntry.arguments?.getString("serviceItem")
|
||||
val serviceItem = Gson().fromJson(serviceItemString, Service::class.java)
|
||||
serviceItem?.let { AddService(navController, it)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,10 +1,6 @@
|
||||
package com.example.myapplication.Navbar
|
||||
package com.example.myapplication.composeui.Navbar
|
||||
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.vectorResource
|
||||
import com.example.myapplication.R
|
||||
|
||||
sealed class NavItem(
|
||||
@ -31,10 +27,6 @@ sealed class NavItem(
|
||||
"orders",
|
||||
R.drawable.icon_profile
|
||||
)
|
||||
object ProfileNotAuth : NavItem(
|
||||
"profile_not_auth",
|
||||
R.drawable.icon_profile
|
||||
)
|
||||
object Login : NavItem(
|
||||
"login",
|
||||
R.drawable.icon_profile
|
||||
@ -44,7 +36,7 @@ sealed class NavItem(
|
||||
R.drawable.icon_profile
|
||||
)
|
||||
object AddService : NavItem(
|
||||
"add_service",
|
||||
"add_service/{serviceItem}",
|
||||
R.drawable.icon_list_of_services
|
||||
)
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.example.myapplication.composeui.Orders
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.myapplication.model.Order
|
||||
import java.text.SimpleDateFormat
|
||||
import java.util.Date
|
||||
|
||||
@Composable
|
||||
fun OrderItem (order: Order){
|
||||
val dateFormat = SimpleDateFormat("dd-MM-yyyy")
|
||||
Column (
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(10.dp)
|
||||
.clip(RoundedCornerShape(15.dp))
|
||||
){
|
||||
Row (
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
modifier = Modifier
|
||||
.background(Color.White)
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 15.dp, vertical = 10.dp),
|
||||
){
|
||||
Text(text = "Order:${order.orderId}", modifier = Modifier.weight(1f), style = MaterialTheme.typography.bodyMedium)
|
||||
Text(text = "${order.total}", style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
Row (
|
||||
modifier = Modifier
|
||||
.background(Color.White)
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 15.dp),
|
||||
){
|
||||
Text(text = dateFormat.format(Date(order.date)), style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
package com.example.myapplication.composeui.Orders
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.OrderViewModel
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@Composable
|
||||
fun Orders (navController: NavController, orderViewModel: OrderViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val user = GlobalUser.getInstance().getUser()
|
||||
val ordersList by orderViewModel.orders.collectAsState()
|
||||
LaunchedEffect(Unit) {
|
||||
withContext(Dispatchers.IO) {
|
||||
orderViewModel.getUserOrders(user?.userId!!)
|
||||
}
|
||||
}
|
||||
LazyColumn(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(BlueMain)
|
||||
.padding(15.dp)
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
itemsIndexed(ordersList){_, item ->
|
||||
OrderItem(item)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
package com.example.myapplication.Profile
|
||||
package com.example.myapplication.composeui.Profile
|
||||
|
||||
import android.view.Gravity
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@ -16,22 +18,35 @@ import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.Navbar.NavItem
|
||||
import com.example.myapplication.UIComponents.MyTextField
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.BasketViewModel
|
||||
import com.example.myapplication.businessLogic.viewmodel.UserViewModel
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.composeui.UIComponents.MyTextField
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun Login (navController: NavController){
|
||||
fun Login (navController: NavController, userViewModel: UserViewModel = viewModel(factory = AppViewModelProvider.Factory), basketViewModel: BasketViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val context = LocalContext.current
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
@ -55,19 +70,50 @@ fun Login (navController: NavController){
|
||||
}
|
||||
Column (
|
||||
){
|
||||
Row (modifier = Modifier
|
||||
.padding(vertical = 5.dp)
|
||||
){
|
||||
MyTextField(label = "Email", onValueChanged = {})
|
||||
var isEmailValid by remember { mutableStateOf(true)}
|
||||
var isPasswordValid by remember { mutableStateOf(true)}
|
||||
|
||||
if (!isEmailValid) {
|
||||
Text(
|
||||
text = "Invalid email format",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.Red, fontSize = TextUnit(4.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Row (modifier = Modifier
|
||||
.padding(vertical = 5.dp)
|
||||
){
|
||||
MyTextField(label = "Password", onValueChanged = {})
|
||||
MyTextField(label = "Email", onValueChanged = {
|
||||
userViewModel.email.value = it
|
||||
isEmailValid = userViewModel.isValidEmail()
|
||||
})
|
||||
}
|
||||
if (!isPasswordValid) {
|
||||
Text(
|
||||
text = "Password is required",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.Red, fontSize = TextUnit(4.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Row (modifier = Modifier
|
||||
.padding(vertical = 5.dp)
|
||||
){
|
||||
MyTextField(label = "Password", onValueChanged = {
|
||||
userViewModel.password.value = it
|
||||
isPasswordValid = it.isNotEmpty()
|
||||
})
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.ListOfServices.route) },
|
||||
onClick = {
|
||||
CoroutineScope(Dispatchers.Main).launch {
|
||||
userViewModel.authUser()
|
||||
navController.navigate(NavItem.Profile.route)
|
||||
}
|
||||
val toast = Toast.makeText(context, "message", Toast.LENGTH_SHORT)
|
||||
toast.setGravity(Gravity.TOP, 0, 100)
|
||||
toast.show()
|
||||
},
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.padding(top = 10.dp)
|
||||
@ -1,10 +1,11 @@
|
||||
package com.example.myapplication.Profile
|
||||
package com.example.myapplication.composeui.Profile
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
@ -21,19 +22,26 @@ import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.alpha
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.Navbar.NavItem
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.model.RoleEnum
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.RedBtn
|
||||
|
||||
@Composable
|
||||
fun Profile(navController: NavHostController){
|
||||
val user = GlobalUser.getInstance().getUser()
|
||||
if(user == null){
|
||||
Login(navController = navController)
|
||||
}else{
|
||||
Column (
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
@ -42,6 +50,17 @@ fun Profile(navController: NavHostController){
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.Center
|
||||
){
|
||||
Text(
|
||||
text = "PetMed",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White, fontSize = TextUnit(8.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Box(modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.size(200.dp)
|
||||
@ -49,26 +68,27 @@ fun Profile(navController: NavHostController){
|
||||
){
|
||||
// TODO: upload profile image
|
||||
}
|
||||
Box(modifier = Modifier.padding(15.dp)){
|
||||
Text(
|
||||
text = "Name Surname",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.align(Alignment.Center),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
Box(modifier = Modifier.padding(15.dp)){
|
||||
Text(
|
||||
text = "example@mail.ex",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.align(Alignment.Center),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
Box(modifier = Modifier.padding(15.dp)){
|
||||
Text(
|
||||
text = user.name + " " + user.surname,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.align(Alignment.Center),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
Box(modifier = Modifier.padding(15.dp)){
|
||||
Text(
|
||||
text = user.email,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.align(Alignment.Center),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
}
|
||||
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.ProfileChange.route) },
|
||||
modifier = Modifier
|
||||
@ -107,27 +127,32 @@ fun Profile(navController: NavHostController){
|
||||
color = Color.White
|
||||
)
|
||||
}
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.AddService.route) },
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
.clip(CircleShape)
|
||||
.padding(vertical = 5.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(
|
||||
text = "Add service",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = Color.White
|
||||
)
|
||||
if(user.role == RoleEnum.Admin){
|
||||
Button(
|
||||
onClick = { navController.navigate("add_service/{}") },
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
.clip(CircleShape)
|
||||
.padding(vertical = 5.dp),
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = GreenBtn,
|
||||
contentColor = Color.White
|
||||
),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
) {
|
||||
Text(
|
||||
text = "Add service",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = Color.White
|
||||
)
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.ProfileNotAuth.route) },
|
||||
onClick = {
|
||||
GlobalUser.getInstance().setUser(null)
|
||||
navController.navigate(NavItem.Login.route)
|
||||
},
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.fillMaxWidth()
|
||||
@ -151,4 +176,5 @@ fun Profile(navController: NavHostController){
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
package com.example.myapplication.Profile
|
||||
package com.example.myapplication.composeui.Profile
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@ -13,11 +12,6 @@ import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.text.BasicTextField
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.KeyboardArrowDown
|
||||
import androidx.compose.material3.AlertDialogDefaults.shape
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
@ -27,28 +21,30 @@ import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberUpdatedState
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.Shape
|
||||
import androidx.compose.ui.modifier.modifierLocalConsumer
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.input.TextFieldValue
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavHostController
|
||||
import com.example.myapplication.GlobalUser
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.UIComponents.MyTextField
|
||||
import com.example.myapplication.ui.theme.BlueBorder
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.UserViewModel
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.composeui.UIComponents.MyTextField
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
|
||||
@Composable
|
||||
fun ProfileChange (navController: NavHostController){
|
||||
fun ProfileChange (navController: NavHostController, userViewModel: UserViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val user = GlobalUser.getInstance().getUser()
|
||||
Column (
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
@ -57,6 +53,17 @@ fun ProfileChange (navController: NavHostController){
|
||||
.padding(bottom = 60.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
){
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth(),
|
||||
horizontalArrangement = Arrangement.Center
|
||||
){
|
||||
Text(
|
||||
text = "PetMed",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.White, fontSize = TextUnit(8.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Box(modifier = Modifier
|
||||
.clip(CircleShape)
|
||||
.size(200.dp)
|
||||
@ -72,7 +79,7 @@ fun ProfileChange (navController: NavHostController){
|
||||
}
|
||||
Box(modifier = Modifier.padding(15.dp)){
|
||||
Text(
|
||||
text = "Name Surname",
|
||||
text = "${user?.name} ${user?.surname}",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
@ -82,7 +89,7 @@ fun ProfileChange (navController: NavHostController){
|
||||
}
|
||||
Box(modifier = Modifier.padding(15.dp)){
|
||||
Text(
|
||||
text = "example@mail.ex",
|
||||
text = "${user?.email}",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
@ -93,23 +100,48 @@ fun ProfileChange (navController: NavHostController){
|
||||
Column (
|
||||
){
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Name", onValueChanged = {})
|
||||
MyTextField(label = "Name", onValueChanged = {userViewModel.name.value = it})
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Surname", onValueChanged = {})
|
||||
MyTextField(label = "Surname", onValueChanged = {userViewModel.surname.value = it})
|
||||
}
|
||||
var isEmailValid by remember { mutableStateOf(true) }
|
||||
var isPasswordValid by remember { mutableStateOf(true) }
|
||||
|
||||
if (!isEmailValid) {
|
||||
Text(
|
||||
text = "Invalid email format",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.Red, fontSize = TextUnit(4.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Row (modifier = Modifier
|
||||
.padding(vertical = 5.dp)
|
||||
){
|
||||
MyTextField(label = "Email", onValueChanged = {
|
||||
userViewModel.email.value = it
|
||||
isEmailValid = userViewModel.isValidEmail()
|
||||
})
|
||||
}
|
||||
if (!isPasswordValid) {
|
||||
Text(
|
||||
text = "Password is required",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.Red, fontSize = TextUnit(4.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Email", onValueChanged = {})
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Old password", onValueChanged = {})
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "New password", onValueChanged = {})
|
||||
MyTextField(label = "Password", onValueChanged = {
|
||||
userViewModel.password.value = it
|
||||
isPasswordValid = it.isNotEmpty()
|
||||
})
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = { /*TODO*/ },
|
||||
onClick = {
|
||||
userViewModel.updateUser()
|
||||
navController.navigate(NavItem.Profile.route)
|
||||
},
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.padding(top = 10.dp)
|
||||
@ -1,4 +1,4 @@
|
||||
package com.example.myapplication.Profile
|
||||
package com.example.myapplication.composeui.Profile
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
@ -16,6 +16,10 @@ import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
@ -23,15 +27,18 @@ import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.TextUnit
|
||||
import androidx.compose.ui.unit.TextUnitType
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.Navbar.NavItem
|
||||
import com.example.myapplication.UIComponents.MyTextField
|
||||
import com.example.myapplication.composeui.Navbar.NavItem
|
||||
import com.example.myapplication.composeui.UIComponents.MyTextField
|
||||
import com.example.myapplication.ui.theme.BlueMain
|
||||
import com.example.myapplication.ui.theme.GreenBtn
|
||||
import com.example.myapplication.ui.theme.TextSecondary
|
||||
import com.example.myapplication.businessLogic.viewmodel.AppViewModelProvider
|
||||
import com.example.myapplication.businessLogic.viewmodel.UserViewModel
|
||||
|
||||
@Composable
|
||||
fun Registration (navController: NavController){
|
||||
fun Registration (navController: NavController, userViewModel: UserViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
@ -56,20 +63,50 @@ fun Registration (navController: NavController){
|
||||
Column (
|
||||
){
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Name", onValueChanged = {})
|
||||
MyTextField(label = "Name", onValueChanged = { userViewModel.name.value = it })
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Surname", onValueChanged = {})
|
||||
MyTextField(label = "Surname", onValueChanged = { userViewModel.surname.value = it })
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Email", onValueChanged = {})
|
||||
var isEmailValid by remember { mutableStateOf(true) }
|
||||
var isPasswordValid by remember { mutableStateOf(true) }
|
||||
|
||||
if (!isEmailValid) {
|
||||
Text(
|
||||
text = "Invalid email format",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.Red, fontSize = TextUnit(4.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Row (modifier = Modifier.padding(vertical = 5.dp)){
|
||||
MyTextField(label = "Password", onValueChanged = {})
|
||||
Row (modifier = Modifier
|
||||
.padding(vertical = 5.dp)
|
||||
){
|
||||
MyTextField(label = "Email", onValueChanged = {
|
||||
userViewModel.email.value = it
|
||||
isEmailValid = userViewModel.isValidEmail()
|
||||
})
|
||||
}
|
||||
if (!isPasswordValid) {
|
||||
Text(
|
||||
text = "Password is required",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
.copy(Color.Red, fontSize = TextUnit(4.0f, TextUnitType.Em))
|
||||
)
|
||||
}
|
||||
Row (modifier = Modifier
|
||||
.padding(vertical = 5.dp)
|
||||
){
|
||||
MyTextField(label = "Password", onValueChanged = {
|
||||
userViewModel.password.value = it
|
||||
isPasswordValid = it.isNotEmpty()
|
||||
})
|
||||
}
|
||||
}
|
||||
Button(
|
||||
onClick = { navController.navigate(NavItem.ListOfServices.route) },
|
||||
onClick = {
|
||||
userViewModel.createUser()
|
||||
navController.navigate(NavItem.Login.route)
|
||||
},
|
||||
modifier = Modifier
|
||||
.height(60.dp)
|
||||
.padding(top = 10.dp)
|
||||
@ -1,4 +1,4 @@
|
||||
package com.example.myapplication.UIComponents
|
||||
package com.example.myapplication.composeui.UIComponents
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.border
|
||||
@ -28,7 +28,7 @@ import com.example.myapplication.ui.theme.TextSecondary
|
||||
@Composable
|
||||
fun MyTextField (
|
||||
label: String,
|
||||
onValueChanged: (String) -> Unit
|
||||
onValueChanged: (String) -> Unit,
|
||||
){
|
||||
val textState = remember { mutableStateOf(TextFieldValue()) }
|
||||
val text by rememberUpdatedState(newValue = textState.value)
|
||||
@ -46,13 +46,16 @@ fun MyTextField (
|
||||
if(textState.value.text.isEmpty()){
|
||||
Text(
|
||||
text = label,
|
||||
style = MaterialTheme.typography.bodyMedium.copy(color = TextSecondary)
|
||||
style = MaterialTheme.typography.bodyMedium.copy(color = TextSecondary),
|
||||
)
|
||||
}else{
|
||||
|
||||
}
|
||||
BasicTextField(
|
||||
value = text,
|
||||
onValueChange = { newValue ->
|
||||
textState.value = newValue
|
||||
onValueChange = {
|
||||
textState.value = it
|
||||
onValueChanged(it.text)
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
textStyle = MaterialTheme.typography.bodyMedium,
|
||||
@ -1,20 +1,16 @@
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.TextFieldDefaults.indicatorLine
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
@ -23,6 +19,7 @@ import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.myapplication.R
|
||||
@ -61,9 +58,7 @@ fun SearchBar(
|
||||
.clip(RoundedCornerShape(15.dp)),
|
||||
singleLine = true,
|
||||
colors = TextFieldDefaults.textFieldColors(
|
||||
textColor = Color.Black,
|
||||
containerColor = Color.White,
|
||||
placeholderColor = TextSecondary,
|
||||
focusedIndicatorColor = Color.Transparent,
|
||||
disabledIndicatorColor = Color.Transparent,
|
||||
unfocusedIndicatorColor = Color.Transparent,
|
||||
@ -0,0 +1,71 @@
|
||||
package com.example.myapplication.database
|
||||
|
||||
import android.content.Context
|
||||
import androidx.room.Database
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import com.example.myapplication.database.dao.BasketDao
|
||||
import com.example.myapplication.database.dao.OrderDao
|
||||
import com.example.myapplication.database.dao.RemoteKeysDao
|
||||
import com.example.myapplication.database.dao.ServiceDao
|
||||
import com.example.myapplication.database.dao.UserDao
|
||||
import com.example.myapplication.model.Basket
|
||||
import com.example.myapplication.model.BasketService
|
||||
import com.example.myapplication.model.Order
|
||||
import com.example.myapplication.model.OrderService
|
||||
import com.example.myapplication.model.RemoteKeys
|
||||
import com.example.myapplication.model.Service
|
||||
import com.example.myapplication.model.User
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Database(entities = [User::class, Service::class, Order::class, OrderService::class, Basket::class, BasketService::class, RemoteKeys::class], version = 10)
|
||||
abstract class AppDatabase : RoomDatabase(){
|
||||
abstract fun serviceDao(): ServiceDao
|
||||
abstract fun userDao(): UserDao
|
||||
abstract fun orderDao(): OrderDao
|
||||
abstract fun basketDao(): BasketDao
|
||||
abstract fun remoteKeysDao(): RemoteKeysDao
|
||||
|
||||
companion object {
|
||||
private const val DB_NAME: String = "my-db"
|
||||
|
||||
@Volatile
|
||||
private var INSTANCE: AppDatabase? = null
|
||||
|
||||
suspend fun populateDatabase() {
|
||||
// INSTANCE?.let { database ->
|
||||
// // User
|
||||
// val userDao = database.userDao()
|
||||
// val user1 = User(null, "Danil", "Markov", "danil@mail.ru", "123", RoleEnum.Admin)
|
||||
// userDao.insert(user1)
|
||||
// val basketDao = database.basketDao()
|
||||
// val basket1 = Basket(null, user1.userId!!)
|
||||
// basketDao.insert(basket1)
|
||||
// }
|
||||
}
|
||||
|
||||
fun getInstance(appContext: Context): AppDatabase {
|
||||
return INSTANCE ?: synchronized(this) {
|
||||
Room.databaseBuilder(
|
||||
appContext,
|
||||
AppDatabase::class.java,
|
||||
DB_NAME
|
||||
)
|
||||
.addCallback(object : Callback() {
|
||||
override fun onCreate(db: SupportSQLiteDatabase) {
|
||||
super.onCreate(db)
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
populateDatabase()
|
||||
}
|
||||
}
|
||||
})
|
||||
.fallbackToDestructiveMigration()
|
||||
.build()
|
||||
.also { INSTANCE = it }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package com.example.myapplication.database.dao
|
||||
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Delete
|
||||
import androidx.room.Insert
|
||||
import androidx.room.Query
|
||||
import com.example.myapplication.model.Basket
|
||||
import com.example.myapplication.model.BasketService
|
||||
import com.example.myapplication.model.BasketWithServices
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
@Dao
|
||||
interface BasketDao {
|
||||
@Insert
|
||||
suspend fun insert(basket: Basket):Long
|
||||
@Insert
|
||||
suspend fun insertBasketService(basketService: BasketService)
|
||||
@Query("SELECT * FROM tbl_basket WHERE creatorUserId = :id")
|
||||
fun getBasketWithServices(id: Int): Flow<BasketWithServices>
|
||||
@Query("SELECT * FROM tbl_basket WHERE creatorUserId = :id")
|
||||
suspend fun getUsersBasket(id: Int): Basket
|
||||
@Query("SELECT * FROM tbl_basket")
|
||||
fun getAllBaskets(): Flow<List<Basket>>
|
||||
@Delete
|
||||
suspend fun delete(basket: Basket)
|
||||
@Query("DELETE FROM tbl_basket_service WHERE basketId = :basketId AND serviceId = :serviceId")
|
||||
suspend fun removeServiceFromBasket(basketId: Int, serviceId: Int)
|
||||
@Query("UPDATE tbl_basket_service SET quantity = :quantity WHERE basketId = :basketId AND serviceId = :serviceId")
|
||||
suspend fun updateServiceQuantity(basketId: Int, serviceId: Int, quantity: Int)
|
||||
@Query("UPDATE tbl_basket_service SET quantity = quantity + 1 WHERE basketId = :basketId AND serviceId = :serviceId")
|
||||
suspend fun incrementServiceQuantity(basketId: Int, serviceId: Int)
|
||||
@Query("UPDATE tbl_basket_service SET quantity = quantity - 1 WHERE basketId = :basketId AND serviceId = :serviceId")
|
||||
suspend fun decrementServiceQuantity(basketId: Int, serviceId: Int)
|
||||
@Query("SELECT quantity FROM tbl_basket_service WHERE basketId = :basketId AND serviceId = :serviceId")
|
||||
suspend fun getQuantity(basketId: Int, serviceId: Int): Int?
|
||||
@Query("SELECT * FROM tbl_basket_service WHERE basketId = :basketId AND serviceId = :serviceId")
|
||||
suspend fun getService(basketId: Int, serviceId: Int): BasketService?
|
||||
@Query("SELECT SUM(price * quantity) FROM tbl_basket_service bs JOIN tbl_service s ON bs.serviceId = s.serviceId WHERE bs.basketId = :basketId")
|
||||
suspend fun getTotalPriceForBasket(basketId: Int): Double?
|
||||
@Query("DELETE FROM tbl_basket_service WHERE basketId = :basketId")
|
||||
suspend fun clearBasket(basketId: Int)
|
||||
}
|
||||
@ -0,0 +1,27 @@
|
||||
package com.example.myapplication.database.dao
|
||||
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Delete
|
||||
import androidx.room.Insert
|
||||
import androidx.room.Query
|
||||
import com.example.myapplication.model.Order
|
||||
import com.example.myapplication.model.OrderService
|
||||
import com.example.myapplication.model.OrderWithServices
|
||||
import com.example.myapplication.model.UserWithOrder
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
@Dao
|
||||
interface OrderDao {
|
||||
@Insert
|
||||
suspend fun insert(order: Order):Long
|
||||
@Delete
|
||||
suspend fun delete(order: Order)
|
||||
@Insert
|
||||
suspend fun insertOrderService(orderService: OrderService)
|
||||
@Query("SELECT * FROM tbl_order WHERE orderId = :id")
|
||||
fun getOrderWithServices(id: Int): Flow<OrderWithServices>
|
||||
@Query("SELECT * FROM tbl_order")
|
||||
fun getAllOrders(): Flow<List<Order>>
|
||||
@Query("SELECT * FROM tbl_user WHERE userId =:id")
|
||||
fun getUserOrders(id: Int) : Flow<UserWithOrder>
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.example.myapplication.database.dao
|
||||
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Insert
|
||||
import androidx.room.OnConflictStrategy
|
||||
import androidx.room.Query
|
||||
import com.example.myapplication.model.RemoteKeyType
|
||||
import com.example.myapplication.model.RemoteKeys
|
||||
|
||||
@Dao
|
||||
interface RemoteKeysDao {
|
||||
@Query("SELECT * FROM remote_keys WHERE entityId = :entityId AND type = :type")
|
||||
suspend fun getRemoteKeys(entityId: Int, type: RemoteKeyType): RemoteKeys?
|
||||
@Insert(onConflict = OnConflictStrategy.REPLACE)
|
||||
suspend fun insertAll(remoteKey: List<RemoteKeys>)
|
||||
@Query("DELETE FROM remote_keys WHERE type = :type")
|
||||
suspend fun clearRemoteKeys(type: RemoteKeyType)
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.example.myapplication.database.dao
|
||||
|
||||
import androidx.paging.PagingSource
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Delete
|
||||
import androidx.room.Insert
|
||||
import androidx.room.Query
|
||||
import androidx.room.Update
|
||||
import com.example.myapplication.model.Service
|
||||
|
||||
@Dao
|
||||
interface ServiceDao {
|
||||
@Insert
|
||||
suspend fun insert(vararg service: Service)
|
||||
@Update
|
||||
suspend fun update(service: Service)
|
||||
@Delete
|
||||
suspend fun delete(service: Service)
|
||||
@Query("SELECT*FROM tbl_service")
|
||||
fun getAllServicesPaged(): PagingSource<Int, Service>
|
||||
@Query("select * from tbl_service")
|
||||
fun getAll(): PagingSource<Int, Service>
|
||||
@Query("SELECT * FROM tbl_service WHERE serviceId = :id")
|
||||
suspend fun getServiceById(id: Int): Service
|
||||
@Query("DELETE FROM tbl_service")
|
||||
suspend fun deleteAll()
|
||||
@Query("DELETE FROM tbl_service WHERE serviceId = :id")
|
||||
suspend fun invalidateService(id: Int)
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package com.example.myapplication.database.dao
|
||||
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Delete
|
||||
import androidx.room.Insert
|
||||
import androidx.room.Query
|
||||
import androidx.room.Update
|
||||
import com.example.myapplication.model.User
|
||||
|
||||
@Dao
|
||||
interface UserDao {
|
||||
@Insert
|
||||
suspend fun insert(user: User)
|
||||
|
||||
@Update
|
||||
suspend fun update(user: User)
|
||||
|
||||
@Delete
|
||||
suspend fun delete(user: User)
|
||||
|
||||
@Query("SELECT * FROM tbl_user WHERE userId = :id")
|
||||
suspend fun getUserById(id: Int): User
|
||||
|
||||
@Query("SELECT * FROM tbl_user WHERE email = :email")
|
||||
suspend fun getUserByEmail(email: String): User
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package com.example.myapplication.database.repository
|
||||
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.database.dao.BasketDao
|
||||
import com.example.myapplication.model.Basket
|
||||
import com.example.myapplication.model.BasketService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.flow.flow
|
||||
|
||||
class BasketRepositoryImpl(private val basketDao: BasketDao): BasketRepository {
|
||||
suspend fun createBasket(basket: Basket): Long = basketDao.insert(basket)
|
||||
suspend fun getUsersBasket(userId: Int): Basket = basketDao.getUsersBasket(userId)
|
||||
override suspend fun removeServiceFromBasket(basketId: Int, serviceId: Int) = basketDao.removeServiceFromBasket(basketId, serviceId)
|
||||
suspend fun updateServiceQuantity(basketId: Int, serviceId: Int, quantity: Int) = basketDao.updateServiceQuantity(basketId, serviceId, quantity)
|
||||
override suspend fun incrementServiceQuantity(basketId: Int, serviceId: Int) = basketDao.incrementServiceQuantity(basketId, serviceId)
|
||||
override suspend fun decrementServiceQuantity(basketId: Int, serviceId: Int) = basketDao.decrementServiceQuantity(basketId, serviceId)
|
||||
override suspend fun insertBasketService(basketService: BasketService) = basketDao.insertBasketService(basketService)
|
||||
override suspend fun getBasketWithServices(id: Int): Flow<List<Service>> = flow {basketDao.getBasketWithServices(id).first().services}
|
||||
override suspend fun getUserBasketId(id: Int): Flow<Int> {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
suspend fun delete(basket: Basket) = basketDao.delete(basket)
|
||||
override suspend fun getQuantity(basketId: Int, serviceId: Int): Int? = basketDao.getQuantity(basketId, serviceId)
|
||||
override suspend fun existService(basketId: Int, serviceId: Int): Boolean {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
override suspend fun getTotalPriceForUser(userId: Int): Double? {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
override suspend fun deleteAllServiceFromBasket(basketId: Int) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
suspend fun getService(basketId: Int, serviceId: Int): BasketService? = basketDao.getService(basketId, serviceId)
|
||||
suspend fun getTotalPriceForBasket(basketId: Int): Double? = basketDao.getTotalPriceForBasket(basketId)
|
||||
suspend fun clearBasket(basketId: Int) = basketDao.clearBasket(basketId)
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
package com.example.myapplication.database.repository
|
||||
|
||||
import com.example.myapplication.businessLogic.repository.OrderRepository
|
||||
import com.example.myapplication.database.dao.OrderDao
|
||||
import com.example.myapplication.model.Order
|
||||
import com.example.myapplication.model.OrderService
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class OrderRepositoryImpl(private val orderDao: OrderDao): OrderRepository {
|
||||
// override suspend fun insert(order: Order) = orderDao.insert(order)
|
||||
// override suspend fun addServiceToOrder(orderService: OrderService) = orderDao.insertOrderService(orderService)
|
||||
// override suspend fun delete(order: Order) = orderDao.delete(order)
|
||||
// override suspend fun getServiceFromOrder(id: Int): Flow<List<Service>> {
|
||||
// TODO("Not yet implemented")
|
||||
// }
|
||||
// suspend fun getOrderWithServices(id: Int) = orderDao.getOrderWithServices(id)
|
||||
// suspend fun getAllOrders() = orderDao.getAllOrders()
|
||||
// override suspend fun getUserOrders(id: Int): Flow<List<Order>> = flow { orderDao.getUserOrders(id).first().orders }
|
||||
override suspend fun insert(order: Order) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
override suspend fun addServiceToOrder(orderService: OrderService) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
override suspend fun delete(order: Order) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
override suspend fun getServiceFromOrder(id: Int): Flow<List<Service>> {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
|
||||
override suspend fun getUserOrders(id: Int): Flow<List<Order>> {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.example.myapplication.database.repository
|
||||
|
||||
import com.example.myapplication.database.dao.RemoteKeysDao
|
||||
import com.example.myapplication.model.RemoteKeyType
|
||||
import com.example.myapplication.model.RemoteKeys
|
||||
|
||||
class RemoteKeysRepositoryImpl(private val remoteKeysDao: RemoteKeysDao) {
|
||||
suspend fun getAllRemoteKeys(id: Int, type: RemoteKeyType) =
|
||||
remoteKeysDao.getRemoteKeys(id, type)
|
||||
|
||||
suspend fun createRemoteKeys(remoteKeys: List<RemoteKeys>) =
|
||||
remoteKeysDao.insertAll(remoteKeys)
|
||||
|
||||
suspend fun deleteRemoteKey(type: RemoteKeyType) =
|
||||
remoteKeysDao.clearRemoteKeys(type)
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.example.myapplication.database.repository
|
||||
|
||||
import androidx.paging.Pager
|
||||
import androidx.paging.PagingConfig
|
||||
import androidx.paging.PagingData
|
||||
import androidx.paging.PagingSource
|
||||
import com.example.myapplication.businessLogic.repository.ServiceRepository
|
||||
import com.example.myapplication.database.dao.ServiceDao
|
||||
import com.example.myapplication.di.AppContainer
|
||||
import com.example.myapplication.model.Service
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class ServiceRepositoryImpl(private val serviceDao: ServiceDao): ServiceRepository {
|
||||
override suspend fun insert(service: Service) = serviceDao.insert(service)
|
||||
override suspend fun update(service: Service) = serviceDao.update(service)
|
||||
override suspend fun delete(service: Service) = serviceDao.delete(service)
|
||||
override suspend fun getServiceById(id: Int): Service = serviceDao.getServiceById(id)
|
||||
override suspend fun getAllServices(): Flow<PagingData<Service>> = Pager(
|
||||
config = PagingConfig(
|
||||
pageSize = AppContainer.LIMIT,
|
||||
enablePlaceholders = false
|
||||
),
|
||||
pagingSourceFactory = serviceDao::getAll
|
||||
).flow
|
||||
|
||||
suspend fun clearServices() = serviceDao.deleteAll()
|
||||
suspend fun insertServices(services: List<Service>) =
|
||||
serviceDao.insert(*services.toTypedArray())
|
||||
fun getAllServicesPagingSource(): PagingSource<Int, Service> = serviceDao.getAll()
|
||||
suspend fun invalidateService(id: Int) = serviceDao.invalidateService(id)
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.example.myapplication.database.repository
|
||||
|
||||
import com.example.myapplication.api.model.UserRemoteSignIn
|
||||
import com.example.myapplication.businessLogic.repository.UserRepository
|
||||
import com.example.myapplication.database.dao.UserDao
|
||||
import com.example.myapplication.model.User
|
||||
|
||||
class UserRepositoryImpl(private val userDao: UserDao): UserRepository {
|
||||
override suspend fun insert(user: User) = userDao.insert(user)
|
||||
override suspend fun update(user: User) = userDao.update(user)
|
||||
override suspend fun delete(user: User) = userDao.delete(user)
|
||||
override suspend fun authUser(user: UserRemoteSignIn): User {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
suspend fun getUserById(id: Int) = userDao.getUserById(id)
|
||||
suspend fun getUserByEmail(email: String) = userDao.getUserByEmail(email)
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
package com.example.myapplication.di
|
||||
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.businessLogic.repository.OrderRepository
|
||||
import com.example.myapplication.businessLogic.repository.ServiceRepository
|
||||
import com.example.myapplication.businessLogic.repository.UserRepository
|
||||
|
||||
interface AppContainer {
|
||||
val serviceRepo: ServiceRepository
|
||||
val userRepo: UserRepository
|
||||
val orderRepo: OrderRepository
|
||||
val basketRepo: BasketRepository
|
||||
|
||||
companion object {
|
||||
const val TIMEOUT = 5000L
|
||||
const val LIMIT = 10
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package com.example.myapplication.di
|
||||
|
||||
import android.content.Context
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.repository.RestBasketRepository
|
||||
import com.example.myapplication.api.repository.RestOrderRepository
|
||||
import com.example.myapplication.api.repository.RestServiceRepository
|
||||
import com.example.myapplication.api.repository.RestUserRepository
|
||||
import com.example.myapplication.businessLogic.repository.BasketRepository
|
||||
import com.example.myapplication.businessLogic.repository.OrderRepository
|
||||
import com.example.myapplication.businessLogic.repository.ServiceRepository
|
||||
import com.example.myapplication.businessLogic.repository.UserRepository
|
||||
import com.example.myapplication.database.AppDatabase
|
||||
import com.example.myapplication.database.repository.RemoteKeysRepositoryImpl
|
||||
import com.example.myapplication.database.repository.ServiceRepositoryImpl
|
||||
|
||||
class AppDataContainer(context: Context) : AppContainer {
|
||||
override val serviceRepo: ServiceRepository by lazy {
|
||||
RestServiceRepository(
|
||||
ServerService.getInstance(),
|
||||
serviceRepository,
|
||||
AppDatabase.getInstance(context),
|
||||
remoteKeyRepository
|
||||
)
|
||||
}
|
||||
override val userRepo: UserRepository by lazy{
|
||||
RestUserRepository(ServerService.getInstance())
|
||||
}
|
||||
override val orderRepo: OrderRepository by lazy {
|
||||
RestOrderRepository(ServerService.getInstance())
|
||||
}
|
||||
override val basketRepo: BasketRepository by lazy{
|
||||
RestBasketRepository(ServerService.getInstance())
|
||||
}
|
||||
|
||||
private val serviceRepository: ServiceRepositoryImpl by lazy {
|
||||
ServiceRepositoryImpl(AppDatabase.getInstance(context).serviceDao())
|
||||
}
|
||||
private val remoteKeyRepository: RemoteKeysRepositoryImpl by lazy{
|
||||
RemoteKeysRepositoryImpl(AppDatabase.getInstance(context).remoteKeysDao())
|
||||
}
|
||||
}
|
||||
11
app/src/main/java/com/example/myapplication/model/Basket.kt
Normal file
11
app/src/main/java/com/example/myapplication/model/Basket.kt
Normal file
@ -0,0 +1,11 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
|
||||
@Entity(tableName = "tbl_basket")
|
||||
data class Basket(
|
||||
@PrimaryKey
|
||||
val basketId: Int? = null,
|
||||
val creatorUserId: Int
|
||||
)
|
||||
@ -0,0 +1,11 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
|
||||
@Entity(tableName = "tbl_basket_service",
|
||||
primaryKeys = ["basketId", "serviceId"])
|
||||
data class BasketService(
|
||||
val basketId: Int,
|
||||
val serviceId: Int,
|
||||
val quantity: Int
|
||||
)
|
||||
@ -0,0 +1,15 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Embedded
|
||||
import androidx.room.Junction
|
||||
import androidx.room.Relation
|
||||
|
||||
data class BasketWithServices(
|
||||
@Embedded val basket: Basket,
|
||||
@Relation(
|
||||
parentColumn = "basketId",
|
||||
entityColumn = "serviceId",
|
||||
associateBy = Junction(BasketService::class)
|
||||
)
|
||||
val services: List<Service>
|
||||
)
|
||||
13
app/src/main/java/com/example/myapplication/model/Order.kt
Normal file
13
app/src/main/java/com/example/myapplication/model/Order.kt
Normal file
@ -0,0 +1,13 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
|
||||
@Entity(tableName = "tbl_order")
|
||||
data class Order(
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
val orderId: Int? = null,
|
||||
val date: Long,
|
||||
val total: Double,
|
||||
val creatorUserId: Int
|
||||
)
|
||||
@ -0,0 +1,10 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
|
||||
@Entity(primaryKeys = ["orderId", "serviceId"], tableName = "tbl_order_service")
|
||||
data class OrderService(
|
||||
val orderId: Int,
|
||||
val serviceId: Int,
|
||||
val quantity: Int
|
||||
)
|
||||
@ -0,0 +1,15 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Embedded
|
||||
import androidx.room.Junction
|
||||
import androidx.room.Relation
|
||||
|
||||
data class OrderWithServices(
|
||||
@Embedded val order: Order,
|
||||
@Relation(
|
||||
parentColumn = "orderId",
|
||||
entityColumn = "serviceId",
|
||||
associateBy = Junction(OrderService::class)
|
||||
)
|
||||
val services: List<Service>
|
||||
)
|
||||
@ -0,0 +1,22 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
import androidx.room.TypeConverter
|
||||
import androidx.room.TypeConverters
|
||||
|
||||
enum class RemoteKeyType(private val type: String) {
|
||||
SERVICE(Service::class.simpleName ?: "Service");
|
||||
@TypeConverter
|
||||
fun toRemoteKeyType(value: String) = RemoteKeyType.values().first { it.type == value }
|
||||
@TypeConverter
|
||||
fun fromRemoteKeyType(value: RemoteKeyType) = value.type
|
||||
}
|
||||
@Entity(tableName = "remote_keys")
|
||||
data class RemoteKeys(
|
||||
@PrimaryKey val entityId: Int,
|
||||
@TypeConverters(RemoteKeyType::class)
|
||||
val type: RemoteKeyType,
|
||||
val prevKey: Int?,
|
||||
val nextKey: Int?
|
||||
)
|
||||
@ -0,0 +1,6 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
enum class RoleEnum {
|
||||
Admin,
|
||||
User
|
||||
}
|
||||
13
app/src/main/java/com/example/myapplication/model/Service.kt
Normal file
13
app/src/main/java/com/example/myapplication/model/Service.kt
Normal file
@ -0,0 +1,13 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
|
||||
@Entity(tableName="tbl_service")
|
||||
data class Service (
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
var serviceId: Int? = null,
|
||||
var name: String,
|
||||
var price: Double,
|
||||
var photo: Int? = null
|
||||
)
|
||||
17
app/src/main/java/com/example/myapplication/model/User.kt
Normal file
17
app/src/main/java/com/example/myapplication/model/User.kt
Normal file
@ -0,0 +1,17 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
|
||||
@Entity(tableName = "tbl_user")
|
||||
data class User(
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
val userId: Int? = null,
|
||||
var name: String,
|
||||
var surname: String,
|
||||
var email: String,
|
||||
var password: String,
|
||||
val role: RoleEnum,
|
||||
val photo: Int? = null,
|
||||
val basketId: Int? = null
|
||||
)
|
||||
@ -0,0 +1,13 @@
|
||||
package com.example.myapplication.model
|
||||
|
||||
import androidx.room.Embedded
|
||||
import androidx.room.Relation
|
||||
|
||||
data class UserWithOrder(
|
||||
@Embedded val user: User,
|
||||
@Relation(
|
||||
parentColumn = "userId",
|
||||
entityColumn = "creatorUserId"
|
||||
)
|
||||
val orders: List<Order>
|
||||
)
|
||||
Loading…
x
Reference in New Issue
Block a user