|
|
@@ -42,7 +42,9 @@
|
|
|
<TextView style="@style/style_item_end_next" />
|
|
|
|
|
|
</LinearLayout>
|
|
|
- <View style="@style/style_item_line_new"
|
|
|
+
|
|
|
+ <View
|
|
|
+ style="@style/style_item_line_new"
|
|
|
android:visibility="gone" />
|
|
|
|
|
|
<LinearLayout
|
|
|
@@ -62,7 +64,7 @@
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
- <View style="@style/style_item_line_new"/>
|
|
|
+ <View style="@style/style_item_line_new" />
|
|
|
|
|
|
<LinearLayout
|
|
|
android:id="@+id/order_layout"
|
|
|
@@ -83,16 +85,16 @@
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
- <View style="@style/style_item_line_new"/>
|
|
|
+ <View style="@style/style_item_line_new" />
|
|
|
|
|
|
<RelativeLayout
|
|
|
android:id="@+id/voucher_layout"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:paddingTop="@dimen/content_padding_16"
|
|
|
android:paddingBottom="@dimen/content_padding_16"
|
|
|
- android:paddingStart="@dimen/content_padding_8"
|
|
|
android:paddingEnd="@dimen/content_padding_30"
|
|
|
+ android:paddingStart="@dimen/content_padding_8"
|
|
|
+ android:paddingTop="@dimen/content_padding_16"
|
|
|
android:visibility="visible">
|
|
|
|
|
|
<ImageView
|
|
|
@@ -104,33 +106,35 @@
|
|
|
android:id="@+id/voucher_label"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_toRightOf="@+id/voucher_icon"
|
|
|
android:layout_marginStart="12dp"
|
|
|
- android:text="我的福利" />
|
|
|
+ android:layout_toRightOf="@+id/voucher_icon"
|
|
|
+ android:text="我的福利"
|
|
|
+ android:textColor="@color/black_444444"
|
|
|
+ android:textSize="14sp" />
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/voucher_red_dot"
|
|
|
- android:text="new"
|
|
|
- android:textColor="@android:color/white"
|
|
|
- android:textSize="6sp"
|
|
|
- android:rotation="-20"
|
|
|
- android:padding="2dp"
|
|
|
- android:layout_toRightOf="@+id/voucher_label"
|
|
|
- android:layout_marginStart="4dp"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:background="@drawable/shape_red_solid_rectangle_18"/>
|
|
|
+ android:layout_marginStart="4dp"
|
|
|
+ android:layout_toRightOf="@+id/voucher_label"
|
|
|
+ android:background="@drawable/shape_red_solid_rectangle_18"
|
|
|
+ android:padding="2dp"
|
|
|
+ android:rotation="-20"
|
|
|
+ android:text="new"
|
|
|
+ android:textColor="@android:color/white"
|
|
|
+ android:textSize="6sp" />
|
|
|
|
|
|
<TextView
|
|
|
- android:layout_alignParentEnd="true"
|
|
|
style="@style/style_item_end_next"
|
|
|
+ android:layout_alignParentEnd="true"
|
|
|
android:visibility="visible" />
|
|
|
|
|
|
</RelativeLayout>
|
|
|
|
|
|
<View
|
|
|
android:id="@+id/fgt_person_center_my_focus_line"
|
|
|
- style="@style/style_item_line_new"/>
|
|
|
+ style="@style/style_item_line_new" />
|
|
|
|
|
|
<LinearLayout
|
|
|
android:id="@+id/fgt_person_center_my_focus"
|
|
|
@@ -174,8 +178,9 @@
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
- <View style="@style/style_item_line_new"
|
|
|
- android:visibility="gone"/>
|
|
|
+ <View
|
|
|
+ style="@style/style_item_line_new"
|
|
|
+ android:visibility="gone" />
|
|
|
|
|
|
<LinearLayout
|
|
|
android:id="@+id/proxy_game_account_layout"
|
