瀏覽代碼

resolves #1551 using theme utils instead of custom implementation

AndyScherzinger 7 年之前
父節點
當前提交
c5ec853181

+ 1 - 3
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -28,7 +28,6 @@ import android.accounts.AccountManagerFuture;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -1060,8 +1059,7 @@ public abstract class DrawerActivity extends ToolbarActivity implements DisplayU
                             .into(target);
                 } else {
                     // plain color
-                    int color = Color.parseColor(background);
-                    navigationHeader.setBackgroundColor(color);
+                    navigationHeader.setBackgroundColor(ThemeUtils.primaryColor(getAccount()));
                 }
             }
         }

+ 2 - 4
src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -32,7 +32,6 @@ import android.app.FragmentManager;
 import android.content.ContentResolver;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -301,10 +300,9 @@ public class UserInfoActivity extends FileActivity {
                             .error(R.drawable.background)
                             .crossFade()
                             .into(target);
-                } else if (!background.isEmpty()) {
+                } else {
                     // plain color
-                    int color = Color.parseColor(background);
-                    appBar.setBackgroundColor(color);
+                    appBar.setBackgroundColor(ThemeUtils.primaryColor(account));
                 }
             }
         }