diff --git a/app/src/main/java/com/ssu/assu/ui/review/WriteReviewViewModel.kt b/app/src/main/java/com/ssu/assu/ui/review/WriteReviewViewModel.kt index 8a5f7afa..bf1e0ea7 100644 --- a/app/src/main/java/com/ssu/assu/ui/review/WriteReviewViewModel.kt +++ b/app/src/main/java/com/ssu/assu/ui/review/WriteReviewViewModel.kt @@ -22,11 +22,13 @@ class WriteReviewViewModel @Inject constructor( private val _writeResult = MutableLiveData>() val writeResult: LiveData> = _writeResult + private var isSubmitting = false fun writeReview( request: ReviewWriteRequestDto, images: List ) { viewModelScope.launch { + _writeResult.value = writeReviewUseCase(request, images) } } diff --git a/app/src/main/res/layout/activity_user_photo_review.xml b/app/src/main/res/layout/activity_user_photo_review.xml index 2f123c64..ffd1ae35 100644 --- a/app/src/main/res/layout/activity_user_photo_review.xml +++ b/app/src/main/res/layout/activity_user_photo_review.xml @@ -250,10 +250,11 @@ @@ -261,11 +262,12 @@ @@ -273,11 +275,13 @@ diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 9ab53e53..ec17a133 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -21,7 +21,7 @@ @@ -87,7 +87,7 @@ + app:layout_constraintTop_toBottomOf="@id/iv_qr_complete_cross"/> + app:layout_constraintTop_toBottomOf="@id/qr_complete_mg1"> + android:layout_height="11dp"/> @@ -73,7 +73,7 @@ diff --git a/app/src/main/res/layout/fragment_user_home.xml b/app/src/main/res/layout/fragment_user_home.xml index 01951ef5..9b29bfe9 100644 --- a/app/src/main/res/layout/fragment_user_home.xml +++ b/app/src/main/res/layout/fragment_user_home.xml @@ -46,541 +46,565 @@ app:layout_constraintTop_toBottomOf="@id/home_linear_layout_1" app:layout_constraintHeight_percent="0.02857142857"/> - + app:layout_constraintEnd_toEndOf="parent"/> - + - - - + - - - - - + - - - - - - - - - - - - - - - - - - - + + + + + + - + android:src="@drawable/ic_info_circle_empty" + app:layout_constraintStart_toStartOf="@id/tv_home_qr_certify" /> - - + android:textColor="@color/assu_font_sub" + android:layout_marginStart="6dp"/> + - + - - - - - + - - + - + + + - + - + - + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + android:layout_width="wrap_content" + android:layout_marginStart="8dp" + android:text="역전할머니맥주" + android:textColor="@color/assu_font_main" + android:textSize="14sp"/> + + + + + - + android:layout_width="wrap_content" + android:layout_marginStart="8dp" + android:text="취향" + android:textColor="@color/assu_font_main" + android:textSize="14sp"/> - - - + + app:layout_columnWeight="1" + android:orientation="horizontal" + android:gravity="center_vertical" + android:layout_marginBottom="12dp"> + + + + + + + android:textSize="14sp"/> + - + + + - - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="8dp" + android:text="역전할머니맥주" + android:textColor="@color/assu_font_main" + android:textSize="14sp"/> - + + + + + + - - + - - - - - - - - - - - - + - - - - - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="8dp" + android:text="Bread * co" + android:textColor="@color/assu_font_main" + android:textSize="14sp"/> + + + + + - - + + + + diff --git a/app/src/main/res/layout/fragment_user_mypage.xml b/app/src/main/res/layout/fragment_user_mypage.xml index bed26e2c..7ce5eedc 100644 --- a/app/src/main/res/layout/fragment_user_mypage.xml +++ b/app/src/main/res/layout/fragment_user_mypage.xml @@ -10,7 +10,7 @@ tools:context=".presentation.user.mypage.UserMypageFragment"> + app:layout_constraintStart_toEndOf="@id/user_account_mg1"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg2" + app:layout_constraintStart_toEndOf="@id/user_account_mg1"> + app:layout_constraintStart_toEndOf="@id/cv_user_account_profile" + app:layout_constraintTop_toTopOf="@id/cv_user_account_profile"/> + app:layout_constraintStart_toEndOf="@id/user_account_mg3" + app:layout_constraintTop_toTopOf="@id/user_account_mg3" + app:layout_constraintBottom_toBottomOf="@id/cv_user_account_profile"> + app:layout_constraintTop_toBottomOf="@id/cv_user_account_profile" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg5" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"/> + app:layout_constraintTop_toBottomOf="@id/tv_user_account_setting" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg6" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"> + app:layout_constraintStart_toEndOf="@id/user_account_mg7_2"/> + app:layout_constraintTop_toBottomOf="@id/cl_user_account_component1" + app:layout_constraintStart_toStartOf="@id/cl_user_account_component1"/> + app:layout_constraintTop_toBottomOf="@id/cl_user_account_component1" + app:layout_constraintStart_toStartOf="@id/cl_user_account_component1"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg10" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"> + app:layout_constraintStart_toEndOf="@id/user_account_mg11_2"/> + app:layout_constraintTop_toBottomOf="@id/cl_user_account_component3" + app:layout_constraintStart_toStartOf="@id/cl_user_account_component3"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg12" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"/> + app:layout_constraintTop_toBottomOf="@id/tv_user_account_service_center" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg13" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"> + app:layout_constraintStart_toEndOf="@id/user_account_mg14_2"/> + app:layout_constraintTop_toBottomOf="@id/cl_user_account_component4" + app:layout_constraintStart_toStartOf="@id/cl_user_account_component4"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg15" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"> + app:layout_constraintStart_toEndOf="@id/user_account_mg16_2"/> + app:layout_constraintTop_toBottomOf="@id/cl_user_account_component5" + app:layout_constraintStart_toStartOf="@id/cl_user_account_component1"/> + app:layout_constraintTop_toBottomOf="@id/user_account_mg17" + app:layout_constraintStart_toStartOf="@id/cv_user_account_profile"> + app:layout_constraintStart_toEndOf="@id/user_account_mg18_2"/> diff --git a/app/src/main/res/layout/fragment_user_partnership_select.xml b/app/src/main/res/layout/fragment_user_partnership_select.xml index ffbcfdf1..ffa616ae 100644 --- a/app/src/main/res/layout/fragment_user_partnership_select.xml +++ b/app/src/main/res/layout/fragment_user_partnership_select.xml @@ -7,10 +7,10 @@ android:layout_height="match_parent" android:background="@color/assu_background" xmlns:app="http://schemas.android.com/apk/res-auto" - tools:context=".presentation.user.home.GroupVerifyFragment"> + tools:context=".presentation.user.home.partnership_selectVerifyFragment"> + app:layout_constraintTop_toBottomOf="@id/partnership_select_h1" + app:layout_constraintStart_toEndOf="@id/partnership_select_w1"/> + app:layout_constraintTop_toBottomOf="@id/partnership_select_h2"/> + app:layout_constraintTop_toBottomOf="@id/tv_partnership_select_guide"/> + app:layout_constraintStart_toEndOf="@id/partnership_select_w3" + app:layout_constraintTop_toBottomOf="@id/partnership_select_h4" + app:layout_constraintEnd_toStartOf="@id/partnership_select_w4"> + app:layout_constraintBottom_toTopOf="@id/partnership_select_h6"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_user_select_service.xml b/app/src/main/res/layout/fragment_user_select_service.xml index def5e3cd..b22e477d 100644 --- a/app/src/main/res/layout/fragment_user_select_service.xml +++ b/app/src/main/res/layout/fragment_user_select_service.xml @@ -120,6 +120,7 @@ android:layout_height="0dp" app:layout_constraintHeight_percent="0.025" app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_service_goods1"/>