Лаб 3. Всё есть, но есть и проблемы

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Sun Oct 08 15:55:30 GMT+04:00 2023
-gradle.version=8.0

.idea/gradle.xml

@@ -7,7 +7,13 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" />
+        <option name="gradleJvm" value="jbr-17" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
       </GradleProjectSettings>
     </option>
   </component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,41 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/kotlinc.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="Kotlin2JvmCompilerArguments">
+    <option name="jvmTarget" value="17" />
+  </component>
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.10" />
+    <option name="version" value="1.8.20" />
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/workspace.xml

@@ -1,18 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+  </component>
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="dc3793c7-c725-42e8-8eda-044c95f334c1" name="Changes" comment="коммит1" />
+    <list default="true" id="dc3793c7-c725-42e8-8eda-044c95f334c1" name="Changes" comment="Лаб 3 изменение действий под новые модели. Начало">
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/UserWithPets.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/PetViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-checksums.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/dependencies-accessors/gc.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileChanges/last-build.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/gc.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/cache.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/vcs-1/gc.properties" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/kotlinc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/kotlinc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle.kts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/CreatePet.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/CreatePet.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/Home.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/Home.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/Login.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/Login.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/Profile.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/Profile.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/PetDao.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/PetDao.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/PetImageDao.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/PetImageDao.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/UserDao.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/UserDao.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/PetList.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/PetList.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/database/AppDatabase.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/database/AppDatabase.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/PetImage.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/PetImage.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/PetWithImage.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/PetWithImage.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/User.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/User.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.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[RF8N601QWVE]" />
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
   <component name="ExternalProjectsManager">
     <system id="GRADLE">
       <state>
+        <task path="$PROJECT_DIR$/app">
+          <activation />
+        </task>
         <projects_view>
           <tree_state>
             <expand />
@@ -22,10 +78,20 @@
       </state>
     </system>
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Kotlin File" />
+        <option value="Interface" />
+        <option value="Kotlin Interface" />
+        <option value="Kotlin Class" />
+      </list>
+    </option>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="main" />
+        <entry key="$PROJECT_DIR$" value="Lab2" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -33,6 +99,9 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="CurrentFile" />
+  </component>
   <component name="ProjectId" id="2WToW0mvjPzND9QiCAmC6MXKLwF" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -41,15 +110,116 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "cidr.known.project.marker": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;android-custom-viewC:/Users/Kate/AppData/Local/Android/Sdk/sources/android-31/android/view/View.java_SELECTED&quot;: &quot;View&quot;,
+    &quot;android-custom-viewC:/Users/Kate/AppData/Local/Android/Sdk/sources/android-31/android/view/ViewGroup.java_SELECTED&quot;: &quot;ViewGroup&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;com.android.tools.idea.devicemanager.tab&quot;: &quot;Physical&quot;,
+    &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/Kate/AndroidStudioProjects/Ihonkina_PIbd-31_PMU&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;project.kotlinCompiler&quot;
   }
-}]]></component>
+}</component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp\models\user\viewmodels" />
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp\composeui\navigation" />
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp\models\user\composeui" />
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp\composeui" />
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\res\drawable" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp\composeui" />
+    </key>
+    <key name="CreateKotlinClassDialog.RecentsKey">
+      <recent name="com.example.pmuapp.composeui" />
+    </key>
+    <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="com.example.pmuapp.models.user.model.viewmodel" />
+      <recent name="com.example.pmuapp.composeui" />
+    </key>
+    <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <recent name="com.example.pmuapp.models.user.Dao" />
+      <recent name="com.example.pmuapp.composeui.navigation" />
+    </key>
+  </component>
+  <component name="RunManager">
+    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+      <module name="PMUapp.app.main" />
+      <option name="DEPLOY" value="true" />
+      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+      <option name="DEPLOY_AS_INSTANT" value="false" />
+      <option name="ARTIFACT_NAME" value="" />
+      <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+      <option name="CLEAR_APP_STORAGE" value="false" />
+      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
+      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <option name="DEBUGGER_TYPE" value="Auto" />
+      <Auto>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Auto>
+      <Hybrid>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Hybrid>
+      <Java>
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Java>
+      <Native>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+        <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+        <option name="DEBUG_SANDBOX_SDK" value="false" />
+      </Native>
+      <Profilers>
+        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+      </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+      <method v="2">
+        <option name="Android.Gradle.BeforeRunTask" enabled="true" />
+      </method>
+    </configuration>
+  </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
@@ -66,7 +236,84 @@
       <option name="project" value="LOCAL" />
       <updated>1696766359976</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="добавление отчета лаб 1">
+      <created>1696766847352</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1696766847352</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Лаб 2 начало">
+      <created>1697038354150</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1697038354150</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Лаб 2 нало работы с пользователем">
+      <created>1697041852651</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1697041852651</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Лаб 2 питомцы просто добавлены">
+      <created>1697054812374</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1697054812374</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Лаб 2 выглядит как предварительный конец 2 лабы">
+      <created>1697086817058</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1697086817058</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Лаб 2 выглядит как предварительный конец 2 лабы">
+      <created>1697086828529</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1697086828529</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Лаб 2 вроде конец">
+      <created>1698235676591</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1698235676591</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Лаб 3 начало">
+      <created>1698258901683</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1698258901683</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Лаб 3 начало">
+      <created>1698258953508</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1698258953508</updated>
+    </task>
+    <task id="LOCAL-00011" summary="Лаб 3 создание моделей">
+      <created>1699816471908</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1699816471908</updated>
+    </task>
+    <task id="LOCAL-00012" summary="Лаб 3 изменение действий под новые модели. Начало">
+      <created>1699890169920</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1699890169920</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -80,7 +327,7 @@
                   <entry key="branch">
                     <value>
                       <list>
-                        <option value="Lab1" />
+                        <option value="Lab3" />
                       </list>
                     </value>
                   </entry>
