diff --git a/presentation/src/main/java/org/gdsc/presentation/view/mypage/restaurantdetail/RestaurantDetailFragment.kt b/presentation/src/main/java/org/gdsc/presentation/view/mypage/restaurantdetail/RestaurantDetailFragment.kt index a9750e84..07eaadfb 100644 --- a/presentation/src/main/java/org/gdsc/presentation/view/mypage/restaurantdetail/RestaurantDetailFragment.kt +++ b/presentation/src/main/java/org/gdsc/presentation/view/mypage/restaurantdetail/RestaurantDetailFragment.kt @@ -167,6 +167,7 @@ class RestaurantDetailFragment : Fragment() { binding.restaurantDetailPager.adapter = RestaurantDetailPagerAdapter(this) binding.restaurantDetailPager.isUserInputEnabled = false + binding.restaurantDetailPager.offscreenPageLimit = 1 TabLayoutMediator(binding.tabLayout, binding.restaurantDetailPager) { tab, position -> when (position) { diff --git a/presentation/src/main/res/layout/fragment_restaurant_detail.xml b/presentation/src/main/res/layout/fragment_restaurant_detail.xml index edac825c..ab0875d3 100644 --- a/presentation/src/main/res/layout/fragment_restaurant_detail.xml +++ b/presentation/src/main/res/layout/fragment_restaurant_detail.xml @@ -1,59 +1,55 @@ + android:layout_height="match_parent"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + tools:text="용용선생 노원점" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_restaurant_name"> @@ -61,17 +57,16 @@ android:layout_width="1dp" android:layout_height="12dp" android:layout_gravity="center_vertical" - android:background="@color/grey200" android:layout_marginHorizontal="12dp" - /> + android:background="@color/grey200" /> + tools:text="중식" /> @@ -79,82 +74,80 @@ android:id="@+id/ct_address" android:layout_width="0dp" android:layout_height="wrap_content" - app:layout_constraintStart_toStartOf="parent" + android:layout_marginTop="4dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/ct_distance_and_category" - android:layout_marginTop="4dp"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ct_distance_and_category"> + android:text="주소복사" + android:textColor="@color/main300" /> + android:contentDescription="profile" + android:src="@drawable/mock_profile" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ct_address" /> + app:layout_constraintBottom_toBottomOf="@id/iv_profile" + app:layout_constraintStart_toEndOf="@id/iv_profile" + app:layout_constraintTop_toTopOf="@id/iv_profile" + tools:text="Blaire" /> + app:tabTextColor="@color/grey400"> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tab_layout" /> @@ -165,70 +158,69 @@ android:layout_width="0dp" android:layout_height="1dp" android:background="@color/grey100" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintBottom_toTopOf="@id/ct_review_foam" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toTopOf="@id/ct_review_foam"/> + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintStart_toStartOf="parent"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@id/et_review" /> + app:layout_constraintEnd_toEndOf="parent" /> + app:layout_constraintEnd_toStartOf="@id/btn_register" + app:layout_constraintStart_toEndOf="@id/add_image_icon" /> diff --git a/presentation/src/main/res/layout/fragment_restaurant_info.xml b/presentation/src/main/res/layout/fragment_restaurant_info.xml index 4c23d6c8..2a55b23a 100644 --- a/presentation/src/main/res/layout/fragment_restaurant_info.xml +++ b/presentation/src/main/res/layout/fragment_restaurant_info.xml @@ -1,143 +1,128 @@ + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_restaurant_photo.xml b/presentation/src/main/res/layout/fragment_restaurant_photo.xml index ba010b73..c8e756c0 100644 --- a/presentation/src/main/res/layout/fragment_restaurant_photo.xml +++ b/presentation/src/main/res/layout/fragment_restaurant_photo.xml @@ -2,8 +2,9 @@ + app:layout_constraintTop_toTopOf="parent" + /> + app:layout_constraintTop_toBottomOf="@id/tv_photos"/> \ No newline at end of file diff --git a/presentation/src/main/res/layout/fragment_restaurant_review.xml b/presentation/src/main/res/layout/fragment_restaurant_review.xml index 1a655fdd..9c4120ed 100644 --- a/presentation/src/main/res/layout/fragment_restaurant_review.xml +++ b/presentation/src/main/res/layout/fragment_restaurant_review.xml @@ -2,7 +2,7 @@ @@ -20,7 +20,7 @@