From f6cfeeb4ef0d0caa64b0f6587ab8934ca0fde095 Mon Sep 17 00:00:00 2001 From: 62160052 <62160052@go.buu.ac.th> Date: Sat, 24 Sep 2022 20:11:26 +0700 Subject: [PATCH] Add Recyclerview --- .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/7.3.3/fileHashes/fileHashes.bin | Bin 76115 -> 76315 bytes .gradle/7.3.3/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .gradle/buildOutputCleanup/outputFiles.bin | Bin 253358 -> 253412 bytes .idea/misc.xml | 1 + app/src/main/res/layout/fragment_overview.xml | 16 +++++++++++----- app/src/main/res/layout/grid_view_item.xml | 6 +++--- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock index c41e9806ac783a6a763ac7e7d8333cf8e78cd4f3..406dc8a79a5616184a22efbc9c745acc62fc1658 100644 GIT binary patch literal 17 VcmZRsUgMuDB)xe(0~jz00RSr<1Bn0t literal 17 UcmZRsUgMuDB)xe(0|a~l04x0jY5)KL diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin index 6a58db0f47cedb2b3c629567bbc6f1827e652adf..e4f133c2ba74b431cd552e1805534daf4635c4a6 100644 GIT binary patch delta 3145 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 Ow-DF~j2)l~Ru2Gu)Y|3% delta 3020 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 diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock index cf8dc8c0682cd765086a7bdef66aa1acc0c5f5d9..e9193af9913004162df4507be871a28b8c9756a2 100644 GIT binary patch literal 17 VcmZR6R%ybQyvz0`0~oMP0{}3P1atrZ literal 17 VcmZR6R%ybQyvz0`0~oMz001xo1Lgn# diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 0d8081ab3b7ec6220c85bdddf04424e1a3bd9acb..06248381ebfc9b73cdba19f7533d23771047cc86 100644 GIT binary patch literal 17 UcmZQBSl$}m?k^O|00x2!04nMO<p2Nx literal 17 UcmZQBSl$}m?k^O|00x2u04llzwEzGB diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 511bcd26875f005ad91452cbf2215a858daa50ec..4df35562fd76e45873ff29ffc07676b0c53e8926 100644 GIT binary patch delta 149 zcmZ3toBzpf{td?O7&$kayi*kBf3fP`Q^^ZI7(jse?t$$-jEtLE8DDPKEoW|J-aeO$ z@vH>npY7Soj3-(6`M0KBaqo`=DP>^3duhA22IFNd){P7d-h$KjXfi2ow+UukzMS#z x_9wp>7wYg|xw<mTOXCVu`MT{j>P*7Sj3*~5dbEGgV%q*ei+SIs=@;Y}%>cKOH|78U delta 96 zcmaE|n}6MI{td?O7&$hZyi*k3p3BI%ik0!=cF}U?xy;+=axtEjVEny3Tbc1B%XS|P z##36XGZ`43CQk3sWK!I&63n=NIpd%0Pku2j)Y(2)or#N?apOeAg!T_wOxr(bG4I<1 E01s~^hX4Qo diff --git a/.idea/misc.xml b/.idea/misc.xml index d4773db..2499995 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,6 +4,7 @@ <option name="filePathToZoomLevelMap"> <map> <entry key="..\:/Users/Fair/Desktop/android-basics-kotlin-mars-photos-app-starter/app/src/main/res/drawable/ic_broken_image.xml" value="0.226" /> + <entry key="..\:/Users/Fair/Desktop/android-basics-kotlin-mars-photos-app-starter/app/src/main/res/layout/fragment_overview.xml" value="0.33" /> <entry key="..\:/Users/Fair/Desktop/android-basics-kotlin-mars-photos-app-starter/app/src/main/res/layout/grid_view_item.xml" value="0.24048913043478262" /> </map> </option> diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml index cd30938..2521839 100644 --- a/app/src/main/res/layout/fragment_overview.xml +++ b/app/src/main/res/layout/fragment_overview.xml @@ -30,14 +30,20 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context="com.example.android.marsphotos.overview.OverViewFragment"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@{viewModel.status}" + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/photos_grid" + android:layout_width="0dp" + android:layout_height="0dp" + android:padding="6dp" + app:layoutManager= + "androidx.recyclerview.widget.GridLayoutManager" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + tools:itemCount="16" + tools:listitem="@layout/grid_view_item" + app:spanCount="2" /> </androidx.constraintlayout.widget.ConstraintLayout> </layout> \ No newline at end of file diff --git a/app/src/main/res/layout/grid_view_item.xml b/app/src/main/res/layout/grid_view_item.xml index 9353304..56adc84 100644 --- a/app/src/main/res/layout/grid_view_item.xml +++ b/app/src/main/res/layout/grid_view_item.xml @@ -21,8 +21,8 @@ xmlns:tools="http://schemas.android.com/tools"> <data> <variable - name="viewModel" - type="com.example.android.marsphotos.overview.OverviewViewModel" /> + name="photo" + type="com.example.android.marsphotos.network.MarsPhoto" /> </data> <ImageView android:id="@+id/mars_image" @@ -31,6 +31,6 @@ android:scaleType="fitXY" android:adjustViewBounds="true" android:padding="2dp" - app:imageUrl="@{viewModel.photos.imgSrcUrl}" + app:imageUrl="@{photo.imgSrcUrl}" tools:src="@tools:sample/backgrounds/scenic"/> </layout> -- GitLab