@@ -95,6 +342,49 @@
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="коммит1" />
-    <option name="LAST_COMMIT_MESSAGE" value="коммит1" />
+    <MESSAGE value="добавление отчета лаб 1" />
+    <MESSAGE value="Лаб 2 начало" />
+    <MESSAGE value="Лаб 2 нало работы с пользователем" />
+    <MESSAGE value="Лаб 2 питомцы просто добавлены" />
+    <MESSAGE value="Лаб 2 выглядит как предварительный конец 2 лабы" />
+    <MESSAGE value="Лаб 2 вроде конец" />
+    <MESSAGE value="Лаб 3 начало" />
+    <MESSAGE value="Лаб 3 создание моделей" />
+    <MESSAGE value="Лаб 3 изменение действий под новые модели. Начало" />
+    <option name="LAST_COMMIT_MESSAGE" value="Лаб 3 изменение действий под новые модели. Начало" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt</url>
+          <line>31</line>
+          <properties>
+            <option name="lambda-ordinal" value="-1" />
+          </properties>
+          <option name="timeStamp" value="81" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt</url>
+          <line>27</line>
+          <option name="timeStamp" value="82" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt</url>
+          <line>28</line>
+          <option name="timeStamp" value="83" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt</url>
+          <line>108</line>
+          <option name="timeStamp" value="84" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt</url>
+          <line>217</line>
+          <option name="timeStamp" value="88" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
   </component>
 </project>

app/build.gradle.kts

