Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Commit

Permalink
πŸ“Œ 일기 μž‘μ„±, 상세 νŽ˜μ΄μ§€ fix (#93)
Browse files Browse the repository at this point in the history 
* [fix] 일기 μž‘μ„±, 일기 상세 νŽ˜μ΄μ§€ scrollview μˆ˜μ •

* [cleanup] remove item_month
  • Loading branch information
@HamBeomJoon
HamBeomJoon authored Aug 14, 2024
1 parent fefb568 commit 0c4c7ea
Show file tree
Hide file tree
Showing 3 changed files with 173 additions and 270 deletions.
163 changes: 84 additions & 79 deletions Nabi/presentation/src/main/res/layout/fragment_add_diary.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,85 +7,90 @@

</data>

<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">

<ImageButton
android:id="@+id/ib_back"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="4dp"
android:background="@color/transparent"
android:src="@drawable/ic_arrow"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_save"
style="@style/pretendard_semi_bold_18px"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"

android:background="@color/transparent"
android:text="@string/text_add_diary_save"
android:textColor="@color/black"
android:visibility="gone"

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/ib_back" />

<ImageButton
android:id="@+id/ib_mic"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:src="@drawable/ic_mic"
app:layout_constraintEnd_toStartOf="@id/btn_save"

app:layout_constraintTop_toTopOf="@id/ib_back"
app:layout_goneMarginEnd="8dp"
tools:ignore="ContentDescription" />

<TextView
android:id="@+id/tv_diary_date"
style="@style/heading2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent">

android:layout_marginTop="32dp"
android:textColor="@color/black"
app:layout_constraintEnd_toEndOf="parent"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ib_back"
tools:text="2024λ…„ 7μ›” 27일" />

<EditText
android:id="@+id/et_diary"
style="@style/body2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginHorizontal="52dp"
android:layout_marginTop="28dp"
android:layout_marginBottom="20dp"

android:background="@color/transparent"
android:gravity="center|top"
android:hint="@string/text_add_diary_hint"
android:textColorHint="@color/gray1"
android:inputType="textMultiLine"
android:textColor="@color/black"

app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_diary_date"
tools:ignore="Autofill" />

</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">

<ImageButton
android:id="@+id/ib_back"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="4dp"
android:background="@color/transparent"
android:src="@drawable/ic_arrow"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_save"
style="@style/pretendard_semi_bold_18px"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="8dp"

android:background="@color/transparent"
android:text="@string/text_add_diary_save"
android:textColor="@color/black"
android:visibility="gone"

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/ib_back" />

<ImageButton
android:id="@+id/ib_mic"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:src="@drawable/ic_mic"
app:layout_constraintEnd_toStartOf="@id/btn_save"

app:layout_constraintTop_toTopOf="@id/ib_back"
app:layout_goneMarginEnd="8dp"
tools:ignore="ContentDescription" />

<TextView
android:id="@+id/tv_diary_date"
style="@style/heading2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

android:layout_marginTop="32dp"
android:textColor="@color/black"
app:layout_constraintEnd_toEndOf="parent"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ib_back"
tools:text="2024λ…„ 7μ›” 27일" />

<EditText
android:id="@+id/et_diary"
style="@style/body2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginHorizontal="52dp"
android:layout_marginTop="28dp"
android:layout_marginBottom="20dp"

android:background="@color/transparent"
android:gravity="center|top"
android:hint="@string/text_add_diary_hint"
android:inputType="textMultiLine"
android:textColor="@color/black"
android:textColorHint="@color/gray1"

app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_diary_date"
tools:ignore="Autofill" />

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
175 changes: 89 additions & 86 deletions Nabi/presentation/src/main/res/layout/fragment_detail_diary.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,103 +7,106 @@

</data>

<androidx.constraintlayout.widget.ConstraintLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:layout_height="match_parent">

<Toolbar
android:id="@+id/tb_diary_detail"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:contentInsetStart="0dp">
android:background="@color/white">

<ImageButton
android:id="@+id/ib_back"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@null"
android:src="@drawable/ic_arrow"
android:background="@color/transparent"/>
<Toolbar
android:id="@+id/tb_diary_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:contentInsetStart="0dp"
app:layout_constraintTop_toTopOf="parent">

<ImageButton
android:id="@+id/ib_back"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/transparent"
android:contentDescription="@null"
android:src="@drawable/ic_arrow" />

<ImageButton
android:id="@+id/ib_bookmark"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_gravity="end"
android:background="@color/transparent"
android:contentDescription="@null"
android:src="@drawable/ic_heart" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_edit"
style="@style/pretendard_semi_bold_18px"
android:layout_width="48dp"

android:layout_height="wrap_content"

android:layout_gravity="end"
android:background="@color/transparent"
android:text="μˆ˜μ •"
android:textColor="@color/black" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_delete"
style="@style/pretendard_semi_bold_18px"
android:layout_width="48dp"

android:layout_height="wrap_content"

android:layout_gravity="end"
android:background="@color/transparent"
android:text="μ‚­μ œ"
android:textColor="@color/red" />
</Toolbar>

<ImageView
android:id="@+id/iv_emotion"
android:layout_width="100dp"
android:layout_height="100dp"

<ImageButton
android:id="@+id/ib_bookmark"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@null"
android:src="@drawable/ic_heart"
android:background="@color/transparent"
android:layout_gravity="end"/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tb_diary_detail"

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_edit"
android:layout_width="48dp"
android:layout_height="wrap_content"
tools:src="@drawable/img_happiness" />

android:background="@color/transparent"

android:text="μˆ˜μ •"
style="@style/pretendard_semi_bold_18px"
android:textColor="@color/black"
android:layout_gravity="end"/>
<TextView
android:id="@+id/tv_diary_date"
style="@style/heading2"
android:layout_width="wrap_content"

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_delete"
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:textColor="@color/black"
app:layout_constraintEnd_toEndOf="parent"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_emotion"
tools:text="2024λ…„ 7μ›” 27일" />

<TextView
android:id="@+id/tv_diary_content"
style="@style/body2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginHorizontal="52dp"
android:layout_marginVertical="28dp"
android:gravity="center|top"
android:textColor="@color/black"
app:layout_constraintBottom_toBottomOf="parent"

android:background="@color/transparent"

android:text="μ‚­μ œ"
android:textColor="@color/red"
style="@style/pretendard_semi_bold_18px"
android:layout_gravity="end"/>
</Toolbar>

<ImageView
android:id="@+id/iv_emotion"
android:layout_width="100dp"
android:layout_height="100dp"

android:contentDescription="@null"
app:layout_constraintTop_toBottomOf="@id/tb_diary_detail"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

tools:src="@drawable/img_happiness"/>

<TextView
android:id="@+id/tv_diary_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

app:layout_constraintTop_toBottomOf="@id/iv_emotion"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="28dp"

tools:text="2024λ…„ 7μ›” 27일"
style="@style/heading2"
android:textColor="@color/black"/>

<TextView
android:id="@+id/tv_diary_content"
android:layout_width="0dp"
android:layout_height="0dp"

app:layout_constraintTop_toBottomOf="@id/tv_diary_date"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginHorizontal="52dp"
android:layout_marginVertical="28dp"

tools:text="μ˜€λŠ˜μ€ μ•Œλ°”λ₯Ό λ‹€λ…€μ™“λ‹€ λ°₯μ‹œκ°„μ— λΉ„κ°€ λ„ˆλ¬΄ 많이 μ™€μ„œ λ›°μ–΄κ°€λ‹€κ°€ 물웅덩이λ₯Ό λ°Ÿμ•˜λ‹€ μ–‘λ§κΉŒμ§€ λ‹€ μ –μ–΄λ²„λ €μ„œ μ˜† 반 μ „μž„μ„ μƒλ‹˜ 슬리퍼λ₯Ό 뺏어 μ‹ μ—ˆλ‹€ μ˜€ν›„ μˆ˜μ—…ν•˜λŠ” λ™μ•ˆ 양말도 λ‹€ 마λ₯΄κ³  μŠ¬λ¦¬νΌκ°€ ν­μ‹ ν­μ‹ ν•΄μ„œ 기뢄이 μ’‹μ•˜λ‹€ μ„ μƒλ‹˜ γ„±γ……ν•©λ‹ˆλ‹€"
style="@style/body2"
android:textColor="@color/black"
android:gravity="center|top"/>

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_diary_date"
tools:text="μ˜€λŠ˜μ€ μ•Œλ°”λ₯Ό λ‹€λ…€μ™“λ‹€ λ°₯μ‹œκ°„μ— λΉ„κ°€ λ„ˆλ¬΄ 많이 μ™€μ„œ λ›°μ–΄κ°€λ‹€κ°€ 물웅덩이λ₯Ό λ°Ÿμ•˜λ‹€ μ–‘λ§κΉŒμ§€ λ‹€ μ –μ–΄λ²„λ €μ„œ μ˜† 반 μ „μž„μ„ μƒλ‹˜ 슬리퍼λ₯Ό 뺏어 μ‹ μ—ˆλ‹€ μ˜€ν›„ μˆ˜μ—…ν•˜λŠ” λ™μ•ˆ 양말도 λ‹€ 마λ₯΄κ³  μŠ¬λ¦¬νΌκ°€ ν­μ‹ ν­μ‹ ν•΄μ„œ 기뢄이 μ’‹μ•˜λ‹€ μ„ μƒλ‹˜ γ„±γ……ν•©λ‹ˆλ‹€" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</layout>
Loading

0 comments on commit 0c4c7ea

Please sign in to comment.