diff --git a/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java index 8225849..c7f9081 100644 --- a/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java +++ b/app/src/main/java/com/unibuy/smartdevice/ui/dialog/BuyDialog.java @@ -308,16 +308,30 @@ public class BuyDialog extends DialogAbstract { binding.textCount.setText(getContext().getString(R.string.pay_item_count, getTotalCount())); int payable = getTotalPrice(); - StringBuilder priceText = new StringBuilder("NT$").append(payable); + String priceText = "NT$" + payable; + android.text.SpannableStringBuilder spannable = new android.text.SpannableStringBuilder(priceText); + spannable.setSpan( + new android.text.style.ForegroundColorSpan(androidx.core.content.ContextCompat.getColor(getContext(), R.color.primary)), + 0, + priceText.length(), + android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ); + if (!MyApp.getInstance().getReportFreeGiftCodeStructure().getFreeGiftId().isEmpty()) { int saved = getOriginalPrice() - payable; if (saved > 0) { - priceText.append(" (") - .append(getContext().getString(R.string.pay_discounted_format, saved)) - .append(")"); + String discountPart = " (" + getContext().getString(R.string.pay_discounted_format, saved) + ")"; + int start = spannable.length(); + spannable.append(discountPart); + spannable.setSpan( + new android.text.style.ForegroundColorSpan(androidx.core.content.ContextCompat.getColor(getContext(), R.color.success)), + start, + spannable.length(), + android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE + ); } } - binding.textPrice.setText(priceText.toString()); + binding.textPrice.setText(spannable); } public void dialogCancel() { diff --git a/app/src/main/res/layout/dialog_buy.xml b/app/src/main/res/layout/dialog_buy.xml index b848060..1354c67 100644 --- a/app/src/main/res/layout/dialog_buy.xml +++ b/app/src/main/res/layout/dialog_buy.xml @@ -8,57 +8,6 @@ android:paddingTop="24dp" android:orientation="vertical"> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + 取消(%d秒) 購物車品項(%d件) NT$%d - 共 %d 件 + 商品數量:共 %d 件 應付金額 已折抵 NT$%d 超出庫存