From 17754f6e72db9fc924b9e985d4c366257fa7db5e Mon Sep 17 00:00:00 2001
From: Kate <kateihonk.al.07@gmail.com>
Date: Mon, 13 Nov 2023 19:42:47 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=203=20=D0=B8=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B5=D0=B9=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=B8=D0=B9=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B8.=20?=
 =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gradle/8.0/checksums/checksums.lock          | Bin 17 -> 17 bytes
 .gradle/8.0/checksums/md5-checksums.bin       | Bin 25997 -> 26297 bytes
 .gradle/8.0/checksums/sha1-checksums.bin      | Bin 45065 -> 45551 bytes
 .gradle/8.0/fileHashes/fileHashes.lock        | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 334619 -> 337247 bytes
 .idea/workspace.xml                           |  77 +++++++++---------
 app/build.gradle.kts                          |   3 +
 .../com/example/pmuapp/composeui/EditPet.kt   |   6 +-
 .../java/com/example/pmuapp/composeui/Home.kt |   2 +-
 .../com/example/pmuapp/composeui/Login.kt     |  41 +++-------
 .../com/example/pmuapp/composeui/PlayPet.kt   |   5 +-
 .../com/example/pmuapp/composeui/Profile.kt   |   8 +-
 .../pmuapp/composeui/navigation/MyPage.kt     |  16 ++--
 .../pmuapp/models/user/composeui/PetList.kt   |   6 +-
 .../pmuapp/models/user/model/AuthViewModel.kt |  10 ---
 .../example/pmuapp/models/user/model/User.kt  |  25 +++---
 .../user/model/viewmodel/AuthViewModel.kt     |  45 ++++++++++
 .../user/model/viewmodel/UserViewModel.kt     |  36 ++++++++
 19 files changed, 165 insertions(+), 115 deletions(-)
 delete mode 100644 app/src/main/java/com/example/pmuapp/models/user/model/AuthViewModel.kt
 create mode 100644 app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt
 create mode 100644 app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt

diff --git a/.gradle/8.0/checksums/checksums.lock b/.gradle/8.0/checksums/checksums.lock
index 27d9b8e7c7c964c9e928cde73c5d39b09440297a..fb0feb48819b6e6d6f73ad2fbf67924ef273802f 100644
GIT binary patch
literal 17
VcmZSfO*qBs&T^@U0SuUq0RSd}1J?im

