Skip to content

Refactor/#152 #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eeeeeaaan wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Refactor/#152 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/com/ssu/assu/ui/review/WriteReviewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ class WriteReviewViewModel @Inject constructor(
private val _writeResult = MutableLiveData<RetrofitResult<ReviewWriteResponseDto>>()
val writeResult: LiveData<RetrofitResult<ReviewWriteResponseDto>> = _writeResult

private var isSubmitting = false
fun writeReview(
request: ReviewWriteRequestDto,
images: List<MultipartBody.Part>
) {
viewModelScope.launch {

_writeResult.value = writeReviewUseCase(request, images)
}
}
Expand Down
16 changes: 10 additions & 6 deletions app/src/main/res/layout/activity_user_photo_review.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,34 +250,38 @@
<!-- 첫 번째 ImageView: 부모의 시작(start)에 제약(constraint)을 걸어 맨 왼쪽에 배치 -->
<ImageView
android:id="@+id/iv_photo_review_photo1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="1:1"
android:src="@drawable/ic_select_photo"
app:layout_constraintWidth_percent="0.2898"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

<!-- 두 번째 ImageView: 부모의 중앙에 제약(constraint)을 걸어 중앙에 배치 -->
<ImageView
android:id="@+id/iv_photo_review_photo2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="1:1"
android:src="@drawable/ic_select_photo"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_percent="0.2898"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>

<!-- 세 번째 ImageView: 부모의 끝(end)에 제약(constraint)을 걸어 맨 오른쪽에 배치 -->
<ImageView
android:id="@+id/iv_photo_review_photo3"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
android:src="@drawable/ic_select_photo"
app:layout_constraintDimensionRatio="1:1"
android:visibility="visible"

app:layout_constraintWidth_percent="0.2898"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<View
android:id="@+id/dashboard_mg2"
android:layout_width="0dp"
android:layout_height="10dp"
android:layout_height="0dp"
app:layout_constraintWidth_percent="0.061"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/dashboard_mg1"/>
Expand Down Expand Up @@ -87,7 +87,7 @@

<View
android:id="@+id/dashboard_mg3"
android:layout_width="10dp"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintHeight_percent="0.0263"
app:layout_constraintStart_toEndOf="@id/dashboard_mg2"
Expand Down Expand Up @@ -364,7 +364,7 @@

<View
android:id="@+id/dashboard_mg10"
android:layout_width="10dp"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintHeight_percent="0.0222"
app:layout_constraintStart_toStartOf="parent"
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/res/layout/fragment_group_qr_complete.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:layout_height="match_parent">

<ImageView
android:id="@+id/iv_cross"
android:id="@+id/iv_qr_complete_cross"
android:layout_width="24dp"
android:layout_height="24dp"
app:layout_constraintStart_toStartOf="parent"
Expand All @@ -19,10 +19,10 @@
android:src="@drawable/ic_cross"/>

<View
android:id="@+id/view_mg1"
android:id="@+id/qr_complete_mg1"
android:layout_width="match_parent"
android:layout_height="255dp"
app:layout_constraintTop_toBottomOf="@id/iv_cross"/>
app:layout_constraintTop_toBottomOf="@id/iv_qr_complete_cross"/>


<LinearLayout
Expand All @@ -32,7 +32,7 @@
app:layout_constraintEnd_toEndOf="parent"
android:orientation="vertical"
android:gravity="center"
app:layout_constraintTop_toBottomOf="@id/view_mg1">
app:layout_constraintTop_toBottomOf="@id/qr_complete_mg1">

<TextView
android:layout_width="wrap_content"
Expand All @@ -43,13 +43,13 @@
android:fontFamily="@font/pretendard_semibold"/>

<View
android:id="@+id/view_mg2"
android:id="@+id/qr_complete_mg2"
android:layout_width="match_parent"
android:layout_height="10dp"/>
android:layout_height="11dp"/>


<LinearLayout
android:id="@+id/ll_complete_content"
android:id="@+id/ll_qr_complete_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
Expand All @@ -73,7 +73,7 @@


<View
android:id="@+id/view_mg3"
android:id="@+id/qr_complete_mg3"
android:layout_width="match_parent"
android:layout_height="20dp"/>

Expand Down
Loading