From fa7709c2b6eabe89c7e02c541f2e23d5414015db Mon Sep 17 00:00:00 2001
From: 62160052 <62160052@go.buu.ac.th>
Date: Sat, 24 Sep 2022 19:05:26 +0700
Subject: [PATCH] Implement the Mars Photos data class and Update
 MarsApiService and OverviewViewModel

---
 .gradle/7.3.3/checksums/checksums.lock        | Bin 17 -> 17 bytes
 .gradle/7.3.3/checksums/md5-checksums.bin     | Bin 19147 -> 19597 bytes
 .gradle/7.3.3/checksums/sha1-checksums.bin    | Bin 20765 -> 22817 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/7.3.3/fileHashes/fileHashes.bin       | Bin 74165 -> 74965 bytes
 .gradle/7.3.3/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../buildOutputCleanup.lock                   | Bin 17 -> 17 bytes
 .gradle/buildOutputCleanup/outputFiles.bin    | Bin 184415 -> 211949 bytes
 ...radle__com_squareup_moshi_moshi_1_13_0.xml |  13 ++++++++
 ...com_squareup_moshi_moshi_kotlin_1_13_0.xml |  13 ++++++++
 .../Gradle__com_squareup_okio_okio_1_17_2.xml |  13 --------
 .../Gradle__com_squareup_okio_okio_2_10_0.xml |  13 ++++++++
 ...uareup_retrofit2_converter_moshi_2_9_0.xml |  13 ++++++++
 ...reup_retrofit2_converter_scalars_2_9_0.xml |  13 --------
 ..._jetbrains_kotlin_kotlin_reflect_1_6_0.xml |  13 ++++++++
 ..._jetbrains_kotlin_kotlin_stdlib_1_5_31.xml |  13 --------
 ...g_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml |  13 ++++++++
 ...ins_kotlin_kotlin_stdlib_common_1_5_31.xml |  13 --------
 ...ains_kotlin_kotlin_stdlib_common_1_6_0.xml |  13 ++++++++
 ...brains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml |  13 ++++++++
 ...brains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml |  13 ++++++++
 .../app/MarsPhotos.app.androidTest.iml        |  30 +++++++++++------
 .idea/modules/app/MarsPhotos.app.main.iml     |  31 ++++++++++++------
 .idea/modules/app/MarsPhotos.app.unitTest.iml |  31 ++++++++++++------
 app/build.gradle                              |   9 ++---
 .../marsphotos/network/MarsApiService.kt      |  13 +++++---
 .../android/marsphotos/network/MarsPhoto.kt   |   7 ++++
 .../marsphotos/overview/OverviewViewModel.kt  |   2 +-
 28 files changed, 200 insertions(+), 92 deletions(-)
 create mode 100644 .idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml
 create mode 100644 .idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml
 delete mode 100644 .idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml
 create mode 100644 .idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml
 create mode 100644 .idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml
 delete mode 100644 .idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml
 create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml
 delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml
 create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml
 delete mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml
 create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml
 create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml
 create mode 100644 .idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml
 create mode 100644 app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt

