diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomDialogMenuItem.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomDialogMenuItem.kt index 22ce77bd8..974610b54 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomDialogMenuItem.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomDialogMenuItem.kt @@ -12,9 +12,9 @@ class BottomDialogMenuItem( ) : AppCompatTextView(context, attrs, R.style.BottomDialogMenuItemStyle) { init { - val verticalPadding = - resources.getDimension(R.dimen.padding_bottommenudialog_menu_item_vertical) - .roundToInt() + val verticalPadding = resources + .getDimension(R.dimen.padding_bottommenudialog_menu_item_vertical) + .roundToInt() setPadding(0, verticalPadding, 0, verticalPadding) } } diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomMenuDialog.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomMenuDialog.kt index cbb7062ee..41e60827e 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomMenuDialog.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/common/views/bottomMenuDialog/BottomMenuDialog.kt @@ -1,24 +1,21 @@ package com.emmsale.presentation.common.views.bottomMenuDialog import android.content.Context -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.ViewGroup +import com.emmsale.R import com.emmsale.databinding.DialogBottomMenuBinding import com.emmsale.presentation.common.views.VerticalDivider import com.google.android.material.bottomsheet.BottomSheetDialog -class BottomMenuDialog(context: Context) : BottomSheetDialog(context) { - - private val binding: DialogBottomMenuBinding by lazy { - DialogBottomMenuBinding.inflate(layoutInflater) - } +class BottomMenuDialog( + context: Context, +) : BottomSheetDialog(context, R.style.RoundBottomSheetDialogStyle) { + private val binding by lazy { DialogBottomMenuBinding.inflate(layoutInflater) } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(binding.root) - initDialogWindow() } @@ -51,7 +48,6 @@ class BottomMenuDialog(context: Context) : BottomSheetDialog(context) { } private fun initDialogWindow() { - window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) window?.attributes?.let { it.width = ViewGroup.LayoutParams.MATCH_PARENT it.height = ViewGroup.LayoutParams.WRAP_CONTENT diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/ClubsAddBottomDialogFragment.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/ClubsAddBottomDialogFragment.kt index 202e41ca5..df1893db9 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/ClubsAddBottomDialogFragment.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/ClubsAddBottomDialogFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.activityViewModels +import com.emmsale.R import com.emmsale.databinding.FragmentEditmyprofileClubsAddBottomDialogBinding import com.emmsale.presentation.common.views.ActivityTag import com.emmsale.presentation.common.views.activityChipOf @@ -41,6 +42,8 @@ class ClubsAddBottomDialogFragment : BottomSheetDialogFragment() { viewModel.fetchAllActivities() } + override fun getTheme(): Int = R.style.RoundBottomSheetDialogStyle + private fun initDataBinding() { binding.viewModel = viewModel binding.addClubs = ::addClubs diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/EducationsAddBottomDialogFragment.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/EducationsAddBottomDialogFragment.kt index 281312693..59320cc1e 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/EducationsAddBottomDialogFragment.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/EducationsAddBottomDialogFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.activityViewModels +import com.emmsale.R import com.emmsale.databinding.FragmentEditmyprofileEducationsAddBottomDialogBinding import com.emmsale.presentation.common.views.ActivityTag import com.emmsale.presentation.common.views.activityChipOf @@ -40,6 +41,8 @@ class EducationsAddBottomDialogFragment : BottomSheetDialogFragment() { viewModel.fetchAllActivities() } + override fun getTheme(): Int = R.style.RoundBottomSheetDialogStyle + private fun initDataBinding() { binding.viewModel = viewModel binding.addEducations = ::addEducations diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/FieldsAddBottomDialogFragment.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/FieldsAddBottomDialogFragment.kt index 5068612a2..3652d9de5 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/FieldsAddBottomDialogFragment.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/editMyProfile/FieldsAddBottomDialogFragment.kt @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.activityViewModels +import com.emmsale.R import com.emmsale.databinding.FragmentEditmyprofileFieldsAddBottomDialogBinding import com.emmsale.presentation.common.views.ActivityTag import com.emmsale.presentation.common.views.activityChipOf @@ -28,7 +29,6 @@ class FieldsAddBottomDialogFragment : BottomSheetDialogFragment() { ): View { _binding = FragmentEditmyprofileFieldsAddBottomDialogBinding .inflate(layoutInflater, container, false) - binding.lifecycleOwner = viewLifecycleOwner return binding.root } @@ -40,6 +40,8 @@ class FieldsAddBottomDialogFragment : BottomSheetDialogFragment() { viewModel.fetchAllActivities() } + override fun getTheme(): Int = R.style.RoundBottomSheetDialogStyle + private fun initDataBinding() { binding.viewModel = viewModel binding.addFields = ::addFields diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/profile/SendMessageDialog.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/profile/SendMessageDialog.kt index 5f1df9858..4034f703a 100644 --- a/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/profile/SendMessageDialog.kt +++ b/android/2023-emmsale/app/src/main/java/com/emmsale/presentation/ui/profile/SendMessageDialog.kt @@ -1,13 +1,12 @@ package com.emmsale.presentation.ui.profile -import android.graphics.Color -import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.DialogFragment import androidx.fragment.app.activityViewModels +import com.emmsale.R import com.emmsale.databinding.DialogSendMessageBinding class SendMessageDialog : DialogFragment() { @@ -24,17 +23,17 @@ class SendMessageDialog : DialogFragment() { savedInstanceState: Bundle?, ): View { _binding = DialogSendMessageBinding.inflate(inflater, container, false) - dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) binding.lifecycleOwner = viewLifecycleOwner return binding.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - initDataBinding() } + override fun getTheme(): Int = R.style.RoundBottomSheetDialogStyle + private fun initDataBinding() { binding.vm = viewModel binding.onSendButtonClick = ::onSendButtonClick diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_activity_tag.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_activity_tag.xml index 02405a707..77feef4f2 100644 --- a/android/2023-emmsale/app/src/main/res/drawable/bg_activity_tag.xml +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_activity_tag.xml @@ -2,7 +2,7 @@ - + diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_all_transparent.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_all_transparent.xml new file mode 100644 index 000000000..ee063016c --- /dev/null +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_all_transparent.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_event_search.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_event_search.xml index 3bd9b06a4..a5196554a 100644 --- a/android/2023-emmsale/app/src/main/res/drawable/bg_event_search.xml +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_event_search.xml @@ -1,7 +1,7 @@ - + - + - \ No newline at end of file diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_primarynotification_header.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_primarynotification_header.xml index 4e650251b..7a319cf2c 100644 --- a/android/2023-emmsale/app/src/main/res/drawable/bg_primarynotification_header.xml +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_primarynotification_header.xml @@ -2,7 +2,7 @@ - + diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_profile_activityicon.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_profile_activityicon.xml index 1e29bbf16..08cea993f 100644 --- a/android/2023-emmsale/app/src/main/res/drawable/bg_profile_activityicon.xml +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_profile_activityicon.xml @@ -1,10 +1,14 @@ - - - - + + + + + + + + + diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_shadow.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_shadow.xml index 75d970b54..4b96006c6 100644 --- a/android/2023-emmsale/app/src/main/res/drawable/bg_shadow.xml +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_shadow.xml @@ -34,7 +34,7 @@ - + diff --git a/android/2023-emmsale/app/src/main/res/drawable/bg_tablayout_indicator.xml b/android/2023-emmsale/app/src/main/res/drawable/bg_tablayout_indicator.xml index 8a775e5ed..d6da809d2 100644 --- a/android/2023-emmsale/app/src/main/res/drawable/bg_tablayout_indicator.xml +++ b/android/2023-emmsale/app/src/main/res/drawable/bg_tablayout_indicator.xml @@ -1,11 +1,11 @@ - - + + diff --git a/android/2023-emmsale/app/src/main/res/layout/activity_child_comments.xml b/android/2023-emmsale/app/src/main/res/layout/activity_child_comments.xml index bca86b428..28c2be59f 100644 --- a/android/2023-emmsale/app/src/main/res/layout/activity_child_comments.xml +++ b/android/2023-emmsale/app/src/main/res/layout/activity_child_comments.xml @@ -26,14 +26,12 @@ + bind:viewModel="@{viewModel}" + tools:visibility="gone" /> diff --git a/android/2023-emmsale/app/src/main/res/layout/activity_edit_my_profile.xml b/android/2023-emmsale/app/src/main/res/layout/activity_edit_my_profile.xml index 5b7d3e841..f27674c6e 100644 --- a/android/2023-emmsale/app/src/main/res/layout/activity_edit_my_profile.xml +++ b/android/2023-emmsale/app/src/main/res/layout/activity_edit_my_profile.xml @@ -33,7 +33,6 @@ android:id="@+id/cl_editmyprofile_root" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" tools:context=".presentation.ui.editMyProfile.EditMyProfileActivity"> @@ -166,11 +165,11 @@ android:id="@+id/rv_editmyprofile_fields" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="17dp" android:layout_marginTop="23dp" - android:layout_marginEnd="17dp" + android:clipToPadding="false" android:orientation="horizontal" android:overScrollMode="never" + android:paddingHorizontal="17dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -239,8 +238,7 @@ android:background="@drawable/bg_profile_activityicon" android:importantForAccessibility="no" app:layout_constraintStart_toStartOf="@+id/tv_editmyprofile_activity_label" - app:layout_constraintTop_toBottomOf="@+id/tv_editmyprofile_choose_activity_message" - app:srcCompat="@drawable/ic_profile_education" /> + app:layout_constraintTop_toBottomOf="@+id/tv_editmyprofile_choose_activity_message" /> + app:layout_constraintTop_toBottomOf="@+id/tv_editmyprofile_education_add_button" /> diff --git a/android/2023-emmsale/app/src/main/res/layout/activity_event_detail.xml b/android/2023-emmsale/app/src/main/res/layout/activity_event_detail.xml index 25b0f550a..7fe5d72f4 100644 --- a/android/2023-emmsale/app/src/main/res/layout/activity_event_detail.xml +++ b/android/2023-emmsale/app/src/main/res/layout/activity_event_detail.xml @@ -37,12 +37,13 @@ + tools:background="@color/white"> + android:layout_height="wrap_content" + android:background="@android:color/transparent"> @@ -96,10 +96,10 @@ android:layout_marginTop="11dp" android:textSize="13sp" android:textStyle="bold" - app:visible="@{!(vm.eventDetail.eventDetail.progressStatus instanceof EventProgressStatus.Ended)}" app:eventApplyingStatus="@{vm.eventDetail.eventDetail.applicationStatus}" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" + app:visible="@{!(vm.eventDetail.eventDetail.progressStatus instanceof EventProgressStatus.Ended)}" tools:text="D-21" tools:textColor="@color/primary_color" /> @@ -108,11 +108,11 @@ android:layout_width="1dp" android:layout_height="0dp" android:layout_marginStart="6dp" - app:visible="@{!(vm.eventDetail.eventDetail.progressStatus instanceof EventProgressStatus.Ended)}" android:background="@color/light_gray" app:layout_constraintBottom_toBottomOf="@+id/tv_application_status" app:layout_constraintStart_toEndOf="@+id/tv_application_status" - app:layout_constraintTop_toTopOf="@+id/tv_application_status" /> + app:layout_constraintTop_toTopOf="@+id/tv_application_status" + app:visible="@{!(vm.eventDetail.eventDetail.progressStatus instanceof EventProgressStatus.Ended)}" /> @@ -177,6 +177,7 @@ android:id="@+id/tablayout_eventdetail" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="@android:color/transparent" app:tabBackground="@drawable/bg_tablayout_indicator" app:tabIndicatorColor="@color/primary_color" app:tabIndicatorFullWidth="true" @@ -191,7 +192,6 @@ android:id="@+id/vp_eventdetail" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + android:layout_height="match_parent"> + app:layout_constraintTop_toBottomOf="@+id/view_profile_divider" /> + app:layout_constraintTop_toBottomOf="@+id/rv_profile_educations" /> + tools:visibility="gone" /> diff --git a/android/2023-emmsale/app/src/main/res/layout/activity_recruitment_post_detail.xml b/android/2023-emmsale/app/src/main/res/layout/activity_recruitment_post_detail.xml index c0d20dac7..cf6515962 100644 --- a/android/2023-emmsale/app/src/main/res/layout/activity_recruitment_post_detail.xml +++ b/android/2023-emmsale/app/src/main/res/layout/activity_recruitment_post_detail.xml @@ -19,22 +19,20 @@ + android:layout_height="match_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto"> @@ -9,8 +8,7 @@ @@ -32,7 +30,6 @@ android:layout_marginTop="8dp" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@+id/iv_bottommenudialog_topdecoration" - tools:layout_editor_absoluteX="17dp" /> + app:layout_constraintTop_toBottomOf="@+id/iv_bottommenudialog_topdecoration" /> diff --git a/android/2023-emmsale/app/src/main/res/layout/dialog_send_message.xml b/android/2023-emmsale/app/src/main/res/layout/dialog_send_message.xml index 1cdd575d9..0262d6966 100644 --- a/android/2023-emmsale/app/src/main/res/layout/dialog_send_message.xml +++ b/android/2023-emmsale/app/src/main/res/layout/dialog_send_message.xml @@ -27,7 +27,6 @@ -