Procházet zdrojové kódy

1.修改Android Apex Drivers部分图标。

Pen Li před 7 roky
rodič
revize
7fb0fcd45b
43 změnil soubory, kde provedl 29 přidání a 21 odebrání
  1. 5 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/MainActivity.java
  2. 1 1
      ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailAdapter.java
  3. binární
      ApexDrivers/app/src/main/res/drawable-hdpi/btn_map.png
  4. binární
      ApexDrivers/app/src/main/res/drawable-hdpi/btn_navigation.png
  5. binární
      ApexDrivers/app/src/main/res/drawable-hdpi/btn_scanner.png
  6. binární
      ApexDrivers/app/src/main/res/drawable-hdpi/check_mark.png
  7. binární
      ApexDrivers/app/src/main/res/drawable-hdpi/indicator.png
  8. binární
      ApexDrivers/app/src/main/res/drawable-hdpi/upload_list.png
  9. binární
      ApexDrivers/app/src/main/res/drawable-ldpi/btn_map.png
  10. binární
      ApexDrivers/app/src/main/res/drawable-ldpi/btn_navigation.png
  11. binární
      ApexDrivers/app/src/main/res/drawable-ldpi/btn_scanner.png
  12. binární
      ApexDrivers/app/src/main/res/drawable-ldpi/check_mark.png
  13. binární
      ApexDrivers/app/src/main/res/drawable-ldpi/indicator.png
  14. binární
      ApexDrivers/app/src/main/res/drawable-ldpi/upload_list.png
  15. binární
      ApexDrivers/app/src/main/res/drawable-mdpi/btn_map.png
  16. binární
      ApexDrivers/app/src/main/res/drawable-mdpi/btn_navigation.png
  17. binární
      ApexDrivers/app/src/main/res/drawable-mdpi/btn_scanner.png
  18. binární
      ApexDrivers/app/src/main/res/drawable-mdpi/check_mark.png
  19. binární
      ApexDrivers/app/src/main/res/drawable-mdpi/indicator.png
  20. binární
      ApexDrivers/app/src/main/res/drawable-mdpi/upload_list.png
  21. binární
      ApexDrivers/app/src/main/res/drawable-xhdpi/btn_map.png
  22. binární
      ApexDrivers/app/src/main/res/drawable-xhdpi/btn_navigation.png
  23. binární
      ApexDrivers/app/src/main/res/drawable-xhdpi/btn_scanner.png
  24. binární
      ApexDrivers/app/src/main/res/drawable-xhdpi/check_mark.png
  25. binární
      ApexDrivers/app/src/main/res/drawable-xhdpi/indicator.png
  26. binární
      ApexDrivers/app/src/main/res/drawable-xhdpi/upload_list.png
  27. binární
      ApexDrivers/app/src/main/res/drawable-xxhdpi/btn_map.png
  28. binární
      ApexDrivers/app/src/main/res/drawable-xxhdpi/btn_navigation.png
  29. binární
      ApexDrivers/app/src/main/res/drawable-xxhdpi/btn_scanner.png
  30. binární
      ApexDrivers/app/src/main/res/drawable-xxhdpi/check_mark.png
  31. binární
      ApexDrivers/app/src/main/res/drawable-xxhdpi/indicator.png
  32. binární
      ApexDrivers/app/src/main/res/drawable-xxhdpi/upload_list.png
  33. 1 1
      ApexDrivers/app/src/main/res/drawable/animate.xml
  34. binární
      ApexDrivers/app/src/main/res/drawable/barcode_h.png
  35. binární
      ApexDrivers/app/src/main/res/drawable/barcode_n.png
  36. 2 2
      ApexDrivers/app/src/main/res/drawable/barcode_selector.xml
  37. binární
      ApexDrivers/app/src/main/res/drawable/checkmark.png
  38. 5 7
      ApexDrivers/app/src/main/res/layout/detail_location_cell.xml
  39. 4 2
      ApexDrivers/app/src/main/res/layout/detail_map_cell.xml
  40. 2 0
      ApexDrivers/app/src/main/res/layout/filter_date_cell.xml
  41. 4 2
      ApexDrivers/app/src/main/res/layout/filter_search_footer.xml
  42. 4 4
      ApexDrivers/app/src/main/res/layout/filter_status_cell.xml
  43. 1 1
      ApexDrivers/app/src/main/res/layout/option_item_cell.xml

