diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt index cf0d570c..b7fa54ce 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/UserProfileActivity.kt @@ -896,6 +896,10 @@ class UserProfileActivity : BaseActivity( item: GetCommunityPostListResponse, index: Int ) { + val lp = layout.root.layoutParams + lp.width = screenWidth - 24.dpToPx().toInt() * 2 + layout.root.layoutParams = lp + layout.ivCreatorProfile.loadUrl(item.creatorProfileUrl) { crossfade(true) placeholder(R.drawable.ic_place_holder) diff --git a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/creator_community/CreatorCommunityAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/creator_community/CreatorCommunityAdapter.kt index c9d50bd0..70099bb9 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/creator_community/CreatorCommunityAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/explorer/profile/creator_community/CreatorCommunityAdapter.kt @@ -13,6 +13,7 @@ import kr.co.vividnext.sodalive.extensions.dpToPx import kr.co.vividnext.sodalive.extensions.loadUrl class CreatorCommunityAdapter( + private val width: Int, private val onClickItem: (Long) -> Unit ) : RecyclerView.Adapter() { @@ -51,6 +52,10 @@ class CreatorCommunityAdapter( binding.tvLikeCount.text = "${item.likeCount}" binding.tvCommentCount.text = "${item.commentCount}" + val lp = binding.root.layoutParams + lp.width = width + binding.root.layoutParams = lp + binding.root.setOnClickListener { onClickItem(item.creatorId) } } } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/home/AuditionBannerAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/home/AuditionBannerAdapter.kt deleted file mode 100644 index 1fbd7b48..00000000 --- a/app/src/main/java/kr/co/vividnext/sodalive/home/AuditionBannerAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package kr.co.vividnext.sodalive.home - -import android.content.Context -import android.graphics.Bitmap -import android.graphics.drawable.Drawable -import android.widget.FrameLayout -import android.widget.ImageView -import com.bumptech.glide.Glide -import com.bumptech.glide.request.target.CustomTarget -import com.bumptech.glide.request.transition.Transition -import com.zhpan.bannerview.BaseBannerAdapter -import com.zhpan.bannerview.BaseViewHolder -import kr.co.vividnext.sodalive.R -import kr.co.vividnext.sodalive.audition.GetAuditionListItem - -class AuditionBannerAdapter( - private val context: Context, - private val itemWidth: Int, - private val itemHeight: Int, - private val onClick: (Long) -> Unit -) : BaseBannerAdapter() { - override fun bindData( - holder: BaseViewHolder, - data: GetAuditionListItem, - position: Int, - pageSize: Int - ) { - val ivBanner = holder.findViewById(R.id.iv_recommend_live) - val layoutParams = ivBanner.layoutParams as FrameLayout.LayoutParams - - layoutParams.width = itemWidth - layoutParams.height = itemHeight - - Glide - .with(context) - .asBitmap() - .load(data.imageUrl) - .into(object : CustomTarget() { - override fun onResourceReady(resource: Bitmap, transition: Transition?) { - ivBanner.layoutParams = layoutParams - ivBanner.setImageBitmap(resource) - } - - override fun onLoadCleared(placeholder: Drawable?) { - } - }) - - ivBanner.setOnClickListener { onClick(data.id) } - } - - override fun getLayoutId(viewType: Int): Int { - return R.layout.item_recommend_live - } -} 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 0ce803d1..47a34caf 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 @@ -69,7 +69,6 @@ class HomeFragment : BaseFragment(FragmentHomeBinding::infl private lateinit var homeContentAdapter: HomeContentAdapter private lateinit var contentBannerAdapter: AudioContentMainBannerAdapter private lateinit var originalSeriesAdapter: HomeSeriesAdapter - private lateinit var auditionAdapter: AuditionBannerAdapter private lateinit var seriesDayOfWeekAdapter: HomeSeriesAdapter private lateinit var weelyChartAdapter: HomeWeeklyChartAdapter private lateinit var recommendChannelAdapter: HomeRecommendChannelAdapter diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index 8350afba..3f0dc0e6 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -686,7 +686,9 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl @SuppressLint("NotifyDataSetChanged") private fun setupCommunityPost() { - creatorCommunityAdapter = CreatorCommunityAdapter { + creatorCommunityAdapter = CreatorCommunityAdapter( + width = (screenWidth - 48f.dpToPx()).toInt() + ) { if (SharedPreferenceManager.token.isNotBlank()) { startActivity( Intent( diff --git a/app/src/main/res/drawable-mdpi/ic_comment_78909c.png b/app/src/main/res/drawable-mdpi/ic_comment_78909c.png new file mode 100644 index 00000000..9f748434 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_comment_78909c.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_heart_78909c.png b/app/src/main/res/drawable-mdpi/ic_heart_78909c.png new file mode 100644 index 00000000..c94d255d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_heart_78909c.png differ diff --git a/app/src/main/res/layout/item_creator_community.xml b/app/src/main/res/layout/item_creator_community.xml index d5a2e6e8..617a18ac 100644 --- a/app/src/main/res/layout/item_creator_community.xml +++ b/app/src/main/res/layout/item_creator_community.xml @@ -1,12 +1,13 @@ + android:padding="16dp"> - + android:gravity="center_vertical" + android:orientation="vertical"> - + + + + + android:contentDescription="@null" + android:scaleType="centerCrop" /> + android:src="@drawable/ic_heart_78909c" /> + android:src="@drawable/ic_comment_78909c" /> diff --git a/app/src/main/res/layout/layout_creator_community_post.xml b/app/src/main/res/layout/layout_creator_community_post.xml index 6a85c61f..f4c0bc4e 100644 --- a/app/src/main/res/layout/layout_creator_community_post.xml +++ b/app/src/main/res/layout/layout_creator_community_post.xml @@ -20,10 +20,10 @@ android:id="@+id/iv_write" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="13.3dp" android:background="@drawable/bg_round_corner_13_3_333333_555555" android:contentDescription="@null" android:padding="13dp" - android:layout_marginEnd="13.3dp" android:src="@drawable/ic_make_message" android:visibility="gone" /> @@ -37,14 +37,15 @@ android:id="@+id/ll_all" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginStart="13.3dp" + android:gravity="center" android:orientation="vertical" android:visibility="visible" - android:layout_marginStart="13.3dp" tools:ignore="UseCompoundDrawables"> @@ -52,10 +53,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="11dp" - android:fontFamily="@font/gmarket_sans_light" + android:fontFamily="@font/pretendard_regular" + android:gravity="center" android:text="더보기" - android:textColor="@color/color_bbbbbb" - android:textSize="11sp" /> + android:textColor="#B0BEC5" + android:textSize="14sp" /> @@ -82,19 +84,19 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10.3dp" - android:fontFamily="@font/gmarket_sans_bold" + android:fontFamily="@font/pretendard_bold" android:text="게시물 등록" android:textColor="@color/color_eeeeee" - android:textSize="14.7sp" /> + android:textSize="18sp" /> + android:textSize="14sp" />