refactpr: 펫 상세화면 이미지 연결 및 툴바 터치 안되는 이슈

woowacourse-teams · Aug 4, 2024 · 0425efb · 0425efb
1 parent 9aa72ea
commit 0425efb
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 21 deletions.
diff --git a/...id/app/src/main/java/com/happy/friendogly/presentation/ui/petdetail/PetDetailViewModel.kt b/...id/app/src/main/java/com/happy/friendogly/presentation/ui/petdetail/PetDetailViewModel.kt
@@ -1,5 +1,6 @@
 package com.happy.friendogly.presentation.ui.petdetail
 
+import android.util.Log
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.SavedStateHandle
@@ -50,6 +51,7 @@ class PetDetailViewModel(
     }
 
     fun navigateToBack() {
+        Log.d("ttt", "hihi")
         _navigateAction.emit(PetProfileNavigationAction.NavigateToBack)
     }
 

diff --git a/android/app/src/main/res/layout/activity_pet_detail.xml b/android/app/src/main/res/layout/activity_pet_detail.xml
@@ -17,26 +17,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/rect_black_gradient_start"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-        <ImageView
-            android:id="@+id/iv_arrow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            app:tint="@color/white"
-            onSingleClick="@{() -> vm.navigateToBack()}"
-            app:layout_constraintBottom_toBottomOf="@+id/toolbar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_arrow_left" />
-
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/vp_pet_detail"
@@ -67,5 +47,26 @@
             app:setUpIndicator="@{vm.uiState.petsDetail.data.size()}" />
 
 
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/rect_black_gradient_start"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <ImageView
+            android:id="@+id/iv_arrow"
+            onSingleClick="@{() -> vm.navigateToBack()}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="16dp"
+            app:layout_constraintBottom_toBottomOf="@+id/toolbar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_arrow_left"
+            app:tint="@color/white" />
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/app/src/main/res/layout/item_pet_detail.xml b/android/app/src/main/res/layout/item_pet_detail.xml
@@ -19,10 +19,10 @@
 
         <ImageView
             android:id="@+id/iv_dog_profile"
+            urlToImage="@{petDetail.imageUrl}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="centerCrop"
-            android:src="@drawable/img_acorm"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"