@@ -1,16 +1,17 @@
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("com.google.devtools.ksp")
 }
 
 android {
     namespace = "com.example.pmuapp"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.example.pmuapp"
         minSdk = 24
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
 
@@ -30,17 +31,17 @@ 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
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.3"
+        kotlinCompilerExtensionVersion = "1.4.5"
     }
     packaging {
         resources {
@@ -49,16 +50,36 @@ android {
     }
 }
 
-dependencies {
 
+
+dependencies {
+    // Core
     implementation("androidx.core:core-ktx:1.9.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+
+    // UI
     implementation("androidx.activity:activity-compose:1.7.2")
     implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    implementation("androidx.navigation:navigation-compose:2.6.0")
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
+    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
+    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
+    implementation ("io.coil-kt:coil-compose:1.4.0")
+
+
+
+    // Room
+    val room_version = "2.5.2"
+    implementation("androidx.room:room-runtime:$room_version")
+    annotationProcessor("androidx.room:room-compiler:$room_version")
+    ksp("androidx.room:room-compiler:$room_version")
+    implementation("androidx.room:room-ktx:$room_version")
+    implementation("androidx.room:room-paging:$room_version")
+
+    // Tests
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@@ -66,4 +87,9 @@ dependencies {
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
+    implementation("androidx.compose.runtime:runtime-livedata:1.1.0-alpha03")
+    implementation("androidx.compose.runtime:runtime-livedata:1.1.0-alpha03")
+
+
+
 }

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:theme="@style/Theme.PMUapp"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".MainComposeActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.PMUapp">

app/src/main/java/com/example/pmuapp/MainComposeActivity.kt

@@ -1,46 +1,47 @@
 package com.example.pmuapp
 
+import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.annotation.RequiresApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import com.example.pmuapp.composeui.navigation.MainNavbar
 import com.example.pmuapp.ui.theme.PMUappTheme
 
-class MainActivity : ComponentActivity() {
+class MainComposeActivity : ComponentActivity() {
+    @RequiresApi(Build.VERSION_CODES.O)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
             PMUappTheme {
-                // A surface container using the 'background' color from the theme
                 Surface(
                     modifier = Modifier.fillMaxSize(),
                     color = MaterialTheme.colorScheme.background
                 ) {
-                    Greeting("Android")
+                    MainNavbar()
                 }
             }
         }
     }
 }
 
+@RequiresApi(Build.VERSION_CODES.O)
+@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
+@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
+fun MainNavbarPreview() {
     PMUappTheme {
-        Greeting("Android")
+        Surface(
+            color = MaterialTheme.colorScheme.background
+        ) {
+            MainNavbar()
+        }
     }
 }

app/src/main/java/com/example/pmuapp/composeui/CreatePet.kt

@@ -0,0 +1,88 @@
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.example.pmuapp.R
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.Pet
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CreatePet(navController: NavController, authViewModel: AuthViewModel, onSaveClick: (Pet) -> Unit) {
+    var selectedImage by remember { mutableStateOf(R.drawable.pet1) }
+    var petName by remember { mutableStateOf("") }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp)
+    ) {
+        val imageIds = intArrayOf(
+            R.drawable.pet1,
+            R.drawable.pet2,
+            R.drawable.pet3,
+            R.drawable.pet4,
+            R.drawable.pet5,
+            R.drawable.pet6,
+            R.drawable.pet7,
+            R.drawable.pet8
+        )
+
+        LazyRow(
+            modifier = Modifier.fillMaxWidth(),
+            contentPadding = PaddingValues(horizontal = 8.dp)
+        ) {
+            items(imageIds.size) { index ->
+                val imageId = imageIds[index]
+                Image(
+                    painter = painterResource(id = imageId),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .size(100.dp)
+                        .padding(4.dp)
+                        .clickable {
+                            selectedImage = imageId
+                        }
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        TextField(
+            value = petName,
+            onValueChange = { petName = it },
+            label = { Text("Имя питомца") },
+            modifier = Modifier.fillMaxWidth()
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Button(
+            onClick = {
+                if (petName.isNotEmpty()) {
+                    val newPet = Pet(petName, selectedImage, "", authViewModel.currentUser.value )
+
+                    onSaveClick(newPet)
+                    petName = ""
+                    selectedImage = R.drawable.pet1
+
+                    navController.navigate(Screen.Home.route)
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Сохранить")
+        }
+    }
+}

app/src/main/java/com/example/pmuapp/composeui/EditPet.kt

@@ -0,0 +1,118 @@
+package com.example.pmuapp.composeui
+
+import android.os.Build.*
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+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.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.OutlinedTextField
+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.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.Pet
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+import com.example.pmuapp.models.user.model.viewmodel.PetViewModel
+import com.example.pmuapp.models.user.model.viewmodel.UserViewModel
+
+@RequiresApi(VERSION_CODES.O)
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun EditPet(navController: NavController, authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel,  pet : Pet?, onSaveClick: (Pet) -> Unit)  {
+
+    var petName = remember { mutableStateOf(pet?.name ?: "") }
+    var petNotes = remember { mutableStateOf(pet?.notes ?: "") }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(10.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        if(pet!=null) {
+            val imageResId = pet?.imageResId ?: 0
+            Image(
+                painter = painterResource(id = imageResId),
+                contentDescription = null,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(200.dp)
+            )
+        }
+
+        OutlinedTextField(
+            value = petName.value,
+            onValueChange = { petName.value = it },
+            label = { Text("Имя питомца") },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 8.dp)
+        )
+
+        Text(
+            text = "Заметка о питомце",
+            style = TextStyle(fontSize = 16.sp),
+            modifier = Modifier.padding(top = 8.dp)
+        )
+
+        TextField(
+            value = petNotes.value,
+            onValueChange = { petNotes.value = it },
+            label = { Text("Заметки") },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 8.dp)
+                .heightIn(max = 200.dp)
+                .padding(16.dp),
+            readOnly = false
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+
+
+
+        val petId = Screen.PlayPet.route.replace(
+            "{id}",
+            pet?.id.toString()
+        )
+        Button(
+            onClick = {
+                val updatedPet = Pet(
+                    pet?.id ?: 0,
+                    petName.value,
+                    pet?.imageResId ?:0,
+                    pet?.userId ?:0,
+                    petNotes.value)
+                onSaveClick(updatedPet)
+
+              //  val petId = Screen.EditPet.route.replace("{id}", pet?.id.toString())
+               // navController?.navigate(petId)
+                //navController.navigate()
+                navController.navigate(Screen.Home.route)
+
+            },
+            modifier = Modifier.padding(16.dp)
+        ) {
+            Text("Сохранить")
+        }
+
+    }
+}

app/src/main/java/com/example/pmuapp/composeui/Home.kt

@@ -0,0 +1,43 @@
+package com.example.pmuapp.composeui
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+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.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.composeui.PetList
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+import com.example.pmuapp.models.user.model.viewmodel.PetViewModel
+import com.example.pmuapp.models.user.model.viewmodel.UserViewModel
+@OptIn(ExperimentalMaterial3Api::class)
+@SuppressLint("RememberReturnType")
+@Composable
+fun Home(navController: NavController, authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel) {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Button(
+            onClick = {
+                navController.navigate(Screen.CreatePet.route)
+            }
+        ) {
+            Text("Создать питомца")
+        }
+        Spacer(modifier = Modifier.height(16.dp))
+
+        PetList(navController,authViewModel, petViewModel, userViewModel, authViewModel.currentUser.value?.id ?: -1)
+
+    }
+}

app/src/main/java/com/example/pmuapp/composeui/Login.kt

@@ -0,0 +1,93 @@
+package com.example.pmuapp.composeui
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+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.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+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.text.input.PasswordVisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavController
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun Login(
+    navController: NavController,
+    authViewModel: AuthViewModel
+) {
+    var username by remember { mutableStateOf("") }
+    var password by remember { mutableStateOf("") }
+
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        TextField(
+            value = username,
+            onValueChange = { username = it },
+            label = { Text("Username") },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
+
+        TextField(
+            value = password,
+            onValueChange = { password = it },
+            label = { Text("Password") },
+            visualTransformation = PasswordVisualTransformation(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Button(
+            onClick = {
+                authViewModel.viewModelScope.launch {
+                    authViewModel.loginUser(username, password)
+                }
+                    // Добавляем небольшую задержку (например, 100 мс) для обеспечения завершения операции входа в систему
+                 //   delay(1000)
+                    val authenticatedUser = authViewModel.currentUser.value
+                    if (authenticatedUser != null) {
+
+                        navController.navigate(Screen.Home.route)
+                    } else {
+                        println("Аутентификация не удалась")
+                    }
+
+
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Login")
+        }
+
+    }
+}

app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt

@@ -0,0 +1,91 @@
+package com.example.pmuapp.composeui
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+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.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.Pet
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+import com.example.pmuapp.models.user.model.viewmodel.PetViewModel
+import com.example.pmuapp.models.user.model.viewmodel.UserViewModel
+
+@RequiresApi(Build.VERSION_CODES.O)
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PlayPet(navController: NavController, authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel, pet: Pet?) {
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(10.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        if (pet!=null) {
+            val imageResId = pet?.imageResId ?: 0
+            Image(
+                painter = painterResource(id = imageResId),
+                contentDescription = null,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(200.dp)
+            )
+        }
+        Text(
+            text = pet?.name ?: "",
+            style = TextStyle(fontWeight = FontWeight.Bold, fontSize = 24.sp),
+            modifier = Modifier.padding(top = 8.dp)
+        )
+
+        Text(
+            text = "Заметка о питомце",
+            style = TextStyle(fontSize = 16.sp),
+            modifier = Modifier.padding(top = 8.dp)
+        )
+
+        TextField(
+            value = pet?.notes ?: "",
+            onValueChange = { },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 8.dp)
+                .heightIn(max = 200.dp)
+                .padding(16.dp),
+            readOnly = true
+        )
+
+        Spacer(modifier = Modifier.weight(1f))
+        val petId = Screen.EditPet.route.replace("{id}", pet?.id.toString())
+
+        Button(
+
+            onClick = {
+
+                navController?.navigate(petId)
+
+            },
+            modifier = Modifier.padding(16.dp)
+        ) {
+            Text("Изменить")
+        }
+    }
+}

app/src/main/java/com/example/pmuapp/composeui/Profile.kt

@@ -0,0 +1,132 @@
+package com.example.pmuapp.composeui
+
+import android.annotation.SuppressLint
+import android.net.Uri
+import androidx.activity.OnBackPressedCallback
+import androidx.activity.OnBackPressedDispatcher
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+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.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import coil.compose.rememberImagePainter
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.User
+import kotlinx.coroutines.flow.callbackFlow
+
+@OptIn(ExperimentalMaterial3Api::class)
+@SuppressLint("RememberReturnType")
+@Composable
+fun Profile(navController: NavController,currentUser: User?, onSaveClick: (User) -> Unit) {
+    val nameState = remember { mutableStateOf(currentUser?.name.orEmpty()) }
+    val loginState = remember { mutableStateOf(currentUser?.login.orEmpty()) }
+    val passwordState = remember { mutableStateOf(currentUser?.password.orEmpty()) }
+
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(16.dp)
+    ) {
+        currentUser?.let { user ->
+            Image(
+                painter = rememberImagePainter(data = user.imageUri),
+                contentDescription = null,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .height(200.dp)
+            )
+        }
+
+        val selectedImageUri = remember { mutableStateOf<Uri?>(null) }
+
+        val imagePickerLauncher = rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { result: Uri? ->
+            result?.let { uri ->
+                selectedImageUri.value = uri
+            }
+        }
+
+        Button(
+            onClick = {
+                imagePickerLauncher.launch("image/*")
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Загрузить фото")
+        }
+
+        TextField(
+            value = nameState.value,
+            onValueChange = { nameState.value = it },
+            label = { Text("Name") },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
+
+        TextField(
+            value = loginState.value,
+            onValueChange = { loginState.value = it },
+            label = { Text("Login") },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
+
+        TextField(
+            value = passwordState.value,
+            onValueChange = { passwordState.value = it },
+            label = { Text("Password") },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 16.dp)
+        )
+
+        Button(
+            onClick = {
+                val updatedUser = User(
+                    currentUser?.id ?: 0,
+                    nameState.value,
+                    loginState.value,
+                    passwordState.value,
+                    selectedImageUri.value?.toString() ?: ""
+                )
+                onSaveClick(updatedUser)
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Сохранить")
+        }
+
+
+        Button(
+            onClick = {
+                navController.navigate(Screen.Login.route)
+
+            },
+            modifier = Modifier.fillMaxWidth()
+
+        ) {
+            Text("Выйти")
+        }
+    }
+}

app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt

@@ -0,0 +1,268 @@
+package com.example.pmuapp.composeui.navigation
+
+import CreatePet
+import android.annotation.SuppressLint
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.lifecycle.viewModelScope
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hierarchy
+import androidx.navigation.NavGraph.Companion.findStartDestination
+import androidx.navigation.NavHostController
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import com.example.pmuapp.R
+import com.example.pmuapp.composeui.EditPet
+import com.example.pmuapp.composeui.Home
+import com.example.pmuapp.composeui.Login
+import com.example.pmuapp.composeui.PlayPet
+import com.example.pmuapp.composeui.Profile
+import com.example.pmuapp.models.user.Dao.PetDao
+import com.example.pmuapp.models.user.Dao.UserDao
+import com.example.pmuapp.models.user.composeui.PetList
+import com.example.pmuapp.models.user.composeui.UserList
+import com.example.pmuapp.models.user.database.AppDatabase
+import com.example.pmuapp.models.user.model.Pet
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+import com.example.pmuapp.models.user.model.viewmodel.PetViewModel
+import com.example.pmuapp.models.user.model.viewmodel.UserViewModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun Topbar(
+    navController: NavHostController,
+    currentScreen: Screen?
+) {
+    TopAppBar(
+        colors = TopAppBarDefaults.smallTopAppBarColors(
+            containerColor = MaterialTheme.colorScheme.primary,
+            titleContentColor = MaterialTheme.colorScheme.onPrimary,
+        ),
+        title = {
+            Text(stringResource(currentScreen?.resourceId ?: R.string.app_name))
+        },
+        navigationIcon = {
+            if (currentScreen == Screen.PlayPet) {
+                IconButton(
+                    onClick = {
+                        navController.navigate(Screen.Home.route)
+                    }
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.ArrowBack,
+                        contentDescription = "Back",
+                        tint = MaterialTheme.colorScheme.onPrimary
+                    )
+                }
+            }  else if (
+                navController.previousBackStackEntry != null
+                && (currentScreen == null || !currentScreen.showInBottomBar)
+            ) {
+                IconButton(onClick = { navController.navigateUp() }) {
+                    Icon(
+                        imageVector = Icons.Default.ArrowBack,
+                        contentDescription = "Back",
+                        tint = MaterialTheme.colorScheme.onPrimary
+                    )
+                }
+            }
+        }
+    )
+}
+
+@Composable
+fun Navbar(
+    navController: NavHostController,
+    currentDestination: NavDestination?,
+    modifier: Modifier = Modifier
+) {
+    NavigationBar(modifier) {
+        Screen.bottomBarItems.forEach { screen ->
+            NavigationBarItem(
+                icon = { Icon(screen.icon, contentDescription = null) },
+                label = { Text(stringResource(screen.resourceId)) },
+                selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
+                onClick = {
+                    navController.navigate(screen.route) {
+                        popUpTo(navController.graph.findStartDestination().id) {
+                            saveState = true
+                        }
+                        launchSingleTop = true
+                        restoreState = true
+                    }
+                }
+            )
+        }
+    }
+}
+
+@SuppressLint("StateFlowValueCalledInComposition", "SuspiciousIndentation")
+@RequiresApi(Build.VERSION_CODES.O)
+@Composable
+fun NavHost(
+    navController: NavHostController,
+    innerPadding: PaddingValues,
+    authViewModel: AuthViewModel,
+    userViewModel: UserViewModel,
+    petViewModel: PetViewModel
+) {
+    NavHost(
+        navController = navController,
+        startDestination = Screen.Login.route,
+        modifier = Modifier.padding(innerPadding)
+    ) {
+        composable(Screen.Login.route) {
+            Login(navController, authViewModel)
+        }
+        composable(Screen.Profile.route) {
+            val currentUser = authViewModel.currentUser.value
+
+            if (currentUser != null) {
+                Profile(navController,
+                    currentUser = currentUser ,
+                    onSaveClick = {updatedUser ->
+                        userViewModel.updateUser(updatedUser)
+                   //     authViewModel.updateCurrentUset(currentUser?.id ?:-1)
+                        navController.navigate(Screen.UserList.route)
+                    }
+                )
+            } else {
+            }
+        }
+
+        composable(Screen.UserList.route) { UserList(navController, userViewModel) }
+        composable(Screen.Home.route){
+            val currentUser = authViewModel.currentUser
+            if (currentUser != null) {
+                Home(navController,
+                    authViewModel,
+                    petViewModel,
+                    userViewModel
+                )
+            } else {
+            }
+
+        }
+        composable(Screen.CreatePet.route) {
+            val currentUser = authViewModel.currentUser
+            val id: Int = currentUser.value?.id?.toInt() ?: 0
+            CreatePet ( navController, authViewModel , onSaveClick = { newPet ->
+                petViewModel.createPet(newPet)
+                //userViewModel.addTask(currentUser?.id ?:0, adedTask)
+             //   authViewModel.updateCurrentUset(id)
+            }
+            )
+
+        }
+
+        composable(
+            Screen.UserView.route,
+            arguments = listOf(navArgument("id") { type = NavType.IntType })
+        ) { backStackEntry ->
+            val userId = backStackEntry.arguments?.getInt("id") ?: -1
+
+            Box(
+                contentAlignment = Alignment.TopCenter,
+                modifier = Modifier.fillMaxSize()
+            ) {
+                PetList(navController,authViewModel, petViewModel, userViewModel, userId+1)
+            }
+        }
+        composable(
+            Screen.PlayPet.route,
+            arguments = listOf(navArgument("id") { type = NavType.IntType })
+        ) { backStackEntry ->
+            val petId = backStackEntry.arguments?.getInt("id") ?: -1
+            val pet = petViewModel.getPet(petId)
+                PlayPet(navController,authViewModel, petViewModel, userViewModel, pet.value)
+        }
+        composable(
+            Screen.EditPet.route,
+            arguments = listOf(navArgument("id") { type = NavType.IntType })
+        ) { backStackEntry ->
+            val petId = backStackEntry.arguments?.getInt("id") ?: -1
+            val pet = petViewModel.getPet(petId)
+            EditPet(navController,authViewModel, petViewModel, userViewModel, pet.value,
+                onSaveClick = {updatedPet ->
+                    petViewModel.viewModelScope.launch {
+                        delay(1000)
+                        petViewModel.updatePet(updatedPet)
+                        delay(1000)
+                     //   authViewModel.updateCurrentUset(id)
+                    }})
+        }
+
+    }
+}
+
+@RequiresApi(Build.VERSION_CODES.O)
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainNavbar() {
+    val navController = rememberNavController()
+    val context = LocalContext.current
+    val database: AppDatabase = AppDatabase.getInstance(context)
+    val userDao: UserDao = database.userDao()
+    val petDao: PetDao = database.petDao()
+    val authViewModel = remember { AuthViewModel(userDao) }
+    val userViewModel = remember { UserViewModel(userDao) }
+    val petViewModel = remember { PetViewModel(petDao) }
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentDestination = navBackStackEntry?.destination
+    val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
+
+    Scaffold(
+        topBar = {
+            Topbar(navController, currentScreen)
+        },
+        bottomBar = {
+            if (currentScreen == null || currentScreen.showInBottomBar) {
+                Navbar(navController, currentDestination)
+            }
+        }
+    ) { innerPadding ->
+        NavHost(navController, innerPadding, authViewModel, userViewModel, petViewModel )
+        }
+}
+
+//@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
+//@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
+//@Composable
+//fun MainNavbarPreview() {
+//    PMUappTheme {
+//        Surface(
+//            color = MaterialTheme.colorScheme.background
+//        ) {
+//            MainNavbar()
+//        }
+//    }
+//}

app/src/main/java/com/example/pmuapp/composeui/navigation/Screen.kt

@@ -0,0 +1,58 @@
+package com.example.pmuapp.composeui.navigation
+
+import androidx.annotation.StringRes
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material.icons.filled.List
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.ui.graphics.vector.ImageVector
+import com.example.pmuapp.R
+
+
+enum class Screen(
+    val route: String,
+    @StringRes val resourceId: Int,
+    val icon: ImageVector = Icons.Filled.Favorite,
+    val showInBottomBar: Boolean = true
+) {
+    UserList(
+        "user-list", R.string.users_title, Icons.Filled.List
+    ),
+    Home(
+        "home", R.string.home_title, Icons.Filled.Home
+    ),
+    Profile(
+        "profile", R.string.user_my_title, Icons.Filled.Person
+    ),
+    UserView(
+        "user-view/{id}", R.string.user_view_title, showInBottomBar = false
+    ),
+    Login(
+    "login", R.string.login_title, showInBottomBar = false
+    ),
+    CreatePet(
+    "createpet", R.string.create_pet_title, showInBottomBar = false
+    ),
+    PlayPet(
+        "playpet/{id}", R.string.play_pet_title,showInBottomBar = false
+    ),
+    EditPet(
+    "editpet/{id}", R.string.edit_pet_title,showInBottomBar = false
+    );
+
+
+    companion object {
+        val bottomBarItems = listOf(
+            UserList,
+            Home,
+            Profile,
+        )
+
+        fun getItem(route: String): Screen? {
+            val findRoute = route.split("/").first()
+            return values().find { value -> value.route.startsWith(findRoute) }
+        }
+    }
+}

app/src/main/java/com/example/pmuapp/models/user/Dao/PetDao.kt

@@ -0,0 +1,36 @@
+package com.example.pmuapp.models.user.Dao;
+
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy
+import androidx.room.Query;
+import androidx.room.Transaction
+import androidx.room.Update;
+import com.example.pmuapp.models.user.model.Pet
+
+import kotlinx.coroutines.flow.Flow
+
+import java.util.List;
+
+
+@Dao
+interface PetDao {
+    @Query("SELECT * FROM pets")
+    fun getAllPets(): Flow<List<Pet>>
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insertAll(pets: kotlin.collections.List<Pet>)
+    @Insert
+    suspend fun insertPet(pet: Pet)
+
+    @Update
+    suspend fun updatePet(pet: Pet)
+
+    @Delete
+    suspend fun deletePet(pet: Pet)
+    @Query("select * from pets where pets.id = :uid ")
+    suspend fun getOne(uid: Int):Pet
+    @Query("select * from pets where pets.user_id = :uid")
+    suspend fun getByUid(uid: Int): kotlin.collections.List<Pet>
+}

app/src/main/java/com/example/pmuapp/models/user/Dao/PetImageDao.kt

@@ -0,0 +1,24 @@
+//package com.example.pmuapp.models.user.Dao
+//
+//import androidx.room.Dao
+//import androidx.room.Delete
+//import androidx.room.Insert
+//import androidx.room.Query
+//import androidx.room.Update
+//import com.example.pmuapp.models.user.model.PetImage
+//import kotlinx.coroutines.flow.Flow
+//
+//@Dao
+//interface PetImageDao {
+//    @Insert
+//    suspend fun insertPetImage(petImage: PetImage)
+//
+//    @Update
+//    suspend fun updatePetImage(petImage: PetImage)
+//
+//    @Delete
+//    suspend fun deletePetImage(petImage: PetImage)
+//
+//    @Query("SELECT * FROM pet_images WHERE pet_id = :petId")
+//    fun getPetImagesByPetId(petId: Int): Flow<List<PetImage>>
+//}

app/src/main/java/com/example/pmuapp/models/user/Dao/UserDao.kt

@@ -0,0 +1,50 @@
+package com.example.pmuapp.models.user.Dao;
+
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Transaction
+import androidx.room.Update;
+import com.example.pmuapp.models.user.model.Pet
+
+import com.example.pmuapp.models.user.model.User;
+import com.example.pmuapp.models.user.model.UserWithPets
+import kotlinx.coroutines.flow.Flow
+
+import java.util.List;
+
+
+@Dao
+interface UserDao {
+    @Transaction
+    @Query("SELECT * FROM users")
+    fun getUsersWithPets(): Flow<List<User>>
+
+    @Insert
+    suspend fun insert(user: User)
+
+    @Update
+    suspend fun update(user: User)
+
+    @Delete
+    suspend fun delete(user: User)
+
+//    @Query("SELECT * FROM users left join pets on pets.user_id = users.id WHERE login = :login AND password = :password")
+//    suspend fun getUserByLoginAndPassword(login: String, password: String): UserWithPets
+
+    @Query("SELECT * FROM users WHERE users.login = :username AND users.password = :password")
+    suspend fun getUserByLoginAndPassword(username: String, password: String): User?
+  //  @Query("SELECT * FROM users WHERE id = :userId")
+   // suspend fun getUserWithPetsById(userId: Int): User?
+  @Transaction
+  @Query("SELECT * FROM users LEFT JOIN pets ON pets.user_id = users.id WHERE users.id = :userId")
+  suspend fun getUserById(userId: Int): User?
+
+    @Transaction
+    @Query("SELECT * FROM users LEFT JOIN pets ON pets.user_id = users.id WHERE users.id = :userId")
+    suspend fun getUserWithPetsById(userId: Int): User?
+
+
+}

app/src/main/java/com/example/pmuapp/models/user/composeui/PetList.kt

@@ -0,0 +1,110 @@
+package com.example.pmuapp.models.user.composeui
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material3.Button
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
+import com.example.pmuapp.models.user.model.viewmodel.PetViewModel
+import com.example.pmuapp.models.user.model.viewmodel.UserViewModel
+
+@SuppressLint("StateFlowValueCalledInComposition")
+@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class)
+@Composable
+fun PetList(navController: NavController, authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel, userId: Int) {
+
+        val currentUser by userViewModel.user.collectAsState()
+      //  petViewModel.getPet(userId)
+        var pets = petViewModel.pets.collectAsState()
+
+
+        LazyColumn(
+                verticalArrangement = Arrangement.Center,
+                horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+//                if (authViewModel.currentUser.value?.id!=currentUser?.id) {
+//                        item {
+//                                Text(
+//                                        text = currentUser?.name + " (" + currentUser?.login + ")",
+//                                        style = TextStyle(
+//                                                fontSize = 24.sp,
+//                                                fontWeight = FontWeight.Bold
+//                                        ),
+//                                        modifier = Modifier.padding(16.dp)
+//                                )
+//                        }
+//                }
+                if (pets != null) {
+                        items(pets.value.size) { index ->
+                                val pet = pets.value[index]
+                                val imageId = pet.imageResId
+                                val petName = pet.name
+
+                                Column(
+                                        horizontalAlignment = Alignment.CenterHorizontally,
+                                        modifier = Modifier.padding(8.dp)
+                                ) {
+                                        Image(
+                                                painter = painterResource(id = imageId),
+                                                contentDescription = null,
+                                                modifier = Modifier.size(100.dp)
+                                        )
+
+                                        Text(
+                                                text = petName,
+                                                modifier = Modifier.padding(top = 4.dp)
+                                        )
+
+                                        if (userId ==(authViewModel.currentUser.value?.id ?: -1)) {
+                                                val petId = Screen.PlayPet.route.replace(
+                                                        "{id}",
+                                                        pet.id.toString()
+                                                )
+                                                Button(
+                                                        onClick = {
+                                                                navController?.navigate(petId)
+                                                        },
+                                                ) {
+                                                        Text("Играть")
+                                                }
+                                                IconButton(
+                                                        onClick = {
+                                                                petViewModel.deletePet(pet)
+                                                        }
+                                                ) {
+                                                        Icon(
+                                                                imageVector = Icons.Default.Delete,
+                                                                contentDescription = "Удалить"
+                                                        )
+                                                }
+                                        }
+                                }
+                        }
+                }
+
+        }
+}

app/src/main/java/com/example/pmuapp/models/user/composeui/StudentView.kt

@@ -0,0 +1,49 @@
+package com.example.pmuapp.models.user.composeui
+
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.example.pmuapp.R
+import com.example.pmuapp.models.user.model.User
+import com.example.pmuapp.ui.theme.PMUappTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun StudentView(user: User) {
+
+    Column(
+        Modifier
+            .fillMaxWidth()
+            .padding(all = 10.dp)
+    ) {
+        OutlinedTextField(modifier = Modifier.fillMaxWidth(),
+            value = user.name, onValueChange = {}, readOnly = true,
+            label = {
+                Text(stringResource(id = R.string.user_name))
+            }
+        )
+        OutlinedTextField(modifier = Modifier.fillMaxWidth(),
+            value = user.login, onValueChange = {}, readOnly = true,
+            label = {
+                Text(stringResource(id = R.string.user_login))
+            }
+        )
+        OutlinedTextField(modifier = Modifier.fillMaxWidth(),
+            value = user.password, onValueChange = {}, readOnly = true,
+            label = {
+                Text(stringResource(id = R.string.user_login))
+            }
+        )
+    }
+}

app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt

@@ -0,0 +1,46 @@
+package com.example.pmuapp.models.user.composeui
+
+import android.annotation.SuppressLint
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavController
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.User
+import com.example.pmuapp.models.user.model.viewmodel.UserViewModel
+import com.example.pmuapp.ui.theme.PMUappTheme
+
+
+@SuppressLint("StateFlowValueCalledInComposition")
+@Composable
+fun UserList(navController: NavController?, userViewModel: UserViewModel) {
+    userViewModel.updateUsers()
+    var users = userViewModel.users.value
+
+    if (users.count()!=0) {
+        Column(Modifier.padding(all = 10.dp)) {
+            users.forEachIndexed() { index, user ->
+                val userId = Screen.UserView.route.replace("{id}", index.toString())
+                Button(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(all = 10.dp),
+                    onClick = { navController?.navigate(userId) }) {
+                    Text("${user.login}")
+                }
+            }
+        }
+    }
+}
+

app/src/main/java/com/example/pmuapp/models/user/database/AppDatabase.kt

@@ -0,0 +1,73 @@
+package com.example.pmuapp.models.user.database
+
+import android.content.Context
+import androidx.lifecycle.viewmodel.CreationExtras
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.sqlite.db.SupportSQLiteDatabase
+import com.example.pmuapp.R
+import com.example.pmuapp.models.user.Dao.PetDao
+import com.example.pmuapp.models.user.Dao.UserDao
+import com.example.pmuapp.models.user.model.Pet
+import com.example.pmuapp.models.user.model.User
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Database(entities = [User::class, Pet::class], version = 1, exportSchema = false)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun userDao(): UserDao
+    abstract fun petDao(): PetDao
+  //  abstract fun petImageDao(): PetImageDao
+    companion object {
+        private const val DB_NAME: String = "pmy-db"
+
+        @Volatile
+        private var INSTANCE: AppDatabase? = null
+
+        private suspend fun populateDatabase() {
+            INSTANCE?.let { database ->
+                // Groups
+                val userDao = database.userDao()
+                val user1 = User(1, "Иван", "ivan", "111",R.drawable.avatar.toString())
+                val user2 = User(2, "Анна", "ann", "111",R.drawable.avatar.toString())
+                val user3 = User(3, "Макс", "max", "111",R.drawable.avatar.toString())
+
+                userDao.insert(user1)
+                userDao.insert(user2)
+                userDao.insert(user3)
+
+
+//                val petImageDao = database.petImageDao()
+//                val petImage1 = PetImage(1, 1, R.drawable.pet1)
+//                val petImage2 = PetImage(2, 2, R.drawable.pet2)
+//                val petImage3 = PetImage(3, 3, R.drawable.pet3)
+//
+//                petImageDao.insertPetImage(petImage1)
+//                petImageDao.insertPetImage(petImage2)
+//                petImageDao.insertPetImage(petImage3)
+            }
+        }
+
+        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()
+                            }
+                        }
+                    })
+                    .build()
+                    .also { INSTANCE = it }
+            }
+        }
+    }
+}

