|
|
@@ -14,7 +14,7 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent"
|
|
|
android:orientation="vertical"
|
|
|
- android:paddingTop="@dimen/activity_horizontal_margin_ss">
|
|
|
+ android:paddingTop="@dimen/margin_s">
|
|
|
|
|
|
<include layout="@layout/view_divider_common" />
|
|
|
|
|
|
@@ -27,8 +27,7 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:minHeight="@dimen/height_tab_bar"
|
|
|
+ android:layout_height="@dimen/height_tool_item"
|
|
|
android:orientation="vertical"
|
|
|
android:paddingStart="@dimen/activity_horizontal_margin"
|
|
|
android:paddingEnd="@dimen/activity_horizontal_margin"
|
|
|
@@ -64,8 +63,7 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:minHeight="@dimen/height_tab_bar"
|
|
|
+ android:layout_height="@dimen/height_tool_item"
|
|
|
android:orientation="vertical"
|
|
|
android:paddingStart="@dimen/activity_horizontal_margin"
|
|
|
android:paddingEnd="@dimen/activity_horizontal_margin"
|
|
|
@@ -101,8 +99,7 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:minHeight="@dimen/height_tab_bar"
|
|
|
+ android:layout_height="@dimen/height_tool_item"
|
|
|
android:orientation="vertical"
|
|
|
android:paddingStart="@dimen/activity_horizontal_margin"
|
|
|
android:paddingEnd="@dimen/activity_horizontal_margin"
|
|
|
@@ -138,8 +135,7 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:minHeight="@dimen/height_tab_bar"
|
|
|
+ android:layout_height="@dimen/height_tool_item"
|
|
|
android:orientation="vertical"
|
|
|
android:paddingStart="@dimen/activity_horizontal_margin"
|
|
|
android:paddingEnd="@dimen/activity_horizontal_margin"
|
|
|
@@ -161,7 +157,7 @@
|
|
|
android:layout_marginTop="@dimen/margin_sss"
|
|
|
android:textColor="@color/gray_text_s"
|
|
|
android:textSize="@dimen/text_normal_s"
|
|
|
- android:text="返回今日天气信息(限时免费)"/>
|
|
|
+ android:text="返回今日天气信息(免费开放中)"/>
|
|
|
</LinearLayout>
|
|
|
</FrameLayout>
|
|
|
<include layout="@layout/view_divider_common" />
|
|
|
@@ -175,8 +171,7 @@
|
|
|
|
|
|
<LinearLayout
|
|
|
android:layout_width="match_parent"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:minHeight="@dimen/height_tab_bar"
|
|
|
+ android:layout_height="@dimen/height_tool_item"
|
|
|
android:orientation="vertical"
|
|
|
android:paddingStart="@dimen/activity_horizontal_margin"
|
|
|
android:paddingEnd="@dimen/activity_horizontal_margin"
|
|
|
@@ -198,7 +193,7 @@
|
|
|
android:layout_marginTop="@dimen/margin_sss"
|
|
|
android:textColor="@color/gray_text_s"
|
|
|
android:textSize="@dimen/text_normal_s"
|
|
|
- android:text="返回当天宜忌信息(限时免费)"/>
|
|
|
+ android:text="返回当天宜忌信息(免费开放中)"/>
|
|
|
</LinearLayout>
|
|
|
</FrameLayout>
|
|
|
<include layout="@layout/view_divider_common" />
|