ABBIDOT_APP/Abbidot_Android
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

套餐优化

Browse Source
This commit is contained in:
yezhiqiu
2025-10-15 09:39:31 +08:00
parent 8930bba35f
commit 05f62cf33c
25 changed files with 392 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/res/layout/item_choose_plan_layout.xml
View File

@@ -36,13 +36,13 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/tv_choose_plan_item_name"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_18"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="@dimen/dp_8"
android:paddingVertical="@dimen/dp_2"
app:qmui_backgroundColor="@color/orange_color4"
app:qmui_radius="@dimen/dp_38">
android:paddingHorizontal="@dimen/dp_10"
android:paddingVertical="@dimen/dp_4"
app:qmui_backgroundColor="@color/select_color2"
app:qmui_radius="@dimen/dp_18">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_choose_plan_item_discount_percent"
@@ -50,11 +50,13 @@
android:layout_marginEnd="@dimen/dp_4"
android:text="25%"
android:textSize="@dimen/textSize16"
android:visibility="gone"
app:typeface="@string/roboto_bold_font" />
<com.abbidot.tracker.widget.TypefaceTextView
style="@style/my_TextView_style_v2"
android:text="OFF"
android:text="@string/txt_popular"
android:textColor="@color/select_color"
android:textSize="@dimen/textSize12"
app:typeface="@string/roboto_bold_font" />
</com.qmuiteam.qmui.widget.roundwidget.QMUIRoundLinearLayout>
@@ -72,8 +74,8 @@
<com.abbidot.tracker.widget.TypefaceTextView
style="@style/my_TextView_style_v2"
android:layout_alignBaseline="@id/tv_choose_plan_item_money"
android:layout_alignTop="@id/tv_choose_plan_item_money"
android:layout_alignBottom="@id/tv_choose_plan_item_money"
android:layout_toEndOf="@id/tv_choose_plan_item_money"
android:text="@string/txt_per_month"
android:textSize="@dimen/textSize14"
@@ -81,25 +83,23 @@
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_choose_plan_item_year_money"
android:id="@+id/tv_choose_plan_item_billed_money"
style="@style/my_TextView_style_v2"
android:layout_alignTop="@id/tv_choose_plan_item_money"
android:layout_alignBaseline="@id/tv_choose_plan_item_money"
android:layout_alignEnd="@id/ll_choose_plan_item_discount_percent"
android:layout_alignBottom="@id/tv_choose_plan_item_money"
android:text="@string/txt_money_unit"
android:textColor="@color/select_color3"
android:textSize="@dimen/textSize14" />
android:text="@string/txt_billed_annually"
android:textColor="@color/select_color"
android:textSize="@dimen/textSize10" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_choose_plan_item_discount_money"
android:id="@+id/tv_choose_plan_item_plan_money"
style="@style/my_TextView_style_v2"
android:layout_alignTop="@id/tv_choose_plan_item_year_money"
android:layout_alignBottom="@id/tv_choose_plan_item_year_money"
android:layout_marginEnd="@dimen/dp_8"
android:layout_toStartOf="@id/tv_choose_plan_item_year_money"
android:layout_above="@id/tv_choose_plan_item_billed_money"
android:layout_alignEnd="@id/tv_choose_plan_item_billed_money"
android:text="@string/txt_money_unit"
android:textColor="@color/select_color3"
android:textSize="@dimen/textSize14" />
android:textColor="@color/select_color"
android:textSize="@dimen/textSize16"
android:textStyle="bold" />
</RelativeLayout>
@@ -111,6 +111,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:visibility="gone"
app:cardBackgroundColor="@color/select_color2"
app:cardCornerRadius="@dimen/dp_50"
app:cardElevation="@dimen/dp_4">

13
app/src/main/res/layout/item_subscription_plan_layout.xml
View File