app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt

@@ -0,0 +1,49 @@
+package com.example.pmuapp.models.user.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+
+@Entity(
+    tableName = "pets", foreignKeys = [
+        ForeignKey(
+            entity = User::class,
+            parentColumns = ["id"],
+            childColumns = ["user_id"],
+           // onDelete = ForeignKey.CASCADE, // Set to CASCADE for automatic deletion of associated pets
+           // onUpdate = ForeignKey.CASCADE
+        )
+    ]
+)
+data class Pet(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int,
+    val name: String,
+    @ColumnInfo(name = "image_res_id")
+    val imageResId: Int,
+    @ColumnInfo(name = "user_id", index = true)
+    val userId: Int, // Changed from groupId to userId
+    val notes: String
+) {
+    @Ignore
+    constructor(name: String, imageResId: Int, notes: String, user: User?,) :
+            this(0, name, imageResId,  user?.id ?:0, notes)
+
+//    @Relation(parentColumn = "id", entityColumn = "pet_id")
+//    var petImage: PetImage? = null
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        other as Pet
+        if (id != other.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return id ?: -1
+    }
+}
+

app/src/main/java/com/example/pmuapp/models/user/model/PetImage.kt

@@ -0,0 +1,26 @@
+package com.example.pmuapp.models.user.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+//
+//@Entity(tableName = "pet_images")
+//data class PetImage(
+//    @PrimaryKey(autoGenerate = true)
+//    val id: Int,
+//    @ColumnInfo(name = "pet_id")
+//    val petId: Int,
+//    val imageData: Int
+//) {
+//    override fun equals(other: Any?): Boolean {
+//        if (this === other) return true
+//        if (javaClass != other?.javaClass) return false
+//        other as PetImage
+//        if (id != other.id) return false
+//        return true
+//    }
+//
+//    override fun hashCode(): Int {
+//        return id ?: -1
+//    }
+//}

