From ce4ea39afd14301dd1df0501a657fa6de97d576a Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 27 Nov 2018 17:11:35 +0800
Subject: [PATCH] [*]修改主页指针跳转动画
---
app/src/main/res/layout/fragment_setting_layout.xml | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/app/src/main/res/layout/fragment_setting_layout.xml b/app/src/main/res/layout/fragment_setting_layout.xml
index 53a3afd..a1f3697 100644
--- a/app/src/main/res/layout/fragment_setting_layout.xml
+++ b/app/src/main/res/layout/fragment_setting_layout.xml
@@ -43,17 +43,19 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="������������"
android:layout_alignParentRight="true"
- android:textColor="@color/dark_gray_txt"
android:drawableRight="@mipmap/icon_jiantou"
android:drawablePadding="@dimen/x6"
+ android:text="������������"
+ android:textColor="@color/dark_gray_txt"
android:textSize="16sp" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -76,14 +78,17 @@
android:textSize="16sp" />
<android.support.v7.widget.SwitchCompat
+ android:id="@+id/sc_open"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"/>
+ android:layout_alignParentRight="true" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
<RelativeLayout
android:id="@+id/rl_setvoice"
android:layout_width="match_parent"
@@ -102,13 +107,63 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/x10"
android:layout_toRightOf="@+id/iv3"
- android:text="������������"
- android:textColor="@color/dark_gray_txt"
android:drawableRight="@mipmap/icon_jiantou"
+ android:text="���������������������"
+ android:textColor="@color/dark_gray_txt"
android:textSize="16sp" />
+
+ <Button
+ android:id="@+id/sc_male"
+ android:layout_width="wrap_content"
+ android:layout_height="@dimen/x30"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:layout_marginRight="@dimen/x20"
+ android:background="@drawable/choose_button"
+ android:stateListAnimator="@anim/progress"
+ android:text="������"
+ android:textColor="@color/dark_gray_txt" />
</RelativeLayout>
+
<View
android:layout_width="match_parent"
android:layout_height="1dp"
- android:background="@color/gray_line"/>
+ android:background="@color/gray_line" />
+
+ <Button
+ android:id="@+id/bt_sure"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x40"
+ android:layout_marginLeft="@dimen/x40"
+ android:layout_marginTop="@dimen/x24"
+ android:layout_marginRight="@dimen/x40"
+ android:background="@mipmap/bt_blue"
+ android:paddingBottom="@dimen/x10"
+ android:text="������������"
+ android:textColor="@color/white"
+ android:textSize="16sp" />
+
+ <Button
+ android:id="@+id/bt_look"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/x40"
+ android:layout_marginLeft="@dimen/x40"
+ android:layout_marginTop="@dimen/x24"
+ android:layout_marginRight="@dimen/x40"
+ android:background="@mipmap/bt_blue"
+ android:gravity="center"
+ android:text="������������"
+ android:textColor="@color/white"
+ android:textSize="16sp"
+ android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/tv_version"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="30dp"
+ android:gravity="center_horizontal|bottom"
+ android:text="������������V1.0"
+ android:textColor="@color/dark_gray_txt"
+ android:textSize="18sp" />
</LinearLayout>
\ No newline at end of file
--
Gitblit v1.8.0