Skip to content

Commit 31665b4

Browse files
authored
Merge pull request #607 from Team-WSS/feat/604
fix: 프로필 설명 글이 짤린 현상
2 parents f605208 + 46c4801 commit 31665b4

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

app/src/main/res/layout/activity_other_user_page.xml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<com.google.android.material.appbar.CollapsingToolbarLayout
3131
android:layout_width="match_parent"
32-
android:layout_height="260dp"
32+
android:layout_height="272dp"
3333
android:background="@color/transparent"
3434
app:collapsedTitleGravity="center"
3535
app:layout_scrollFlags="scroll|exitUntilCollapsed">
@@ -41,6 +41,7 @@
4141
android:adjustViewBounds="true"
4242
android:background="@color/primary_20_F5F7FF"
4343
android:paddingTop="36dp"
44+
android:paddingBottom="12dp"
4445
app:layout_collapseMode="parallax">
4546

4647
<ImageView
@@ -70,10 +71,11 @@
7071
android:id="@+id/tv_other_user_page_user_description"
7172
android:layout_width="0dp"
7273
android:layout_height="wrap_content"
73-
android:layout_marginTop="4dp"
7474
android:layout_marginHorizontal="20dp"
75-
android:paddingBottom="30dp"
75+
android:layout_marginTop="6dp"
7676
android:gravity="center"
77+
android:maxLines="2"
78+
android:paddingBottom="30dp"
7779
android:text='@{otherUserPageViewModel.uiState.otherUserProfile.intro}'
7880
android:textAppearance="@style/body2"
7981
android:textColor="@color/gray_200_AEADB3"
@@ -197,11 +199,11 @@
197199
android:layout_width="wrap_content"
198200
android:layout_height="wrap_content"
199201
android:layout_gravity="center"
200-
android:src="@drawable/img_other_user_page_no_public"
201202
android:layout_marginTop="100dp"
202-
app:layout_constraintTop_toTopOf="parent"
203+
android:src="@drawable/img_other_user_page_no_public"
204+
app:layout_constraintEnd_toEndOf="parent"
203205
app:layout_constraintStart_toStartOf="parent"
204-
app:layout_constraintEnd_toEndOf="parent"/>
206+
app:layout_constraintTop_toTopOf="parent" />
205207

206208
<TextView
207209
android:id="@+id/tv_other_user_page_no_public_message"
@@ -212,9 +214,9 @@
212214
android:text='@{String.format(@string/other_user_page_no_public, otherUserPageViewModel.uiState.otherUserProfile.nickname)}'
213215
android:textAppearance="@style/body2"
214216
android:textColor="@color/gray_200_AEADB3"
215-
app:layout_constraintTop_toBottomOf="@id/iv_other_user_page_no_public"
217+
app:layout_constraintEnd_toEndOf="parent"
216218
app:layout_constraintStart_toStartOf="parent"
217-
app:layout_constraintEnd_toEndOf="parent"/>
219+
app:layout_constraintTop_toBottomOf="@id/iv_other_user_page_no_public" />
218220

219221
</androidx.constraintlayout.widget.ConstraintLayout>
220222

app/src/main/res/layout/fragment_my_page.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<com.google.android.material.appbar.CollapsingToolbarLayout
3131
android:layout_width="match_parent"
32-
android:layout_height="260dp"
32+
android:layout_height="272dp"
3333
android:background="@color/transparent"
3434
app:collapsedTitleGravity="center"
3535
app:layout_scrollFlags="scroll|exitUntilCollapsed">
@@ -41,6 +41,7 @@
4141
android:adjustViewBounds="true"
4242
android:background="@color/primary_20_F5F7FF"
4343
android:paddingTop="36dp"
44+
android:paddingBottom="12dp"
4445
app:layout_collapseMode="parallax">
4546

4647
<ImageView
@@ -83,10 +84,11 @@
8384
android:id="@+id/tv_my_page_user_description"
8485
android:layout_width="0dp"
8586
android:layout_height="wrap_content"
86-
android:layout_marginTop="4dp"
8787
android:layout_marginHorizontal="20dp"
88-
android:paddingBottom="30dp"
88+
android:layout_marginTop="6dp"
8989
android:gravity="center"
90+
android:maxLines="2"
91+
android:paddingBottom="30dp"
9092
android:text='@{myPageViewModel.uiState.myProfile.intro}'
9193
android:textAppearance="@style/body2"
9294
android:textColor="@color/gray_200_AEADB3"

0 commit comments

Comments
 (0)