app/src/main/java/com/example/pmuapp/models/user/model/PetWithImage.kt

@@ -0,0 +1,13 @@
+package com.example.pmuapp.models.user.model
+
+import androidx.room.Embedded
+import androidx.room.Relation
+
+//data class PetWithImage(
+//    @Embedded val pet: Pet,
+//    @Relation(
+//        parentColumn = "id",
+//        entityColumn = "pet_id"
+//    )
+//    val petImage: PetImage?
+//)

app/src/main/java/com/example/pmuapp/models/user/model/User.kt

@@ -0,0 +1,40 @@
+package com.example.pmuapp.models.user.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Ignore
+import androidx.room.PrimaryKey
+import androidx.room.Relation
+
+@Entity(tableName = "users")
+data class User(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int = 0,
+    val name: String = "",
+    val login: String = "",
+    val password: String = "",
+    val imageUri: String = ""
+)
+ {
+    @Ignore
+    constructor(
+        name: String,
+        login: String,
+        password: String,
+        imageUri: String
+    ) : this(0, name, login, password, imageUri)
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (javaClass != other?.javaClass) return false
+        other as User
+        if (id != other.id) return false
+        return true
+    }
+
+    override fun hashCode(): Int {
+        return id ?: -1
+    }
+}
+
+

app/src/main/java/com/example/pmuapp/models/user/model/UserWithPets.kt