@@ -5,11 +5,12 @@
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:layout_width="@dimen/dp_160"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_2"
android:minWidth="@dimen/dp_160"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/dp_20"
app:cardElevation="0dp">
@@ -19,12 +20,12 @@
android:id="@+id/rl_subscribe_plan_shade_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent">
android:background="@color/transparent"
android:paddingHorizontal="@dimen/dp_18">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscribe_plan_item_name"
style="@style/my_TextView_style_v2"
android:layout_marginHorizontal="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_16"
android:text="@string/app_name"
android:textSize="@dimen/textSize16"
@@ -46,6 +47,7 @@
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_subscribe_plan_as_low_as"
android:layout_alignStart="@id/tv_subscribe_plan_item_name"
android:layout_marginBottom="@dimen/dp_16"
android:text="@string/txt_money_unit"
android:textColor="@color/select_color"
android:textSize="@dimen/textSize26"
@@ -64,9 +66,8 @@
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_subscribe_plan_item_per_year"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_subscribe_plan_item_money"
android:layout_alignStart="@id/tv_subscribe_plan_item_money"
android:layout_marginBottom="@dimen/dp_16"
android:layout_alignBaseline="@id/tv_subscribe_plan_item_money"
android:layout_toEndOf="@id/tv_subscribe_plan_item_money"
android:text="@string/txt_per_month"
android:textColor="@color/select_color3"
android:textSize="@dimen/textSize14"

67
app/src/main/res/layout/layout_sure_subscribe_plan_addons_layout.xml
View File

@@ -6,7 +6,10 @@
android:orientation="vertical">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/iv_sure_subscribe_plan_insurance"
style="@style/my_TextView_style_v2"
android:drawableEnd="@drawable/icon_tip_image_svg"
android:drawablePadding="@dimen/dp_4"
android:text="@string/txt_annual_care"
android:textSize="@dimen/textSize16"
android:textStyle="bold" />
@@ -19,63 +22,57 @@
android:paddingHorizontal="@dimen/dp_20"
android:paddingVertical="@dimen/dp_10">
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_sure_subscribe_plan_insurance"
style="@style/my_TextView_style_v2"
android:text="@string/txt_replace_guarantee"
android:textSize="@dimen/textSize14"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_sure_subscribe_plan_insurance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/tv_sure_subscribe_plan_insurance"
android:layout_alignBottom="@id/tv_sure_subscribe_plan_insurance"
android:layout_marginStart="@dimen/dp_4"
android:layout_toEndOf="@id/tv_sure_subscribe_plan_insurance"
android:background="@drawable/selector_transparent_pressed"
android:src="@drawable/icon_tip_image_svg" />
<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/cb_sure_subscribe_insure_switch"
style="@style/my_checkbox_switch_style"
android:layout_alignTop="@id/tv_sure_subscribe_plan_insurance"
android:layout_alignParentEnd="true"
android:checked="true" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_sure_subscribe_plan_auto_renew_dec"
android:id="@+id/tv_sure_subscribe_plan_insurance"
style="@style/my_TextView_style_v2"
android:layout_alignTop="@id/cb_sure_subscribe_insure_switch"
android:layout_alignBottom="@id/cb_sure_subscribe_insure_switch"
android:text="@string/txt_replacement_year"
android:textSize="@dimen/textSize14" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/dp_1"
android:layout_below="@id/tv_sure_subscribe_plan_insurance"
android:layout_marginEnd="@dimen/dp_45"
android:gravity="start"
android:text="@string/txt_replace_guarantee_dec"
android:textSize="@dimen/textSize14"
app:lineHeight="@dimen/textSize16"
app:typeface="@string/roboto_regular_font" />
android:layout_marginTop="@dimen/dp_10"
android:background="@color/block_color" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_sure_subscribe_plan_insurance_money"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_sure_subscribe_plan_auto_renew_dec"
android:layout_marginTop="@dimen/dp_10"
android:layout_below="@id/tv_sure_subscribe_plan_insurance"
android:layout_alignParentEnd="true"
android:layout_marginTop="@dimen/dp_20"
android:text="@string/txt_money_unit"
android:textColor="@color/select_color"
android:textSize="@dimen/textSize26"
android:textStyle="bold"
android:visibility="gone" />
android:textSize="@dimen/textSize16" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_sure_subscribe_plan_insurance_per"
android:id="@+id/tv_sure_subscribe_plan_insurance_per_money"
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_sure_subscribe_plan_auto_renew_dec"
android:layout_marginTop="@dimen/dp_6"
android:text="1 x $12.9"
android:layout_alignTop="@id/tv_sure_subscribe_plan_insurance_money"
android:layout_alignBottom="@id/tv_sure_subscribe_plan_insurance_money"
android:text="@string/txt_money_unit"
android:textColor="@color/select_color"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_regular_font" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_sure_subscribe_plan_insurance_per"
style="@style/my_TextView_style_v2"
android:layout_alignBaseline="@id/tv_sure_subscribe_plan_insurance_per_money"
android:layout_toEndOf="@id/tv_sure_subscribe_plan_insurance_per_money"
android:text="@string/txt_month_unit"
android:textSize="@dimen/textSize14"
app:typeface="@string/roboto_regular_font" />
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>

