diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt index 078f75c0..b939f1c3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audition/AuditionFragment.kt @@ -49,6 +49,10 @@ class AuditionFragment : BaseFragment( private fun setupView() { loadingDialog = LoadingDialog(requireActivity(), layoutInflater) + binding.tvBack.setOnClickListener { + requireActivity().finish() + } + val recyclerView = binding.rvAudition adapter = AuditionListAdapter { if (SharedPreferenceManager.token.isNotBlank()) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt index a4e74611..857f92a4 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/home/CreatorRankingAdapter.kt @@ -12,7 +12,6 @@ import com.bumptech.glide.request.RequestOptions import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.databinding.ItemHomeCreatorBinding import kr.co.vividnext.sodalive.explorer.GetExplorerSectionCreatorResponse -import kr.co.vividnext.sodalive.extensions.moneyFormat class CreatorRankingAdapter( private val onClickItem: (Long) -> Unit @@ -38,7 +37,6 @@ class CreatorRankingAdapter( .into(binding.ivProfile) binding.tvNickname.text = item.nickname - binding.tvFollower.text = item.followerCount.moneyFormat() when (index) { 0 -> { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt index 47a34caf..c95a5640 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/home/HomeFragment.kt @@ -628,10 +628,10 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl .ivAudition .layoutParams as LinearLayout.LayoutParams - val width = screenWidth - val height = width * 198 / 352 - layoutParams.width = width - layoutParams.height = height + val width = screenWidth - 24.dpToPx() + val height = width * 120 / 352 + layoutParams.width = width.toInt() + layoutParams.height = height.toInt() binding.ivAudition.layoutParams = layoutParams diff --git a/app/src/main/res/drawable-mdpi/img_banner_audition.png b/app/src/main/res/drawable-mdpi/img_banner_audition.png index d171f916..e4a0ab1f 100644 Binary files a/app/src/main/res/drawable-mdpi/img_banner_audition.png and b/app/src/main/res/drawable-mdpi/img_banner_audition.png differ diff --git a/app/src/main/res/drawable/bg_home_creator.xml b/app/src/main/res/drawable/bg_home_creator.xml index 5ad41476..4b281176 100644 --- a/app/src/main/res/drawable/bg_home_creator.xml +++ b/app/src/main/res/drawable/bg_home_creator.xml @@ -1,9 +1,6 @@ - + - + diff --git a/app/src/main/res/drawable/live_button_background.xml b/app/src/main/res/drawable/live_button_background.xml index 6fbb5ea2..59b3ce34 100644 --- a/app/src/main/res/drawable/live_button_background.xml +++ b/app/src/main/res/drawable/live_button_background.xml @@ -1,9 +1,6 @@ - - + diff --git a/app/src/main/res/layout/fragment_audition.xml b/app/src/main/res/layout/fragment_audition.xml index 28df4d33..4f0bc57a 100644 --- a/app/src/main/res/layout/fragment_audition.xml +++ b/app/src/main/res/layout/fragment_audition.xml @@ -1,21 +1,29 @@ + android:layout_height="match_parent" + tools:background="@color/color_131313"> + app:layout_constraintTop_toTopOf="parent" + tools:ignore="RelativeOverlap" /> + app:layout_constraintTop_toBottomOf="@+id/tv_back"> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> diff --git a/app/src/main/res/layout/item_home_creator.xml b/app/src/main/res/layout/item_home_creator.xml index fc384b1a..a4c951fd 100644 --- a/app/src/main/res/layout/item_home_creator.xml +++ b/app/src/main/res/layout/item_home_creator.xml @@ -1,52 +1,59 @@ - + android:orientation="vertical" + android:padding="16dp"> + android:layout_width="84dp" + android:layout_height="84dp" + android:contentDescription="@null" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + diff --git a/app/src/main/res/layout/item_home_live.xml b/app/src/main/res/layout/item_home_live.xml index edb9291d..c479dd80 100644 --- a/app/src/main/res/layout/item_home_live.xml +++ b/app/src/main/res/layout/item_home_live.xml @@ -6,8 +6,9 @@ android:background="@drawable/live_button_background" android:gravity="center_vertical" android:orientation="horizontal" - android:paddingHorizontal="14dp" - android:paddingVertical="10dp"> + android:paddingVertical="10dp" + android:paddingStart="14dp" + android:paddingEnd="16dp"> diff --git a/app/src/main/res/layout/item_home_recommend_channel.xml b/app/src/main/res/layout/item_home_recommend_channel.xml index a079d147..a75480b2 100644 --- a/app/src/main/res/layout/item_home_recommend_channel.xml +++ b/app/src/main/res/layout/item_home_recommend_channel.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="280dp" android:layout_height="wrap_content" - android:background="@drawable/bg_home_recommend_channel" + android:background="@drawable/bg_home_creator" android:orientation="vertical" android:padding="20dp"> diff --git a/app/src/main/res/layout/item_latest_finished_live.xml b/app/src/main/res/layout/item_latest_finished_live.xml index cc1dad3f..d06c3424 100644 --- a/app/src/main/res/layout/item_latest_finished_live.xml +++ b/app/src/main/res/layout/item_latest_finished_live.xml @@ -17,7 +17,6 @@ android:id="@+id/fl_profile" android:layout_width="84dp" android:layout_height="84dp" - android:background="@drawable/circle_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/app/src/main/res/layout/layout_live_now.xml b/app/src/main/res/layout/layout_live_now.xml index 5c497d31..f360b25c 100644 --- a/app/src/main/res/layout/layout_live_now.xml +++ b/app/src/main/res/layout/layout_live_now.xml @@ -21,7 +21,7 @@ android:fontFamily="@font/pretendard_bold" android:text="지금 " android:textColor="@color/color_3bb9f1" - android:textSize="26sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> + android:textSize="24sp" /> diff --git a/app/src/main/res/layout/layout_live_reservation.xml b/app/src/main/res/layout/layout_live_reservation.xml index f1b5ca4d..f0461705 100644 --- a/app/src/main/res/layout/layout_live_reservation.xml +++ b/app/src/main/res/layout/layout_live_reservation.xml @@ -21,7 +21,7 @@ android:fontFamily="@font/pretendard_bold" android:text="라이브 " android:textColor="@color/color_3bb9f1" - android:textSize="26sp" /> + android:textSize="24sp" /> + android:textSize="24sp" />