@@ -0,0 +1,14 @@
+package com.example.pmuapp.models.user.model
+
+import androidx.room.Embedded
+import androidx.room.Entity
+import androidx.room.Relation
+
+data class UserWithPets(
+    @Embedded val user: User,
+    @Relation(
+        parentColumn = "id",
+        entityColumn = "user_id"
+    )
+    val pets: List<Pet>
+)

app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt

@@ -0,0 +1,55 @@
+package com.example.pmuapp.models.user.model.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.pmuapp.models.user.Dao.UserDao
+import com.example.pmuapp.models.user.model.User
+import com.example.pmuapp.models.user.model.UserWithPets
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class AuthViewModel(private val userDao: UserDao) : ViewModel() {
+
+    private val _currentUser = MutableStateFlow<User?>(null)
+    val currentUser: StateFlow<User?> get() = _currentUser
+
+  /*  init {
+        // Подписываемся на изменения в базе данных и обновляем _currentUser
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val user = userDao.getUserByLoginAndPassword("", "")
+                _currentUser.value = user
+            }
+        }
+    }
+*/
+    fun loginUser(username: String, password: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val user = userDao.getUserByLoginAndPassword(username, password)
+                    _currentUser.value = user
+            }
+        }
+    }
+
+    fun updateCurrentUset(id:Int) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+
+                val user = userDao.getUserWithPetsById(id)
+                // Обновляем _currentUser после успешной аутентификации
+                _currentUser.value = user
+
+            }
+        }
+    }
+
+
+    // Добавьте методы для выхода пользователя, регистрации и других операций, если нужно
+}

