diff --git a/.gradle/7.3.3/checksums/checksums.lock b/.gradle/7.3.3/checksums/checksums.lock index 2caefc0d217c127881c05805c14d6bf2a9fdf695..621825710ca293efd5c827a5dabf4533f75f15a1 100644 Binary files a/.gradle/7.3.3/checksums/checksums.lock and b/.gradle/7.3.3/checksums/checksums.lock differ diff --git a/.gradle/7.3.3/checksums/md5-checksums.bin b/.gradle/7.3.3/checksums/md5-checksums.bin index b9798e2208c4e54b18def435c7d9ccd95aa920ff..93163f693442c6c6712ce8d1fa7d6a49d541e6f3 100644 Binary files a/.gradle/7.3.3/checksums/md5-checksums.bin and b/.gradle/7.3.3/checksums/md5-checksums.bin differ diff --git a/.gradle/7.3.3/checksums/sha1-checksums.bin b/.gradle/7.3.3/checksums/sha1-checksums.bin index 399b2fb19ce25766dfbd422980144200b1d78a60..ddd915877b2fd911ca696b572aea46877e83deab 100644 Binary files a/.gradle/7.3.3/checksums/sha1-checksums.bin and b/.gradle/7.3.3/checksums/sha1-checksums.bin differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock index ad18cf70483c9b3dffad88dbefdf3120a9c34fc1..c9eddb154f2508550d8fdf99e085a07e713360e9 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.lock and b/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin index 440135a61d43fbee4aa0a8799cb990daf93a36b3..9df50f3644a98515edc0b6c7c499a4363b8442ed 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.bin and b/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock index 05bf1f91d6c88e64cdb44179f760f20ac37efaaf..40bd99b62265cd5714eaf05e5568d28d81541698 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.lock and b/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 4bff1ed14e521467a6812177a1ee014eeedf8402..16dd642da3fcddcc13e9da9ddc1662109c3ce34b 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 407d74a6e157dad9e2e174fd212af1e6716e0299..511bcd26875f005ad91452cbf2215a858daa50ec 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_java8_2_2_0.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_java8_2_2_0.xml new file mode 100644 index 0000000000000000000000000000000000000000..fc8d67780f7b81a0739f99cb725ec7a274be85a1 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_java8_2_2_0.xml @@ -0,0 +1,11 @@ +<component name="libraryTable"> + <library name="Gradle: androidx.lifecycle:lifecycle-common-java8:2.2.0"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common-java8/2.2.0/cd3478503da69b1a7e0319bd2d1389943db9b364/lifecycle-common-java8-2.2.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common-java8/2.2.0/777ad8a2c39ec412a8c77a3923ceb536946acb29/lifecycle-common-java8-2.2.0-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_coil_kt_coil_1_1_1_aar.xml b/.idea/libraries/Gradle__io_coil_kt_coil_1_1_1_aar.xml new file mode 100644 index 0000000000000000000000000000000000000000..a21e9038133ef4eb478ede9f1bf2df0e2f7050b4 --- /dev/null +++ b/.idea/libraries/Gradle__io_coil_kt_coil_1_1_1_aar.xml @@ -0,0 +1,15 @@ +<component name="libraryTable"> + <library name="Gradle: io.coil-kt:coil:1.1.1@aar"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/556ce2fb67d090037ce639475ba8edfe/transformed/jetified-coil-1.1.1/jars/classes.jar!/" /> + <root url="file://$USER_HOME$/.gradle/caches/transforms-3/556ce2fb67d090037ce639475ba8edfe/transformed/jetified-coil-1.1.1/res" /> + <root url="file://$USER_HOME$/.gradle/caches/transforms-3/556ce2fb67d090037ce639475ba8edfe/transformed/jetified-coil-1.1.1/AndroidManifest.xml" /> + </CLASSES> + <JAVADOC> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.coil-kt/coil/1.1.1/8ccd1d9168824a63c50e01128ca817009058d39a/coil-1.1.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.coil-kt/coil/1.1.1/a698ab8d13bd1ae738e6b736f902e139937874b4/coil-1.1.1-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Gradle__io_coil_kt_coil_base_1_1_1_aar.xml b/.idea/libraries/Gradle__io_coil_kt_coil_base_1_1_1_aar.xml new file mode 100644 index 0000000000000000000000000000000000000000..5b119bd443398fac03d6deaf67e7c9c513043e23 --- /dev/null +++ b/.idea/libraries/Gradle__io_coil_kt_coil_base_1_1_1_aar.xml @@ -0,0 +1,15 @@ +<component name="libraryTable"> + <library name="Gradle: io.coil-kt:coil-base:1.1.1@aar"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/transforms-3/70a594bcb2b68e114aff8f38cb1efae7/transformed/jetified-coil-base-1.1.1/jars/classes.jar!/" /> + <root url="file://$USER_HOME$/.gradle/caches/transforms-3/70a594bcb2b68e114aff8f38cb1efae7/transformed/jetified-coil-base-1.1.1/res" /> + <root url="file://$USER_HOME$/.gradle/caches/transforms-3/70a594bcb2b68e114aff8f38cb1efae7/transformed/jetified-coil-base-1.1.1/AndroidManifest.xml" /> + </CLASSES> + <JAVADOC> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.coil-kt/coil-base/1.1.1/cfa9ed109bea1da11a9184e898683bc094733d99/coil-base-1.1.1-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.coil-kt/coil-base/1.1.1/f2ff79b032b2a8d04c24afe1b4295406b47a2451/coil-base-1.1.1-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_4_1.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_4_1.xml deleted file mode 100644 index 87640dceaba7d5a4eeb92c5244611e21225352ac..0000000000000000000000000000000000000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.1"> - <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.4.1/2349e3c971098c0c5379403b64a844d0c3cc2f3d/kotlinx-coroutines-android-1.4.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.4.1/2d2e396a1946b3fa47a5aec400deea9ecea25282/kotlinx-coroutines-android-1.4.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.4.1/4e7595e64706ad99a06d3339c89ebb053bf0874b/kotlinx-coroutines-android-1.4.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_4_2.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_4_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..784d023585cac34509b8293d3915b7610ab0d589 --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_android_1_4_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.4.2/dbf36cc9f9cc03a72e20bf440cfeb89d74ca775f/kotlinx-coroutines-android-1.4.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.4.2/a5db7b477a07dd79f818b04db8087c9e26db6506/kotlinx-coroutines-android-1.4.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.4.2/92998cc3260a93b88776c591336bf8b80980198a/kotlinx-coroutines-android-1.4.2-sources.jar!/" /> + </SOURCES> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_4_1.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_4_1.xml deleted file mode 100644 index 0d5e8b00c8153377ca42269064ba787b46a43d94..0000000000000000000000000000000000000000 --- a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_4_1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.1"> - <CLASSES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.1/936067d1e0195f638396f60e71da745bb14a35ca/kotlinx-coroutines-core-jvm-1.4.1.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.1/d80f4320b02ad4aa13ceee17e777dc5976a3c0ff/kotlinx-coroutines-core-jvm-1.4.1-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.1/c9619d548a64a55dd2de19fb7bc6ab2baf1cf751/kotlinx-coroutines-core-jvm-1.4.1-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_4_2.xml b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_4_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..3628acdbc6d6caec95d4ada9f77e4d78b6af3a5c --- /dev/null +++ b/.idea/libraries/Gradle__org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm_1_4_2.xml @@ -0,0 +1,13 @@ +<component name="libraryTable"> + <library name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2"> + <CLASSES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/4b9c6b2de7cabfb2c9ad7a5c709b1ddb7bbfd2ad/kotlinx-coroutines-core-jvm-1.4.2.jar!/" /> + </CLASSES> + <JAVADOC> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/5b145403ce14230958817a376881849afb0badeb/kotlinx-coroutines-core-jvm-1.4.2-javadoc.jar!/" /> + </JAVADOC> + <SOURCES> + <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-jvm/1.4.2/279286284cd5c9116752887dedf258d67ab8c19d/kotlinx-coroutines-core-jvm-1.4.2-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 8cd9705a946828c959baf6651e747c67ed6c0572..f2ee8e54daca2a5fb90cba781bf8794cdb304c09 100644 --- a/.idea/modules/app/MarsPhotos.app.androidTest.iml +++ b/.idea/modules/app/MarsPhotos.app.androidTest.iml @@ -30,12 +30,13 @@ <arg>$USER_HOME$/.gradle/caches/transforms-3/a53f151ec505672010a22b7c03d29252/transformed/jetified-core-ktx-1.7.0-api.jar</arg> <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/60857e8f0bacbd3c5240619db01ff40d/transformed/jetified-coil-1.1.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/31de323bf2346e7f9b226c43fe0c08f0/transformed/jetified-coil-base-1.1.1-api.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> @@ -43,7 +44,8 @@ <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/f825e6ffac8894f60a7239a2eb942211/transformed/jetified-kotlinx-coroutines-android-1.4.2.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/4ab22b315e32ea41a3f09b73f50ced08/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.2.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> @@ -77,6 +79,7 @@ <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/32b730f107f5e9a44793a5ecd5bd9da5/transformed/versionedparcelable-1.1.1-api.jar</arg> <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar</arg> + <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common-java8/2.2.0/cd3478503da69b1a7e0319bd2d1389943db9b364/lifecycle-common-java8-2.2.0.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/118f500fcdef5fbdcd6a3e845e86b433/transformed/lifecycle-livedata-core-2.3.1-api.jar</arg> <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/500234fd95f9e1f9b525e8ed012821ca/transformed/interpolator-1.0.0-api.jar</arg> @@ -160,8 +163,8 @@ <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" /> <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.kotlinx:kotlinx-coroutines-android:1.4.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" 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.6.0" level="project" /> @@ -176,6 +179,7 @@ <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.lifecycle:lifecycle-common-java8:2.2.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" /> @@ -230,6 +234,8 @@ <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.2.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: io.coil-kt:coil:1.1.1@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: io.coil-kt:coil-base:1.1.1@aar" level="project" /> </component> <component name="TestModuleProperties" production-module="MarsPhotos.app.main" /> </module> \ No newline at end of file diff --git a/.idea/modules/app/MarsPhotos.app.main.iml b/.idea/modules/app/MarsPhotos.app.main.iml index 65f88c04dd8dc95466b7c4f8e142fe094f6c7673..5880c2063d1e0cd07e49fef293fe0bac0791e184 100644 --- a/.idea/modules/app/MarsPhotos.app.main.iml +++ b/.idea/modules/app/MarsPhotos.app.main.iml @@ -63,6 +63,9 @@ <arg>$USER_HOME$/.gradle/caches/transforms-3/d4d946351b08675dd37690741a823b98/transformed/lifecycle-livedata-2.2.0-api.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/118f500fcdef5fbdcd6a3e845e86b433/transformed/lifecycle-livedata-core-2.3.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/60857e8f0bacbd3c5240619db01ff40d/transformed/jetified-coil-1.1.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/31de323bf2346e7f9b226c43fe0c08f0/transformed/jetified-coil-base-1.1.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common-java8/2.2.0/cd3478503da69b1a7e0319bd2d1389943db9b364/lifecycle-common-java8-2.2.0.jar</arg> <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/269cad4f60199726039a9c6f854db4c0/transformed/core-runtime-2.1.0-api.jar</arg> <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg> @@ -73,8 +76,8 @@ <arg>$USER_HOME$/.gradle/caches/transforms-3/b27ca653f7182dbb67a0dc9f21fe2e05/transformed/localbroadcastmanager-1.0.0-api.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/61b30826f218b69832f9d999dc8452c4/transformed/print-1.0.0-api.jar</arg> <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/f825e6ffac8894f60a7239a2eb942211/transformed/jetified-kotlinx-coroutines-android-1.4.2.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/4ab22b315e32ea41a3f09b73f50ced08/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.2.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> @@ -168,8 +171,8 @@ <orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" /> <orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" /> <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.kotlinx:kotlinx-coroutines-android:1.4.2" level="project" /> + <orderEntry type="library" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" 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.6.0" level="project" /> @@ -184,6 +187,7 @@ <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.lifecycle:lifecycle-common-java8:2.2.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" /> @@ -238,5 +242,7 @@ <orderEntry type="library" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.transition:transition:1.3.0@aar" level="project" /> <orderEntry type="library" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" /> + <orderEntry type="library" name="Gradle: io.coil-kt:coil:1.1.1@aar" level="project" /> + <orderEntry type="library" name="Gradle: io.coil-kt:coil-base:1.1.1@aar" level="project" /> </component> </module> \ No newline at end of file diff --git a/.idea/modules/app/MarsPhotos.app.unitTest.iml b/.idea/modules/app/MarsPhotos.app.unitTest.iml index 059a42f6960dab588107f8fbaa8d53ad6a91ae10..7d6fb29038a444f35c37fcbef0d5e33c210ea12d 100644 --- a/.idea/modules/app/MarsPhotos.app.unitTest.iml +++ b/.idea/modules/app/MarsPhotos.app.unitTest.iml @@ -63,6 +63,9 @@ <arg>$USER_HOME$/.gradle/caches/transforms-3/d4d946351b08675dd37690741a823b98/transformed/lifecycle-livedata-2.2.0-api.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/118f500fcdef5fbdcd6a3e845e86b433/transformed/lifecycle-livedata-core-2.3.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/60857e8f0bacbd3c5240619db01ff40d/transformed/jetified-coil-1.1.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/31de323bf2346e7f9b226c43fe0c08f0/transformed/jetified-coil-base-1.1.1-api.jar</arg> + <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common-java8/2.2.0/cd3478503da69b1a7e0319bd2d1389943db9b364/lifecycle-common-java8-2.2.0.jar</arg> <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.3.1/fc466261d52f4433863642fb40d12441ae274a98/lifecycle-common-2.3.1.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/269cad4f60199726039a9c6f854db4c0/transformed/core-runtime-2.1.0-api.jar</arg> <arg>$USER_HOME$/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar</arg> @@ -73,8 +76,8 @@ <arg>$USER_HOME$/.gradle/caches/transforms-3/b27ca653f7182dbb67a0dc9f21fe2e05/transformed/localbroadcastmanager-1.0.0-api.jar</arg> <arg>$USER_HOME$/.gradle/caches/transforms-3/61b30826f218b69832f9d999dc8452c4/transformed/print-1.0.0-api.jar</arg> <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/f825e6ffac8894f60a7239a2eb942211/transformed/jetified-kotlinx-coroutines-android-1.4.2.jar</arg> + <arg>$USER_HOME$/.gradle/caches/transforms-3/4ab22b315e32ea41a3f09b73f50ced08/transformed/jetified-kotlinx-coroutines-core-jvm-1.4.2.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> @@ -156,8 +159,8 @@ <orderEntry type="library" scope="TEST" name="Gradle: androidx.annotation:annotation:1.2.0" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.lifecycle:lifecycle-common:2.3.1" level="project" /> <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.kotlinx:kotlinx-coroutines-android:1.4.2" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.2" 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.6.0" level="project" /> @@ -172,6 +175,7 @@ <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.lifecycle:lifecycle-common-java8:2.2.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" /> @@ -226,6 +230,8 @@ <orderEntry type="library" scope="TEST" name="Gradle: androidx.recyclerview:recyclerview:1.1.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.transition:transition:1.3.0@aar" level="project" /> <orderEntry type="library" scope="TEST" name="Gradle: androidx.viewpager2:viewpager2:1.0.0@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: io.coil-kt:coil:1.1.1@aar" level="project" /> + <orderEntry type="library" scope="TEST" name="Gradle: io.coil-kt:coil-base:1.1.1@aar" level="project" /> </component> <component name="TestModuleProperties" production-module="MarsPhotos.app.main" /> </module> \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 339ccbb0ea72c04da12d46c9565ff38adea07d45..55c159f39feb798f58f7e6833ea232297f84c39d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -68,4 +68,7 @@ dependencies { // Moshi implementation 'com.squareup.moshi:moshi-kotlin:1.13.0' + + // Coil + implementation "io.coil-kt:coil:1.1.1" } \ 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 ce974e6f59fd5bf0ce51516986217cb1003ffe36..6050dd501b731b47ceba74b0abfbfdf51d2c61fc 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 @@ -21,12 +21,15 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.android.marsphotos.network.MarsApi +import com.example.android.marsphotos.network.MarsPhoto import kotlinx.coroutines.launch /** * The [ViewModel] that is attached to the [OverviewFragment]. */ class OverviewViewModel : ViewModel() { + private val _photos = MutableLiveData<MarsPhoto>() + val photos: LiveData<MarsPhoto> = _photos // The internal MutableLiveData that stores the status of the most recent request private val _status = MutableLiveData<String>() @@ -47,8 +50,9 @@ class OverviewViewModel : ViewModel() { private fun getMarsPhotos() { viewModelScope.launch { try { + _photos.value = MarsApi.retrofitService.getPhotos()[0] val listResult = MarsApi.retrofitService.getPhotos() - _status.value = "Success: ${listResult.size} Mars photos retrieved" + _status.value = " First Mars image URL : ${_photos.value!!.imgSrcUrl}" } catch (e: Exception) { _status.value = "Failure: ${e.message}" }