Skip to content

Commit

Permalink
๐Ÿš‘ ๐Ÿ› comment bug fix (#395)
Browse files Browse the repository at this point in the history
* Create PR for #394

* ๐Ÿ› add di annotation

* ๐Ÿ› conflict solve

* ๐Ÿ› add paddingend to comment edittext

- before: when comment is longer than one line, "send" image button is covered by comment text

* โœจ add step image selection on recipe making

* โœจ add removal and alteration of step images

* ๐Ÿ› fix recipe photo saving error

* :style: kt lint formatting

* ๐Ÿ’„ kt lint formatting

* ๐Ÿ’„ kt lint formatting

* ๐Ÿ› fix permission error when choosing multiple step images

* ๐Ÿ› fix permission error when choosing multiple step images

* ๐Ÿ› fix permission error when choosing multiple step images

* ๐Ÿ› fix file path error when choosing multiple step images

* ๐Ÿ› fix file path error when choosing multiple step images

* โ™ป๏ธ apply feedbacks

* ๐Ÿ› fix order changes in step images

* ๐Ÿ› fix order changes in step images

* โœจ apply viewpager to making recipe step

* style: apply dark mode

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hogu59 <[email protected]>
Co-authored-by: ii2001 <[email protected]>
Co-authored-by: Gimun Kim <[email protected]>
  • Loading branch information
4 people authored Oct 24, 2024
1 parent 431c1d3 commit 9bf94c2
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.viewModels
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import dagger.hilt.android.AndroidEntryPoint
import net.pengcook.android.R
import net.pengcook.android.databinding.FragmentCommentMenuBottomBinding
import net.pengcook.android.presentation.core.model.Comment

@AndroidEntryPoint
class CommentMenuBottomFragment : BottomSheetDialogFragment() {
private var _binding: FragmentCommentMenuBottomBinding? = null
private val binding
Expand Down
15 changes: 8 additions & 7 deletions android/app/src/main/res/layout/fragment_comment_menu_bottom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_button_round_corner"
android:padding="24dp"
tools:context=".presentation.comment.bottomsheet.CommentMenuBottomFragment">

Expand All @@ -34,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="UserName : "
android:text="@string/comment_menu_username"
android:textColor="@color/text_color"
android:textSize="16sp"
android:textStyle="bold"
Expand All @@ -47,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{comment.userName}"
android:textColor="@color/text_color"
android:textColor="@color/yellow_strong"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintStart_toEndOf="@id/tv_username_title"
Expand All @@ -60,7 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="Comment : "
android:text="@string/comment_menu_comment_content"
android:textColor="@color/text_color"
android:textSize="16sp"
android:textStyle="bold"
Expand All @@ -72,7 +73,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@{comment.message}"
android:textColor="@color/text_color"
android:textColor="@color/yellow_strong"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -91,7 +92,7 @@
android:gravity="center"
android:onClick="@{() -> vm.onReport()}"
android:padding="14dp"
android:text="Report"
android:text="@string/comment_menu_report"
android:textColor="@color/text_color"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
Expand All @@ -111,7 +112,7 @@
android:fontFamily="@font/notosans_bold"
android:gravity="center"
android:padding="14dp"
android:text="Block"
android:text="@string/comment_menu_block"
android:textColor="@color/text_color"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="@id/tv_report"
Expand Down Expand Up @@ -147,7 +148,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/report_title_bottom"
android:textColor="@color/text_color"
android:textColor="@color/yellow_strong"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
android:padding="16dp"
android:textSize="16sp"
android:maxLength="30"
android:paddingEnd="40dp"
android:text="@={content}"
app:layout_constraintTop_toTopOf="parent"
tools:hint="Hint" />
Expand Down
5 changes: 5 additions & 0 deletions android/app/src/main/res/values-ko-rKR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@

<string name="comment_reported">์œ ์ € %s๊ฐ€ ์‹ ๊ณ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.</string>
<string name="comment_deleted">๋Œ“๊ธ€์ด ์‚ญ์ œ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.</string>
<string name="comment_menu_username">์œ ์ €๋ช… :</string>
<string name="comment_menu_comment_content">๋Œ“๊ธ€ ๋‚ด์šฉ :</string>
<string name="comment_menu_delete">์‚ญ์ œํ•˜๊ธฐ</string>
<string name="comment_menu_block">์ฐจ๋‹จํ•˜๊ธฐ</string>
<string name="comment_menu_report">์‹ ๊ณ ํ•˜๊ธฐ</string>

<string name="report_title_bottom">์‹ ๊ณ  ์‚ฌ์œ ๋ฅผ ์„ ํƒํ•ด์ฃผ์„ธ์š”.</string>
<string name="report_title_dialog">์‹ ๊ณ  ์‚ฌ์œ ๋ฅผ ์„ ํƒํ•ด์ฃผ์„ธ์š”.</string>
Expand Down
6 changes: 6 additions & 0 deletions android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@

<string name="comment_reported">User %s Reported</string>
<string name="comment_deleted">Comment Deleted</string>
<string name="comment_menu_username">UserName :</string>
<string name="comment_menu_comment_content">Comment :</string>
<string name="comment_menu_delete">Delete my comment</string>
<string name="comment_menu_block">Block</string>
<string name="comment_menu_report">Report</string>


<string name="report_title_bottom">Please choose the reason of report</string>
<string name="report_title_dialog">Choose reason of report</string>
Expand Down

0 comments on commit 9bf94c2

Please sign in to comment.