Browse Source

highlight currently active user

AndyScherzinger 8 years ago
parent
commit
42c61c9ed4

BIN
res/drawable-hdpi/ic_account_circle_white_18dp.png


BIN
res/drawable-mdpi/ic_account_circle_white_18dp.png


BIN
res/drawable-xhdpi/ic_account_circle_white_18dp.png


BIN
res/drawable-xxhdpi/ic_account_circle_white_18dp.png


BIN
res/drawable-xxxhdpi/ic_account_circle_white_18dp.png


+ 5 - 0
res/drawable/round_bgnd.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="#ffffff"/>
+</shape>

+ 24 - 22
res/layout/account_item.xml

@@ -23,29 +23,31 @@
     android:orientation="horizontal"
     android:weightSum="1">
 
-    <ImageView
-        android:id="@+id/user_icon"
-        android:layout_width="@dimen/user_icon_size"
-        android:layout_height="@dimen/user_icon_size"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/standard_margin"
-        android:src="@drawable/ic_menu_archive"
-        />
+    <FrameLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical">
+
+        <ImageView
+            android:id="@+id/user_icon"
+            android:layout_width="@dimen/user_icon_size"
+            android:layout_height="@dimen/user_icon_size"
+            android:layout_gravity="top|left"
+            android:layout_marginLeft="@dimen/standard_margin"
+            android:layout_marginRight="@dimen/alternate_half_margin"
+            android:layout_marginTop="@dimen/alternate_half_margin"
+            android:layout_marginBottom="@dimen/alternate_half_margin"
+            android:src="@drawable/ic_menu_archive"            />
 
-    <ImageView
-        android:id="@+id/ticker"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_alignRight="@id/icon"
-        android:layout_alignEnd="@id/icon"
-        android:layout_alignTop="@id/icon"
-        android:layout_marginRight="-8dp"
-        android:layout_marginEnd="-8dp"
-        android:layout_marginTop="-8dp"
-        android:src="@drawable/ic_current"
-        />
-        <!-- drawable will be replaced by ic_current_white + tint in runtime;
-        ic_current here as a placeholder -->
+        <ImageView
+            android:id="@+id/ticker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_account_circle_white_18dp"
+            android:tint="@color/actionbar_start_color"
+            android:layout_gravity="bottom|right"
+            android:background="@drawable/round_bgnd"/>
+    </FrameLayout >
 
     <TextView
         android:id="@+id/user_name"

+ 2 - 2
src/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -86,8 +86,8 @@ public class ManageAccountsActivity extends FileActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(this, R.drawable.ic_current_white));
-        int tint = ContextCompat.getColor(this, R.color.actionbar_start_color);
+        mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(this, R.drawable.ic_account_circle_white_18dp));
+        int tint = ContextCompat.getColor(this, R.color.primary);
         DrawableCompat.setTint(mTintedCheck, tint);
 
         setContentView(R.layout.accounts_layout);

+ 0 - 1
src/com/owncloud/android/ui/adapter/AccountListAdapter.java

@@ -33,7 +33,6 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.activity.BaseActivity;
-import com.owncloud.android.ui.activity.ManageAccountsActivity;
 import com.owncloud.android.utils.DisplayUtils;
 
 import java.util.List;