diff --git a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt index f320a19d2..c16bf75f9 100644 --- a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt @@ -50,6 +50,11 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import com.youth.banner.listener.OnPageChangeListener +import java.text.SimpleDateFormat +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter +import java.util.Calendar +import java.util.Locale class VipCenterActivity : BaseViewBindingActivity(), @@ -141,9 +146,6 @@ class VipCenterActivity : BaseViewBindingActivity(), recyclerView = findViewById(R.id.recycler_view) recyclerView.layoutManager = GridLayoutManager(this, 2) - - val exclusivePrivilegesTitle = findViewById(R.id.center_title_2) - exclusivePrivilegesTitle.text = R.string.vip_center_4.toString() } override fun initWhiteTitleBar(title: String?) { @@ -207,22 +209,24 @@ class VipCenterActivity : BaseViewBindingActivity(), it?.let { // 当前显示的 index // TODO 处理轮播组件 index 更新 currentIndex = it - handleIdentificationAreaContent(it) } } vipViewModel.vipInfosLiveData.observe(this) { it?.let { // ArrayList[VipInfo] 每个等级的 VIP 内容 // TODO 初始化轮播组件 - val adapter = VipCenterBannerAdapter(this, it) - banner.setAdapter(adapter, false) - handleIdentificationAreaContent(0) + } } vipViewModel.myVipInfoLiveData.observe(this) { it?.let { banner.setCurrentItem(it.currLevel - 1) + val adapter = vipViewModel.vipInfosLiveData.value?.let { it1 -> + VipCenterBannerAdapter(this, + it1, it) + } + banner.setAdapter(adapter, false) //TODO 处理有 VIP 的情况,banner 要跳转到对应 index // bannerView.visibility = View.VISIBLE // bannerView.post { @@ -253,7 +257,7 @@ class VipCenterActivity : BaseViewBindingActivity(), // TODO 根据当前显示的 VIP 信息更新 UI authAdapter.setVipInfo(it) authAdapter.notifyDataSetChanged() -// handleIdentificationAreaContent(it.vipLevel) + handleIdentificationAreaContent(it) vipIdentificationsAdapter.setVipInfo(it) refreshOpenVipState() } @@ -270,8 +274,12 @@ class VipCenterActivity : BaseViewBindingActivity(), } } - private fun handleIdentificationAreaContent(position: Int) { - // 条件: + private fun handleIdentificationAreaContent(vipInfo: VipInfo) { + val exclusivePrivilegesTitle = findViewById(R.id.center_title_2) + "${getString(R.string.vip_center_4)}\n(${vipInfo.ownAuthTypes?.size}/13)".also { + binding.centerTitle2.text = it + } +// exclusivePrivilegesTitle.text = R.string.vip_center_4.toString() } @SuppressLint("CheckResult") @@ -386,25 +394,29 @@ class VipCenterActivity : BaseViewBindingActivity(), } if (currentChargeInfo != null){ - "${currentChargeInfo?.getMoney()?.times(1000)} ${ + "${currentChargeInfo?.getMoney()?.times(1000)?.toInt()} ${ getString(R.string.vip_center_5).format( " / 30" ) }".also { binding.tvOpenVip.text = it } } -// if (currentChargeInfo != null && (myVipInfo == null || myVipInfo.vipLevel < currentVipInfo.vipLevel)) { -// // TODO: 處理新增的 金幣返回 -// "${currentChargeInfo?.getMoney()} ${ -// getString(R.string.vip_center_5).format( -// // TODO: 計算剩餘時間 -// " / 30" -// ) -// }".also { binding.tvOpenVip.text = it } -// binding.layoutOpenVip.isVisible = true -// } else { -// binding.layoutOpenVip.isVisible = false -// } + // 获取当前时间 + val calendar = Calendar.getInstance() + + // 计算30天后的时间 + calendar.add(Calendar.DAY_OF_YEAR, 30) + + // 定义输出格式 + val dateFormat = SimpleDateFormat("yyyy/MM/dd 00:00", Locale.getDefault()) + + // 格式化日期时间 + val formattedDate = dateFormat.format(calendar.time) + + // 输出结果 + val result = "$formattedDate Expires" + binding.tvAdditionalText.text = result + } else { currentChargeInfo = null // binding.layoutOpenVip.isVisible = false diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt index 47f39413c..ea0e29ccb 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt @@ -4,6 +4,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.ImageView +import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.chwl.app.R import com.chwl.app.ui.utils.loadAnim @@ -14,16 +15,21 @@ import com.chwl.library.download.DownloadRequest.Companion.build import com.chwl.library.download.DownloadTask import com.chwl.library.download.FileDownloadListener import com.chwl.library.utils.PathHelper.generateResourcesFilePath +import com.chwl.library.utils.ResUtil.getString import com.tencent.qgame.animplayer.AnimConfig import com.tencent.qgame.animplayer.AnimView import com.tencent.qgame.animplayer.inter.IAnimListener import com.tencent.qgame.animplayer.util.ScaleType import com.youth.banner.adapter.BannerAdapter import java.io.File +import java.text.SimpleDateFormat +import java.util.Calendar +import java.util.Locale class VipCenterBannerAdapter( private val context: Context, - private val vipInfos: List + private val vipInfos: List, + private val myVipInfo: VipInfo? ) : BannerAdapter(vipInfos) { private val DOWNLOAD_TAG = "gift_effect_download" @@ -38,17 +44,34 @@ class VipCenterBannerAdapter( override fun onBindView(holder: BannerViewHolder, data: VipInfo, position: Int, size: Int) { - // 加载本地背景图片 + holder.dueText.visibility = View.GONE + myVipInfo?.let { + if (it.vipLevel == data.vipLevel) { + val calendar = Calendar.getInstance() + calendar.add(Calendar.SECOND, it.remainSeconds) + val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()) + val formattedDate = dateFormat.format(calendar.time) + val result = "${getString(R.string.vip_center_2)}$formattedDate" + holder.dueText.text = result + holder.dueText.visibility = View.VISIBLE + } + } + + var colorHex = "" + var resourceName = "vip_center_level_${position+1}" + val resourceId = context.resources.getIdentifier(resourceName, "drawable", context.packageName) + holder.imgBackground.setImageResource(resourceId) + when(position) { - 0->holder.imgBackground.setImageResource(R.drawable.vip_center_level_1) - 1->holder.imgBackground.setImageResource(R.drawable.vip_center_level_2) - 2->holder.imgBackground.setImageResource(R.drawable.vip_center_level_3) - 3->holder.imgBackground.setImageResource(R.drawable.vip_center_level_4) - 4->holder.imgBackground.setImageResource(R.drawable.vip_center_level_5) - 5->holder.imgBackground.setImageResource(R.drawable.vip_center_level_6) - 6->holder.imgBackground.setImageResource(R.drawable.vip_center_level_7) - 7->holder.imgBackground.setImageResource(R.drawable.vip_center_level_8) - 8->holder.imgBackground.setImageResource(R.drawable.vip_center_level_9) + 0-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_3A4D14)) + 1-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_4D143A)) + 2-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_4D2C14)) + 3-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_44144D)) + 4-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_1C344D)) + 5-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_1C4D35)) + 6-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_44144D)) + 7-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_4D371C)) + 8-> holder.dueText.setTextColor(context.resources.getColor(R.color.color_4D1C1C)) } // holder.svgaImage.loadFromUrl(data.vipLogo) @@ -94,30 +117,12 @@ class VipCenterBannerAdapter( }) } - - inner class BannerViewHolder(view: View) : RecyclerView.ViewHolder(view) { val imgBackground: ImageView = view.findViewById(R.id.img_background) // val svgaImage: SVGAImageView = view.findViewById(R.id.iv_vip_icon) val vapAnimView: AnimView = view.findViewById(R.id.vap_anim_view) + val dueText: TextView = view.findViewById(R.id.due_date_textview) } -// private fun drawVAPEffect(url: String) { -//// log("drawVAPEffect url:$url") -// val filePath = generateResourcesFilePath(url) -// val request = build(url, filePath, DOWNLOAD_TAG, null, 60000L) -// download(request, object : FileDownloadListener() { -// override fun onDownloadCompleted(task: DownloadTask) { -// val path = task.getRequest().getPath() -//// log("drawVAPEffect onDownloadCompleted url:$url path:$path") -// holder.vapAnimView.startPlay(File(path)) -// } -// -// override fun onDownloadError(exception: DownloadException) { -//// log("drawVAPEffect onDownloadError url:$url") -// exception.printStackTrace() -//// effectHandler.sendEmptyMessageDelayed(0, 4000) -// } -// }) -// } + } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt index d5959322a..7911d4dee 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt @@ -7,7 +7,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import com.bumptech.glide.Glide import com.chwl.app.R import com.chwl.core.vip.bean.VipAuthInfo import com.chwl.core.vip.bean.VipInfo @@ -36,27 +35,45 @@ class VipCenterIdentificationsAdapter( holder: VipCenterIdentificationsAdapter.ItemViewHolder, position: Int ) { - val item = items[position] - - // 加载内容图片 - Glide.with(context) - .load(item.authIcon) - .into(holder.contentImageView) - - // 设置标题 - holder.titleTextView.text = item.authName - - holder.itemView.setOnClickListener { - listener.onItemClick(position) + var targetIndex = 0 + when(position) { + 0 -> targetIndex = 0 + 1 -> targetIndex = 1 + 2 -> targetIndex = 4 + 3 -> targetIndex = 7 + 4 -> targetIndex = 11 } + val item = items[targetIndex] + vipInfo?.let { + holder.titleTextView.text = item.authName + + val lv = it.vipLevel + var resourceName = "null" + + when (position) { + 0 -> resourceName = "vip_center_identification_vipidentity_lv$lv" + 1 -> resourceName = "vip_center_identification_roomcard_lv$lv" + 2 -> resourceName = "vip_center_identification_mic_lv$lv" + 3 -> resourceName = "vip_center_identification_bubble_lv$lv" + 4 -> resourceName = "vip_center_identification_entry_lv$lv" + } + + val resourceId = context.resources + .getIdentifier(resourceName, "drawable", context.packageName) + holder.contentImageView.setImageResource(resourceId) + } + +// holder.itemView.setOnClickListener { +// listener.onItemClick(position) +// } } override fun getItemCount(): Int { return vipInfo?.let { when (it.vipLevel) { - 1, 2 -> 3 - 3 -> 4 - else -> 6 + 1, 2 -> 2 + 3 -> 3 + else -> 5 } } ?: 0 // items.size } @@ -69,7 +86,6 @@ class VipCenterIdentificationsAdapter( } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { -// val backgroundImageView: ImageView = view.findViewById(R.id.background_image) val contentImageView: ImageView = view.findViewById(R.id.item_image) val titleTextView: TextView = view.findViewById(R.id.item_title) } diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv4.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv4.webp new file mode 100644 index 000000000..3f19bb3d6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv4.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv5.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv5.webp new file mode 100644 index 000000000..3547adf44 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv5.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv6.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv6.webp new file mode 100644 index 000000000..b38eaf38f Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv6.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv7.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv7.webp new file mode 100644 index 000000000..1c7bfb096 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv7.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv8.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv8.webp new file mode 100644 index 000000000..6d36037df Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv8.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv9.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv9.webp new file mode 100644 index 000000000..e6359705e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_bubble_lv9.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv4.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv4.webp new file mode 100644 index 000000000..337020c34 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv4.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv5.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv5.webp new file mode 100644 index 000000000..924d12b1d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv5.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv6.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv6.webp new file mode 100644 index 000000000..5326504d9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv6.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv7.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv7.webp new file mode 100644 index 000000000..9d65a46b0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv7.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv8.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv8.webp new file mode 100644 index 000000000..e326ed610 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv8.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv9.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv9.webp new file mode 100644 index 000000000..c174b1d61 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_entry_lv9.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv3.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv3.webp new file mode 100644 index 000000000..564c05d10 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv3.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv4.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv4.webp new file mode 100644 index 000000000..e0d0b4c21 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv4.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv5.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv5.webp new file mode 100644 index 000000000..ec1efd620 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv5.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv6.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv6.webp new file mode 100644 index 000000000..0de69d224 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv6.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv7.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv7.webp new file mode 100644 index 000000000..bcd1ab214 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv7.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv8.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv8.webp new file mode 100644 index 000000000..8534c2bb4 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv8.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv9.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv9.webp new file mode 100644 index 000000000..28c2d3c2a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_mic_lv9.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv1.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv1.webp new file mode 100644 index 000000000..7093d3095 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv1.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv2.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv2.webp new file mode 100644 index 000000000..aaf290cca Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv2.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv3.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv3.webp new file mode 100644 index 000000000..b12848283 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv3.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv4.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv4.webp new file mode 100644 index 000000000..6903074bf Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv4.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv5.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv5.webp new file mode 100644 index 000000000..c16e972ae Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv5.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv6.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv6.webp new file mode 100644 index 000000000..9eaeb867d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv6.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv7.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv7.webp new file mode 100644 index 000000000..6369a7b84 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv7.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv8.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv8.webp new file mode 100644 index 000000000..4e3672780 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv8.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv9.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv9.webp new file mode 100644 index 000000000..e777088f1 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_roomcard_lv9.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv1.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv1.webp new file mode 100644 index 000000000..d114ce5b0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv1.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv2.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv2.webp new file mode 100644 index 000000000..7330a671b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv2.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv3.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv3.webp new file mode 100644 index 000000000..81a369cb7 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv3.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv4.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv4.webp new file mode 100644 index 000000000..7891b0108 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv4.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv5.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv5.webp new file mode 100644 index 000000000..2d843ae63 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv5.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv6.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv6.webp new file mode 100644 index 000000000..d6d1e7a2a Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv6.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv7.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv7.webp new file mode 100644 index 000000000..430988d58 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv7.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv8.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv8.webp new file mode 100644 index 000000000..12b332f09 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv8.webp differ diff --git a/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv9.webp b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv9.webp new file mode 100644 index 000000000..35bc08e0c Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_center_identification_vipidentity_lv9.webp differ diff --git a/app/src/main/res/layout/activity_vip_center.xml b/app/src/main/res/layout/activity_vip_center.xml index 78ae9f81d..c3dad0829 100644 --- a/app/src/main/res/layout/activity_vip_center.xml +++ b/app/src/main/res/layout/activity_vip_center.xml @@ -7,7 +7,6 @@ android:layout_height="match_parent" android:background="#150c00" android:orientation="vertical" - android:clipChildren="false" android:fitsSystemWindows="true"> - - - - - - - - - - - - - Activate VIP Due on: Identification - Exclusive Privileges/n($s/$s) + Exclusive Privileges %sDays Expires Renew diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8f51745bf..028898c18 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -750,4 +750,13 @@ #FFE3AF #633000 + + #3A4D14 + #4D2C14 + #44144D + #4D143A + #1C344D + #1C4D35 + #4D371C + #4D1C1C diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b6092513..37ab7c605 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5326,7 +5326,7 @@ You cannot join again within 24 hours after leaving Activate VIP Due on: Identification - Exclusive Privileges/n + Exclusive Privileges %sDays Expires Renew