diff --git a/.gradle/7.3.3/checksums/checksums.lock b/.gradle/7.3.3/checksums/checksums.lock
index 3dcdc4edb6dcf923803edaafa92ff30cb54603ad..2caefc0d217c127881c05805c14d6bf2a9fdf695 100644
GIT binary patch
literal 17
UcmZSn%^ClasZrt{0|b--05DkuKL7v#

literal 17
UcmZSn%^ClasZrt{0|Yn&05B#53;+NC

diff --git a/.gradle/7.3.3/checksums/md5-checksums.bin b/.gradle/7.3.3/checksums/md5-checksums.bin
index 83634bcd81fb0ec72b2e4dda4be0ab420075ceb3..b9798e2208c4e54b18def435c7d9ccd95aa920ff 100644
GIT binary patch
delta 722
zcmX>-m9cjw;|3Fnda?F1Au(U)dG#}Zfw%sDDCi4aa(~jKx+t(PgXesx@c-%IJ0~mM
z4|oL;_nr(B-xiy(NcQhdsJM?NOnk?gKgr6GH|?S76Jg?epG@}rEigG)!b#))_L=*|
z{I=hRDDjDgDS36z{&H^Ju{4Od*XhZ<5*8XCZA!jWNe2r;1iin*6o1}X_{YaL`x!*s
z>+j^f5&;4(Cpn}lI_n=o1ig<=W|b^rVp80w_(Oc7!4J{Rjvif1^~MYg44MoK42mEu
z;5{u<k<W`=c-z0@o*@SJLl_tsoAaYLaYKyYh+$x0&_mS`(d`nj<Y|u4k9`LPw6APh
z2h|}A)xnRc<H4gZ67LUbeBR%m$2GOSXv0jXmX{DMJcXEABG={pOuh0+l>LyBgiH0R
zc@Q02*&sTkLNRqn7kEm^uQd35Wg1Ui<JT46Av!kygXmyShv}$C_+2UNlv_=6&ZMhe
zet$QqG;lz)Y!icOnF!N@&{165l4Sp=zvG+7%`XzCHZFwf_yEzt^$Syn>7IorMMLVA
zJ<0zeCGOI1#o!7K;O&1QTG%ZxwUidA@^LFE%@tUcIP=(KPJf6cJFY`?a9;!I007!<
B>n8vJ

delta 47
zcmeC3$#{Ay;|3E6M&8N35)zZwN_b3Gl{A>#D(Nx#sbm%tqvuA&AL1JgE{JV*^yp#&
E0ECSYbN~PV

diff --git a/.gradle/7.3.3/checksums/sha1-checksums.bin b/.gradle/7.3.3/checksums/sha1-checksums.bin
index 9b41f603de94371b5de5b39fa4fcae39d38a7549..399b2fb19ce25766dfbd422980144200b1d78a60 100644
GIT binary patch
delta 2979
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

delta 131
zcmZ3uiE-{C#tkMCf?AD#k{u<}_N6d@fzQ*)r4kvFc_lq2w@OM(-YS_e*;Ptna;cQW
z<h@c7lix~7Og5D^m|QC@G5M~v!DLk#gUPuv5|g*ecuW?R^_*NLD?WLtti<H2vJ#V1
k<q{@;m6MokD{nA)uDlWx3*$z`AL1JgBt$kldfedv09;}#?EnA(

diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock
index ef211b11b2ec678c3c75318ccb6202612176273f..ad18cf70483c9b3dffad88dbefdf3120a9c34fc1 100644
GIT binary patch
literal 17
UcmZRsUgMuDB)xe(0|ZP204tgV2LJ#7

literal 17
UcmZRsUgMuDB)xe(0|b-;04sh2>i_@%

diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin
index f0c114af55a258191541674c2f4c4708e474ad2b..440135a61d43fbee4aa0a8799cb990daf93a36b3 100644
GIT binary patch
delta 5030
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

delta 4008
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
Hq;UoS3`(X?

diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock
index d52e66c73528812ab8d55f50bba9537c0d6d6a1b..05bf1f91d6c88e64cdb44179f760f20ac37efaaf 100644
GIT binary patch
literal 17
VcmZR6R%ybQyvz0`0~j#R1pqLS1b6@d

literal 17
VcmZR6R%ybQyvz0`0~j!U2LLeX1knHh

diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index ed90e7da3020774d4a4d0b63368292b61345d176..4bff1ed14e521467a6812177a1ee014eeedf8402 100644
GIT binary patch
literal 17
UcmZQBSl$}m?k^O|00sh_04h-fO#lD@

literal 17
UcmZQBSl$}m?k^O|00#Wt04k9KjsO4v

diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
index f7b00fb8a096627919150a94a2564039fd99efb7..407d74a6e157dad9e2e174fd212af1e6716e0299 100644
GIT binary patch
delta 4705
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
E0HCuacK`qY

delta 1545
zcmaF+o#*}n?hPgqjK?>dN^mkx4wDq$+$w3wxcQpY3g*ev<UBTilZ#;5oTm7LadVmS
z4yMU&Y6+Y7sm);AoTs6{vU!<K2FqkMLxatEh7;H}i&+RTZML(@VBfsYaU~Oz*3Rji
zeoU&<-TasgrZ4kjil08!pUHFjH-9FN>3IQ664U1eFo{n;8^Gkbd6~;rbw>8dF*y}B
zwmTQ?;yDql#sCI6vS5nw=)c(Rch^4@dxS&yUDLrd!#iy-%{b*G0|Ud(jfy|SHyR{}
zbCxqO81OJKFh1T~IOiwh<feHQn}y~pFi!SbAhEe>K?BQVp`{ZhUs~$1*=X4b#?3-2
z1UNQZZQx+p9JR%OdGey|A2zSrA;G-)*6s|(%~5;hxi(Kcp2@gb=%gnTn{FfnW7Ndy
z3uTxyrz^=aOH9v_Wlos>2*lEoW0sh{NRHWH`YRAiN}kzcbJppTN{kOCo4iZhy!M>~
z(`MF>4osV4KmTB#ocr5j^V#14jGImWZeZE|myvM=&-A@~j1t@5@-b>KZPyiK%wU<m
zR+Ld<`CU;)=ILK07(J$kN-|E^{#TN*fpPm(X+}*(CSAela{Cx<r!U^em@r*>KcoKi
zr2UMN(+}@wl$ic`KcfNv`Ab)vE_Vb$0;%=$^j)u+6sLcF&6KeHuMA@@8{^UK*~*NG
z%+sH!G2WPdMV+x?dx{2Q0`vAe+KdO-rf)G~{ILCsF=GVNb{8{7dB*M4=8S?&%a>R(
zGEd)Q!<aDL#Fo)udyOqf!5e#!vsxS(4Vbr|abbMGxc!J5V*}&#7!SsZ>2Ew3KWzWv
z$+&=N`Whd`itRSOj0c(6v^p6WyNahTk!4bt{zaC_aJsD=lf?8~IVO+kXXThCOfQvZ
zl9;|%p2=W3s{)h3^jZZb@#$+6m<*?XRbZ0X&J)0R)P?ce_DfS38(F4j&t&x2etIUO
z0^@e(*^Dz7w{M=qc!F{I<avw<+qvg6ZeW~#c>!a>cJGCZ7nrsiFJWB3y8ZP^#&~9l
zJcq~b&i#koz(K^++W#L4wp(3iDrDO3yq?jVar>kVj2juZE8k_B!MOeMJ*FM3+ZR7!
zI>EAi@jk|Mmg!ey86~${A7)fwoL+o{F_TGOaiZdf=^wP1c&GD~Gu@c%5NSRA-%&;m
z#y8v9k1+}|O*c5fIAQyZ6O8PP)4!i&G@R~miqT+u$0<eww&@oxFutFD{UW2`c7;of
z7A(^Xt}(_>e}0W|;`RyG87&y6Ke)kYuwCOO;|#{>H*PWB*nZ+R<9sFwy|oo~ejBR1
zz@A_%s)YLC|8_x6W=qEH5%(DvFl{&DWp-zt9{!ZEa=Vova|F}&Rl>{`jMIOKFdvwH
zNtF4+^jl)g3EN-1W<0^T{lr_w1{P4VPS_qL$85>Wq-VHM@c|>mQ}2oyk4-LkuxRs!
z#9(H4UOTn@$uCAr#_gtm7(1A@U;W4UgK_IqrVq^9-?A_zFmF%gVEVzhy_AcIgJt_v
zJ|+vs?N9lcG?=EV3NaZ>&lLj2xe(Ke?Y+WG0qonqN-=F<+`d<a=>^mFz4A-}jN4Te
znIxFEhpI4jFiroe#?(JOJD8D+Nt<z_q5$jm4_Zt;%!~`C*Xl7HoF1mn<gtC5K9fDu
zbY3H-%I))vK$g8TW_rLr{h2k>hwbldK+!nQ4rKT|M<xxX?f0CSG8m`FxiU#??{j6^
zz&Jh39b|?(Qy}AZc~7S4EZfidf(()KXDVRYzATVQpLzS+5T-`P>1|<5Kbh1uH!8m1
z0Ef-yd5IU8raRO#E&>J6<O%2NK%5EFKjbmyY~L`ONrq{=Lo{O;<Kz#4$0mR9STuP-
z%(2Z5k^3Newl{P!ZeZO0p@A`oX?nqGrl{!$dKiyQz7SBi`M~o>Op`wZPME%+fYD>R
zK_XM#<OQj(CO-(x0dZbUUXVIryTTHtD#qy!(Tq1Hf4Kc;yFoMK55~<7k<S=GZrT2!
b8x*n&(iwj+g52<o5hPN<w%uVele{eeO`c7)

diff --git a/.idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml b/.idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml
new file mode 100644
index 0000000..f990e54
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_moshi_moshi_1_13_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: com.squareup.moshi:moshi:1.13.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/da685586facab9eb5c4fb630ce248be14e7da21b/moshi-1.13.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/5a2db1031c2d2bf7b5af1575456d778727ee32f/moshi-1.13.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi/1.13.0/e2f718e52cdb2dc17b457d75f0947e2959903959/moshi-1.13.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml b/.idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml
new file mode 100644
index 0000000..61faa41
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_moshi_moshi_kotlin_1_13_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi-kotlin/1.13.0/5cacbc44534ccc4a04719be599fff66fb1fbdfb9/moshi-kotlin-1.13.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi-kotlin/1.13.0/6aaa79c092c28e9863c2206e9bea6f38f8381ac/moshi-kotlin-1.13.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.moshi/moshi-kotlin/1.13.0/c35db4351cca26d3c10c3e6260cc2327a37392d8/moshi-kotlin-1.13.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml
deleted file mode 100644
index f0b1401..0000000
--- a/.idea/libraries/Gradle__com_squareup_okio_okio_1_17_2.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.squareup.okio:okio:1.17.2">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/78c7820b205002da4d2d137f6f312bd64b3d6049/okio-1.17.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/b223e35cf99bb8c3d2a5b369b6b52093a6a750c2/okio-1.17.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.17.2/331ecaeba2fd87c06a0766e8ebe718e1e294f27d/okio-1.17.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml b/.idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml
new file mode 100644
index 0000000..a05824f
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_okio_okio_2_10_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: com.squareup.okio:okio:2.10.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.10.0/accaddddbb597fb70290fd40358b1ce66b8c2b3d/okio-jvm-2.10.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.10.0/1dfc782569ad3d50583495fc2f9fe27f8bc1be3d/okio-2.10.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.10.0/9600a13b3037fe9548bc0af13cb6ffa7414a99a1/okio-2.10.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml
new file mode 100644
index 0000000..0249b4d
--- /dev/null
+++ b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_moshi_2_9_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-moshi/2.9.0/db0979801926e6d39bc2478736145f9761c3e034/converter-moshi-2.9.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-moshi/2.9.0/cf43081e493a6eec8e9c22e4c22790ed2ee24efc/converter-moshi-2.9.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-moshi/2.9.0/274e84654aca7c92d957aaeae21382e192a49a8/converter-moshi-2.9.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml b/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml
deleted file mode 100644
index d1fea57..0000000
--- a/.idea/libraries/Gradle__com_squareup_retrofit2_converter_scalars_2_9_0.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.9.0/e9ee6f35fb7ba877a35519f9a8f55c648df820d4/converter-scalars-2.9.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.9.0/27bde53ab0ac67523ba150fc6ac671d46aef4c8a/converter-scalars-2.9.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.9.0/e85efc627a70eb797632f8d427e598d8a95ebaf/converter-scalars-2.9.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml
new file mode 100644
index 0000000..e60d6df
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_reflect_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.6.0/a215a7f914d5916dc5fd2d45cea16524e0220203/kotlin-reflect-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-reflect-1.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-reflect/1.6.0/2148ad58f5141ac0c6527bac514b8b785713708b/kotlin-reflect-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml
deleted file mode 100644
index 8ce5bf1..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.31/6628d61d0f5603568e72d2d5915d2c034b4f1c55/kotlin-stdlib-1.5.31.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.31/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-1.5.31-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.5.31/70f4e47092d0158a39aafc634ad60b6320c3d6ce/kotlin-stdlib-1.5.31-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml
new file mode 100644
index 0000000..ba50b1f
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.6.0/a40b8b22529b733892edf4b73468ce598bb17f04/kotlin-stdlib-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-1.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.6.0/a6284476c56bd752eb0020e062c78c930abdc168/kotlin-stdlib-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml
deleted file mode 100644
index 082826f..0000000
--- a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_5_31.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" type="kotlin.common">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31/43331609c7de811fed085e0dfd150874b157c32/kotlin-stdlib-common-1.5.31.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-common-1.5.31-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.5.31/ee22598c6d20e94e0fd08cc696f09f83e41b3935/kotlin-stdlib-common-1.5.31-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml
new file mode 100644
index 0000000..92a7981
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" type="kotlin.common">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.0/7857e365f925cfa060f941c1357cda1f8790502c/kotlin-stdlib-common-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-common-1.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.6.0/241e9056f9415f6970a9d7d43de2a117b94959d0/kotlin-stdlib-common-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml
new file mode 100644
index 0000000..935133d
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk7_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.0/da6bdc87391322974a43ccc00a25536ae74dad51/kotlin-stdlib-jdk7-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-jdk7-1.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.6.0/ccdfdab71f0f3ba104191d8f673d0620e7ed2e46/kotlin-stdlib-jdk7-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml
new file mode 100644
index 0000000..5f93893
--- /dev/null
+++ b/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_jdk8_1_6_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.0/baf82c475e9372c25407f3d132439e4aa803b8b8/kotlin-stdlib-jdk8-1.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.0/5b8f86fea035328fc9e8c660773037a3401ce25f/kotlin-stdlib-jdk8-1.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk8/1.6.0/a61c046a90a08dd30eb105b8b8530fce678ecb46/kotlin-stdlib-jdk8-1.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules/app/MarsPhotos.app.androidTest.iml b/.idea/modules/app/MarsPhotos.app.androidTest.iml
index 01911bc..8cd9705 100644
--- a/.idea/modules/app/MarsPhotos.app.androidTest.iml
+++ b/.idea/modules/app/MarsPhotos.app.androidTest.iml
@@ -31,13 +31,20 @@
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/745a3864afa770389e88c0c27d7feee0/transformed/jetified-lifecycle-runtime-ktx-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/eff1ebde4fd8c4d0d286003f921a9f3f/transformed/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/837af72680ba95e39dc2a842d2d964c4/transformed/jetified-kotlinx-coroutines-android-1.4.1.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/caf139de7e20b6365b22a4bd716d75fe/transformed/jetified-moshi-kotlin-1.13.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/ecc4355351acb175a8e8b2fb4187bd80/transformed/jetified-kotlin-reflect-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/0934dd603a90fcf1273942c8265202e8/transformed/jetified-converter-moshi-2.9.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/9ae528a4f6a3367e5731e1abdb826c40/transformed/jetified-moshi-1.13.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/ca2f258da5f0b13877c315eb96b7b5a2/transformed/jetified-kotlin-stdlib-jdk8-1.6.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/d18815ae34dbece54cb2e58cc8a029b1/transformed/navigation-common-ktx-2.3.5-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/f77a71e57c1f97a636429568f0e2b65f/transformed/jetified-collection-ktx-1.1.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/c53ff331c7e8511db420d28f44e40519/transformed/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/52c6bb7e34c4780e36f2a83296962719/transformed/jetified-kotlin-stdlib-1.5.31.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/6f7d376e678fa028b52e453ccc9874f4/transformed/jetified-converter-scalars-2.9.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/6d0fc1969f98cc6f13a6878e069f30e4/transformed/jetified-okio-jvm-2.10.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/65ed3dfc4f273a334776b385f0de403b/transformed/jetified-kotlin-stdlib-jdk7-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/c2906dea34bbf28bc01d644150879019/transformed/jetified-kotlin-stdlib-1.6.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/4f67ff79be93972270067427bb87136c/transformed/jetified-viewbinding-7.2.2-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/ca7602e8544ecf5deb12bc513835bef2/transformed/jetified-lifecycle-process-2.2.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/5fdc6d5d731ededd5c9d7e59ab48afd8/transformed/jetified-lifecycle-service-2.2.0-api.jar</arg>
@@ -80,9 +87,7 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/069f843916ead4071e50108505c9e15e/transformed/jetified-annotation-experimental-1.1.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/7562b4b8ea427c69eb732d0794a11d6a/transformed/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/d4e851ec70827e1b5f131be3f04db443/transformed/jetified-kotlin-stdlib-common-1.5.31.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/19c2c41bd7c5dcba9db4b14d27d0137f/transformed/jetified-okio-1.17.2.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/5e82e7bf9603922773e0af91b5bfb276/transformed/jetified-kotlin-stdlib-common-1.6.0.jar</arg>
                 <arg>$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-31/android.jar</arg>
                 <arg>$USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar</arg>
               </args>
@@ -157,15 +162,20 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection-ktx:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi:1.13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:databinding-runtime:7.2.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:viewbinding:7.2.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
diff --git a/.idea/modules/app/MarsPhotos.app.main.iml b/.idea/modules/app/MarsPhotos.app.main.iml
index 48d2da6..65f88c0 100644
--- a/.idea/modules/app/MarsPhotos.app.main.iml
+++ b/.idea/modules/app/MarsPhotos.app.main.iml
@@ -14,6 +14,7 @@
           <stringArguments>
             <stringArg name="classpath">
               <args>
+                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/e9db5c5c0739c825af784661011b0915/transformed/databinding-runtime-7.2.2-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/e249974dacb90bb898105d54a04ab873/transformed/databinding-adapters-7.2.2-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/7.2.2/cb53bd625b7a99cf218f46634d07d1886441288/databinding-common-7.2.2.jar</arg>
@@ -74,15 +75,20 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/837af72680ba95e39dc2a842d2d964c4/transformed/jetified-kotlinx-coroutines-android-1.4.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/52c6bb7e34c4780e36f2a83296962719/transformed/jetified-kotlin-stdlib-1.5.31.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/caf139de7e20b6365b22a4bd716d75fe/transformed/jetified-moshi-kotlin-1.13.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/ecc4355351acb175a8e8b2fb4187bd80/transformed/jetified-kotlin-reflect-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/0934dd603a90fcf1273942c8265202e8/transformed/jetified-converter-moshi-2.9.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/9ae528a4f6a3367e5731e1abdb826c40/transformed/jetified-moshi-1.13.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/ca2f258da5f0b13877c315eb96b7b5a2/transformed/jetified-kotlin-stdlib-jdk8-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/6d0fc1969f98cc6f13a6878e069f30e4/transformed/jetified-okio-jvm-2.10.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/65ed3dfc4f273a334776b385f0de403b/transformed/jetified-kotlin-stdlib-jdk7-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/c2906dea34bbf28bc01d644150879019/transformed/jetified-kotlin-stdlib-1.6.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/7562b4b8ea427c69eb732d0794a11d6a/transformed/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/d4e851ec70827e1b5f131be3f04db443/transformed/jetified-kotlin-stdlib-common-1.5.31.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/5e82e7bf9603922773e0af91b5bfb276/transformed/jetified-kotlin-stdlib-common-1.6.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/069f843916ead4071e50108505c9e15e/transformed/jetified-annotation-experimental-1.1.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/8b616e05b06556d2825e76c8eacb3731/transformed/constraintlayout-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/6f7d376e678fa028b52e453ccc9874f4/transformed/jetified-converter-scalars-2.9.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/19c2c41bd7c5dcba9db4b14d27d0137f/transformed/jetified-okio-1.17.2.jar</arg>
                 <arg>$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-31/android.jar</arg>
                 <arg>$USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar</arg>
               </args>
@@ -164,15 +170,20 @@
     <orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.collection:collection-ktx:1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
     <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:2.10.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.moshi:moshi:1.13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:databinding-runtime:7.2.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.databinding:viewbinding:7.2.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
diff --git a/.idea/modules/app/MarsPhotos.app.unitTest.iml b/.idea/modules/app/MarsPhotos.app.unitTest.iml
index fca1b2d..059a42f 100644
--- a/.idea/modules/app/MarsPhotos.app.unitTest.iml
+++ b/.idea/modules/app/MarsPhotos.app.unitTest.iml
@@ -14,6 +14,7 @@
           <stringArguments>
             <stringArg name="classpath">
               <args>
+                <arg>$MODULE_DIR$/../../../app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/e9db5c5c0739c825af784661011b0915/transformed/databinding-runtime-7.2.2-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/e249974dacb90bb898105d54a04ab873/transformed/databinding-adapters-7.2.2-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/7.2.2/cb53bd625b7a99cf218f46634d07d1886441288/databinding-common-7.2.2.jar</arg>
@@ -74,15 +75,20 @@
                 <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.2.0/57136ff68ee784c6e19db34ed4a175338fadfde1/annotation-1.2.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/837af72680ba95e39dc2a842d2d964c4/transformed/jetified-kotlinx-coroutines-android-1.4.1.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/6bade9496bdca1bbc6c479e253fd9b44/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.1.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/52c6bb7e34c4780e36f2a83296962719/transformed/jetified-kotlin-stdlib-1.5.31.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/caf139de7e20b6365b22a4bd716d75fe/transformed/jetified-moshi-kotlin-1.13.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/ecc4355351acb175a8e8b2fb4187bd80/transformed/jetified-kotlin-reflect-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/0934dd603a90fcf1273942c8265202e8/transformed/jetified-converter-moshi-2.9.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/9ae528a4f6a3367e5731e1abdb826c40/transformed/jetified-moshi-1.13.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/ca2f258da5f0b13877c315eb96b7b5a2/transformed/jetified-kotlin-stdlib-jdk8-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/6d0fc1969f98cc6f13a6878e069f30e4/transformed/jetified-okio-jvm-2.10.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/65ed3dfc4f273a334776b385f0de403b/transformed/jetified-kotlin-stdlib-jdk7-1.6.0.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/c2906dea34bbf28bc01d644150879019/transformed/jetified-kotlin-stdlib-1.6.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/7562b4b8ea427c69eb732d0794a11d6a/transformed/jetified-annotations-13.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/d4e851ec70827e1b5f131be3f04db443/transformed/jetified-kotlin-stdlib-common-1.5.31.jar</arg>
+                <arg>$USER_HOME$/.gradle/caches/transforms-3/5e82e7bf9603922773e0af91b5bfb276/transformed/jetified-kotlin-stdlib-common-1.6.0.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/069f843916ead4071e50108505c9e15e/transformed/jetified-annotation-experimental-1.1.0-api.jar</arg>
                 <arg>$USER_HOME$/.gradle/caches/transforms-3/8b616e05b06556d2825e76c8eacb3731/transformed/constraintlayout-2.1.1-api.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/6f7d376e678fa028b52e453ccc9874f4/transformed/jetified-converter-scalars-2.9.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/aa387c4ddb7a97c4c35eb5571bf144de/transformed/jetified-retrofit-2.9.0.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/7493175e7f10e323820c8ee8ca990a9a/transformed/jetified-okhttp-3.14.9.jar</arg>
-                <arg>$USER_HOME$/.gradle/caches/transforms-3/19c2c41bd7c5dcba9db4b14d27d0137f/transformed/jetified-okio-1.17.2.jar</arg>
                 <arg>$USER_HOME$/AppData/Local/Android/Sdk/platforms/android-31/android.jar</arg>
                 <arg>$USER_HOME$/AppData/Local/Android/Sdk/build-tools/30.0.3/core-lambda-stubs.jar</arg>
               </args>
@@ -152,15 +158,20 @@
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.arch.core:core-common:2.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.5.31" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-common:1.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection:1.1.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.collection:collection-ktx:1.1.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-moshi:2.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:retrofit:2.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okhttp3:okhttp:3.14.9" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:1.17.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.retrofit2:converter-scalars:2.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.okio:okio:2.10.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi:1.13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.squareup.moshi:moshi-kotlin:1.13.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlin:kotlin-reflect:1.6.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:databinding-runtime:7.2.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.databinding:viewbinding:7.2.2@aar" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.3.1@aar" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 4eead14..339ccbb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -63,8 +63,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    // Retrofit
-    implementation "com.squareup.retrofit2:retrofit:2.9.0"
-    // Retrofit with Scalar Converter
-    implementation "com.squareup.retrofit2:converter-scalars:2.9.0"
+    // Retrofit with Moshi Converter
+    implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
+
+    // Moshi
+    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt b/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt
index 33fe516..3a251cf 100644
--- a/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt
+++ b/app/src/main/java/com/example/android/marsphotos/network/MarsApiService.kt
@@ -1,18 +1,21 @@
 package com.example.android.marsphotos.network
-
+import com.squareup.moshi.Moshi
 import retrofit2.Retrofit
-import retrofit2.converter.scalars.ScalarsConverterFactory
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
-
+private val moshi = Moshi.Builder()
+    .add(KotlinJsonAdapterFactory())
+    .build()
 private const val BASE_URL =
     "https://android-kotlin-fun-mars-server.appspot.com"
 private val retrofit = Retrofit.Builder()
-    .addConverterFactory(ScalarsConverterFactory.create())
+    .addConverterFactory(MoshiConverterFactory.create(moshi))
     .baseUrl(BASE_URL)
     .build()
 interface MarsApiService {
     @GET("photos")
-    suspend fun getPhotos(): String
+    suspend fun getPhotos(): List<MarsPhoto>
 }
 object MarsApi {
     val retrofitService : MarsApiService by lazy {
diff --git a/app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt b/app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt
new file mode 100644
index 0000000..ed37404
--- /dev/null
+++ b/app/src/main/java/com/example/android/marsphotos/network/MarsPhoto.kt
@@ -0,0 +1,7 @@
+package com.example.android.marsphotos.network
+
+import com.squareup.moshi.Json
+
+data class MarsPhoto(
+    val id: String, @Json(name = "img_src") val imgSrcUrl: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt b/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt
index 8902214..ce974e6 100644
--- a/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt
+++ b/app/src/main/java/com/example/android/marsphotos/overview/OverviewViewModel.kt
@@ -48,7 +48,7 @@ class OverviewViewModel : ViewModel() {
         viewModelScope.launch {
             try {
                 val listResult = MarsApi.retrofitService.getPhotos()
-                _status.value = listResult
+                _status.value = "Success: ${listResult.size} Mars photos retrieved"
             } catch (e: Exception) {
                 _status.value = "Failure: ${e.message}"
             }
-- 
GitLab