新增周期3天,5天的订阅,后台已同步以天为单位的订阅;

添加图片后,再输入邮箱,输入框被挡住;
订阅加载套餐详情时,保险有个默认值64.8元,导致买3个月套餐却支付了3年的保险;
wifi 设置跳过密码输入页面。
This commit is contained in:
yezhiqiu
2026-01-06 09:41:22 +08:00
parent 9a6df5bbc9
commit 5381a21c63
15 changed files with 106 additions and 43 deletions

View File

@@ -12,13 +12,16 @@
layout="@layout/layout_top_bar" />
<androidx.core.widget.NestedScrollView style="@style/my_ScrollView_style">
<androidx.core.widget.NestedScrollView
android:id="@+id/sv_setting_feedback_scroll"
style="@style/my_ScrollView_style">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ll_setting_feedback_layout"
style="@style/root_layout_style"
android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginVertical="@dimen/dp_18"
android:id="@+id/ll_setting_feedback_layout"
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.abbidot.tracker.widget.TypefaceTextView

View File

@@ -14,7 +14,8 @@
<androidx.core.widget.NestedScrollView
android:id="@+id/sv_subscribe_plan_layout"
style="@style/my_ScrollView_style"
android:layout_weight="1">
android:layout_weight="1"
android:visibility="gone">
<androidx.appcompat.widget.LinearLayoutCompat
style="@style/root_layout_style"
@@ -79,5 +80,6 @@
android:layout_marginHorizontal="@dimen/dp_16"
android:text="@string/txt_continue"
app:qmui_radius="@dimen/dp_64"
android:visibility="gone"
app:typeface="@string/roboto_bold_font" />
</androidx.appcompat.widget.LinearLayoutCompat>

View File

@@ -73,6 +73,7 @@
android:textStyle="bold" />
<com.abbidot.tracker.widget.TypefaceTextView
android:id="@+id/tv_choose_plan_item_unit"
style="@style/my_TextView_style_v2"
android:layout_alignBaseline="@id/tv_choose_plan_item_money"
android:layout_alignTop="@id/tv_choose_plan_item_money"

View File

@@ -1057,4 +1057,9 @@
<string name="txt_edit_profile">Edit Profile</string>
<string name="txt_no_internet">No internet connection</string>
<string name="txt_per_day">/day</string>
<string name="txt_renewal_day">Renewal: $%s/%s day on %s</string>
<string name="txt_day_unit">/day x%s</string>
<string name="txt_auto_subscription_day">(Renew at $%s per %s day thereafter)</string>
</resources>