diff --git a/.gradle/7.3.3/executionHistory/executionHistory.bin b/.gradle/7.3.3/executionHistory/executionHistory.bin index 582032a..47008fa 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.bin and b/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock index 3923acc..47d7876 100644 Binary files a/.gradle/7.3.3/executionHistory/executionHistory.lock and b/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin index fd062c5..56bf472 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.bin and b/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock index 3773b4e..e9d48d7 100644 Binary files a/.gradle/7.3.3/fileHashes/fileHashes.lock and b/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin index 637df9e..9ef7760 100644 Binary files a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin and b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a41c9f1..6084011 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 0253b43..396d7e5 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index d063028..77461d8 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt index 99f0d43..6ddda39 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt @@ -117,7 +117,7 @@ class ActivateActivity : BaseActivity() { viewBinding.couponView.text = couponTip val adapter = CouponAdapter(this@ActivateActivity, list) adapter.setItemEvent { i, itemCouponBinding, viewHolder, data -> - itemCouponBinding.root.setOnClickListener { + itemCouponBinding.useButton.setOnClickListener { val finalPlanAdapter = planAdapter if (finalPlanAdapter != null) { couponId = data.id @@ -233,7 +233,7 @@ class ActivateActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - viewBinding.toolbar.title = getText(R.string.activation_app) + title = getText(R.string.activation_app) setReturnButton() val account = appSettings.getValue(AppSettings.Setting.Account, "") if (account.isBlank()) { diff --git a/app/src/main/res/drawable/ic_outline_shopping_cart_24.xml b/app/src/main/res/drawable/ic_outline_shopping_cart_24.xml new file mode 100644 index 0000000..afd9dcf --- /dev/null +++ b/app/src/main/res/drawable/ic_outline_shopping_cart_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/round_background_true.xml b/app/src/main/res/drawable/round_background_true.xml index c95d1b1..9185e07 100644 --- a/app/src/main/res/drawable/round_background_true.xml +++ b/app/src/main/res/drawable/round_background_true.xml @@ -1,6 +1,6 @@ - + + android:color="?attr/colorOnSecondaryContainer" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_activate.xml b/app/src/main/res/layout/activity_activate.xml index 7ac52a7..1a2c1d2 100644 --- a/app/src/main/res/layout/activity_activate.xml +++ b/app/src/main/res/layout/activity_activate.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context=".MainActivity"> + tools:context=".ActivateActivity"> - + android:layout_height="wrap_content"> - + - + android:layout_marginTop="8dp"> - + - + android:layout_marginBottom="60dp"> - + diff --git a/app/src/main/res/layout/activity_order_list.xml b/app/src/main/res/layout/activity_order_list.xml index 7a9fb5a..2d67706 100644 --- a/app/src/main/res/layout/activity_order_list.xml +++ b/app/src/main/res/layout/activity_order_list.xml @@ -1,30 +1,26 @@ - + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:context=".OrderListActivity"> - - - + android:layout_height="?attr/actionBarSize" /> + - + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:context=".OrderListActivity"> + android:layout_height="wrap_content" + android:fitsSystemWindows="true"> - - - + android:layout_height="?attr/actionBarSize" /> diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml index fd833d9..49eca38 100644 --- a/app/src/main/res/layout/activity_search.xml +++ b/app/src/main/res/layout/activity_search.xml @@ -1,28 +1,26 @@ - + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:context=".OrderListActivity"> - - - + android:layout_height="?attr/actionBarSize" /> + - + android:src="@drawable/add" /> diff --git a/app/src/main/res/layout/item_audit_mod.xml b/app/src/main/res/layout/item_audit_mod.xml index 71de737..0be74f4 100644 --- a/app/src/main/res/layout/item_audit_mod.xml +++ b/app/src/main/res/layout/item_audit_mod.xml @@ -1,7 +1,8 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_coupon.xml b/app/src/main/res/layout/item_coupon.xml index cf1e7c0..0554945 100644 --- a/app/src/main/res/layout/item_coupon.xml +++ b/app/src/main/res/layout/item_coupon.xml @@ -6,8 +6,9 @@ - + + + + + + + + + + - - - - - + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:text="@string/use" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_dynamic.xml b/app/src/main/res/layout/item_dynamic.xml index c94e2f9..4c1d390 100644 --- a/app/src/main/res/layout/item_dynamic.xml +++ b/app/src/main/res/layout/item_dynamic.xml @@ -1,7 +1,8 @@ - + android:textColor="?attr/colorPrimary" + android:visibility="gone" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order.xml b/app/src/main/res/layout/item_order.xml index 09ae854..a415f28 100644 --- a/app/src/main/res/layout/item_order.xml +++ b/app/src/main/res/layout/item_order.xml @@ -1,22 +1,31 @@ - + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"> - + android:orientation="vertical" + android:padding="8dp"> - + - \ No newline at end of file + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a66d37c..6369ccf 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,5 +14,6 @@ #FFFFFFFF #F44336 #8BC34A + #e91e63 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 440e2ab..859decf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -793,6 +793,7 @@ 登出 最近登录:%1$s uid:%2$s 将使用优惠券创建订单,仍继续嘛?(创建订单完成后,将优惠券消耗) + 使用 账号/电子邮件 找不到用户,请检查电子邮件地址是否正确。 随机推荐 diff --git a/assistantCoreLibrary/src/main/res/values/colors.xml b/assistantCoreLibrary/src/main/res/values/colors.xml index e6bdf9f..a4d7e56 100644 --- a/assistantCoreLibrary/src/main/res/values/colors.xml +++ b/assistantCoreLibrary/src/main/res/values/colors.xml @@ -2,5 +2,4 @@ #D32F2F #FBC02D - #2196F3 \ No newline at end of file