From 37822e074254191e8e1b4b2cd7dc6f4a8d915d29 Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Tue, 26 Aug 2025 23:08:45 +0900 Subject: [PATCH 01/16] =?UTF-8?q?3=EC=B0=A8=20QA=20SettingFragment?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wafflestudio/siksha2/ui/main/setting/SettingFragment.kt | 3 +++ app/src/main/res/drawable/ic_tab_community_inactive.xml | 4 ++-- app/src/main/res/drawable/ic_tab_favorite_inactive.xml | 4 ++-- app/src/main/res/drawable/ic_tab_main_inactive.xml | 4 ++-- app/src/main/res/drawable/ic_tab_setting_inactive.xml | 4 ++-- app/src/main/res/layout/fragment_setting.xml | 6 +++--- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt index cc58b3782..9d053e366 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt @@ -1,10 +1,12 @@ package com.wafflestudio.siksha2.ui.main.setting +import android.graphics.Typeface import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView +import android.widget.TextView import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope @@ -96,6 +98,7 @@ class SettingFragment : Fragment() { val action = MainFragmentDirections.actionMainFragmentToVocFragment() findNavController().navigate(action) } + binding.vocRow.findViewById(R.id.setting_row_text).setTypeface(null, Typeface.BOLD) lifecycleScope.launch { vm.showEmptyRestaurantFlow.collect { diff --git a/app/src/main/res/drawable/ic_tab_community_inactive.xml b/app/src/main/res/drawable/ic_tab_community_inactive.xml index c06a5caaa..3676c2cda 100644 --- a/app/src/main/res/drawable/ic_tab_community_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_community_inactive.xml @@ -5,9 +5,9 @@ android:viewportHeight="46"> + android:fillColor="@color/gray_600"/> diff --git a/app/src/main/res/drawable/ic_tab_favorite_inactive.xml b/app/src/main/res/drawable/ic_tab_favorite_inactive.xml index 839dea3b6..0bf74fe18 100644 --- a/app/src/main/res/drawable/ic_tab_favorite_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_favorite_inactive.xml @@ -5,8 +5,8 @@ android:viewportHeight="46"> + android:fillColor="@color/gray_600"/> + android:fillColor="@color/gray_600"/> diff --git a/app/src/main/res/drawable/ic_tab_main_inactive.xml b/app/src/main/res/drawable/ic_tab_main_inactive.xml index 547ca134f..7153a9d9f 100644 --- a/app/src/main/res/drawable/ic_tab_main_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_main_inactive.xml @@ -8,9 +8,9 @@ android:pathData="M9.875,8h16.25v20h-16.25z"/> + android:fillColor="@color/gray_600"/> + android:fillColor="@color/gray_600"/> diff --git a/app/src/main/res/drawable/ic_tab_setting_inactive.xml b/app/src/main/res/drawable/ic_tab_setting_inactive.xml index e9b383172..b2a735ffe 100644 --- a/app/src/main/res/drawable/ic_tab_setting_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_setting_inactive.xml @@ -5,9 +5,9 @@ android:viewportHeight="46"> + android:fillColor="@color/gray_600"/> diff --git a/app/src/main/res/layout/fragment_setting.xml b/app/src/main/res/layout/fragment_setting.xml index 02b243488..497648219 100644 --- a/app/src/main/res/layout/fragment_setting.xml +++ b/app/src/main/res/layout/fragment_setting.xml @@ -47,9 +47,9 @@ android:layout_weight="1" /> From 2f024d1b7c7df41e051e88035a04d086f43c252d Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Tue, 26 Aug 2025 23:24:49 +0900 Subject: [PATCH 02/16] =?UTF-8?q?grayicon=20=EC=83=89=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt | 2 ++ app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/colors.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt index ab27b53ee..d322531a5 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt @@ -111,6 +111,8 @@ class SikshaColors( get() = if (isDarkTheme) Black else White val IconLike: Color get() = if (isDarkTheme) Gray500 else Gray200 + val IconGrayIcon: Color + get() = if (isDarkTheme) Gray600 else Gray500 val ElementChip: Color get() = if (isDarkTheme) Gray50 else Gray100 val ElementTooltip: Color diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 1abb15e45..6374f527a 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -49,6 +49,7 @@ @color/gray_500 @color/black @color/gray_500 + @color/gray_600 @color/gray_50 @color/gray_400 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 227034cba..5bb6fc27f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -49,6 +49,7 @@ @color/gray_400 @color/white @color/gray_200 + @color/gray_500 @color/gray_100 @color/gray_100 From 49ea6b7798002fcc5d820b7004b65213d9977b12 Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Wed, 27 Aug 2025 00:18:01 +0900 Subject: [PATCH 03/16] =?UTF-8?q?grayicon,=20tooltip2=20=EC=83=89=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt | 2 ++ app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/colors.xml | 1 + 3 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt index d322531a5..46b084de0 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/SikshaColors.kt @@ -117,6 +117,8 @@ class SikshaColors( get() = if (isDarkTheme) Gray50 else Gray100 val ElementTooltip: Color get() = if (isDarkTheme) Gray400 else Gray100 + val ElementTooltip2: Color + get() = if (isDarkTheme) Gray400 else White val ElementControl: Color get() = if (isDarkTheme) Gray500 else Gray200 diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 6374f527a..267922381 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -53,6 +53,7 @@ @color/gray_50 @color/gray_400 + @color/gray_400 @color/gray_500 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5bb6fc27f..830edc066 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -53,6 +53,7 @@ @color/gray_100 @color/gray_100 + @color/white @color/gray_200 From 43e3811fde9dd71448ccd6512ebcf347a5b0c9b9 Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Wed, 27 Aug 2025 00:44:26 +0900 Subject: [PATCH 04/16] =?UTF-8?q?3=EC=B0=A8=20QA=20ReorderRestaurantFragme?= =?UTF-8?q?nt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/reorder/ReorderItemAdapter.kt | 15 ++++ .../frame_bottom_left_corner_radius_12.xml | 5 ++ .../frame_bottom_right_corner_radius_12.xml | 5 ++ .../res/drawable/frame_corner_radius_12.xml | 5 ++ .../frame_top_left_corner_radius_12.xml | 5 ++ .../frame_top_right_corner_radius_12.xml | 5 ++ app/src/main/res/drawable/ic_three_lines.xml | 29 +++++--- .../layout/fragment_reorder_restaurant.xml | 20 +++--- .../item_setting_restaurant_reorder.xml | 69 ++++++++++++++----- 9 files changed, 121 insertions(+), 37 deletions(-) create mode 100644 app/src/main/res/drawable/frame_bottom_left_corner_radius_12.xml create mode 100644 app/src/main/res/drawable/frame_bottom_right_corner_radius_12.xml create mode 100644 app/src/main/res/drawable/frame_corner_radius_12.xml create mode 100644 app/src/main/res/drawable/frame_top_left_corner_radius_12.xml create mode 100644 app/src/main/res/drawable/frame_top_right_corner_radius_12.xml diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt index eff316275..fbec41a9a 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt @@ -1,6 +1,7 @@ package com.wafflestudio.siksha2.ui.main.setting.reorder import android.view.ViewGroup +import androidx.core.content.ContextCompat import com.wafflestudio.siksha2.R import com.wafflestudio.siksha2.databinding.ItemSettingRestaurantReorderBinding import com.wafflestudio.siksha2.utils.getInflater @@ -20,6 +21,20 @@ class ReorderItemAdapter() : DragItemAdapter, ReorderItemAdap override fun onBindViewHolder(holder: ViewHolder, position: Int) { super.onBindViewHolder(holder, position) holder.binding.restaurantName.text = mItemList[position].second + + val nameBg = when (position) { + 0 -> R.drawable.frame_top_left_corner_radius_12 + itemCount - 1 -> R.drawable.frame_bottom_left_corner_radius_12 + else -> R.color.gray_50 + } + val handleBg = when (position) { + 0 -> R.drawable.frame_top_right_corner_radius_12 + itemCount - 1 -> R.drawable.frame_bottom_right_corner_radius_12 + else -> R.color.background_secondary + } + + holder.binding.restaurantNameBackground.background = ContextCompat.getDrawable(holder.itemView.context, nameBg) + holder.binding.reorderHandleBackground.background = ContextCompat.getDrawable(holder.itemView.context, handleBg) } override fun getUniqueItemId(position: Int): Long { diff --git a/app/src/main/res/drawable/frame_bottom_left_corner_radius_12.xml b/app/src/main/res/drawable/frame_bottom_left_corner_radius_12.xml new file mode 100644 index 000000000..b396e80fd --- /dev/null +++ b/app/src/main/res/drawable/frame_bottom_left_corner_radius_12.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/frame_bottom_right_corner_radius_12.xml b/app/src/main/res/drawable/frame_bottom_right_corner_radius_12.xml new file mode 100644 index 000000000..5c972dc75 --- /dev/null +++ b/app/src/main/res/drawable/frame_bottom_right_corner_radius_12.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/frame_corner_radius_12.xml b/app/src/main/res/drawable/frame_corner_radius_12.xml new file mode 100644 index 000000000..0a48dfe5e --- /dev/null +++ b/app/src/main/res/drawable/frame_corner_radius_12.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/frame_top_left_corner_radius_12.xml b/app/src/main/res/drawable/frame_top_left_corner_radius_12.xml new file mode 100644 index 000000000..428d9f204 --- /dev/null +++ b/app/src/main/res/drawable/frame_top_left_corner_radius_12.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/frame_top_right_corner_radius_12.xml b/app/src/main/res/drawable/frame_top_right_corner_radius_12.xml new file mode 100644 index 000000000..b129cdc55 --- /dev/null +++ b/app/src/main/res/drawable/frame_top_right_corner_radius_12.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_three_lines.xml b/app/src/main/res/drawable/ic_three_lines.xml index 71730c4a0..083bafe94 100644 --- a/app/src/main/res/drawable/ic_three_lines.xml +++ b/app/src/main/res/drawable/ic_three_lines.xml @@ -1,15 +1,24 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M4,8H20" + android:strokeWidth="1.2" + android:fillColor="#00000000" + android:strokeColor="@color/icon_gray_icon" + android:strokeLineCap="round"/> + android:pathData="M4,12H20" + android:strokeWidth="1.2" + android:fillColor="#00000000" + android:strokeColor="@color/icon_gray_icon" + android:strokeLineCap="round"/> + android:pathData="M4,16H20" + android:strokeWidth="1.2" + android:fillColor="#00000000" + android:strokeColor="@color/icon_gray_icon" + android:strokeLineCap="round"/> diff --git a/app/src/main/res/layout/fragment_reorder_restaurant.xml b/app/src/main/res/layout/fragment_reorder_restaurant.xml index c327afd01..50cb6eae9 100644 --- a/app/src/main/res/layout/fragment_reorder_restaurant.xml +++ b/app/src/main/res/layout/fragment_reorder_restaurant.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/gray_50" + android:background="@color/background_main" android:orientation="vertical" tools:context=".ui.main.setting.reorder.ReorderRestaurantFragment"> @@ -50,15 +50,18 @@ + android:textColor="@color/gray_700" + android:textSize="13sp" + android:textStyle="normal" + android:textAlignment="center" + android:background="@color/background_secondary"/> + android:textSize="12dp" + android:layout_marginTop="15dp"/> diff --git a/app/src/main/res/layout/item_setting_restaurant_reorder.xml b/app/src/main/res/layout/item_setting_restaurant_reorder.xml index f783fbebd..01aaeb127 100644 --- a/app/src/main/res/layout/item_setting_restaurant_reorder.xml +++ b/app/src/main/res/layout/item_setting_restaurant_reorder.xml @@ -3,30 +3,61 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginHorizontal="12dp" - android:layout_marginBottom="8dp" - android:background="@drawable/frame_corner_radius_10_border" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_marginHorizontal="16dp" + android:layout_marginBottom="1dp" android:gravity="center_vertical"> - + android:layout_height="wrap_content" + android:paddingHorizontal="8dp" + android:paddingVertical="6dp" + android:background="@color/gray_50"> + + + + - + android:layout_height="match_parent" + android:background="@color/background_secondary"> + + + + \ No newline at end of file From 70fcb5e8e6424df12ad46fe676287f13e7524025 Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Wed, 27 Aug 2025 00:51:09 +0900 Subject: [PATCH 05/16] =?UTF-8?q?3=EC=B0=A8=20QA=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A7=88=EC=A7=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_menu_detail.xml | 2 +- app/src/main/res/layout/item_review.xml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/res/layout/fragment_menu_detail.xml b/app/src/main/res/layout/fragment_menu_detail.xml index 4a59d8df9..7686d2da6 100644 --- a/app/src/main/res/layout/fragment_menu_detail.xml +++ b/app/src/main/res/layout/fragment_menu_detail.xml @@ -448,7 +448,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingStart="10dp"> + android:paddingStart="16dp"> @@ -35,7 +34,6 @@ android:id="@+id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" android:layout_marginBottom="2dp" android:fontFamily="@font/nanum_square_bold" android:textColor="@color/gray_600" @@ -68,7 +66,6 @@ android:layout_height="wrap_content" android:minHeight="80dp" android:layout_marginStart="29dp" - android:layout_marginEnd="16dp" android:layout_marginTop="8dp" android:textColor="@color/black" android:textSize="12dp" From e54ea4e43ca7ff895a02bba11965401d6b094fea Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Wed, 27 Aug 2025 01:06:45 +0900 Subject: [PATCH 06/16] =?UTF-8?q?3=EC=B0=A8=20QA=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EB=B7=B0=EC=96=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siksha2/ui/menuDetail/MenuDetailFragment.kt | 4 ++-- .../siksha2/ui/menuDetail/MenuReviewsAdapter.kt | 8 +++----- app/src/main/res/layout/activity_image_viewer.xml | 6 +++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuDetailFragment.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuDetailFragment.kt index 2a9b1cf2e..84e0c572f 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuDetailFragment.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuDetailFragment.kt @@ -21,6 +21,7 @@ import com.wafflestudio.siksha2.ui.SikshaTheme import com.wafflestudio.siksha2.utils.dp import com.wafflestudio.siksha2.utils.showToast import com.wafflestudio.siksha2.utils.setVisibleOrGone +import com.wafflestudio.siksha2.utils.showImageViewer import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.launch @@ -155,8 +156,7 @@ class MenuDetailFragment : Fragment() { for (i in 0 until 2) { if (i < imageUrlList.size) { imageReviewList[i].setOnClickListener { - val dialog = ReviewImageDialog.newInstance(imageUrlList[i]) - dialog.show(childFragmentManager, "review_image_${imageUrlList[i]}") + requireContext().showImageViewer(imageUrlList, i) } } } diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewsAdapter.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewsAdapter.kt index fcb1fed8d..49829f4a7 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewsAdapter.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/menuDetail/MenuReviewsAdapter.kt @@ -12,6 +12,7 @@ import com.wafflestudio.siksha2.models.Review import com.wafflestudio.siksha2.utils.getInflater import com.wafflestudio.siksha2.utils.toLocalDateTime import com.wafflestudio.siksha2.utils.setVisibleOrGone +import com.wafflestudio.siksha2.utils.showImageViewer import com.wafflestudio.siksha2.utils.toParsedTimeString class MenuReviewsAdapter constructor( @@ -42,11 +43,8 @@ class MenuReviewsAdapter constructor( if (i < it.size) { imageViewList[i].run { setImage(it[i]) - fragmentManager?.let { - setImageClickListener { url -> - val dialog = ReviewImageDialog.newInstance(url) - dialog.show(fragmentManager, "review_image_$url") - } + setOnClickListener { + it.context.showImageViewer(item.etc.images, i) } setVisibleOrGone(true) } diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml index a303e9b76..33cd1f62d 100644 --- a/app/src/main/res/layout/activity_image_viewer.xml +++ b/app/src/main/res/layout/activity_image_viewer.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black" + android:background="#000000" android:fitsSystemWindows="true"> Date: Mon, 15 Sep 2025 18:17:41 +0900 Subject: [PATCH 07/16] =?UTF-8?q?GNB=20=ED=85=8D=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wafflestudio/siksha2/components/compose/TopBar.kt | 2 ++ app/src/main/res/layout/fragment_leave_review.xml | 2 +- app/src/main/res/layout/fragment_menu_detail.xml | 2 +- app/src/main/res/layout/fragment_reorder_restaurant.xml | 2 +- app/src/main/res/layout/fragment_review.xml | 2 +- app/src/main/res/layout/fragment_review_photo.xml | 2 +- app/src/main/res/layout/fragment_user_account.xml | 2 +- app/src/main/res/layout/fragment_user_profile.xml | 2 +- app/src/main/res/layout/fragment_voc.xml | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/components/compose/TopBar.kt b/app/src/main/java/com/wafflestudio/siksha2/components/compose/TopBar.kt index f1d890aef..d5562cb9b 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/components/compose/TopBar.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/components/compose/TopBar.kt @@ -12,6 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.wafflestudio.siksha2.ui.NavigateUpIcon import com.wafflestudio.siksha2.ui.SikshaTheme import com.wafflestudio.siksha2.ui.SikshaTypography @@ -33,6 +34,7 @@ fun TopBar( modifier = Modifier.align(Alignment.Center), color = SikshaTheme.colors.TextGNB, fontWeight = FontWeight.ExtraBold, + fontSize = 16.sp, style = SikshaTypography.subtitle1 ) Box( diff --git a/app/src/main/res/layout/fragment_leave_review.xml b/app/src/main/res/layout/fragment_leave_review.xml index 9efb38b7c..e3cc9ff82 100644 --- a/app/src/main/res/layout/fragment_leave_review.xml +++ b/app/src/main/res/layout/fragment_leave_review.xml @@ -36,7 +36,7 @@ android:text="@string/leave_review_title" android:textColor="@color/text_GNB" android:textAlignment="center" - android:textSize="18sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> Date: Sun, 21 Sep 2025 16:06:43 +0900 Subject: [PATCH 08/16] =?UTF-8?q?=EC=B5=9C=EC=A2=85QA=5F=ED=98=84=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siksha2/components/CalendarSelectView.kt | 2 +- .../compose/ui/community/PostCreateScreen.kt | 6 +++++- .../siksha2/ui/main/setting/SettingFragment.kt | 7 +++++-- .../main/res/drawable/ic_left_arrow_orange.xml | 2 +- .../main/res/drawable/ic_right_arrow_orange.xml | 2 +- .../res/drawable/ic_tab_community_inactive.xml | 4 ++-- .../res/drawable/ic_tab_favorite_inactive.xml | 4 ++-- .../main/res/drawable/ic_tab_main_inactive.xml | 4 ++-- .../res/drawable/ic_tab_setting_inactive.xml | 4 ++-- .../main/res/layout/component_no_favorite.xml | 9 ++------- app/src/main/res/layout/dialog_filter.xml | 1 - app/src/main/res/layout/fragment_setting.xml | 17 ++++++++--------- .../layout/item_setting_restaurant_reorder.xml | 2 +- app/src/main/res/layout/layout_tab_icon.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 15 files changed, 34 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/components/CalendarSelectView.kt b/app/src/main/java/com/wafflestudio/siksha2/components/CalendarSelectView.kt index eeddb79db..1d2d2a468 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/components/CalendarSelectView.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/components/CalendarSelectView.kt @@ -215,7 +215,7 @@ class CalendarSelectView : LinearLayout { ) { setBackgroundResource(R.drawable.frame_day_today) setTextColor(ContextCompat.getColor(context, R.color.gray_700)) - typeface = ResourcesCompat.getFont(context, R.font.nanum_square_regular) + typeface = ResourcesCompat.getFont(context, R.font.nanum_square_bold) } else { setBackgroundColor(ContextCompat.getColor(context, R.color.transparent)) setTextColor(ContextCompat.getColor(context, R.color.gray_700)) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostCreateScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostCreateScreen.kt index 34413f2f0..3dc4d34af 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostCreateScreen.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostCreateScreen.kt @@ -472,7 +472,11 @@ fun ContentEditText( value = value, onValueChange = onValueChange, modifier = modifier, - textStyle = SikshaTypography.body1.copy(color = SikshaTheme.colors.Black, fontSize = 14.sp), + textStyle = SikshaTypography.body1.copy( + color = SikshaTheme.colors.Black, + fontSize = 14.sp, + lineHeight = 21.sp + ), cursorBrush = SolidColor(SikshaTheme.colors.Orange500), decorationBox = { Box( diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt index 9d053e366..0db473785 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/SettingFragment.kt @@ -1,12 +1,12 @@ package com.wafflestudio.siksha2.ui.main.setting -import android.graphics.Typeface import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView +import androidx.core.content.res.ResourcesCompat import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope @@ -98,7 +98,10 @@ class SettingFragment : Fragment() { val action = MainFragmentDirections.actionMainFragmentToVocFragment() findNavController().navigate(action) } - binding.vocRow.findViewById(R.id.setting_row_text).setTypeface(null, Typeface.BOLD) + + context.let { + binding.vocRow.findViewById(R.id.setting_row_text).setTypeface(ResourcesCompat.getFont(it!!, R.font.nanum_square_bold)) + } lifecycleScope.launch { vm.showEmptyRestaurantFlow.collect { diff --git a/app/src/main/res/drawable/ic_left_arrow_orange.xml b/app/src/main/res/drawable/ic_left_arrow_orange.xml index a7eec4180..76691a604 100644 --- a/app/src/main/res/drawable/ic_left_arrow_orange.xml +++ b/app/src/main/res/drawable/ic_left_arrow_orange.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/app/src/main/res/drawable/ic_right_arrow_orange.xml b/app/src/main/res/drawable/ic_right_arrow_orange.xml index 3d8fc0ddf..59e4a746e 100644 --- a/app/src/main/res/drawable/ic_right_arrow_orange.xml +++ b/app/src/main/res/drawable/ic_right_arrow_orange.xml @@ -5,6 +5,6 @@ android:viewportHeight="16"> diff --git a/app/src/main/res/drawable/ic_tab_community_inactive.xml b/app/src/main/res/drawable/ic_tab_community_inactive.xml index 3676c2cda..dff0236d3 100644 --- a/app/src/main/res/drawable/ic_tab_community_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_community_inactive.xml @@ -5,9 +5,9 @@ android:viewportHeight="46"> + android:fillColor="@color/icon_gray_icon"/> diff --git a/app/src/main/res/drawable/ic_tab_favorite_inactive.xml b/app/src/main/res/drawable/ic_tab_favorite_inactive.xml index 0bf74fe18..e15eec3d3 100644 --- a/app/src/main/res/drawable/ic_tab_favorite_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_favorite_inactive.xml @@ -5,8 +5,8 @@ android:viewportHeight="46"> + android:fillColor="@color/icon_gray_icon"/> + android:fillColor="@color/icon_gray_icon"/> diff --git a/app/src/main/res/drawable/ic_tab_main_inactive.xml b/app/src/main/res/drawable/ic_tab_main_inactive.xml index 7153a9d9f..20544c9b3 100644 --- a/app/src/main/res/drawable/ic_tab_main_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_main_inactive.xml @@ -8,9 +8,9 @@ android:pathData="M9.875,8h16.25v20h-16.25z"/> + android:fillColor="@color/icon_gray_icon"/> + android:fillColor="@color/icon_gray_icon"/> diff --git a/app/src/main/res/drawable/ic_tab_setting_inactive.xml b/app/src/main/res/drawable/ic_tab_setting_inactive.xml index b2a735ffe..88ebbedf3 100644 --- a/app/src/main/res/drawable/ic_tab_setting_inactive.xml +++ b/app/src/main/res/drawable/ic_tab_setting_inactive.xml @@ -5,9 +5,9 @@ android:viewportHeight="46"> + android:fillColor="@color/icon_gray_icon"/> diff --git a/app/src/main/res/layout/component_no_favorite.xml b/app/src/main/res/layout/component_no_favorite.xml index fda8c6a6b..f3ecb7129 100644 --- a/app/src/main/res/layout/component_no_favorite.xml +++ b/app/src/main/res/layout/component_no_favorite.xml @@ -5,19 +5,14 @@ android:gravity="center" android:orientation="vertical"> - - + android:textSize="15sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_filter.xml b/app/src/main/res/layout/dialog_filter.xml index 58da620d7..847548cc3 100644 --- a/app/src/main/res/layout/dialog_filter.xml +++ b/app/src/main/res/layout/dialog_filter.xml @@ -552,7 +552,6 @@ android:paddingBottom="35dp" android:elevation="8dp" android:background="@color/background_secondary" - android:translationZ="4dp" android:paddingHorizontal="16dp"> @@ -68,7 +68,7 @@ android:id="@+id/my_post_row" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="14dp" + android:paddingVertical="12dp" android:paddingStart="16dp" android:paddingEnd="12dp" app:itemText="내가 쓴 글" /> @@ -88,7 +88,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="12dp" - android:paddingBottom="8dp" + android:paddingBottom="12dp" android:paddingStart="16dp" android:paddingEnd="9dp" app:itemText="식당 순서 변경" /> @@ -103,7 +103,7 @@ android:id="@+id/order_favorite_row" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="8dp" + android:paddingVertical="12dp" android:paddingStart="16dp" android:paddingEnd="9dp" app:itemText="즐겨찾기 식당 순서 변경" /> @@ -118,7 +118,7 @@ android:id="@+id/show_empty_check_row" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="8dp" + android:paddingVertical="12dp" android:paddingStart="16dp" android:paddingEnd="9dp" app:itemText="메뉴 없는 식당 숨기기" @@ -137,7 +137,7 @@ android:layout_height="wrap_content" android:paddingStart="16dp" android:paddingEnd="9dp" - android:paddingTop="8dp" + android:paddingTop="12dp" android:paddingBottom="12dp" app:itemText="계정 관리" /> @@ -156,10 +156,9 @@ android:id="@+id/voc_row" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingVertical="8dp" + android:paddingVertical="12dp" android:paddingStart="16dp" android:paddingEnd="12dp" - android:textStyle="bold" app:itemText="1:1 문의하기" app:textColor="@color/orange_500" /> diff --git a/app/src/main/res/layout/item_setting_restaurant_reorder.xml b/app/src/main/res/layout/item_setting_restaurant_reorder.xml index 01aaeb127..5c13c2325 100644 --- a/app/src/main/res/layout/item_setting_restaurant_reorder.xml +++ b/app/src/main/res/layout/item_setting_restaurant_reorder.xml @@ -31,7 +31,7 @@ android:paddingVertical="11dp" android:paddingStart="12dp" android:background="@drawable/frame_corner_radius_12" - android:elevation="1dp" + android:elevation="3dp" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/layout_tab_icon.xml b/app/src/main/res/layout/layout_tab_icon.xml index 617886832..1092edee3 100644 --- a/app/src/main/res/layout/layout_tab_icon.xml +++ b/app/src/main/res/layout/layout_tab_icon.xml @@ -2,6 +2,7 @@ 리뷰 리뷰가 없습니다. 순서를 지정할 식당이 없습니다. - 즐겨찾기에 추가된 식당이 없습니다.\n식당 탭에서 별을 눌러 추가해보세요. + 즐겨찾기에 추가된 식당이 없습니다. 네트워크 연결이 불안정합니다. 알 수 없는 오류가 발생했습니다. 식단 평가 From c99bf1387f1ec4dda8919f3b34d36b6eb289005b Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Sun, 28 Sep 2025 21:12:16 +0900 Subject: [PATCH 09/16] =?UTF-8?q?=EC=B5=9C=EC=A2=85QA=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/community/CommentReportScreen.kt | 26 ++++++----- .../compose/ui/community/PostReportScreen.kt | 26 ++++++----- .../ui/dailyrestaurant/MenuGroupList.kt | 16 ++++++- .../ui/settings/ReorderRestaurantNameCard.kt | 44 +++++++++++++++++++ .../setting/reorder/ReorderItemAdapter.kt | 8 +++- .../layout/fragment_reorder_restaurant.xml | 1 + .../item_setting_restaurant_reorder.xml | 21 ++------- 7 files changed, 101 insertions(+), 41 deletions(-) create mode 100644 app/src/main/java/com/wafflestudio/siksha2/compose/ui/settings/ReorderRestaurantNameCard.kt diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/CommentReportScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/CommentReportScreen.kt index 1a80407a9..e930c3779 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/CommentReportScreen.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/CommentReportScreen.kt @@ -1,5 +1,4 @@ import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape @@ -15,7 +14,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight @@ -79,7 +77,7 @@ fun CommentReportScreen( Column( modifier = Modifier .fillMaxSize() - .background(SikshaTheme.colors.White) + .background(SikshaTheme.colors.BackgroundPrimary) ) { TopBar( title = "신고하기", @@ -104,7 +102,7 @@ fun CommentReportScreen( text = "어떤 이유로 신고하시나요?", style = TextStyle( fontSize = 20.sp, - color = Color.Black + color = SikshaTheme.colors.Black ), modifier = Modifier.padding(start = 4.dp) ) @@ -125,7 +123,8 @@ fun CommentReportScreen( text = user.nickname, fontSize = 12.sp, fontWeight = FontWeight.Bold, - maxLines = 1 + maxLines = 1, + color = SikshaTheme.colors.Black ) } @@ -137,8 +136,7 @@ fun CommentReportScreen( .padding(horizontal = 28.dp) .height(280.dp) .align(Alignment.CenterHorizontally) - .background(Color(0xFFF5F5F5), shape = RoundedCornerShape(8.dp)) - .border(1.dp, Color.LightGray, shape = RoundedCornerShape(8.dp)) + .background(SikshaTheme.colors.Gray50, shape = RoundedCornerShape(8.dp)) ) { BasicTextField( value = reportContent, @@ -147,7 +145,10 @@ fun CommentReportScreen( reportContent = it } }, - textStyle = TextStyle(fontSize = 16.sp), + textStyle = TextStyle( + fontSize = 16.sp, + color = SikshaTheme.colors.Black + ), modifier = Modifier .fillMaxWidth() .weight(1f) @@ -156,7 +157,7 @@ fun CommentReportScreen( Text( text = "${reportContent.length}자/200자", - style = TextStyle(color = Color.Gray, fontSize = 12.sp), + style = TextStyle(color = SikshaTheme.colors.Gray700, fontSize = 12.sp), modifier = Modifier .align(Alignment.End) .padding(8.dp) @@ -169,7 +170,10 @@ fun CommentReportScreen( onClick = { onClickReport(reportContent) }, - colors = ButtonDefaults.buttonColors(backgroundColor = Color(0xFFFF9522)), + colors = ButtonDefaults.buttonColors( + backgroundColor = SikshaTheme.colors.Orange500, + disabledBackgroundColor = SikshaTheme.colors.Gray600 + ), enabled = isContentNotEmpty, modifier = Modifier .fillMaxWidth() @@ -179,7 +183,7 @@ fun CommentReportScreen( ) { Text( text = "전송하기", - color = Color.White, + color = SikshaTheme.colors.TextButton, style = TextStyle( fontSize = 17.sp ) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostReportScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostReportScreen.kt index dcd2cf921..37ab2d69b 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostReportScreen.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostReportScreen.kt @@ -1,5 +1,4 @@ import androidx.compose.foundation.background -import androidx.compose.foundation.border import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.RoundedCornerShape @@ -15,7 +14,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight @@ -79,7 +77,7 @@ fun PostReportScreen( Column( modifier = Modifier .fillMaxSize() - .background(SikshaTheme.colors.White) + .background(SikshaTheme.colors.BackgroundPrimary) ) { TopBar( title = "신고하기", @@ -104,7 +102,7 @@ fun PostReportScreen( text = "어떤 이유로 신고하시나요?", style = TextStyle( fontSize = 20.sp, - color = Color.Black + color = SikshaTheme.colors.Black ), modifier = Modifier.padding(start = 4.dp) ) @@ -125,7 +123,8 @@ fun PostReportScreen( text = user.nickname, fontSize = 12.sp, fontWeight = FontWeight.Bold, - maxLines = 1 + maxLines = 1, + color = SikshaTheme.colors.Black ) } @@ -137,8 +136,7 @@ fun PostReportScreen( .padding(horizontal = 28.dp) .height(280.dp) .align(Alignment.CenterHorizontally) - .background(Color(0xFFF5F5F5), shape = RoundedCornerShape(8.dp)) - .border(1.dp, Color.LightGray, shape = RoundedCornerShape(8.dp)) + .background(SikshaTheme.colors.Gray50, shape = RoundedCornerShape(8.dp)) ) { BasicTextField( value = reportContent, @@ -147,7 +145,10 @@ fun PostReportScreen( reportContent = it } }, - textStyle = TextStyle(fontSize = 16.sp), + textStyle = TextStyle( + fontSize = 16.sp, + color = SikshaTheme.colors.Black + ), modifier = Modifier .fillMaxWidth() .weight(1f) @@ -156,7 +157,7 @@ fun PostReportScreen( Text( text = "${reportContent.length}자/200자", - style = TextStyle(color = Color.Gray, fontSize = 12.sp), + style = TextStyle(color = SikshaTheme.colors.Gray700, fontSize = 12.sp), modifier = Modifier .align(Alignment.End) .padding(8.dp) @@ -169,7 +170,10 @@ fun PostReportScreen( onClick = { onClickReport(reportContent) }, - colors = ButtonDefaults.buttonColors(backgroundColor = Color(0xFFFF9522)), + colors = ButtonDefaults.buttonColors( + backgroundColor = SikshaTheme.colors.Orange500, + disabledBackgroundColor = SikshaTheme.colors.Gray600 + ), enabled = isContentNotEmpty, modifier = Modifier .fillMaxWidth() @@ -179,7 +183,7 @@ fun PostReportScreen( ) { Text( text = "전송하기", - color = Color.White, + color = SikshaTheme.colors.TextButton, style = TextStyle( fontSize = 17.sp ) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt index 579dfe8b3..40e0fe715 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt @@ -19,12 +19,14 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Divider import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.mutableFloatStateOf @@ -103,6 +105,17 @@ fun MenuGroupList( val toolbarHeight = 60.dp val toolbarHeightPx = with(LocalDensity.current) { toolbarHeight.toPx() } val toolbarOffsetHeightPx = remember { mutableFloatStateOf(0f) } + val listState = rememberLazyListState() + val isScrollable by remember { + derivedStateOf { + val layoutInfo = listState.layoutInfo + layoutInfo.totalItemsCount > 0 && + ( + layoutInfo.visibleItemsInfo.firstOrNull()?.index != 0 || + layoutInfo.visibleItemsInfo.lastOrNull()?.index != layoutInfo.totalItemsCount - 1 + ) + } + } val nestedScrollConnection = remember { object : NestedScrollConnection { @@ -110,7 +123,7 @@ fun MenuGroupList( val delta = available.y val newOffset = (toolbarOffsetHeightPx.floatValue + delta) .coerceIn(-toolbarHeightPx, 0f) - toolbarOffsetHeightPx.floatValue = newOffset + toolbarOffsetHeightPx.floatValue = if (isScrollable) newOffset else 0f return Offset.Zero } } @@ -129,6 +142,7 @@ fun MenuGroupList( ) { if (menuGroupList.isNotEmpty()) { LazyColumn( + state = listState, contentPadding = PaddingValues(top = toolbarHeight), modifier = Modifier.fillMaxSize() .padding(start = 8.dp, end = 8.dp, bottom = 17.dp), diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/settings/ReorderRestaurantNameCard.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/settings/ReorderRestaurantNameCard.kt new file mode 100644 index 000000000..333940813 --- /dev/null +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/settings/ReorderRestaurantNameCard.kt @@ -0,0 +1,44 @@ +package com.wafflestudio.siksha2.compose.ui.settings + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.wafflestudio.siksha2.ui.SikshaTheme + +@Composable +fun ReorderRestaurantNameCard( + restaurantName: String, + modifier: Modifier = Modifier +) { + Box( + modifier = modifier.fillMaxSize() + .padding(horizontal = 8.dp, vertical = 6.dp) + .shadow( + elevation = 6.dp, + shape = RoundedCornerShape(12.dp), + spotColor = Color.Transparent + ) + .background( + color = SikshaTheme.colors.ElementTooltip2 + ) + .padding(start = 12.dp, top = 11.dp, bottom = 11.dp), + contentAlignment = Alignment.CenterStart + ) { + Text( + text = restaurantName, + fontSize = 13.sp, + color = SikshaTheme.colors.Gray800, + maxLines = 1 + ) + } +} diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt index fbec41a9a..73a7476e7 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/reorder/ReorderItemAdapter.kt @@ -3,7 +3,9 @@ package com.wafflestudio.siksha2.ui.main.setting.reorder import android.view.ViewGroup import androidx.core.content.ContextCompat import com.wafflestudio.siksha2.R +import com.wafflestudio.siksha2.compose.ui.settings.ReorderRestaurantNameCard import com.wafflestudio.siksha2.databinding.ItemSettingRestaurantReorderBinding +import com.wafflestudio.siksha2.ui.SikshaTheme import com.wafflestudio.siksha2.utils.getInflater import com.woxthebox.draglistview.DragItemAdapter @@ -20,7 +22,11 @@ class ReorderItemAdapter() : DragItemAdapter, ReorderItemAdap override fun onBindViewHolder(holder: ViewHolder, position: Int) { super.onBindViewHolder(holder, position) - holder.binding.restaurantName.text = mItemList[position].second + holder.binding.restaurantName.setContent { + SikshaTheme { + ReorderRestaurantNameCard(mItemList[position].second) + } + } val nameBg = when (position) { 0 -> R.drawable.frame_top_left_corner_radius_12 diff --git a/app/src/main/res/layout/fragment_reorder_restaurant.xml b/app/src/main/res/layout/fragment_reorder_restaurant.xml index b8f408c05..9abc37945 100644 --- a/app/src/main/res/layout/fragment_reorder_restaurant.xml +++ b/app/src/main/res/layout/fragment_reorder_restaurant.xml @@ -79,6 +79,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginVertical="20dp" + android:layout_marginHorizontal="16dp" android:layout_weight="1" android:visibility="gone" /> diff --git a/app/src/main/res/layout/item_setting_restaurant_reorder.xml b/app/src/main/res/layout/item_setting_restaurant_reorder.xml index 5c13c2325..e84558ef9 100644 --- a/app/src/main/res/layout/item_setting_restaurant_reorder.xml +++ b/app/src/main/res/layout/item_setting_restaurant_reorder.xml @@ -4,39 +4,26 @@ android:layout_width="match_parent" android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_marginHorizontal="16dp" android:layout_marginBottom="1dp" - android:gravity="center_vertical"> + android:gravity="center_vertical" + android:background="@color/background_secondary"> - + app:layout_constraintEnd_toEndOf="parent" /> From f7aa5e753120c710bfb4e4856e1966ba3733b75f Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Sat, 1 Nov 2025 16:25:55 +0900 Subject: [PATCH 10/16] =?UTF-8?q?=ED=83=AD=20=EA=B8=80=EC=94=A8=20?= =?UTF-8?q?=EC=95=88=EB=B3=B4=EC=9E=84=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_main.xml | 2 +- app/src/main/res/layout/layout_tab_icon.xml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 8491d1700..acb47d988 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -45,7 +45,7 @@ + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> \ No newline at end of file From 64d25a47aa167af2effd4b4379560bbc5ecd84da Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Sat, 1 Nov 2025 16:42:56 +0900 Subject: [PATCH 11/16] =?UTF-8?q?=EC=8B=9D=EB=8B=B9=20=EC=88=9C=EC=84=9C?= =?UTF-8?q?=20=EB=B0=94=EA=BE=B8=EA=B8=B0=20=EB=B0=B0=EA=B2=BD=EC=83=89=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_setting_restaurant_reorder.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/item_setting_restaurant_reorder.xml b/app/src/main/res/layout/item_setting_restaurant_reorder.xml index e84558ef9..1e5082e25 100644 --- a/app/src/main/res/layout/item_setting_restaurant_reorder.xml +++ b/app/src/main/res/layout/item_setting_restaurant_reorder.xml @@ -6,7 +6,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_marginBottom="1dp" android:gravity="center_vertical" - android:background="@color/background_secondary"> + android:background="@color/background_main"> Date: Sat, 1 Nov 2025 17:10:35 +0900 Subject: [PATCH 12/16] =?UTF-8?q?=EB=82=B4=EA=B0=80=EC=93=B4=EA=B8=80=20?= =?UTF-8?q?=EB=B0=B0=EA=B2=BD=EC=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siksha2/compose/ui/community/UserPostListScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/UserPostListScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/UserPostListScreen.kt index e6209b863..878050804 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/UserPostListScreen.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/UserPostListScreen.kt @@ -64,7 +64,7 @@ fun UserPostListScreen( Column( modifier = modifier - .background(SikshaTheme.colors.White) + .background(SikshaTheme.colors.BackgroundPrimary) ) { TopBar( title = "내가 쓴 글", From ee5e4bacc1e15161b945a0014f56488a77e0636e Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Sat, 1 Nov 2025 17:19:24 +0900 Subject: [PATCH 13/16] =?UTF-8?q?=EB=A7=90=ED=92=8D=EC=84=A0=20=EA=B7=B8?= =?UTF-8?q?=EB=A6=BC=EC=9E=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_review.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/item_review.xml b/app/src/main/res/layout/item_review.xml index cc88f60a1..0fd42bb7e 100644 --- a/app/src/main/res/layout/item_review.xml +++ b/app/src/main/res/layout/item_review.xml @@ -68,10 +68,11 @@ android:layout_marginStart="29dp" android:layout_marginTop="8dp" android:textColor="@color/black" - android:textSize="12dp" + android:textSize="12sp" android:padding="10dp" android:background="@drawable/frame_review_speech_bubble" - android:elevation="3dp" + android:elevation="24dp" + android:outlineSpotShadowColor="@color/transparent" app:layout_constraintTop_toBottomOf="@id/stars" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" From debafc3f512404aa6bcf122f07bbe5906708b50f Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Sat, 1 Nov 2025 17:31:37 +0900 Subject: [PATCH 14/16] =?UTF-8?q?=EB=AC=B8=EC=9D=98=20=EC=A0=84=EC=86=A1?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=20=EC=83=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siksha2/ui/main/setting/voc/VocFragment.kt | 7 +++++++ app/src/main/res/drawable/frame_leave_review_button.xml | 9 +++++---- .../res/drawable/frame_leave_review_button_active.xml | 5 +++++ .../res/drawable/frame_leave_review_button_inactive.xml | 5 +++++ 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable/frame_leave_review_button_active.xml create mode 100644 app/src/main/res/drawable/frame_leave_review_button_inactive.xml diff --git a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/voc/VocFragment.kt b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/voc/VocFragment.kt index 7c289867e..71a299ec3 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/voc/VocFragment.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/ui/main/setting/voc/VocFragment.kt @@ -56,12 +56,19 @@ class VocFragment : Fragment() { it?.length, 500 ) + + if (it?.isNotEmpty() == true) { + binding.submitButton.isEnabled = true + } else { + binding.submitButton.isEnabled = false + } } binding.closeButton.setOnClickListener { findNavController().popBackStack() } + binding.submitButton.isEnabled = false binding.submitButton.setOnClickListener { lifecycleScope.launch { when (val response = userStatusManager.sendVoc(voc = binding.commentEdit.text.toString(), platform = "Android")) { diff --git a/app/src/main/res/drawable/frame_leave_review_button.xml b/app/src/main/res/drawable/frame_leave_review_button.xml index abe3fb554..ad51739d9 100644 --- a/app/src/main/res/drawable/frame_leave_review_button.xml +++ b/app/src/main/res/drawable/frame_leave_review_button.xml @@ -1,5 +1,6 @@ - - - - + + + + + diff --git a/app/src/main/res/drawable/frame_leave_review_button_active.xml b/app/src/main/res/drawable/frame_leave_review_button_active.xml new file mode 100644 index 000000000..abe3fb554 --- /dev/null +++ b/app/src/main/res/drawable/frame_leave_review_button_active.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/frame_leave_review_button_inactive.xml b/app/src/main/res/drawable/frame_leave_review_button_inactive.xml new file mode 100644 index 000000000..bea454ae0 --- /dev/null +++ b/app/src/main/res/drawable/frame_leave_review_button_inactive.xml @@ -0,0 +1,5 @@ + + + + + From 0c93c75a881fa1c9c4e8a63045a6d42a6c98f1b7 Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Sat, 1 Nov 2025 17:42:33 +0900 Subject: [PATCH 15/16] =?UTF-8?q?=EB=A1=9C=EB=94=A9=20=EC=8B=A4=ED=8C=A8?= =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compose/ui/community/PostDetailScreen.kt | 5 ++-- .../compose/ui/community/PostListScreen.kt | 25 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt index fe4d42e35..606cc429e 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostDetailScreen.kt @@ -162,12 +162,13 @@ fun PostDetailScreenFailed( } ) Box( - modifier = Modifier.fillMaxSize(), + modifier = Modifier.fillMaxSize() + .background(colors.BackgroundPrimary), contentAlignment = Alignment.Center ) { Text( text = errorMessage, - color = colors.Gray400, + color = colors.Gray600, fontSize = 12.sp, style = MaterialTheme.typography.body2 ) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostListScreen.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostListScreen.kt index 8d487b42a..544ce61ea 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostListScreen.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/community/PostListScreen.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyListState import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material.Button +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.Text @@ -25,8 +25,10 @@ import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel import androidx.paging.LoadState import androidx.paging.PagingData @@ -240,17 +242,18 @@ fun PostsErrorPlaceHolder( color = SikshaTheme.colors.Gray600, style = SikshaTypography.subtitle1 ) - Button( - modifier = Modifier.background(SikshaTheme.colors.Orange500), - onClick = { + Text( + modifier = Modifier.background( + SikshaTheme.colors.Orange500, + RoundedCornerShape(8.dp) + ).clickable { onClickRetry() - } - ) { - Text( - text = stringResource(R.string.community_retry_button), - color = SikshaTheme.colors.TextButton - ) - } + }.padding(vertical = 10.dp, horizontal = 20.dp), + text = stringResource(R.string.community_retry_button), + color = SikshaTheme.colors.TextButton, + fontSize = 16.sp, + fontWeight = FontWeight.Bold + ) } } } From f759ced98367565fba98ea76deb7a96648ace532 Mon Sep 17 00:00:00 2001 From: Shim Woojin Date: Fri, 30 Jan 2026 21:44:22 +0900 Subject: [PATCH 16/16] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=97=AC=EB=B0=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt index 40e0fe715..ad7889642 100644 --- a/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt +++ b/app/src/main/java/com/wafflestudio/siksha2/compose/ui/dailyrestaurant/MenuGroupList.kt @@ -145,7 +145,7 @@ fun MenuGroupList( state = listState, contentPadding = PaddingValues(top = toolbarHeight), modifier = Modifier.fillMaxSize() - .padding(start = 8.dp, end = 8.dp, bottom = 17.dp), + .padding(start = 8.dp, end = 8.dp), verticalArrangement = Arrangement.spacedBy(18.dp) ) { items(menuGroupList) { menuGroup -> @@ -175,6 +175,9 @@ fun MenuGroupList( ) } } + item { + Spacer(Modifier.height(17.dp)) + } } } else { Text(