+ 5 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/MainActivity.java

@@ -301,7 +301,11 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
         if (ApexDriverApplication.sharedApplication().isLogin()) {
 
             MenuItem uploadItem = menu.add(0, 0, 0, "Upload List");
-            uploadItem.setIcon(R.drawable.upload_list);
+
+            Drawable drawable = getResources().getDrawable(R.drawable.upload_list);
+            ImageUtil.renderingDrawable(drawable,getResources(),R.color.ApexDriverWhite);
+            uploadItem.setIcon(drawable);
+
             uploadItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
 //            menu.add(0, 1, 0, "Logout");

+ 1 - 1
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/detail/DetailAdapter.java

@@ -404,7 +404,7 @@ public class DetailAdapter extends BaseExpandableListAdapter {
 
         TextView titleTv;
         TextView locationTv;
-        Button navigationBtn;
+        ImageButton navigationBtn;
         WeakReference<DetailLocationModel> mWeakLocation;
 
         LocationHolder(View view) {

binární
ApexDrivers/app/src/main/res/drawable-hdpi/btn_map.png


binární
ApexDrivers/app/src/main/res/drawable-hdpi/btn_navigation.png


binární
ApexDrivers/app/src/main/res/drawable-hdpi/btn_scanner.png


binární
ApexDrivers/app/src/main/res/drawable-hdpi/check_mark.png


binární
ApexDrivers/app/src/main/res/drawable-hdpi/indicator.png


binární
ApexDrivers/app/src/main/res/drawable-hdpi/upload_list.png


binární
ApexDrivers/app/src/main/res/drawable-ldpi/btn_map.png


binární
ApexDrivers/app/src/main/res/drawable-ldpi/btn_navigation.png


binární
ApexDrivers/app/src/main/res/drawable-ldpi/btn_scanner.png


binární
ApexDrivers/app/src/main/res/drawable-ldpi/check_mark.png


binární
ApexDrivers/app/src/main/res/drawable-ldpi/indicator.png


binární
ApexDrivers/app/src/main/res/drawable-ldpi/upload_list.png


binární
ApexDrivers/app/src/main/res/drawable-mdpi/btn_map.png


binární
ApexDrivers/app/src/main/res/drawable-mdpi/btn_navigation.png


binární
ApexDrivers/app/src/main/res/drawable-mdpi/btn_scanner.png


binární
ApexDrivers/app/src/main/res/drawable-mdpi/check_mark.png


binární
ApexDrivers/app/src/main/res/drawable-mdpi/indicator.png


binární
ApexDrivers/app/src/main/res/drawable-mdpi/upload_list.png


binární
ApexDrivers/app/src/main/res/drawable-xhdpi/btn_map.png


binární
ApexDrivers/app/src/main/res/drawable-xhdpi/btn_navigation.png


binární
ApexDrivers/app/src/main/res/drawable-xhdpi/btn_scanner.png


binární
ApexDrivers/app/src/main/res/drawable-xhdpi/check_mark.png


binární
ApexDrivers/app/src/main/res/drawable-xhdpi/indicator.png


binární
ApexDrivers/app/src/main/res/drawable-xhdpi/upload_list.png


binární
ApexDrivers/app/src/main/res/drawable-xxhdpi/btn_map.png


binární
ApexDrivers/app/src/main/res/drawable-xxhdpi/btn_navigation.png


binární
ApexDrivers/app/src/main/res/drawable-xxhdpi/btn_scanner.png


binární
ApexDrivers/app/src/main/res/drawable-xxhdpi/check_mark.png


binární
ApexDrivers/app/src/main/res/drawable-xxhdpi/indicator.png


binární
ApexDrivers/app/src/main/res/drawable-xxhdpi/upload_list.png


+ 1 - 1
ApexDrivers/app/src/main/res/drawable/animate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
-                 android:drawable="@drawable/action_setting"
+                 android:drawable="@drawable/indicator"
                  android:fromDegrees="0.0"
                  android:pivotX="50.0%"
                  android:pivotY="50.0%"

binární
ApexDrivers/app/src/main/res/drawable/barcode_h.png


binární
ApexDrivers/app/src/main/res/drawable/barcode_n.png


+ 2 - 2
ApexDrivers/app/src/main/res/drawable/barcode_selector.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_pressed="true" android:drawable="@drawable/barcode_h">
+    <item android:state_pressed="true" android:drawable="@drawable/btn_scanner">
         <shape>
 
             <solid
@@ -11,7 +11,7 @@
         </shape>
     </item>
 
-    <item android:state_pressed="false" android:drawable="@drawable/barcode_n">
+    <item android:state_pressed="false" android:drawable="@drawable/btn_scanner">
         <shape>
 
             <solid

binární
ApexDrivers/app/src/main/res/drawable/checkmark.png


+ 5 - 7
ApexDrivers/app/src/main/res/layout/detail_location_cell.xml

@@ -22,18 +22,16 @@
             android:layout_alignRight="@id/detail_location_title_tv"
             >
 
-            <Button
+            <ImageButton
                 android:id="@+id/detail_location_nav_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
                 android:layout_marginRight="5dp"
                 android:layout_marginLeft="5dp"
-                android:textSize="17sp"
-                android:textColor="#44aaff"
-                android:text="Navigation"
-                android:textAllCaps="false"
+                android:src="@drawable/btn_navigation"
+                android:background="@drawable/clear_bg"
                 />
 
             <TextView

+ 4 - 2
ApexDrivers/app/src/main/res/layout/detail_map_cell.xml

@@ -34,12 +34,14 @@
 
         <ImageButton
             android:id="@+id/detail_map_view"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
             android:layout_centerVertical="true"
             android:layout_alignParentRight="true"
             android:layout_marginRight="5dp"
             android:layout_marginLeft="5dp"
+            android:src="@drawable/btn_map"
+            android:background="@drawable/clear_bg"
             />
 
         <TextView

+ 2 - 0
ApexDrivers/app/src/main/res/layout/filter_date_cell.xml

@@ -17,6 +17,7 @@
             android:layout_weight="1"
             android:layout_margin="5dp"
             android:textAllCaps="false"
+            android:background="@drawable/round_corner_bg"
             />
         <Button
             android:id="@+id/filter_date_to_btn"
@@ -25,6 +26,7 @@
             android:layout_weight="1"
             android:layout_margin="5dp"
             android:textAllCaps="false"
+            android:background="@drawable/round_corner_bg"
             />
 
 

+ 4 - 2
ApexDrivers/app/src/main/res/layout/filter_search_footer.xml

@@ -6,9 +6,11 @@
 
     <Button
         android:id="@+id/filter_search_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_centerInParent="true"
+        android:layout_margin="5dp"
+        android:background="@drawable/round_corner_bg"
         android:text="Search"
         android:textAllCaps="false"
         />

+ 4 - 4
ApexDrivers/app/src/main/res/layout/filter_status_cell.xml

@@ -15,13 +15,13 @@
     
     <ImageView
         android:id="@+id/filter_status_selection_view"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
         android:layout_centerVertical="true"
-        android:layout_marginRight="5dp"
+        android:layout_marginRight="10dp"
         android:layout_alignParentRight="true"
         android:scaleType="centerInside"
-        android:src="@drawable/checkmark"
+        android:src="@drawable/check_mark"
         />
     
 </RelativeLayout>

+ 1 - 1
ApexDrivers/app/src/main/res/layout/option_item_cell.xml

@@ -29,7 +29,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
         android:layout_marginRight="10dp"
-        android:src="@drawable/action_setting"
+        android:src="@drawable/check_mark"
         />
 
 </RelativeLayout>