diff --git a/app/src/main/assets/svga/bubble_tran_bg.svga b/app/src/main/assets/svga/bubble_tran_bg.svga new file mode 100644 index 000000000..4c1a5fc8b Binary files /dev/null and b/app/src/main/assets/svga/bubble_tran_bg.svga differ diff --git a/app/src/main/assets/svga/gold_box_bg.svga b/app/src/main/assets/svga/gold_box_bg.svga new file mode 100644 index 000000000..30eeea8fb Binary files /dev/null and b/app/src/main/assets/svga/gold_box_bg.svga differ diff --git a/app/src/main/assets/svga/smash_eggs_open.svga b/app/src/main/assets/svga/smash_eggs_open.svga new file mode 100644 index 000000000..a2b236dba Binary files /dev/null and b/app/src/main/assets/svga/smash_eggs_open.svga differ diff --git a/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt b/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt index 61e1a2838..02564d637 100644 --- a/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt +++ b/app/src/main/java/com/chwl/app/notify/GlobalNotifyManager.kt @@ -12,6 +12,9 @@ import com.chwl.app.room_chat.activity.RoomMsgActivity import com.chwl.app.support.float.FloatWindowEngine import com.chwl.app.support.float.SimpleFloatQueue import com.chwl.app.support.float.SimpleFloatWindow +import com.chwl.app.treasure_box.activity.BoxRankingActivity +import com.chwl.app.treasure_box.activity.TreasureBoxActivity +import com.chwl.app.treasure_box.activity.TreasureBoxHonourActivity import com.chwl.app.ui.login.AddUserInfoActivity import com.chwl.app.ui.login.LoginCodeActivity import com.chwl.app.ui.login.LoginPhoneActivity @@ -51,11 +54,12 @@ object GlobalNotifyManager : Observer, ILog { NimMiddleActivity::class.java, // 房间页面单独处理 AVRoomActivity::class.java, - // 该Activity用了透明主题且顶部区域还能看到房间页面，那就在房间页面展示飘屏即可 -// TreasureBoxActivity::class.java, - // 该Activity用了透明主题且顶部区域还能看到房间页面，那就在房间页面展示飘屏即可 + // 房间内玩法（该Activity用了透明主题且顶部区域还能看到房间页面，那就在房间页面展示飘屏即可） + TreasureBoxActivity::class.java, + BoxRankingActivity::class.java, + TreasureBoxHonourActivity::class.java, + // 房间内私聊（该Activity用了透明主题且顶部区域还能看到房间页面，那就在房间页面展示飘屏即可） NimRoomP2PMessageActivity::class.java, - // 该Activity用了透明主题且顶部区域还能看到房间页面，那就在房间页面展示飘屏即可 RoomMsgActivity::class.java ) diff --git a/app/src/main/java/com/chwl/app/notify/NotifyAdapter.kt b/app/src/main/java/com/chwl/app/notify/NotifyAdapter.kt index f4830af37..f931eeccd 100644 --- a/app/src/main/java/com/chwl/app/notify/NotifyAdapter.kt +++ b/app/src/main/java/com/chwl/app/notify/NotifyAdapter.kt @@ -2,7 +2,6 @@ package com.chwl.app.notify import android.content.Context import com.chwl.app.notify.views.FindLoveImageNotify -import com.chwl.app.notify.views.FindLoveSvgaNotify import com.chwl.app.notify.views.TemplateImageNotify import com.chwl.app.notify.views.TemplateSvgaNotify import com.chwl.app.notify.views.GiftNotify @@ -39,9 +38,9 @@ class NotifyAdapter : FloatViewAdapter { // 寻爱 is RoomBoxPrizeAttachment -> { if (item.second == CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA) { - return FindLoveSvgaNotify(context) + return FindLoveImageNotify(context, true) } else if (item.second == CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY) { - return FindLoveImageNotify(context) + return FindLoveImageNotify(context, false) } else { return null } diff --git a/app/src/main/java/com/chwl/app/notify/views/FindLoveImageNotify.kt b/app/src/main/java/com/chwl/app/notify/views/FindLoveImageNotify.kt index a25beab48..613bf3023 100644 --- a/app/src/main/java/com/chwl/app/notify/views/FindLoveImageNotify.kt +++ b/app/src/main/java/com/chwl/app/notify/views/FindLoveImageNotify.kt @@ -11,10 +11,10 @@ import com.chwl.app.support.float.BaseFloatView import com.chwl.app.utils.SpannableBuilder import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment import com.chwl.core.utils.extension.subAndReplaceDot -import com.chwl.library.utils.ResUtil +import com.example.lib_utils.UiUtils -class FindLoveImageNotify(context: Context) : BaseFloatView(context) { +class FindLoveImageNotify(context: Context, val isHeightLevel: Boolean) : BaseFloatView(context) { init { LayoutInflater.from(context).inflate(R.layout.layout_template_notify_image, this, true) @@ -31,28 +31,31 @@ class FindLoveImageNotify(context: Context) : BaseFloatView(context) { textView.setTextColor(Color.WHITE) val text = SpannableBuilder() .append( - ResUtil.getString(R.string.avroom_widget_roomeffectview_08), + "厲害了！", ForegroundColorSpan(Color.WHITE) ) .append( data.nick.subAndReplaceDot(8), - ForegroundColorSpan(resources.getColor(R.color.notice_nick)) + ForegroundColorSpan(resources.getColor(R.color.color_FFE44E)) ) .append( - ResUtil.getString(R.string.treasure_in_find_love) + ResUtil.getString( - R.string.avroom_widget_roomeffectview_09 - ), ForegroundColorSpan(Color.WHITE) + "通過歡樂砸蛋獲得\n", ForegroundColorSpan(Color.WHITE) ) .append( data.prizeName, - ForegroundColorSpan(resources.getColor(R.color.notice_nick)) + ForegroundColorSpan(resources.getColor(R.color.color_FFE44E)) ) if (data.prizeNum > 1) { text.append("x" + data.prizeNum, ForegroundColorSpan(Color.WHITE)) } textView.text = text.build() + textView.setPadding(0, UiUtils.dip2px(2f), 0, 0) val bgView = rootView.findViewById(R.id.iv_bg) - bgView.setImageResource(R.drawable.bg_box_notice) + if (isHeightLevel) { + bgView.setImageResource(R.drawable.smash_eggs_notity_bg_5) + } else { + bgView.setImageResource(R.drawable.smash_eggs_notity_bg_4) + } startEnterAnim() startDelayRemove() } diff --git a/app/src/main/java/com/chwl/app/notify/views/FindLoveSvgaNotify.kt b/app/src/main/java/com/chwl/app/notify/views/FindLoveSvgaNotify.kt deleted file mode 100644 index e68079e48..000000000 --- a/app/src/main/java/com/chwl/app/notify/views/FindLoveSvgaNotify.kt +++ /dev/null @@ -1,76 +0,0 @@ -package com.chwl.app.notify.views - -import android.content.Context -import android.graphics.Color -import android.text.style.ForegroundColorSpan -import android.view.LayoutInflater -import android.widget.TextView -import com.chwl.app.R -import com.chwl.app.common.svga.SimpleSvgaCallback -import com.chwl.app.support.float.BaseFloatView -import com.chwl.app.utils.SpannableBuilder -import com.chwl.core.im.custom.bean.RoomBoxPrizeAttachment -import com.chwl.library.utils.ResUtil -import com.chwl.library.utils.StringUtils -import com.opensource.svgaplayer.SVGADrawable -import com.opensource.svgaplayer.SVGAImageView -import com.opensource.svgaplayer.SVGAParser -import com.opensource.svgaplayer.SVGAVideoEntity - - -class FindLoveSvgaNotify(context: Context) : BaseFloatView(context) { - - init { - LayoutInflater.from(context).inflate(R.layout.layout_find_love_notify_svga, this, true) - } - - override fun onBind(item: Any) { - val data = item as? RoomBoxPrizeAttachment - if (data == null) { - requestRemoveSelf() - return - } - val svgaView = rootView.findViewById(R.id.iv_bg) - val textView = rootView.findViewById(R.id.tv_text) - val text = SpannableBuilder() - .append( - ResUtil.getString(R.string.avroom_widget_roomeffectview_011), - ForegroundColorSpan(Color.WHITE) - ) - .append( - StringUtils.abbreviate(data.nick, 8) + " ", - ForegroundColorSpan(resources.getColor(R.color.notice_nick)) - ) - .append( - ResUtil.getString(R.string.treasure_in_find_love) + ResUtil.getString( - R.string.avroom_widget_roomeffectview_012 - ), ForegroundColorSpan(Color.WHITE) - ) - .append( - data.prizeName, - ForegroundColorSpan(resources.getColor(R.color.notice_nick)) - ) - if (data.prizeNum > 1) { - text.append("x" + data.prizeNum, ForegroundColorSpan(Color.WHITE)) - } - svgaView.callback = object : SimpleSvgaCallback() { - override fun onFinished() { - startDelayRemove(0) - } - } - SVGAParser.shareParser() - .decodeFromAssets("svga/box_notify.svga", object : SVGAParser.ParseCompletion { - override fun onComplete(videoItem: SVGAVideoEntity) { - this@FindLoveSvgaNotify.startEnterAnim() - val drawable = SVGADrawable(videoItem) - svgaView.setImageDrawable(drawable) - svgaView.stepToFrame(0, true) - textView.text = text.build() - } - - override fun onError() { - requestRemoveSelf() - } - }, null) - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable-xxhdpi/smash_eggs_notity_bg_4.png b/app/src/main/res/drawable-xxhdpi/smash_eggs_notity_bg_4.png new file mode 100644 index 000000000..517b869b2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/smash_eggs_notity_bg_4.png differ diff --git a/app/src/main/res/drawable-xxhdpi/smash_eggs_notity_bg_5.png b/app/src/main/res/drawable-xxhdpi/smash_eggs_notity_bg_5.png new file mode 100644 index 000000000..a2b3fb64b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/smash_eggs_notity_bg_5.png differ diff --git a/app/src/main/res/drawable/selector_bg_box_price.xml b/app/src/main/res/drawable/selector_bg_box_price.xml index d04390093..c07d9c963 100644 --- a/app/src/main/res/drawable/selector_bg_box_price.xml +++ b/app/src/main/res/drawable/selector_bg_box_price.xml @@ -1,7 +1,7 @@ - - + + diff --git a/app/src/main/res/drawable/shape_7821e8_15dp.xml b/app/src/main/res/drawable/shape_7821e8_15dp.xml new file mode 100644 index 000000000..85488988a --- /dev/null +++ b/app/src/main/res/drawable/shape_7821e8_15dp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/box_ranking_list_item.xml b/app/src/main/res/layout/box_ranking_list_item.xml index 4279e4436..7de0b79b8 100644 --- a/app/src/main/res/layout/box_ranking_list_item.xml +++ b/app/src/main/res/layout/box_ranking_list_item.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/dp_60" + android:layout_height="@dimen/dp_80" android:orientation="horizontal" android:paddingStart="@dimen/dp_0" android:paddingEnd="@dimen/dp_15"> @@ -12,14 +12,14 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_gravity="center" - android:layout_weight="0.3" + android:layout_weight="0.4" android:paddingStart="@dimen/dp_8" android:paddingEnd="@dimen/dp_0"> @@ -37,14 +37,14 @@ @@ -71,8 +71,8 @@ android:drawablePadding="5dp" android:gravity="end" android:textColor="@color/color_F8FF7B" - android:textSize="@dimen/sp_15" + android:textSize="@dimen/sp_14" tools:text="1236843" - app:drawableEndCompat="@drawable/treasure_box_diamond" /> + app:drawableEndCompat="@drawable/icon_diamond" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_template_notify_image.xml b/app/src/main/res/layout/layout_template_notify_image.xml index e7256dd7a..6fc82b37d 100644 --- a/app/src/main/res/layout/layout_template_notify_image.xml +++ b/app/src/main/res/layout/layout_template_notify_image.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:adjustViewBounds="true" app:layout_constraintTop_toTopOf="parent" - tools:src="@drawable/bg_radish_notice" /> + tools:src="@drawable/smash_eggs_notity_bg_4" /> #19FFFFFF #33FFFFFF #66FFFFFF + #99FFFFFF #1EFFFFFF #23FFFFFF @@ -722,5 +723,6 @@ #FFD667FF #FF57CDFF #FFF45E + #FFE44E diff --git a/app/src/module_room_chat/res/layout/activity_room_box_ranking.xml b/app/src/module_room_chat/res/layout/activity_room_box_ranking.xml index ee20b4117..bc14815df 100644 --- a/app/src/module_room_chat/res/layout/activity_room_box_ranking.xml +++ b/app/src/module_room_chat/res/layout/activity_room_box_ranking.xml @@ -1,5 +1,5 @@ - - + android:layout_height="0dp" + android:background="@drawable/smash_eggs_rank_bg" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintDimensionRatio="375:552"> - + - - - + android:layout_weight="1" + android:autoSizeMaxTextSize="@dimen/dp_15" + android:autoSizeMinTextSize="@dimen/dp_8" + android:autoSizeStepGranularity="1sp" + android:autoSizeTextType="uniform" + android:background="@drawable/smash_eggs_rank_bg_tab_selected_left" + android:gravity="center" + android:text="@string/treasure_box_activity_boxrankingactivity_01" + android:textColor="@color/white" + android:textSize="@dimen/dp_15" + app:autoSizeMaxTextSize="@dimen/dp_15" + app:autoSizeMinTextSize="@dimen/dp_8" + app:autoSizeStepGranularity="1sp" + app:autoSizeTextType="uniform" /> - + + - + android:layout_height="0dp" + android:layout_marginTop="@dimen/dp_4" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/layout_tab" /> - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java index bc54b4d22..a64c4df34 100644 --- a/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java +++ b/app/src/module_treasure_box/java/com/chwl/app/treasure_box/activity/BoxRankingActivity.java @@ -6,35 +6,30 @@ import android.content.Intent; import android.view.View; import androidx.fragment.app.Fragment; +import androidx.viewpager2.widget.ViewPager2; import com.chwl.app.R; +import com.chwl.app.avroom.adapter.CommonVPAdapter; import com.chwl.app.base.BaseViewBindingActivity; -import com.chwl.app.common.ViewPagerAdapter; import com.chwl.app.databinding.ActivityRoomBoxRankingBinding; import com.chwl.app.decoration.view.widgets.CarMagicIndicator; import com.chwl.app.room_chat.event.ClickRootViewEvent; import com.chwl.app.treasure_box.fragment.BoxRankingFragment; -import com.chwl.core.home.bean.TabInfo; import com.chwl.core.manager.IMNetEaseManager; import com.chwl.core.manager.RoomEvent; -import com.chwl.core.room.treasure_box.event.RefreshBoxRankingEvent; -import com.chwl.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; -import java.util.List; public class BoxRankingActivity extends BaseViewBindingActivity implements CarMagicIndicator.OnItemSelectListener, View.OnClickListener { - private final String[] titles = {ResUtil.getString(R.string.treasure_box_activity_boxrankingactivity_01), ResUtil.getString(R.string.treasure_box_activity_boxrankingactivity_02)}; public static final int TYPE_TODAY = 1;//今日 public static final int TYPE_YESTERDAY = 2;//今日 - public static void start(Context context) { Intent starter = new Intent(context, BoxRankingActivity.class); context.startActivity(starter); @@ -45,21 +40,48 @@ public class BoxRankingActivity extends BaseViewBindingActivity tabInfoList = new ArrayList<>(2); - for (int i = 0; i < titles.length; i++) { - tabInfoList.add(new TabInfo(i, titles[i])); - } binding.viewpager.setOffscreenPageLimit(2); - binding.viewpager.setAdapter(new ViewPagerAdapter(getSupportFragmentManager(), getFragment(), titles)); - binding.viewIndicator.setViewPager(binding.viewpager, titles, this, getFragment()); + binding.viewpager.setAdapter(new CommonVPAdapter(getSupportFragmentManager(), getLifecycle(), getFragment())); + binding.viewpager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + super.onPageScrolled(position, positionOffset, positionOffsetPixels); + } + + @Override + public void onPageSelected(int position) { + super.onPageSelected(position); + onTabChanged(position); + } + + @Override + public void onPageScrollStateChanged(int state) { + super.onPageScrollStateChanged(state); + } + }); + binding.tvTabToday.setOnClickListener(v -> { + binding.viewpager.setCurrentItem(0); + onTabChanged(0); + }); + binding.tvTabYesterday.setOnClickListener(v -> { + binding.viewpager.setCurrentItem(1); + onTabChanged(1); + }); IMNetEaseManager.get().getChatRoomEventObservable() .compose(bindToLifecycle()) .filter(roomEvent -> roomEvent.getEvent() == RoomEvent.KICK_OUT_ROOM) .subscribe(roomEvent -> finish()); + } - binding.ivRefresh.setOnClickListener(v -> EventBus.getDefault().post(new RefreshBoxRankingEvent())); + private void onTabChanged(int tabPosition) { + if (tabPosition == 0) { + binding.tvTabToday.setBackgroundResource(R.drawable.smash_eggs_rank_bg_tab_selected_left); + binding.tvTabYesterday.setBackground(null); + } else { + binding.tvTabToday.setBackground(null); + binding.tvTabYesterday.setBackgroundResource(R.drawable.smash_eggs_rank_bg_tab_selected_right); + } } @Override @@ -87,7 +109,7 @@ public class BoxRankingActivity extends BaseViewBindingActivity mBinding.llPrizeHint.removeAllViews(); private ArrayList cacheList = new ArrayList<>(); private ArrayList hintPrizeCacheList = new ArrayList<>(); - private ObjectAnimator translationXAnimator; - private ObjectAnimator translationYAnimator; private int height; private int sendMessageSwitchLevel; @@ -123,25 +116,6 @@ public class TreasureBoxActivity extends BaseBindingActivity { - translationYAnimator = ObjectAnimator.ofFloat(mBinding.ivGiftAnim, "translationY", 0, - height - (mBinding.ivBox.getBottom() + mBinding.ivBox.getTop()) / 2f - ScreenUtil.dip2px(10 + 19)).setDuration(100); - translationYAnimator.setInterpolator(new AccelerateDecelerateInterpolator()); - }); - WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); - if (walletInfo != null) { - mBinding.tvDiamondNum.setText(FormatUtils.formatBigInteger(walletInfo.getDiamondNum())); - } - mBinding.view1.setOnClickListener(v -> setBoxPriceSelect(1)); mBinding.view2.setOnClickListener(v -> setBoxPriceSelect(2)); mBinding.view3.setOnClickListener(v -> setBoxPriceSelect(3)); @@ -205,9 +179,22 @@ public class TreasureBoxActivity extends BaseBindingActivity cacheList.size() > 0) - .subscribe(aLong -> { - PrizeNewInfo prizeInfo = cacheList.get(0); - String url = prizeInfo.getPicUrl(); - if (cacheList.size() > 0) cacheList.remove(0); - if (!TextUtils.isEmpty(url)) { - if (translationXAnimator != null) translationXAnimator.start(); - if (translationYAnimator != null) translationYAnimator.start(); - mBinding.ivGiftAnim.setVisibility(View.VISIBLE); - mBinding.svgaGiftBg.startAnimation(); - ImageLoadUtils.loadImage(context, url, mBinding.ivGiftAnim); - } - } - , e -> looperPrize());//出错了继续looper...... - + mBinding.ivBox4.setEnabled(status); } @SuppressLint("CheckResult") @@ -425,7 +390,6 @@ public class TreasureBoxActivity extends BaseBindingActivity + + + + + + \ No newline at end of file diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_ic_close.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_ic_close.png new file mode 100644 index 000000000..a6ea7e556 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_ic_close.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_ic_hammer.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_ic_hammer.png new file mode 100644 index 000000000..46b6a28a4 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_ic_hammer.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_add.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_add.png new file mode 100644 index 000000000..69700bcb6 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_add.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_bg.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_bg.png new file mode 100644 index 000000000..6e06be12d Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_bg.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_bg_num.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_bg_num.png new file mode 100644 index 000000000..144f39684 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_bg_num.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_subtract.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_subtract.png new file mode 100644 index 000000000..c67a033a9 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_multi_subtract.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_success_bg.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_success_bg.png new file mode 100644 index 000000000..4aa33cf89 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_buy_success_bg.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_buy.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_buy.png new file mode 100644 index 000000000..7b4ad212d Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_buy.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer.png new file mode 100644 index 000000000..e6a90ceef Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_1.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_1.png new file mode 100644 index 000000000..f95148110 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_1.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_10.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_10.png new file mode 100644 index 000000000..60946b005 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_10.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_100.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_100.png new file mode 100644 index 000000000..764a8edc9 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_100.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_200.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_200.png new file mode 100644 index 000000000..9eaeaccfd Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_hammer_200.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_more.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_more.png new file mode 100644 index 000000000..51ba2d2d9 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_more.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_rank.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_rank.png new file mode 100644 index 000000000..8e9f9c8a0 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_ic_rank.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg.png new file mode 100644 index 000000000..1b8af1730 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab.png new file mode 100644 index 000000000..d133b757b Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab_selected_left.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab_selected_left.png new file mode 100644 index 000000000..b049366fa Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab_selected_left.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab_selected_right.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab_selected_right.png new file mode 100644 index 000000000..cdb3b31e8 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_bg_tab_selected_right.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top1.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top1.png new file mode 100644 index 000000000..4b0e96148 Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top1.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top2.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top2.png new file mode 100644 index 000000000..f108ddf2e Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top2.png differ diff --git a/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top3.png b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top3.png new file mode 100644 index 000000000..f8fb291bf Binary files /dev/null and b/app/src/module_treasure_box/res/drawable-xxhdpi/smash_eggs_rank_top3.png differ diff --git a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml index 38a449f54..b07720d7c 100644 --- a/app/src/module_treasure_box/res/layout/activity_treasure_box.xml +++ b/app/src/module_treasure_box/res/layout/activity_treasure_box.xml @@ -11,328 +11,349 @@ - + app:layout_constraintDimensionRatio="375:552"> - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" /> + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/line_bottom" + app:layout_constraintWidth_percent="0.768"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - diff --git a/app/src/module_treasure_box/res/layout/treasure_box_dialog_buy_love.xml b/app/src/module_treasure_box/res/layout/treasure_box_dialog_buy_love.xml index 856847e66..7f6960445 100644 --- a/app/src/module_treasure_box/res/layout/treasure_box_dialog_buy_love.xml +++ b/app/src/module_treasure_box/res/layout/treasure_box_dialog_buy_love.xml @@ -9,31 +9,21 @@ - - @@ -45,10 +35,10 @@ android:textStyle="bold" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="@dimen/dp_14" + android:layout_marginTop="@dimen/dp_40" app:layout_constraintStart_toStartOf="@+id/view_bg" app:layout_constraintEnd_toEndOf="@+id/view_bg" - app:layout_constraintTop_toBottomOf="@+id/view_buy_love"/> + app:layout_constraintTop_toTopOf="@id/view_bg"/> @@ -68,7 +58,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="5dp" - android:drawableStart="@drawable/treasure_box_ic_diamond" + android:drawableStart="@drawable/icon_diamond" android:ellipsize="end" android:gravity="center" android:includeFontPadding="false" @@ -82,13 +72,10 @@ - - + android:layout_marginTop="@dimen/dp_40" + app:layout_constraintStart_toStartOf="@id/view_bg" + app:layout_constraintEnd_toEndOf="@id/view_bg" + app:layout_constraintTop_toTopOf="@id/view_bg"/> diff --git a/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml b/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml index 027dd32ff..0a2e49eef 100644 --- a/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml +++ b/app/src/module_treasure_box/res/layout/treasure_box_dialog_love_lack.xml @@ -11,47 +11,45 @@ android:layout_width="@dimen/dp_240" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:src="@drawable/treasure_box_bg_love_lack" + android:src="@drawable/smash_eggs_buy_multi_bg" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.6" /> - - + app:layout_constraintTop_toTopOf="@id/view_bg" /> @@ -71,7 +69,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:layout_marginTop="12dp" - android:drawableStart="@drawable/treasure_box_ic_diamond" + android:drawableStart="@drawable/icon_diamond" android:ellipsize="end" android:gravity="center" android:includeFontPadding="false" @@ -85,22 +83,22 @@ + android:layout_marginStart="@dimen/dp_2" + android:src="@drawable/smash_eggs_buy_multi_add" /> + android:src="@drawable/smash_eggs_buy_multi_subtract" /> @@ -130,11 +128,8 @@ android:layout_width="@dimen/dp_152" android:layout_height="@dimen/dp_32" android:layout_marginTop="@dimen/dp_12" - android:background="@drawable/btn_box_buy" + android:background="@drawable/smash_eggs_buy_bg_buy" android:gravity="center" - android:text="購買" - android:textColor="@color/color_white" - android:textSize="@dimen/sp_14" app:corner="@dimen/dp_18" app:layout_constraintEnd_toEndOf="@+id/view_bg" app:layout_constraintStart_toStartOf="@+id/view_bg" diff --git a/app/src/module_treasure_box/res/values-ar/strings.xml b/app/src/module_treasure_box/res/values-ar/strings.xml index ffe66b518..6c4be7fb0 100644 --- a/app/src/module_treasure_box/res/values-ar/strings.xml +++ b/app/src/module_treasure_box/res/values-ar/strings.xml @@ -3,4 +3,6 @@ لا توجد بيانات إضافية فشل التحميل، اضغط للمحاولة مرة أخرى جار التحميل… + + ليس هناك ما يكفي من المطارق المتاحة، يرجى شراء واحدة \ No newline at end of file diff --git a/app/src/module_treasure_box/res/values-zh-rTW/strings.xml b/app/src/module_treasure_box/res/values-zh-rTW/strings.xml index 747e793fe..81696870f 100644 --- a/app/src/module_treasure_box/res/values-zh-rTW/strings.xml +++ b/app/src/module_treasure_box/res/values-zh-rTW/strings.xml @@ -3,4 +3,5 @@ 沒有更多數據 加載失敗，請點我重試 正在加載中… + 可用錘子不足，請購買 \ No newline at end of file diff --git a/app/src/module_treasure_box/res/values/strings.xml b/app/src/module_treasure_box/res/values/strings.xml index b77960ed8..d407dea2d 100644 --- a/app/src/module_treasure_box/res/values/strings.xml +++ b/app/src/module_treasure_box/res/values/strings.xml @@ -3,4 +3,6 @@ No more data Load failed, tap to retry Loading… + + Not enough hammers available, please buy one \ No newline at end of file diff --git a/modules/module_base/src/main/res/drawable/base_shape_33ffffff_9dp.xml b/modules/module_base/src/main/res/drawable/base_shape_33ffffff_9dp.xml new file mode 100644 index 000000000..74d461d70 --- /dev/null +++ b/modules/module_base/src/main/res/drawable/base_shape_33ffffff_9dp.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file