diff --git a/.idea/misc.xml b/.idea/misc.xml index ba7052b..635999d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 15bf509..b1c66fc 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,6 +6,8 @@ + + + app:srcCompat="?app_icon_menu" /> @@ -73,7 +74,7 @@ android:layout_alignParentRight="true" android:layout_marginBottom="24dp" android:layout_marginRight="20dp" - android:background="@drawable/gank_icon_go_top" /> + app:srcCompat="@drawable/gank_icon_go_top" /> diff --git a/app/src/main/res/layout/activity_edit_user_info.xml b/app/src/main/res/layout/activity_edit_user_info.xml index 7815179..0e774e1 100644 --- a/app/src/main/res/layout/activity_edit_user_info.xml +++ b/app/src/main/res/layout/activity_edit_user_info.xml @@ -40,7 +40,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginRight="10dp" - android:background="@drawable/gank_icon_arrow_right" + app:srcCompat="@drawable/gank_icon_arrow_right" /> + app:srcCompat="@drawable/gank_ic_back_white" /> diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 6186b15..28c1ade 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -1,5 +1,6 @@ + app:srcCompat="?arrow_down_white" /> diff --git a/app/src/main/res/layout/item_more_tools_item.xml b/app/src/main/res/layout/item_more_tools_item.xml index c3986ba..cc9024b 100644 --- a/app/src/main/res/layout/item_more_tools_item.xml +++ b/app/src/main/res/layout/item_more_tools_item.xml @@ -22,7 +22,6 @@ android:layout_marginLeft="6dp" android:layout_marginRight="6dp" android:layout_marginTop="10dp" - android:ellipsize="middle" android:maxLines="1" android:text="工具" android:textColor="@color/black_text3_color" diff --git a/app/src/main/res/layout/layout_refresh_footer.xml b/app/src/main/res/layout/layout_refresh_footer.xml index b666cd7..6fd2992 100755 --- a/app/src/main/res/layout/layout_refresh_footer.xml +++ b/app/src/main/res/layout/layout_refresh_footer.xml @@ -2,7 +2,8 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + > + app:matProg_barColor="?refresh_text_color" + app:matProg_barWidth="2dp" + app:matProg_progressIndeterminate="true"/> + app:srcCompat="?refresh_success_icon" /> + xmlns:wheel="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/tools"> + app:srcCompat="?refresh_success_icon" /> + android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/tools"> + app:srcCompat="?refresh_arrow_icon" /> + app:srcCompat="?refresh_success_icon" /> + path="."/> + path="."/> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 494f3a3..02e06ff 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ ext { buildToolsVersion = "26.0.2" minSdkVersion = 16 targetSdkVersion = 25 - versionCode = 24 + versionCode = 23 versionName = "1.6.7" storePassword = "123456" keyAlias = "Gank"