Лаб 2 вроде конец

Лаб 2 выглядит как предварительный конец 2 лабы
2023-10-25 16:07:52 +04:00 · 2023-10-12 09:00:27 +04:00 · 2023-10-12 09:00:15 +04:00 · 2023-10-12 00:06:50 +04:00 · 2023-10-11 20:30:50 +04:00 · 2023-10-11 19:32:32 +04:00
100 changed files with 2619 additions and 0 deletions
--- a/.gradle/8.0/checksums/checksums.lock
+++ b/.gradle/8.0/checksums/checksums.lock
--- a/.gradle/8.0/checksums/md5-checksums.bin
+++ b/.gradle/8.0/checksums/md5-checksums.bin
--- a/.gradle/8.0/checksums/sha1-checksums.bin
+++ b/.gradle/8.0/checksums/sha1-checksums.bin
--- a/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
+++ b/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock
--- a/.gradle/8.0/dependencies-accessors/gc.properties
+++ b/.gradle/8.0/dependencies-accessors/gc.properties
--- a/.gradle/8.0/executionHistory/executionHistory.bin
+++ b/.gradle/8.0/executionHistory/executionHistory.bin
--- a/.gradle/8.0/executionHistory/executionHistory.lock
+++ b/.gradle/8.0/executionHistory/executionHistory.lock
--- a/.gradle/8.0/fileChanges/last-build.bin
+++ b/.gradle/8.0/fileChanges/last-build.bin
--- a/.gradle/8.0/fileHashes/fileHashes.bin
+++ b/.gradle/8.0/fileHashes/fileHashes.bin
--- a/.gradle/8.0/fileHashes/fileHashes.lock
+++ b/.gradle/8.0/fileHashes/fileHashes.lock
--- a/.gradle/8.0/fileHashes/resourceHashesCache.bin
+++ b/.gradle/8.0/fileHashes/resourceHashesCache.bin
--- a/.gradle/8.0/gc.properties
+++ b/.gradle/8.0/gc.properties
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/cache.properties
+++ b/.gradle/buildOutputCleanup/cache.properties
@ -0,0 +1,2 @@
+#Sun Oct 08 15:55:30 GMT+04:00 2023
+gradle.version=8.0
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- a/.gradle/vcs-1/gc.properties
+++ b/.gradle/vcs-1/gc.properties
--- a/.idea/.name
+++ b/.idea/.name
@ -0,0 +1 @@
+PMUapp
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="17" />
+  </component>
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="jbr-17" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.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>
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,6 @@
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <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>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -0,0 +1,309 @@
+<?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="Лаб 2 выглядит как предварительный конец 2 лабы">
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/executionHistory/executionHistory.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/fileHashes.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/fileHashes/resourceHashesCache.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" 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/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/StudentView.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/composeui/StudentView.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" />
+    </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>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="PMUapp" type="f1a62948:ProjectNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="PMUapp" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="PMUapp" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+              </path>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="PMUapp" type="f1a62948:ProjectNode" />
+                <item name="app" type="2d1252cf:ModuleNode" />
+                <item name="Tasks" type="e4a08cd1:TasksNode" />
+                <item name="other" type="c8890929:TasksNode$1" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Kotlin File" />
+        <option value="Kotlin Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="Lab1" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedTabId" value="ProjectErrors" />
+  </component>
+  <component name="ProjectId" id="2WToW0mvjPzND9QiCAmC6MXKLwF" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectViewState">
+    <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",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "cidr.known.project.marker": "true",
+    "com.android.tools.idea.devicemanager.tab": "Physical",
+    "last_opened_file_path": "C:/Users/Kate/AndroidStudioProjects/Ihonkina_PIbd-31_PMU/app/src/main/java/com/example/pmuapp/composeui/navigation",
+    "settings.editor.selected.configurable": "experimental"
+  }
+}]]></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\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" />
+      <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp" />
+    </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.composeui" />
+    </key>
+    <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
+      <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">
+      <changelist id="dc3793c7-c725-42e8-8eda-044c95f334c1" name="Changes" comment="" />
+      <created>1696765959713</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1696765959713</updated>
+    </task>
+    <task id="LOCAL-00001" summary="коммит1">
+      <created>1696766359976</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1696766359976</updated>
+    </task>
+    <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>
+    <option name="localTasksCounter" value="8" />
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="Lab1" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
+    <MESSAGE value="коммит1" />
+    <MESSAGE value="добавление отчета лаб 1" />
+    <MESSAGE value="Лаб 2 начало" />
+    <MESSAGE value="Лаб 2 нало работы с пользователем" />
+    <MESSAGE value="Лаб 2 питомцы просто добавлены" />
+    <MESSAGE value="Лаб 2 выглядит как предварительный конец 2 лабы" />
+    <option name="LAST_COMMIT_MESSAGE" value="Лаб 2 выглядит как предварительный конец 2 лабы" />
+  </component>
+</project>
--- a/app/.gitignore
+++ b/app/.gitignore
@ -0,0 +1 @@
+/build
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@ -0,0 +1,74 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "com.example.pmuapp"
+    compileSdk = 34
+
+
+    defaultConfig {
+        applicationId = "com.example.pmuapp"
+        minSdk = 24
+        targetSdk = 34
+        versionCode = 1
+        versionName = "1.0"
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.4.3"
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+}
+
+dependencies {
+    implementation ("io.coil-kt:coil-compose:1.4.0")
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    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("com.google.android.engage:engage-core:1.3.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.compose.ui:ui-graphics-android:1.5.3")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    debugImplementation("androidx.compose.ui:ui-tooling")
+    debugImplementation("androidx.compose.ui:ui-test-manifest")
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/app/src/androidTest/java/com/example/pmuapp/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/example/pmuapp/ExampleInstrumentedTest.kt
@ -0,0 +1,24 @@
+package com.example.pmuapp
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.example.pmuapp", appContext.packageName)
+    }
+}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <application
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/Theme.PMUapp"
+        tools:targetApi="31">
+        <activity
+            android:name=".MainComposeActivity"
+            android:exported="true"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.PMUapp">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
--- a/app/src/main/java/com/example/pmuapp/MainComposeActivity.kt
+++ b/app/src/main/java/com/example/pmuapp/MainComposeActivity.kt
@ -0,0 +1,43 @@
+package com.example.pmuapp
+
+import android.content.res.Configuration
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+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 MainComposeActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            PMUappTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colorScheme.background
+                ) {
+                    MainNavbar()
+                }
+            }
+        }
+    }
+}
+
+@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()
+        }
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/composeui/CreatePet.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/CreatePet.kt
@ -0,0 +1,86 @@
+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.models.user.model.Pet
+import com.example.pmuapp.models.user.model.User
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun CreatePet(navController: NavController, 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(0, petName, selectedImage, "")
+                    onSaveClick(newPet)
+                    petName = ""
+                    selectedImage = R.drawable.pet1
+
+                    navController.popBackStack()
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Сохранить")
+        }
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt
@ -0,0 +1,109 @@
+package com.example.pmuapp.composeui
+
+import android.os.Build
+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.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.AuthViewModel
+import com.example.pmuapp.models.user.model.PetViewModel
+import com.example.pmuapp.models.user.model.UserViewModel
+
+@RequiresApi(VERSION_CODES.O)
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun EditPet(navController: NavController ,authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel, petId: Int) {
+    val pet = (authViewModel.currentUser?.petId ?: emptyList()).find { it.id == petId }
+
+    var petName by remember { mutableStateOf(pet?.name ?: "") }
+    var petNotes by remember { mutableStateOf(pet?.notes ?: "") }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(10.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        val imageResId = pet?.imageResId ?: 0
+        Image(
+            painter = painterResource(id = imageResId),
+            contentDescription = null,
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(200.dp)
+        )
+
+        OutlinedTextField(
+            value = petName,
+            onValueChange = { petName = 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,
+            onValueChange = { petNotes = 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 editedPetId = Screen.PlayPet.route.replace("{id}", pet?.id.toString())
+
+        Button(
+            onClick = {
+                val updatedPet = pet?.copy(name = petName, notes = petNotes) ?: return@Button
+
+                petViewModel.updatePet(updatedPet)
+                userViewModel.updatePetOnUser(authViewModel.currentUser?.id ?: -1, updatedPet)
+                authViewModel.currentUser=userViewModel.getUser(authViewModel.currentUser?.id ?: -1)
+                val petId = Screen.EditPet.route.replace("{id}", pet.id.toString())
+                navController?.navigate(editedPetId)
+            },
+            modifier = Modifier.padding(16.dp)
+        ) {
+            Text("Сохранить")
+        }
+
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/composeui/Home.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/Home.kt
@ -0,0 +1,40 @@
+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.height
+import androidx.compose.material3.Button
+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.AuthViewModel
+import com.example.pmuapp.models.user.model.PetViewModel
+import com.example.pmuapp.models.user.model.UserViewModel
+
+@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?.id ?: -1)
+
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/composeui/Login.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/Login.kt
@ -0,0 +1,104 @@
+package com.example.pmuapp.composeui
+
+import android.content.Intent
+import android.content.res.Configuration
+import android.net.Uri
+import android.widget.TextView
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.clickable
+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.MaterialTheme
+import androidx.compose.material3.Surface
+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.rememberUpdatedState
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.navigation.NavController
+import androidx.navigation.NavHostController
+import com.example.pmuapp.R
+import com.example.pmuapp.composeui.navigation.Screen
+import com.example.pmuapp.models.user.model.AuthViewModel
+import com.example.pmuapp.models.user.model.User
+import com.example.pmuapp.ui.theme.PMUappTheme
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun Login(
+    navController: NavHostController,
+    authViewModel: AuthViewModel,
+    users: List<User>
+) {
+    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 = {
+                val authenticatedUser = users.find { it.login == username && it.password == password }
+                if (authenticatedUser != null) {
+                    authViewModel.currentUser = authenticatedUser
+                    navController.navigate(Screen.Profile.route)
+                } else {
+                    println("Authentication failed")
+                }
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Login")
+        }
+
+    }
+}
+
+
+
+
+
--- a/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt
+++ b/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.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.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.AuthViewModel
+import com.example.pmuapp.models.user.model.PetViewModel
+import com.example.pmuapp.models.user.model.UserViewModel
+
+@RequiresApi(Build.VERSION_CODES.O)
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun PlayPet(navController: NavController,authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel, petId: Int) {
+    val pet = (authViewModel.currentUser?.petId ?: emptyList()).find { it.id == petId }
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(10.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        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("Изменить")
+        }
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/composeui/Profile.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/Profile.kt
@ -0,0 +1,131 @@
+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.imageResId),
+                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,
+                    currentUser?.petId ?: emptyList(),
+                selectedImageUri.value?.toString() ?: "",
+                )
+                onSaveClick(updatedUser)
+            },
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text("Сохранить")
+        }
+        Button(
+            onClick = {
+                navController.navigate(Screen.Login.route)
+
+            },
+            modifier = Modifier.fillMaxWidth()
+
+        ) {
+            Text("Выйти")
+        }
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt
@ -0,0 +1,238 @@
+package com.example.pmuapp.composeui.navigation
+
+import CreatePet
+import android.content.res.Configuration
+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.Surface
+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.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+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.composeui.PetList
+import com.example.pmuapp.models.user.composeui.UserList
+import com.example.pmuapp.models.user.model.AuthViewModel
+import com.example.pmuapp.models.user.model.PetViewModel
+import com.example.pmuapp.models.user.model.UserViewModel
+import com.example.pmuapp.ui.theme.PMUappTheme
+
+@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
+                    }
+                }
+            )
+        }
+    }
+}
+
+@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,userViewModel.getUsers())
+        }
+        composable(Screen.Profile.route) {
+            val currentUser = authViewModel.currentUser ?: userViewModel.getUsers().firstOrNull()
+            if (currentUser != null) {
+                Profile(navController,
+                    currentUser = currentUser,
+                    onSaveClick = {updatedUser ->
+                        userViewModel.updateUser(updatedUser)
+                        authViewModel.currentUser = updatedUser
+                        navController.navigate(Screen.Profile.route)
+                    }
+                )
+            } else {
+            }
+        }
+
+        composable(Screen.UserList.route) { UserList(navController, userViewModel) }
+        composable(Screen.Home.route) { Home(navController, authViewModel,petViewModel,userViewModel) }
+        composable(Screen.CreatePet.route) {
+            val currentUser = authViewModel.currentUser ?: userViewModel.getUsers().firstOrNull()
+            CreatePet ( navController, onSaveClick = { newPet ->
+                var adedPet = petViewModel.createPet(newPet)
+                userViewModel.addPetToUser(currentUser?.id ?:0, adedPet)
+                authViewModel.currentUser = userViewModel.getUser(currentUser?.id ?:0)
+            }
+                )
+
+            }
+
+        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)
+            }
+        }
+        composable(
+            Screen.PlayPet.route,
+            arguments = listOf(navArgument("id") { type = NavType.IntType })
+        ) { backStackEntry ->
+            val petId = backStackEntry.arguments?.getInt("id") ?: -1
+
+                PlayPet(navController,authViewModel, petViewModel, userViewModel, petId)
+        }
+        composable(
+            Screen.EditPet.route,
+            arguments = listOf(navArgument("id") { type = NavType.IntType })
+        ) { backStackEntry ->
+            val petId = backStackEntry.arguments?.getInt("id") ?: -1
+                EditPet(navController,authViewModel, petViewModel, userViewModel, petId)
+
+        }
+
+    }
+}
+
+@RequiresApi(Build.VERSION_CODES.O)
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun MainNavbar() {
+    val navController = rememberNavController()
+    val authViewModel = remember { AuthViewModel() }
+    val userViewModel =remember {UserViewModel() }
+    val petViewModel = remember {PetViewModel()}
+    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()
+//        }
+//    }
+//}
--- a/app/src/main/java/com/example/pmuapp/composeui/navigation/Screen.kt
+++ b/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) }
+        }
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/models/user/composeui/PetList.kt
+++ b/app/src/main/java/com/example/pmuapp/models/user/composeui/PetList.kt
@ -0,0 +1,118 @@
+package com.example.pmuapp.models.user.composeui
+
+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.fillMaxWidth
+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.getValue
+import androidx.compose.runtime.rememberUpdatedState
+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.AuthViewModel
+import com.example.pmuapp.models.user.model.PetViewModel
+import com.example.pmuapp.models.user.model.User
+import com.example.pmuapp.models.user.model.UserViewModel
+
+@OptIn(ExperimentalFoundationApi::class, ExperimentalLayoutApi::class)
+@Composable
+fun PetList(navController: NavController, authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel, userId: Int) {
+
+        val currentUser = userViewModel.getUser(userId)
+        var pets = currentUser.petId
+
+        LazyColumn(
+                verticalArrangement = Arrangement.Center,
+                horizontalAlignment = Alignment.CenterHorizontally
+        ) {
+                if (userId != authViewModel.currentUser?.id ?: -1) {
+                        item {
+                                Text(
+                                        text = currentUser?.name + " (" + currentUser.login + ")",
+                                        style = TextStyle(
+                                                fontSize = 24.sp,
+                                                fontWeight = FontWeight.Bold
+                                        ),
+                                        modifier = Modifier.padding(16.dp)
+                                )
+                        }
+                }
+
+                item {
+                        FlowRow() {
+                                pets.forEach { pet ->
+                                        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?.id ?: -1) {
+                                                        val petId = Screen.PlayPet.route.replace("{id}", pet.id.toString())
+                                                        Button(
+                                                                onClick = {
+                                                                        navController?.navigate(petId)
+
+                                                                },
+                                                        ) {
+                                                                Text("Играть")
+                                                        }
+                                                        IconButton(
+                                                                onClick = {
+                                                                        petViewModel.deletePet(pet)
+                                                                        userViewModel.deletePet(
+                                                                                currentUser?.id
+                                                                                        ?: 0,
+                                                                                pet.id
+                                                                        )
+                                                                        authViewModel.currentUser =
+                                                                                userViewModel.getUser(
+                                                                                        currentUser?.id
+                                                                                                ?: 0
+                                                                                )
+                                                                }
+                                                        ) {
+                                                                Icon(
+                                                                        imageVector = Icons.Default.Delete,
+                                                                        contentDescription = "Удалить"
+                                                                )
+                                                        }
+
+                                                }
+                                        }
+                                }
+                        }
+                }
+        }
+}
--- a/app/src/main/java/com/example/pmuapp/models/user/composeui/StudentView.kt
+++ b/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))
+            }
+        )
+    }
+}
--- a/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt
+++ b/app/src/main/java/com/example/pmuapp/models/user/composeui/UserList.kt
@ -0,0 +1,41 @@
+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.Button
+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 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.UserViewModel
+import com.example.pmuapp.ui.theme.PMUappTheme
+
+@Composable
+
+fun UserList(navController: NavController?,
+             userViewModel: UserViewModel
+) {
+    val users = userViewModel.users.value
+
+    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}")
+            }
+        }
+    }
+}
+
--- a/app/src/main/java/com/example/pmuapp/models/user/model/AuthViewModel.kt
+++ b/app/src/main/java/com/example/pmuapp/models/user/model/AuthViewModel.kt
@ -0,0 +1,10 @@
+package com.example.pmuapp.models.user.model
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+
+class AuthViewModel : ViewModel() {
+    var currentUser: User? by mutableStateOf(null)
+}
--- a/app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt
+++ b/app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt
@ -0,0 +1,68 @@
+package com.example.pmuapp.models.user.model
+
+import android.media.Image
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.example.pmuapp.R
+import java.io.Serializable
+
+data class Pet(
+    var id: Int,
+    val name: String,
+    val imageResId: Int,
+    val notes: String
+) : Serializable
+
+class PetViewModel : ViewModel() {
+    var pets: MutableState<List<Pet>> = mutableStateOf(
+        emptyList()
+    )
+    val availablePetImages: List<Int> = listOf(
+        R.drawable.pet1,
+        R.drawable.pet2,
+        R.drawable.pet3,
+        R.drawable.pet4,
+        R.drawable.pet5,
+        R.drawable.pet6,
+        R.drawable.pet7,
+        R.drawable.pet8,
+    )
+
+    fun createPet(newPet: Pet): Pet {
+        newPet.id = pets.value.size.toInt()
+        val updatedPets = pets.value.toMutableList()
+        updatedPets.add(newPet)
+        pets.value = updatedPets
+        return newPet
+    }
+
+    fun deletePet(pet: Pet) {
+        val updatedPets = pets.value.toMutableList()
+        updatedPets.remove(pet)
+        pets.value = updatedPets
+    }
+
+    fun updatePet(updatedPet: Pet) {
+        val updatedPets = pets.value.toMutableList()
+        val index = updatedPets.indexOfFirst { it.id == updatedPet.id }
+
+        if (index != -1) {
+            updatedPets[index] = updatedPet
+            pets.value = updatedPets
+        }
+    }
+}
+
+
+
+//    fun updateUser(updatedUser: User) {
+//        val updatedUsers = users.value.toMutableList()
+//        val index = updatedUsers.indexOfFirst { it.login == updatedUser.login }
+//        if (index != -1) {
+//            updatedUsers[index] = updatedUser
+//            users.value = updatedUsers
+//        }
+//    }
+
+
--- a/app/src/main/java/com/example/pmuapp/models/user/model/User.kt
+++ b/app/src/main/java/com/example/pmuapp/models/user/model/User.kt
@ -0,0 +1,129 @@
+package com.example.pmuapp.models.user.model
+
+import android.net.Uri
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import com.example.pmuapp.R
+import java.io.Serializable
+
+data class User(
+    val id: Int,
+    val name: String,
+    val login: String,
+    val password: String,
+    val petId: List<Pet>,
+    val imageResId: String // Добавляем поле для хранения ID ресурса изображения пользователя
+) : Serializable
+
+
+class UserViewModel : ViewModel() {
+    val imageUri: Uri = Uri.parse("android.resource://com.example.pmuapp/${R.drawable.avatar}")
+
+    var users: MutableState<List<User>> = mutableStateOf(
+        listOf(
+            User(0,"Иван", "ivan", "111111", emptyList(),imageUri.toString()),
+            User(1,"Анна", "ann", "111111", emptyList(),imageUri.toString()),
+            User(2,"Лиза", "liza", "111111",emptyList(),imageUri.toString())
+        )
+    )
+    val availablePetImages: List<Int> = listOf(
+        R.drawable.pet1,
+        R.drawable.pet2,
+        R.drawable.pet3,
+        R.drawable.pet4,
+        R.drawable.pet5,
+        R.drawable.pet6,
+        R.drawable.pet7,
+        R.drawable.pet8,
+    )
+
+    fun getUsers(): List<User> {
+        return users.value
+    }
+    fun getUser(id:Int): User {
+        return users.value.get(id)
+    }
+    fun getPets(id:Int): List<Pet> {
+        return users.value.get(id).petId
+    }
+    // Function to add a pet to a user
+    fun addPetToUser(userId: Int, newPet: Pet) {
+        val updatedUsers = users.value.toMutableList()
+        val user = updatedUsers.find { it.id == userId }
+
+        user?.let {
+            val updatedPets = user.petId.toMutableList()
+            updatedPets.add(newPet)
+            val updatedUser = user.copy(petId = updatedPets)
+            val userIndex = updatedUsers.indexOf(user)
+            updatedUsers[userIndex] = updatedUser
+            users.value = updatedUsers
+        }
+    }
+    fun deletePet(userId: Int, petIdToDelete: Int) {
+        val updatedUsers = users.value.toMutableList()
+
+        // Найдем пользователя по userId
+        val user = updatedUsers.find { it.id == userId }
+
+        user?.let { user ->
+            val updatedPets = user.petId.toMutableList()
+
+            // Найдем питомца по petId и удалим его из списка питомцев
+            val petToDelete = updatedPets.find { it.id == petIdToDelete }
+
+            petToDelete?.let { pet ->
+                updatedPets.remove(pet)
+            }
+
+            // Обновим пользователя с обновленным списком питомцев
+            val updatedUser = user.copy(petId = updatedPets)
+
+            // Обновим список пользователей
+            val userIndex = updatedUsers.indexOf(user)
+            updatedUsers[userIndex] = updatedUser
+            users.value = updatedUsers
+        }
+    }
+
+    fun updatePetOnUser(userId: Int, updatedPet: Pet) {
+        val updatedUsers = users.value.toMutableList()
+
+        // Найдем пользователя по userId
+        val user = updatedUsers.find { it.id == userId }
+
+        user?.let { user ->
+            val updatedPets = user.petId.toMutableList()
+
+            // Найдем питомца по petId и обновим его
+            val petToUpdate = updatedPets.find { it.id == updatedPet.id }
+
+            petToUpdate?.let { pet ->
+                val petIndex = updatedPets.indexOf(pet)
+                updatedPets[petIndex] = updatedPet
+            }
+
+            // Обновим пользователя с обновленным списком питомцев
+            val updatedUser = user.copy(petId = updatedPets)
+
+            // Обновим список пользователей
+            val userIndex = updatedUsers.indexOf(user)
+            updatedUsers[userIndex] = updatedUser
+            users.value = updatedUsers
+        }
+    }
+
+    fun updateUser(updatedUser: User) {
+        val updatedUsers = users.value.toMutableList()
+        val index = updatedUsers.indexOfFirst { it.login == updatedUser.login }
+        if (index != -1) {
+            updatedUsers[index] = updatedUser
+            users.value = updatedUsers
+        }
+    }
+}
+
+
+
+
--- a/app/src/main/java/com/example/pmuapp/ui/theme/Color.kt
+++ b/app/src/main/java/com/example/pmuapp/ui/theme/Color.kt
@ -0,0 +1,11 @@
+package com.example.pmuapp.ui.theme
+
+import androidx.compose.ui.graphics.Color
+
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFFEFB8C8)
+
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFF7D5260)
--- a/app/src/main/java/com/example/pmuapp/ui/theme/Theme.kt
+++ b/app/src/main/java/com/example/pmuapp/ui/theme/Theme.kt
@ -0,0 +1,70 @@
+package com.example.pmuapp.ui.theme
+
+import android.app.Activity
+import android.os.Build
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.dynamicDarkColorScheme
+import androidx.compose.material3.dynamicLightColorScheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
+
+private val DarkColorScheme = darkColorScheme(
+    primary = Purple80,
+    secondary = PurpleGrey80,
+    tertiary = Pink80
+)
+
+private val LightColorScheme = lightColorScheme(
+    primary = Purple40,
+    secondary = PurpleGrey40,
+    tertiary = Pink40
+
+    /* Other default colors to override
+    background = Color(0xFFFFFBFE),
+    surface = Color(0xFFFFFBFE),
+    onPrimary = Color.White,
+    onSecondary = Color.White,
+    onTertiary = Color.White,
+    onBackground = Color(0xFF1C1B1F),
+    onSurface = Color(0xFF1C1B1F),
+    */
+)
+
+@Composable
+fun PMUappTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    // Dynamic color is available on Android 12+
+    dynamicColor: Boolean = true,
+    content: @Composable () -> Unit
+) {
+    val colorScheme = when {
+        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+            val context = LocalContext.current
+            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+        }
+
+        darkTheme -> DarkColorScheme
+        else -> LightColorScheme
+    }
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            window.statusBarColor = colorScheme.primary.toArgb()
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+        }
+    }
+
+    MaterialTheme(
+        colorScheme = colorScheme,
+        typography = Typography,
+        content = content
+    )
+}
--- a/app/src/main/java/com/example/pmuapp/ui/theme/Type.kt
+++ b/app/src/main/java/com/example/pmuapp/ui/theme/Type.kt
@ -0,0 +1,34 @@
+package com.example.pmuapp.ui.theme
+
+import androidx.compose.material3.Typography
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+
+// Set of Material typography styles to start with
+val Typography = Typography(
+    bodyLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 16.sp,
+        lineHeight = 24.sp,
+        letterSpacing = 0.5.sp
+    )
+    /* Other default text styles to override
+    titleLarge = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 22.sp,
+        lineHeight = 28.sp,
+        letterSpacing = 0.sp
+    ),
+    labelSmall = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Medium,
+        fontSize = 11.sp,
+        lineHeight = 16.sp,
+        letterSpacing = 0.5.sp
+    )
+    */
+)
--- a/app/src/main/res/drawable/JNuFnEwXb10.jpg
+++ b/app/src/main/res/drawable/JNuFnEwXb10.jpg
--- a/app/src/main/res/drawable/avatar.jpg
+++ b/app/src/main/res/drawable/avatar.jpg
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#3DDC84"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeWidth="0.8"
+        android:strokeColor="#33FFFFFF" />
+</vector>
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
--- a/app/src/main/res/drawable/pet1.jpg
+++ b/app/src/main/res/drawable/pet1.jpg
--- a/app/src/main/res/drawable/pet2.jpg
+++ b/app/src/main/res/drawable/pet2.jpg
--- a/app/src/main/res/drawable/pet3.jpg
+++ b/app/src/main/res/drawable/pet3.jpg
--- a/app/src/main/res/drawable/pet4.jpg
+++ b/app/src/main/res/drawable/pet4.jpg
--- a/app/src/main/res/drawable/pet5.jpg
+++ b/app/src/main/res/drawable/pet5.jpg
--- a/app/src/main/res/drawable/pet6.jpg
+++ b/app/src/main/res/drawable/pet6.jpg
--- a/app/src/main/res/drawable/pet7.jpg
+++ b/app/src/main/res/drawable/pet7.jpg
--- a/app/src/main/res/drawable/pet8.jpg
+++ b/app/src/main/res/drawable/pet8.jpg
--- a/app/src/main/res/drawable/skNIwe8OnDc.jpg
+++ b/app/src/main/res/drawable/skNIwe8OnDc.jpg
--- a/app/src/main/res/drawable/Лекция
+++ b/app/src/main/res/drawable/Лекция
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/app/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -0,0 +1,31 @@
+<resources>
+    <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>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Theme.PMUapp" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
--- a/app/src/main/res/xml/backup_rules.xml
+++ b/app/src/main/res/xml/backup_rules.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
--- a/app/src/test/java/com/example/pmuapp/ExampleUnitTest.kt
+++ b/app/src/test/java/com/example/pmuapp/ExampleUnitTest.kt
@ -0,0 +1,17 @@
+package com.example.pmuapp
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -0,0 +1,5 @@
+// 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
+}
--- a/gradle.properties
+++ b/gradle.properties
@ -0,0 +1,24 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+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.overridePathCheck=true
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
+#Sun Oct 08 15:55:19 GMT+04:00 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
--- a/185
+++ b/185
@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/local.properties
+++ b/local.properties
@ -0,0 +1,10 @@
+## This file is automatically generated by Android Studio.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file should *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+sdk.dir=C\:\\Users\\Kate\\AppData\\Local\\Android\\Sdk
--- a/report/Lab1.docx
+++ b/report/Lab1.docx
--- a/report/template/Вход.psd
+++ b/report/template/Вход.psd
--- a/report/template/Дом
+++ b/report/template/Дом
--- a/report/template/Изменение
+++ b/report/template/Изменение
--- a/report/template/Мир
+++ b/report/template/Мир
--- a/report/template/Мой
+++ b/report/template/Мой
--- a/report/template/Мой
+++ b/report/template/Мой
--- a/report/template/Мой
+++ b/report/template/Мой
--- a/report/template/Пиомцы.jpg
+++ b/report/template/Пиомцы.jpg
--- a/report/template/Регистрация.psd
+++ b/report/template/Регистрация.psd
--- a/report/template/Создание
+++ b/report/template/Создание
--- a/report/template/Старт.psd
+++ b/report/template/Старт.psd
--- a/report/template/Фон.psd
+++ b/report/template/Фон.psd
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@ -0,0 +1,18 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "PMUapp"
+include(":app")
+
Author	SHA1	Message	Date
Kate	5b71cf1e4b	Лаб 2 вроде конец	2023-10-25 16:07:52 +04:00
Kate	b6d335503d	Лаб 2 выглядит как предварительный конец 2 лабы	2023-10-12 09:00:27 +04:00
Kate	b20055a9c7	Лаб 2 выглядит как предварительный конец 2 лабы	2023-10-12 09:00:15 +04:00
Kate	16d85c07d0	Лаб 2 питомцы просто добавлены	2023-10-12 00:06:50 +04:00
Kate	4d537f08f0	Лаб 2 нало работы с пользователем	2023-10-11 20:30:50 +04:00
Kate	555dca89be	Лаб 2 начало	2023-10-11 19:32:32 +04:00
Kate	24d223cdff	добавление отчета лаб 1	2023-10-08 16:07:23 +04:00
Kate	f06e8e8340	коммит1	2023-10-08 15:59:16 +04:00