布局修改VectorDrawableCompat部分使用替换app:srcCompat

maning0303 · Jan 9, 2018 · 2cce3e0 · 2cce3e0
1 parent 8672814
commit 2cce3e0
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 26 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,8 @@
     <uses-sdk tools:overrideLibrary="com.sdsmdg.harjot.materialshadows"/>
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <!--8.0安装需要的权限-->
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <!-- Jpush -->
     <permission

diff --git a/app/src/main/res/layout/activity_codes.xml b/app/src/main/res/layout/activity_codes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -28,7 +29,7 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="10dp"
-                    android:src="?app_icon_menu" />
+                    app:srcCompat="?app_icon_menu" />
 
             </RelativeLayout>
 
@@ -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" />
 
     </RelativeLayout>
 

diff --git 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"
             />
 
         <de.hdodenhof.circleimageview.CircleImageView
@@ -92,7 +92,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"
             />
 
         <TextView
@@ -140,7 +140,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"
             />
 
         <TextView
@@ -187,7 +187,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"
             />
 
         <TextView
@@ -235,7 +235,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"
             />
 
         <TextView

diff --git a/app/src/main/res/layout/activity_train.xml b/app/src/main/res/layout/activity_train.xml
@@ -79,7 +79,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
                     android:background="@null"
-                    android:ellipsize="middle"
                     android:hint="出发城市"
                     android:maxLines="1"
                     android:padding="0dp"
@@ -126,7 +125,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
                     android:background="@null"
-                    android:ellipsize="middle"
                     android:gravity="right"
                     android:hint="到达城市"
                     android:maxLines="1"

diff --git a/app/src/main/res/layout/activity_weather.xml b/app/src/main/res/layout/activity_weather.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rl_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -52,7 +53,7 @@
                     android:layout_width="24dp"
                     android:layout_height="24dp"
                     android:layout_centerVertical="true"
-                    android:background="@drawable/gank_ic_back_white" />
+                    app:srcCompat="@drawable/gank_ic_back_white" />
 
             </RelativeLayout>
 

diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/menu_header"
     android:layout_width="match_parent"
     android:layout_height="220dp"
@@ -83,7 +84,7 @@
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_marginLeft="6dp"
-            android:background="?arrow_down_white" />
+            app:srcCompat="?arrow_down_white" />
 
     </LinearLayout>
 

diff --git 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
@@ -2,7 +2,8 @@
 <com.maning.gankmm.ui.view.ClassicLoadMoreFooterView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:wheel="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -15,9 +16,9 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="4dp"
             android:layout_toLeftOf="@+id/tvLoadMore"
-            wheel:matProg_barColor="?refresh_text_color"
-            wheel:matProg_barWidth="2dp"
-            wheel:matProg_progressIndeterminate="true"/>
+            app:matProg_barColor="?refresh_text_color"
+            app:matProg_barWidth="2dp"
+            app:matProg_progressIndeterminate="true"/>
 
         <ImageView
             android:id="@+id/ivSuccess"
@@ -26,7 +27,7 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="8dp"
             android:layout_toLeftOf="@+id/tvLoadMore"
-            android:background="?refresh_success_icon" />
+            app:srcCompat="?refresh_success_icon" />
 
         <TextView
             android:id="@+id/tvLoadMore"

diff --git a/app/src/main/res/layout/layout_refresh_footer_normal.xml b/app/src/main/res/layout/layout_refresh_footer_normal.xml
@@ -2,7 +2,8 @@
 <com.maning.gankmm.ui.view.ClassicLoadMoreFooterView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:wheel="http://schemas.android.com/apk/res-auto">
+    xmlns:wheel="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -26,7 +27,7 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="8dp"
             android:layout_toLeftOf="@+id/tvLoadMore"
-            android:background="?refresh_success_icon" />
+            app:srcCompat="?refresh_success_icon" />
 
         <TextView
             android:id="@+id/tvLoadMore"

diff --git a/app/src/main/res/layout/layout_refresh_header.xml b/app/src/main/res/layout/layout_refresh_header.xml
@@ -2,7 +2,8 @@
 <com.maning.gankmm.ui.view.TwitterRefreshHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:wheel="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/tools">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -16,7 +17,7 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="45dp"
             android:layout_toLeftOf="@+id/tvRefresh"
-            android:background="?refresh_arrow_icon" />
+            app:srcCompat="?refresh_arrow_icon" />
 
         <ImageView
             android:id="@+id/ivSuccess"
@@ -25,7 +26,7 @@
             android:layout_centerVertical="true"
             android:layout_marginRight="48dp"
             android:layout_toLeftOf="@+id/tvRefresh"
-            android:background="?refresh_success_icon" />
+            app:srcCompat="?refresh_success_icon" />
 
         <com.maning.gankmm.ui.view.ProgressWheel
             android:id="@+id/progressbar"

diff --git a/app/src/main/res/xml/file_provider.xml b/app/src/main/res/xml/file_provider.xml
@@ -4,10 +4,10 @@
     <!--升级-->
     <external-cache-path
         name="mn_update_external_cache"
-        path=""/>
+        path="."/>
 
     <cache-path
         name="mn_update_cache"
-        path=""/>
+        path="."/>
 
 </paths>
diff --git 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"