literal 17
VcmZSfO*qBs&T^@U0SuVd0{|v!1Hb?P

diff --git a/.gradle/8.0/checksums/md5-checksums.bin b/.gradle/8.0/checksums/md5-checksums.bin
index 2dd2fedaaa9821c9a860d0379e1e033bba74df64..854ce88d85bbf67ebe10ff6003b84b628c1f4485 100644
GIT binary patch
delta 462
zcmeA@&A9U{;|3E6#yOi!C04TWCo#U5ctHFf0~n<4-+Wc>1*3rYmoseplsS!|q8~SJ
zRq$XE@NT^PaOdTIBdBQa<gZE!0{%Y&-}S9KUIr0NQ=ZJLtjNF1Ph!=N+wY-bp_^5e
z7cdH>KmKuf_i_13sA&7<y(*I#88>cJ{2{*4AcJ$Wqlb@dJ;+K;AXWrnfjjy-b=T8Q
zw#>hL!q%)n{1yWPWA};P%MlPG*p2~dJyad`HBPy?e05eDOJ*3om~Q6=)o}%)Ba{VG
z$DXvWr}pntS$gp61sk1u$Fs*FTCPllXkkyo)KVFIkzdtE{8Ub1=N3QqJ&&O}pn=G>
z15-!NtfG!?XBQ6Z{V}1@?-;j$bu6t~4Y7mk988BE!tZ>}8`o@Ik>9@A=gz*#i4&k&
NsvRL(1a^b8008(sgDe05

delta 59
zcmV-B0L1^f%>j+e0kAX}0hY5h7^w!c_8#8>v+W>20+U4}7?X7)8MCG%mjSa?C5r(8
RA+aI&7qKw-39~^+OdY^u7J2{x

diff --git a/.gradle/8.0/checksums/sha1-checksums.bin b/.gradle/8.0/checksums/sha1-checksums.bin
index 41955ce9a2df97a92355f576375c7e2e39ebd956..7117ade9ab3b7b7fdb97c434d8c5439a5b81c6a8 100644
GIT binary patch
delta 695
zcmeBt!1Vqx(*_d>#;==AB`TN&`VXo$`+a`%fB_6PJlwogI)Yc={yDuH=L`O@LPhO2
zf7O`C!9R(y;z72g5=3yL@8(*=m8|?ToKAi1u>K2GS-M%)oP$}wW=Gq_*MZGeP^CLJ
z%UW?V^Y8MLSoP!fd#IrJW?5SY7J<~KJ9ntxS{@5EVD;osM+<@U$3HIbJ}zGgRoc9{
z)iIKhFI?f)l*MYBp(;0Daq4Df(&yZ$$icYT(c?sVhA~h^7l>6sSY-L}m!>A?E;*ds
zd_UFTeVl{woGxVs2FC6ay_X{(Mz9?N(nhGdLKuHu;uChOwVUkn@{(Tt<P5PjXQ8^T
zKy-z&O#Zk?xc>jUB$-F|)lN33p5B#z`p2GR2PTNRD-$8=*wZjgfBExJ>WjD~j)GSn
zIVj9MZEtl#G6$;b9z++{4oqFYKdN{<VE!-ic-6&4C;!^CtY<wfR}a><v}!d}+d1O2
z5!UtnWgna0+Zo5%IC>9V`R`DDZPT$Jh^}f!h+P7^fpjifxDlxhO_$MHwO?EkU+>pc
a{})@gO78soNQ-iaWp%a?%l?7F#Rvf5Z`(lt