3
app/src/main/res/layout/layout_sure_subscribe_plan_detail_layout.xml
View File

@@ -42,6 +42,7 @@
style="@style/my_TextView_style_v2"
android:layout_below="@id/tv_sure_subscribe_plan_name"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_2"
android:text="@string/txt_money_unit"
android:textColor="@color/select_color"
android:textStyle="bold" />
@@ -49,8 +50,8 @@
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_sure_subscribe_plan_per"
style="@style/my_TextView_style_v2"
android:layout_alignBaseline="@id/tv_sure_subscribe_plan_money"
android:layout_alignTop="@id/tv_sure_subscribe_plan_money"
android:layout_alignBottom="@id/tv_sure_subscribe_plan_money"
android:layout_toEndOf="@id/tv_sure_subscribe_plan_money"
android:text="@string/txt_per_month"
android:textSize="@dimen/textSize14"

32
app/src/main/res/values/strings.xml
View File

@@ -676,11 +676,11 @@
<string name="txt_benefits">Benefits</string>
<string name="txt_monthly_subscription">Monthly Subscription</string>
<string name="txt_money_unit">$%s</string>
<string name="txt_per_month">/per month</string>
<string name="txt_per_year">/per year</string>
<string name="txt_per_month_money">$%s/per month</string>
<string name="txt_per_year_money">$%s/per year</string>
<string name="txt_popular">Popular</string>
<string name="txt_per_month">/month</string>
<string name="txt_per_year">/year</string>
<string name="txt_per_month_money">$%s/month</string>
<string name="txt_per_year_money">$%s/year</string>
<string name="txt_popular">Best value</string>
<string name="txt_confirm_plan">Confirm Your Plan</string>
<string name="txt_device_number">Device Number</string>
<string name="txt_terms_conditions_v2">Terms and Conditions</string>
@@ -941,12 +941,12 @@
<string name="txt_renewal_month">Renewal: $%s/month on %s</string>
<string name="txt_renewal_month1">Renewal:</string>
<string name="txt_renewal_month2">/month on</string>
<string name="txt_annual_care">Annual Care Protection</string>
<string name="txt_annual_care">Replacement Coverage</string>
<string name="txt_replace_guarantee_dec">$12.90/year for peace of mind and easy 1-unit replacement annually.</string>
<string name="txt_replace_guarantee">Replacement Guarantee</string>
<string name="txt_enter_discount_code">Enter discount code</string>
<string name="txt_check">Check</string>
<string name="txt_annual_care_text">Annual Care</string>
<string name="txt_annual_care_text">Replacement Coverage</string>
<string name="txt_annual_care_text1">Annual Care: </string>
<string name="txt_ble_connect_fail">Bluetooth connection failed</string>
<string name="txt_led_light_set">LED Light Settings</string>
@@ -966,7 +966,7 @@
<string name="txt_expired">Expired</string>
<string name="txt_upgrade_plan">Upgrade Your Plan</string>
<string name="txt_residual_value">Residual Value</string>
<string name="txt_month_unit">/%s month</string>
<string name="txt_month_unit">/month x%s</string>
<string name="txt_auto_subscription_year">(Renew at $%s per year thereafter)</string>
<string name="txt_auto_subscription_year1">(Renew at </string>
<string name="txt_auto_subscription_year2">per year thereafter)</string>
@@ -1030,5 +1030,21 @@
<string name="txt_as_low_as">As low as</string>
<string name="txt_payment_manager">Payment Manager</string>
<string name="txt_billed_annually">Billed annually</string>
<string name="txt_basic_plan">Basic Plan</string>
<string name="txt_premium_plan">Premium Plan</string>
<string name="txt_real_time_tracking">Real-time Tracking</string>
<string name="txt_activity_logs">Activity/Resting Logs</string>
<string name="txt_notifications_emergencies">Notifications for Emergencies</string>
<string name="txt_customized_led">Customized LED</string>
<string name="txt_bluetooth_radar">Bluetooth Radar</string>
<string name="txt_geofencing">Geofencing</string>
<string name="txt_route_records">Route History Records</string>
<string name="txt_family_sharing">Family Members Sharing</string>
<string name="txt_customer_support">Premium Customer Support</string>
<string name="txt_renewal_years">Renewal: $%s/%s years on %s</string>
<string name="txt_renewal_months">Renewal: $%s/%s months on %s</string>
<string name="txt_replacement_year">1 replacement/year, any reason</string>
</resources>