From 2c76ecbb7edf6e30f1dda4c930a02945c360ecab Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Tue, 27 Nov 2018 17:18:57 +0800
Subject: [PATCH] [*]修改页面动画
---
app/src/main/res/values/styles.xml | 4 ++++
.gradle/4.1/fileHashes/fileHashes.lock | 0
.gradle/4.1/taskHistory/taskHistory.bin | 0
.gradle/4.1/javaCompile/classAnalysis.bin | 0
app/src/main/res/layout/ac_register_layout.xml | 2 ++
app/src/main/res/animator/button_pregress.xml | 33 +++++++++++++++++++++++++++++++++
app/src/main/res/mipmap-xxhdpi/weixin2.png | 0
app/src/main/res/layout/ac_login_layout.xml | 6 ++++--
app/src/main/res/layout/fragment_setting_layout.xml | 1 +
.gradle/4.1/fileHashes/fileHashes.bin | 0
.gradle/4.1/taskHistory/fileSnapshots.bin | 0
.gradle/4.1/javaCompile/javaCompile.lock | 0
app/src/main/res/layout/ac_forget_password_layout.xml | 2 ++
.gradle/4.1/taskHistory/taskHistory.lock | 0
.gradle/4.1/javaCompile/taskHistory.bin | 0
15 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/.gradle/4.1/fileHashes/fileHashes.bin b/.gradle/4.1/fileHashes/fileHashes.bin
index 4721e3f..4614d23 100644
--- a/.gradle/4.1/fileHashes/fileHashes.bin
+++ b/.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
diff --git a/.gradle/4.1/fileHashes/fileHashes.lock b/.gradle/4.1/fileHashes/fileHashes.lock
index 26cd14b..5e9d89e 100644
--- a/.gradle/4.1/fileHashes/fileHashes.lock
+++ b/.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/classAnalysis.bin b/.gradle/4.1/javaCompile/classAnalysis.bin
index 9ad0c23..0cb3ba8 100644
--- a/.gradle/4.1/javaCompile/classAnalysis.bin
+++ b/.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
diff --git a/.gradle/4.1/javaCompile/javaCompile.lock b/.gradle/4.1/javaCompile/javaCompile.lock
index 574c611..2e8aefb 100644
--- a/.gradle/4.1/javaCompile/javaCompile.lock
+++ b/.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
diff --git a/.gradle/4.1/javaCompile/taskHistory.bin b/.gradle/4.1/javaCompile/taskHistory.bin
index 30ecb15..52e582c 100644
--- a/.gradle/4.1/javaCompile/taskHistory.bin
+++ b/.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/fileSnapshots.bin b/.gradle/4.1/taskHistory/fileSnapshots.bin
index 4ad5d0f..ae82f9f 100644
--- a/.gradle/4.1/taskHistory/fileSnapshots.bin
+++ b/.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.bin b/.gradle/4.1/taskHistory/taskHistory.bin
index fc39ce8..ac53b4c 100644
--- a/.gradle/4.1/taskHistory/taskHistory.bin
+++ b/.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
diff --git a/.gradle/4.1/taskHistory/taskHistory.lock b/.gradle/4.1/taskHistory/taskHistory.lock
index 80b5fb9..9180612 100644
--- a/.gradle/4.1/taskHistory/taskHistory.lock
+++ b/.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
diff --git a/app/src/main/res/animator/button_pregress.xml b/app/src/main/res/animator/button_pregress.xml
new file mode 100644
index 0000000..71bacb3
--- /dev/null
+++ b/app/src/main/res/animator/button_pregress.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:state_enabled="true"
+ android:state_pressed="true">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="@android:integer/config_shortAnimTime"
+ android:propertyName="scaleX"
+ android:valueTo="0.8"
+ android:valueType="floatType" />
+ <objectAnimator
+ android:duration="@android:integer/config_shortAnimTime"
+ android:propertyName="scaleY"
+ android:valueTo="0.8"
+ android:valueType="floatType" />
+ </set>
+ </item>
+ <item>
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="@android:integer/config_shortAnimTime"
+ android:propertyName="scaleX"
+ android:valueTo="1.0"
+ android:valueType="floatType" />
+ <objectAnimator
+ android:duration="@android:integer/config_shortAnimTime"
+ android:propertyName="scaleY"
+ android:valueTo="1.0"
+ android:valueType="floatType" />
+ </set>
+ </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/ac_forget_password_layout.xml b/app/src/main/res/layout/ac_forget_password_layout.xml
index 838f32c..8998545 100644
--- a/app/src/main/res/layout/ac_forget_password_layout.xml
+++ b/app/src/main/res/layout/ac_forget_password_layout.xml
@@ -50,6 +50,7 @@
android:paddingRight="@dimen/x8"
android:paddingBottom="@dimen/x12"
android:paddingTop="@dimen/x12"
+ style="@style/button_style"
android:text="���������������"
android:layout_alignBaseline="@+id/et_code"
android:layout_alignBottom="@+id/et_code"
@@ -134,6 +135,7 @@
android:background="@mipmap/bt_blue"
android:gravity="center"
android:text="������"
+ style="@style/button_style"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/ac_login_layout.xml b/app/src/main/res/layout/ac_login_layout.xml
index d5a903d..0393c1d 100644
--- a/app/src/main/res/layout/ac_login_layout.xml
+++ b/app/src/main/res/layout/ac_login_layout.xml
@@ -123,22 +123,24 @@
<Button
android:id="@+id/bt_sure"
+ style="@style/button_style"
android:layout_width="match_parent"
android:layout_height="@dimen/x40"
android:layout_marginLeft="@dimen/x40"
android:layout_marginTop="@dimen/x12"
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/weixinlogin"
+ style="@style/button_style"
android:layout_width="@dimen/x44"
android:layout_height="@dimen/x44"
android:layout_gravity="bottom|center"
android:layout_marginTop="@dimen/x2"
- android:background="@mipmap/weixin"
- android:stateListAnimator="@anim/progress" />
+ android:background="@mipmap/weixin2" />
</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/ac_register_layout.xml b/app/src/main/res/layout/ac_register_layout.xml
index 57618ba..5054193 100644
--- a/app/src/main/res/layout/ac_register_layout.xml
+++ b/app/src/main/res/layout/ac_register_layout.xml
@@ -160,6 +160,8 @@
android:background="@mipmap/bt_blue"
android:gravity="center"
android:text="������"
+ android:paddingBottom="@dimen/x10"
+ style="@style/button_style"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/layout/fragment_setting_layout.xml b/app/src/main/res/layout/fragment_setting_layout.xml
index a1f3697..219c535 100644
--- a/app/src/main/res/layout/fragment_setting_layout.xml
+++ b/app/src/main/res/layout/fragment_setting_layout.xml
@@ -140,6 +140,7 @@
android:background="@mipmap/bt_blue"
android:paddingBottom="@dimen/x10"
android:text="������������"
+ style="@style/button_style"
android:textColor="@color/white"
android:textSize="16sp" />
diff --git a/app/src/main/res/mipmap-xxhdpi/weixin2.png b/app/src/main/res/mipmap-xxhdpi/weixin2.png
new file mode 100644
index 0000000..dbed673
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/weixin2.png
Binary files differ
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cc97e9e..0b886de 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -50,4 +50,8 @@
<item name="android:textSize">12sp</item>
<item name="android:background">@drawable/black_rect_bg</item>
</style>
+
+ <style name="button_style">
+ <item name="android:stateListAnimator">@animator/button_pregress</item>
+ </style>
</resources>
--
Gitblit v1.8.0