delta 72
zcmV-O0Js0|;{u7`0<bg~0qnCi7<dD-#T!r!vn?r!2(!*HparvrH~#{&ojL&nv$j1q
e1d|0qFtbfUQ312ILxBSVE-|qo-~qEiNXTa%I~%e9

diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock
index 3b78ce071ca5bebfc0fb5abbeecd0b264c920ffc..6b6ca6bd42adbb708b37bac316ad1497276a8047 100644
GIT binary patch
literal 17
UcmZQ(dy=8m_$ir@0SpS-0V|ROP5=M^

literal 17
UcmZQ(dy=8m_$ir@0SpS70V|FKN&o-=

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 9d1bfd3ac23157a844e1d97a3d89fbaf552757d1..ffe221fa6745efedd0cab6e4b411cbcee3539c87 100644
GIT binary patch
literal 17
VcmZR6bj^R>eA$;57{H)v82~~320j1)

literal 17
VcmZR6bj^R>eA$;57{H)P002Q}1*iZ3

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index 007ac5bf84bcb7b6c2af5b6751346c9600613ac7..459d3ed21b83b69731a70fc5ad38af40b7f24799 100644
GIT binary patch
delta 4022
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
RmMT0}erZuLEEGze@jvOy9!~%O

delta 1671
zcmX|BZBUd|6y}_BcUhJ%@nc*Sb5{gJjTWjIuo{<ATSrrD(n3=gGoW%Ns+j_Ea8ZAV
z8LhnP@jF0&Xg0~tJ94xshrTe-97!$2X%t8BYeZmb2*d2YSlu7z$9d0t&U2pUx%YC*
z$lVPi>z{DJ1@lQ)2bk$&i@^M1++;Mn#}_-y_fvL&nKIdBHy5WnoW}cEJ!W}!9hzBB
zmn-v(Zv`2%X5PbTQM|bulexJY{hW3eOZfO*^qTW$O?(*+8Sm`5Xsq1pGOPFID)U}#
zuG3igdBAM{yvS)Tk>Y6M>bG8V%6B&bQ*ZLBpQzKE{==-v@Rbp~GsX<xae&d<9WdwI
z{S(Z*-k>sj|7f%u&4U3W=f2mhy#I<r25hj=!8_w1BsuZW>%g=ypIJsv`>xwpT^d-4
z?Ge_2)%zd(d#<O%ZaROZ|JuX+Yq$T;XSbiqS^2wnD36=M+_#*vdH)LXGX=;ic`o=h
z8Um6r32KpVr9hALrNU&C%qcJoWyv%vu1g0$$<+)fiIR7p0v}4tGmr&5b_SHlXEUI}
zj-CXbQ=pQ0UxD&+mlb9g>QGgvTzsNXm2g3k@=MEX_{a~3W$`EACD~UE2?>01Ke(iS
zKOBq^sfS!86OO{S2xGXyP04)1O)l<sYq$j-a!KSdcp(AGWl=Mvp=>_|Zjdvl;fj)`
zRtwi7=i#DV;xECcC{4dv*t;)-&mqfiK(URx?m)IZsUrgap13_zc{n>$qkAJ$g*f4H
z)g#^AK(Vk_`u+kB$kh9A1tjSKtaZwlQJ8}=A_fl<pNq$kd^ijpN_LM#J^$P&Y>VOV
zCStQar8xrE)bjBynqz0R2EEG)&l;L&GYLOPfUPq1NxX?NEelIs@^vmgPm=f&)`MJI
zgj;O(<lYEa^)Wvf&<%?2kze*K#SyEalj~37A*uWkgTS5^^h-qx9*dTRzhDnZUOP70
zIimwJq^tvH*rc@!_2vUN(5)on4sNs=XJ)(PW*@#m_-JL=vk~R1essmbLAhX~0g$dp
zszKT3q-G^+<LPY_`*6~YmW`&JisKTgk-HKpBvs=n5GD3hx~%xb*DzK_PoomV)Yh=a
z=V0A4mg`5UHp9Ej&)(gtoI`mKVs`@$a%h`sGKT#Y;+}7?P3p^GF_?jC7m%wu$pJ^W
zYzAGFw|uk%WZbh>JoOxDa%mP_w=vG8Oqn;ACV;G;r$6%J^EH}F^XVA!;f1t<C%#A-
z^45z~6e+j!NZWVntCZ#Bym2s^s|#ojSB}#zi!P*ml-sqG<CH)lwkr*Ei3L=nT>))e
ze_CS<EKK9#QjO^VmzGk#^p(<Cl=d~`vvKA+tz_9c>WGy0Hqm9^H#bv2u5P9vNLdvH
zl?*qi*e1JnkmjSWh6XV8ov^27h?@y!&FfQ0e1}vbvad>&TXY!i1$7on<s6(&w@hzA
z92lWMlLQCV7I?_bRxUnD7dgK{tB@@;M&1+}O|tV#a=E1WXS#vXe1ZN{M$0KLdoJmj
z$-QBZ+sSJ>X)IJQchWaf+(nI1;_smak#eM;qGEYNK6)E$O54~SrG^8fg*`W-hcpze
zVSf~?m4g%1LXZTH+K3!Z()TxEl5zlNB<stPouc#=u1HhbyK|<h8e~Y<75V8Z3ncuQ
z%5}<^>8jF+NdsYzE5>SEXatvrL@!$e5-`;UV)qfM8`{~TU{HeVQLpb_@YKV_3wT?e
z%9pq$dZ?r?Rqj~PuSn#GnExKPhzL(@*i#($zw;(pyv2d#xVnb(8rnne1)Eez8o$SV
zU`afvc`s+}z||7ktY(6lyC@Fi$_CKoI^G(>VhJ>4h+9LITz>$YjI*tNZmd>*tAUZb
as7(u62J9=*hSvVkP4rKRD8V|lyW}6;qmFn0

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7d57701..111fe90 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,36 +9,26 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="dc3793c7-c725-42e8-8eda-044c95f334c1" name="Changes" comment="Лаб 3 начало">
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/PetDao.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/PetImageDao.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/Dao/UserDao.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/database/AppDatabase.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/PetImage.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/PetWithImage.kt" afterDir="false" />
+    <list default="true" id="dc3793c7-c725-42e8-8eda-044c95f334c1" name="Changes" comment="Лаб 3 создание моделей">
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/checksums.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/md5-checksums.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.0/checksums/sha1-checksums.bin" afterDir="false" />
-      <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/kotlinc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/kotlinc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/MainComposeActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/MainComposeActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/Pet.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/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/model/AuthViewModel.kt" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/User.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/pmuapp/models/user/model/User.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/JNuFnEwXb10.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/skNIwe8OnDc.jpg" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/Лекция 6.pdf" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle.kts" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle.kts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/gradle.properties" beforeDir="false" afterPath="$PROJECT_DIR$/gradle.properties" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,8 +84,8 @@
       <list>
         <option value="Kotlin File" />
         <option value="Interface" />
-        <option value="Kotlin Class" />
         <option value="Kotlin Interface" />
+        <option value="Kotlin Class" />
       </list>
     </option>
   </component>
@@ -121,22 +111,22 @@
     <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/lab4compose",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "project.kotlinCompiler"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;com.android.tools.idea.devicemanager.tab&quot;: &quot;Physical&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/Kate/AndroidStudioProjects/Ihonkina_PIbd-31_PMU&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;project.kotlinCompiler&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="C:\Users\Kate\AndroidStudioProjects\Ihonkina_PIbd-31_PMU\app\src\main\java\com\example\pmuapp\models\user\viewmodels" />
@@ -152,6 +142,7 @@
       <recent name="com.example.pmuapp.composeui" />
     </key>
     <key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
+      <recent name="com.example.pmuapp.models.user.model.viewmodel" />
       <recent name="com.example.pmuapp.composeui" />
     </key>
     <key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
@@ -306,7 +297,14 @@
       <option name="project" value="LOCAL" />
       <updated>1698258953508</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="Лаб 3 создание моделей">
+      <created>1699816471908</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1699816471908</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -342,6 +340,7 @@
     <MESSAGE value="Лаб 2 выглядит как предварительный конец 2 лабы" />
     <MESSAGE value="Лаб 2 вроде конец" />
     <MESSAGE value="Лаб 3 начало" />
-    <option name="LAST_COMMIT_MESSAGE" value="Лаб 3 начало" />
+    <MESSAGE value="Лаб 3 создание моделей" />
+    <option name="LAST_COMMIT_MESSAGE" value="Лаб 3 создание моделей" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8277fc1..43568d4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -65,7 +65,10 @@ dependencies {
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
     implementation("androidx.compose.material3:material3")
+    implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
     implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
+    implementation ("io.coil-kt:coil-compose:1.4.0")
+
 
 
     // Room
diff --git a/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt b/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt
index 41ae443..5f16aa8 100644
--- a/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/EditPet.kt
@@ -1,6 +1,5 @@
 package com.example.pmuapp.composeui
 
-import android.os.Build
 import android.os.Build.*
 import androidx.annotation.RequiresApi
 import androidx.compose.foundation.Image
@@ -25,19 +24,18 @@ 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.viewmodel.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) {
+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 ?: "") }
diff --git a/app/src/main/java/com/example/pmuapp/composeui/Home.kt b/app/src/main/java/com/example/pmuapp/composeui/Home.kt
index 5873b06..6c798cd 100644
--- a/app/src/main/java/com/example/pmuapp/composeui/Home.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/Home.kt
@@ -14,7 +14,7 @@ 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.viewmodel.AuthViewModel
 import com.example.pmuapp.models.user.model.PetViewModel
 import com.example.pmuapp.models.user.model.UserViewModel
 
diff --git a/app/src/main/java/com/example/pmuapp/composeui/Login.kt b/app/src/main/java/com/example/pmuapp/composeui/Login.kt
index 1a7a4fc..7b4922f 100644
--- a/app/src/main/java/com/example/pmuapp/composeui/Login.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/Login.kt
@@ -1,11 +1,5 @@
 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
@@ -15,42 +9,32 @@ 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.collectAsState
 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
+import com.example.pmuapp.models.user.model.viewmodel.AuthViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun Login(
-    navController: NavHostController,
-    authViewModel: AuthViewModel,
-    users: List<User>
+    navController: NavController,
+    authViewModel: AuthViewModel
 ) {
     var username by remember { mutableStateOf("") }
     var password by remember { mutableStateOf("") }
 
+    val users by authViewModel.currentUser.collectAsState()
 
     Column(
         modifier = Modifier
@@ -82,11 +66,12 @@ fun Login(
 
         Button(
             onClick = {
-                val authenticatedUser = users.find { it.login == username && it.password == password }
+                val authenticatedUser = authViewModel.loginUser(username, password)
                 if (authenticatedUser != null) {
-                    authViewModel.currentUser = authenticatedUser
+                    // Аутентификация успешна
                     navController.navigate(Screen.Profile.route)
                 } else {
+                    // Аутентификация не удалась
                     println("Authentication failed")
                 }
             },
@@ -95,10 +80,10 @@ fun Login(
             Text("Login")
         }
 
+
+        // Вы можете также использовать users для дополнительных проверок или вывода информации
+        users?.let {
+            Text("Current User: ${it.name}")
+        }
     }
 }
-
-
-
-
-
diff --git a/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt b/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt
index 2b268bf..f29a8f9 100644
--- a/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/PlayPet.kt
@@ -5,7 +5,6 @@ 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
@@ -25,14 +24,14 @@ 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.viewmodel.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) {
+fun PlayPet(navController: NavController, authViewModel: AuthViewModel, petViewModel: PetViewModel, userViewModel: UserViewModel, petId: Int) {
     val pet = (authViewModel.currentUser?.petId ?: emptyList()).find { it.id == petId }
 
     Column(
diff --git a/app/src/main/java/com/example/pmuapp/composeui/Profile.kt b/app/src/main/java/com/example/pmuapp/composeui/Profile.kt
index 45df3d5..ccc67d6 100644
--- a/app/src/main/java/com/example/pmuapp/composeui/Profile.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/Profile.kt
@@ -49,7 +49,7 @@ fun Profile(navController: NavController,currentUser: User?, onSaveClick: (User)
     ) {
         currentUser?.let { user ->
             Image(
-                painter = rememberImagePainter(data = user.imageResId),
+                painter = rememberImagePainter(data = user.imageUri),
                 contentDescription = null,
                 modifier = Modifier
                     .fillMaxWidth()
@@ -108,8 +108,8 @@ fun Profile(navController: NavController,currentUser: User?, onSaveClick: (User)
                     nameState.value,
                     loginState.value,
                     passwordState.value,
-                    currentUser?.petId ?: emptyList(),
-                selectedImageUri.value?.toString() ?: "",
+                    currentUser?.pets ?: emptyList(),
+                    selectedImageUri.value?.toString() ?: ""
                 )
                 onSaveClick(updatedUser)
             },
@@ -117,6 +117,8 @@ fun Profile(navController: NavController,currentUser: User?, onSaveClick: (User)
         ) {
             Text("Сохранить")
         }
+
+
         Button(
             onClick = {
                 navController.navigate(Screen.Login.route)
diff --git a/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt b/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt
index 6721c08..6cc181e 100644
--- a/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt
+++ b/app/src/main/java/com/example/pmuapp/composeui/navigation/MyPage.kt
@@ -1,7 +1,6 @@
 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
@@ -17,7 +16,6 @@ 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
@@ -27,7 +25,6 @@ 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
@@ -46,10 +43,9 @@ 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.viewmodel.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
@@ -123,11 +119,11 @@ fun Navbar(
 @RequiresApi(Build.VERSION_CODES.O)
 @Composable
 fun NavHost(
-navController: NavHostController,
-innerPadding: PaddingValues,
-authViewModel: AuthViewModel,
-userViewModel: UserViewModel,
-petViewModel: PetViewModel
+    navController: NavHostController,
+    innerPadding: PaddingValues,
+    authViewModel: AuthViewModel,
+    userViewModel: UserViewModel,
+    petViewModel: PetViewModel
 ) {
     NavHost(
         navController = navController,
diff --git 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
index 46bc764..1e12479 100644
--- 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
@@ -6,7 +6,6 @@ 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
@@ -17,8 +16,6 @@ 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
@@ -28,9 +25,8 @@ 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.viewmodel.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)
diff --git 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
deleted file mode 100644
index 2a73530..0000000
--- a/app/src/main/java/com/example/pmuapp/models/user/model/AuthViewModel.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-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)
-}
diff --git 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
index 9e33af1..bbc9ffd 100644
--- 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
@@ -10,22 +10,23 @@ import androidx.room.Relation
 @Entity(tableName = "users")
 data class User(
     @PrimaryKey(autoGenerate = true)
-    val id: Int,
+    val id: Int = 0,
     val name: String,
     val login: String,
     val password: String,
-    @Relation(
-        entity = Pet::class,
-        parentColumn = "id",
-        entityColumn = "user_id"
-    )
-    val pets: List<Pet>,
-    @ColumnInfo(name = "image_res_id")
-    val imageResId: String
-)  {
+    @Relation(parentColumn = "id", entityColumn = "user_id")
+    var pets: List<Pet> = emptyList(),
+    val imageUri: String = ""
+) {
     @Ignore
-    constructor(id: Int, name: String, login: String, password: String, imageResId: Int) :
-            this(id, name, login, password, emptyList(), imageResId)
+    constructor(
+        name: String,
+        login: String,
+        password: String,
+        pets: List<Pet>,
+        imageUri: String
+    ) : this(0, name, login, password, pets, imageUri)
+
     fun addPet(pet: Pet): User {
         val updatedPets = pets.toMutableList()
         updatedPets.add(pet)
diff --git a/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt b/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt
new file mode 100644
index 0000000..a48c066
--- /dev/null
+++ b/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/AuthViewModel.kt
@@ -0,0 +1,45 @@
+package com.example.pmuapp.models.user.model.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.pmuapp.models.user.Dao.UserDao
+import com.example.pmuapp.models.user.model.User
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class AuthViewModel(private val userDao: UserDao) : ViewModel() {
+
+    private val _currentUser = MutableStateFlow<User?>(null)
+    val currentUser: StateFlow<User?> get() = _currentUser.asStateFlow()
+
+    init {
+        // Подписываемся на изменения в базе данных и обновляем _currentUser
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val users = userDao.getAll()
+                // Ваш код обработки данных, если необходимо
+                // Например, если вам нужно обновить _currentUser
+                _currentUser.value = users.firstOrNull()
+            }
+        }
+
+
+
+    }
+    // Метод для входа пользователя
+    fun loginUser(login: String, password: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val user = userDao.getUserByLoginAndPassword(login, password)
+                // Обновляем _currentUser после успешной аутентификации
+                _currentUser.value = user
+            }
+        }
+    }
+
+    // Добавьте методы для выхода пользователя, регистрации и других операций, если нужно
+}
diff --git a/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt b/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt
new file mode 100644
index 0000000..883042c
--- /dev/null
+++ b/app/src/main/java/com/example/pmuapp/models/user/model/viewmodel/UserViewModel.kt
@@ -0,0 +1,36 @@
+package com.example.pmuapp.models.user.model.viewmodel
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.example.pmuapp.models.user.Dao.UserDao
+import com.example.pmuapp.models.user.model.User
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+class UserViewModel(private val userDao: UserDao) : ViewModel() {
+
+    private val _users = MutableStateFlow<List<User>>(emptyList())
+    val users: StateFlow<List<User>> get() = _users
+
+    // Метод для обновления списка пользователей
+    fun updateUsers(newUsers: List<User>) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                _users.value = newUsers
+            }
+        }
+    }
+
+    // Метод для входа пользователя
+    fun loginUser(login: String, password: String) {
+        viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                val user = userDao.getUserByLoginAndPassword(login, password)
+                // Здесь должно быть обновление списка пользователей, но не _currentUser
+                // Также, вам, возможно, нужно вызвать метод updateUsers с обновленным списком пользователей
+            }
+        }
+    }
+}