app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/PetViewModel.kt

@@ -0,0 +1,104 @@
+package com.example.pmuapp.models.user.model.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.pmuapp.models.user.Dao.PetDao
+import com.example.pmuapp.models.user.model.Pet
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class PetViewModel(private val petDao: PetDao) : ViewModel() {
+
+    private val _pet = MutableStateFlow<Pet?>(null)
+    val pet: StateFlow<Pet?> get() = _pet
+    private val _pets = MutableStateFlow<List<Pet>>(emptyList())
+    val pets: StateFlow<List<Pet>> get()= _pets
+
+    // Метод для обновления списка питомцев
+    // Метод для обновления списка питомцев
+    fun updatePets(newPets: List<Pet>) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                // Save the new list of pets to the database
+                petDao.insertAll(newPets)
+
+                // Retrieve the updated list of pets as a Flow
+                val updatedPetsFlow = petDao.getAllPets()
+
+                // Collect the values from the Flow and update _pets
+                updatedPetsFlow.collect { updatedPets ->
+                    // Convert java.util.List to kotlin.collections.List if needed
+                    _pets.value = updatedPets.toList()
+                }
+            }
+        }
+    }
+
+    fun updatePet(updatedPet: Pet) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                // Update the specific pet in the database
+                petDao.updatePet(updatedPet)
+            }
+        }
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                // Retrieve the updated list of pets as a Flow
+                val updatedPetsFlow = petDao.getAllPets()
+
+                // Collect the values from the Flow and update _pets
+                updatedPetsFlow.collect { updatedPets ->
+                    // Convert java.util.List to kotlin.collections.List if needed
+                    _pets.value = updatedPets.toList()
+                }
+            }
+        }
+    }
+
+        // Добавьте метод для создания питомца
+        fun createPet(pet: Pet) {
+            viewModelScope.launch {
+                withContext(Dispatchers.IO) {
+                    // Вставляем новую задачу в базу данных
+                    petDao.insertPet(pet)
+
+                    // Получаем актуальный список задач после вставки
+                    val updatedPetsFlow = petDao.getAllPets()
+                    Log.e("TAG", "222222222222222222222222")
+                    // Collect the values from the Flow and update _pets
+                    updatedPetsFlow.collect { updatedPets ->
+                        // Convert java.util.List to kotlin.collections.List if needed
+                        _pets.value = updatedPets.toList()
+                    }
+                }
+            }
+        }
+
+        fun deletePet(pet: Pet) {
+            viewModelScope.launch {
+                withContext(Dispatchers.IO) {
+                    petDao.deletePet(pet)
+                }
+            }
+        }
+    fun getPet(Id: Int): StateFlow<Pet?>  {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val task = petDao.getOne(Id)
+                _pet.value = task
+            }
+        }
+        return _pet
+    }
+    fun getPetsByUser(userId: Int) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                _pets.value = petDao.getByUid(userId)
+            }
+        }
+    }
+}

