소스 검색

1.修改Android Apex Drivers图像渲染。

Pen Li 7 년 전
부모
커밋
db44d87194

+ 3 - 2
ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/ImageUtil.java

@@ -2,6 +2,7 @@ package com.usai.redant.rautils.utils;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Matrix;
@@ -350,9 +351,9 @@ public class ImageUtil {
         }
     }
 
-    public static void renderingDrawable(Drawable drawable, int color) {
+    public static void renderingDrawable(Drawable drawable, Resources res, int colorId) {
 
-        ColorStateList colorStateList = ColorStateList.valueOf(color);
+        ColorStateList colorStateList = ColorStateList.valueOf(res.getColor(colorId));
         DrawableCompat.setTintList(drawable, colorStateList);
     }
 

+ 4 - 2
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/MainActivity.java

@@ -33,6 +33,7 @@ import com.usai.redant.apexdrivers.home.HomeFragment;
 import com.usai.redant.apexdrivers.login.LoginFragment;
 import com.usai.redant.apexdrivers.network.Network;
 import com.usai.redant.apexdrivers.upload.TaskActivity;
+import com.usai.redant.rautils.utils.ImageUtil;
 import com.usai.redant.rautils.utils.RAUtil;
 import com.usai.redant.rautils.utils.dbgUtil;
 
@@ -125,9 +126,10 @@ public class MainActivity extends BasicActivity implements LoginFragment.LoginCa
             actionBar.setElevation(0); // 5.0以上隐藏分割线
 
             // 将图像渲染成白色
-            ColorStateList colorStateList = ColorStateList.valueOf(getResources().getColor(R.color.ApexDriverWhite));
+//            ColorStateList colorStateList = ColorStateList.valueOf(getResources().getColor(R.color.ApexDriverWhite));
             Drawable drawable = getResources().getDrawable(R.drawable.apexlogo_large);
-            DrawableCompat.setTintList(drawable, colorStateList);
+//            DrawableCompat.setTintList(drawable, colorStateList);
+            ImageUtil.renderingDrawable(drawable,getResources(),R.color.ApexDriverWhite);
 
             // 显示Home
             actionBar.setHomeAsUpIndicator(drawable);

+ 10 - 0
ApexDrivers/app/src/main/java/com/usai/redant/apexdrivers/signature/SignatureActivity.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -55,6 +56,15 @@ public class SignatureActivity extends BasicActivity {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.signature_menu,menu);
+
+        MenuItem saveItem = menu.getItem(1);
+        Drawable saveItemIcon = saveItem.getIcon();
+        ImageUtil.renderingDrawable(saveItemIcon,getResources(),R.color.ApexDriverWhite);
+
+        MenuItem clearItem = menu.getItem(0);
+        Drawable clearItemIcon = clearItem.getIcon();
+        ImageUtil.renderingDrawable(clearItemIcon,getResources(),R.color.ApexDriverWhite);
+
         return true;
     }
 

BIN
ApexDrivers/app/src/main/res/drawable-hdpi/signature_clear.png


BIN
ApexDrivers/app/src/main/res/drawable-hdpi/signature_save.png


BIN
ApexDrivers/app/src/main/res/drawable-ldpi/signature_clear.png


BIN
ApexDrivers/app/src/main/res/drawable-ldpi/signature_save.png


BIN
ApexDrivers/app/src/main/res/drawable-mdpi/signature_clear.png


BIN
ApexDrivers/app/src/main/res/drawable-mdpi/signature_save.png


BIN
ApexDrivers/app/src/main/res/drawable-xhdpi/signature_clear.png


BIN
ApexDrivers/app/src/main/res/drawable-xhdpi/signature_save.png


BIN
ApexDrivers/app/src/main/res/drawable-xxhdpi/signature_clear.png


BIN
ApexDrivers/app/src/main/res/drawable-xxhdpi/signature_save.png


+ 12 - 5
ApexDrivers/app/src/main/res/menu/signature_menu.xml

@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/signature_save_btn"
-        android:title="Save"
+        android:id="@+id/signature_clear_btn"
+        android:title="Clear"
+        app:showAsAction="always"
+        android:icon="@drawable/signature_clear"
         ></item>
 
     <item
-        android:id="@+id/signature_clear_btn"
-        android:title="Clear"
+        android:id="@+id/signature_save_btn"
+        android:title="Save"
+        app:showAsAction="always"
+        android:icon="@drawable/signature_save"
         ></item>
 
+
+
 </menu>