陈奇
2018-11-27 2c76ecbb7edf6e30f1dda4c930a02945c360ecab
[*]修改页面动画
2 files added
13 files modified
48 ■■■■■ changed files
.gradle/4.1/fileHashes/fileHashes.bin patch | view | raw | blame | history
.gradle/4.1/fileHashes/fileHashes.lock patch | view | raw | blame | history
.gradle/4.1/javaCompile/classAnalysis.bin patch | view | raw | blame | history
.gradle/4.1/javaCompile/javaCompile.lock patch | view | raw | blame | history
.gradle/4.1/javaCompile/taskHistory.bin patch | view | raw | blame | history
.gradle/4.1/taskHistory/fileSnapshots.bin patch | view | raw | blame | history
.gradle/4.1/taskHistory/taskHistory.bin patch | view | raw | blame | history
.gradle/4.1/taskHistory/taskHistory.lock patch | view | raw | blame | history
app/src/main/res/animator/button_pregress.xml 33 ●●●●● patch | view | raw | blame | history
app/src/main/res/layout/ac_forget_password_layout.xml 2 ●●●●● patch | view | raw | blame | history
app/src/main/res/layout/ac_login_layout.xml 6 ●●●●● patch | view | raw | blame | history
app/src/main/res/layout/ac_register_layout.xml 2 ●●●●● patch | view | raw | blame | history
app/src/main/res/layout/fragment_setting_layout.xml 1 ●●●● patch | view | raw | blame | history
app/src/main/res/mipmap-xxhdpi/weixin2.png patch | view | raw | blame | history
app/src/main/res/values/styles.xml 4 ●●●● patch | view | raw | blame | history
.gradle/4.1/fileHashes/fileHashes.bin
Binary files differ
.gradle/4.1/fileHashes/fileHashes.lock
Binary files differ
.gradle/4.1/javaCompile/classAnalysis.bin
Binary files differ
.gradle/4.1/javaCompile/javaCompile.lock
Binary files differ
.gradle/4.1/javaCompile/taskHistory.bin
Binary files differ
.gradle/4.1/taskHistory/fileSnapshots.bin
Binary files differ
.gradle/4.1/taskHistory/taskHistory.bin
Binary files differ
.gradle/4.1/taskHistory/taskHistory.lock
Binary files differ
app/src/main/res/animator/button_pregress.xml
New file
@@ -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>
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" />
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>
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" />
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" />
app/src/main/res/mipmap-xxhdpi/weixin2.png
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>