app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt

@@ -0,0 +1,86 @@
+package com.example.pmuapp.models.user.model.viewmodel
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.pmuapp.models.user.Dao.UserDao
+import com.example.pmuapp.models.user.model.Pet
+import com.example.pmuapp.models.user.model.User
+import com.example.pmuapp.models.user.model.UserWithPets
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+class UserViewModel(private val userDao: UserDao) : ViewModel() {
+
+    private val _user = MutableStateFlow<User?>(null)
+    val user: StateFlow<User?> get() = _user
+    private val _users = MutableStateFlow<List<User>>(emptyList())
+    val users: StateFlow<List<User>> get() = _users
+
+
+    // Метод для обновления списка пользователей
+    fun updateUsers(newUsers: List<User>) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                _users.value = newUsers
+            }
+        }
+    }
+    fun updateUsers() {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val updatedUsersFlow = userDao.getUsersWithPets()
+                updatedUsersFlow.collect { updatedUsers ->
+                    _users.value = updatedUsers.toList()
+
+                }
+            }
+        }
+    }
+
+    // Метод для входа пользователя
+    fun loginUser(login: String, password: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val user = userDao.getUserByLoginAndPassword(login, password)
+                // Здесь должно быть обновление списка пользователей, но не _currentUser
+                // Также, вам, возможно, нужно вызвать метод updateUsers с обновленным списком пользователей
+            }
+        }
+    }
+
+
+
+    fun updateUser(updatedUser: User) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                Log.e("TAG", "111111111111111111111")
+                // Update the specific pet in the database
+                userDao.update(updatedUser)
+
+                // Retrieve the updated list of pets as a Flow
+                val updatedUsersFlow = userDao.getUsersWithPets()
+                Log.e("TAG", "222222222222222222222222")
+                // Collect the values from the Flow and update _pets
+                updatedUsersFlow.collect { updatedUsers ->
+                    // Convert java.util.List to kotlin.collections.List if needed
+                    _users.value = updatedUsers.toList()
+                }
+                Log.e("TAG", "333333333333333333333333")
+
+            }
+        }
+    }
+    fun getUser(userId: Int): StateFlow<User?> {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val user = userDao.getUserById(userId)
+                _user.value = user
+            }
+        }
+        return _user
+    }
+
+        }

app/src/main/res/values/strings.xml

@@ -1,3 +1,31 @@
 <resources>
-    <string name="app_name">PMUapp</string>
+    <string name="app_name">Мой питомец</string>
+    <string name="user_name">Имя</string>
+    <string name="user_login">Логин</string>
+    <string name="user_password">Пароль</string>
+    <string name="users_title">Пользователи</string>
+    <string name="user_view_title">Профиль пользователя</string>
+    <string name="home_title">Мой дом</string>
+    <string name="user_my_title">Мой профиль</string>
+    <string name="login_title">Авторизация</string>
+    <string name="create_pet_title">Создание питомца</string>
+    <string name="pet_notes">Заметка питомца</string>
+    <string name="play_pet_title">Мой питомец</string>
+    <string name="edit_pet_title">Изменение питомца</string>
+    <string name="about_text">
+        <p>Это текст <b>о нас</b>!</p>\n\n
+        <p>Здесь могла быть Ваша реклама!</p>\n\n
+        <p>Наш сайт <a href="https://ulstu.ru">ulstu.ru</a></p>
+    </string>
+    <string-array name="available_pet_images">
+        <item>@drawable/avatar</item>
+        <item>@drawable/pet1</item>
+        <item>@drawable/pet2</item>
+        <item>@drawable/pet3</item>
+        <item>@drawable/pet4</item>
+        <item>@drawable/pet5</item>
+        <item>@drawable/pet6</item>
+        <item>@drawable/pet7</item>
+        <item>@drawable/pet8</item>
+    </string-array>
 </resources>

build.gradle.kts

@@ -1,5 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.1.1" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.10" apply false
-}
+    id("com.android.application") version "8.1.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.8.20" apply false
+    id("com.google.devtools.ksp") version "1.8.20-1.0.11" apply false
+}
+
+

gradle.properties

@@ -20,4 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true