Rename UserAdapter and get rid of the old one

app/src/main/java/com/commit451/gitlab/activities/AddUserActivity.java

@@ -17,7 +17,7 @@ import android.widget.Toast;
 import com.commit451.gitlab.GitLabApp;
 import com.commit451.gitlab.R;
-import com.commit451.gitlab.adapter.NewUserAdapter;
+import com.commit451.gitlab.adapter.UserAdapter;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.dialogs.UserRoleDialog;
 import com.commit451.gitlab.events.UserAddedEvent;
@@ -47,7 +47,7 @@ public class AddUserActivity extends BaseActivity {
     @Bind(R.id.userSearch) EditText mUserSearch;
     @Bind(R.id.swipe_layout) SwipeRefreshLayout mSwipeRefreshLayout;
     @Bind(R.id.list) RecyclerView mRecyclerView;
-    NewUserAdapter mAdapter;
+    UserAdapter mAdapter;
     UserRoleDialog mUserRoleDialog;
     User mSelectedUser;
     private final View.OnClickListener mOnBackPressed = new View.OnClickListener() {
@@ -87,7 +87,7 @@ public class AddUserActivity extends BaseActivity {
         }
     };
-    private final NewUserAdapter.Listener mUserClickListener = new NewUserAdapter.Listener() {
+    private final UserAdapter.Listener mUserClickListener = new UserAdapter.Listener() {
         @Override
         public void onUserClicked(User user) {
             mSelectedUser = user;
@@ -137,7 +137,7 @@ public class AddUserActivity extends BaseActivity {
         mToolbar.setNavigationOnClickListener(mOnBackPressed);
         mUserSearch.setOnEditorActionListener(mSearchEditorActionListener);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
-        mAdapter = new NewUserAdapter(mUserClickListener);
+        mAdapter = new UserAdapter(mUserClickListener);
         mRecyclerView.setAdapter(mAdapter);
     }
 }

app/src/main/java/com/commit451/gitlab/adapter/NewUserAdapter.java

-package com.commit451.gitlab.adapter;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.commit451.gitlab.R;
-import com.commit451.gitlab.model.User;
-import com.commit451.gitlab.viewHolders.UserViewHolder;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- * Created by Jawn on 7/28/2015.
- */
-public class NewUserAdapter extends RecyclerView.Adapter<UserViewHolder> {
-
-    public interface Listener {
-        void onUserClicked(User user);
-    }
-
-    private Listener mListener;
-
-    private ArrayList<User> mValues;
-
-    private final View.OnClickListener mItemClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            int position = (int) v.getTag(R.id.list_position);
-            mListener.onUserClicked(getValueAt(position));
-        }
-    };
-
-    public User getValueAt(int position) {
-        return mValues.get(position);
-    }
-
-    public NewUserAdapter(Listener listener) {
-        mListener = listener;
-        mValues = new ArrayList<>();
-    }
-
-    public void setData(Collection<User> data) {
-        mValues.clear();
-        if (data != null) {
-            mValues.addAll(data);
-        }
-        notifyDataSetChanged();
-    }
-
-    @Override
-    public UserViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        UserViewHolder holder = UserViewHolder.create(parent);
-        holder.itemView.setOnClickListener(mItemClickListener);
-        return holder;
-    }
-
-    @Override
-    public void onBindViewHolder(final UserViewHolder holder, int position) {
-        User user = getValueAt(position);
-        holder.bind(user);
-        holder.itemView.setTag(R.id.list_position, position);
-    }
-
-    @Override
-    public int getItemCount() {
-        return mValues.size();
-    }
-
-    public void addUser(User user) {
-        mValues.add(0, user);
-        notifyItemInserted(0);
-    }
-
-    public void removeUser(long userId) {
-        for(User u : mValues) {
-            if(u.getId() == userId) {
-                int index = mValues.indexOf(u);
-                mValues.remove(u);
-                notifyItemRemoved(index);
-                break;
-            }
-        }
-    }
-}

app/src/main/java/com/commit451/gitlab/adapter/UserAdapter.java

 package com.commit451.gitlab.adapter;
-import android.content.Context;
-import android.view.LayoutInflater;
+import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.User;
-import com.squareup.picasso.Picasso;
+import com.commit451.gitlab.viewHolders.UserViewHolder;
 import java.util.ArrayList;
-import java.util.List;
-
-import fr.tkeunebr.gravatar.Gravatar;
-
-public class UserAdapter extends BaseAdapter {
-	
-	private ArrayList<User> users;
-	private LayoutInflater inflater;
-	
-	public UserAdapter(Context context, List<User> users) {
-		this.users = new ArrayList<User>(users);
-		
-		if(context != null) {
-			inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		}
-	}
-	
-	@Override
-	public int getCount() {
-		return users.size();
-	}
-	
-	@Override
-	public User getItem(int position) {
-		return users.get(position);
-	}
-	
-	@Override
-	public long getItemId(int position) {
-		if(users.get(position) == null)
-			return -1;
-		
-		return users.get(position).getId();
-	}
-	
-	public int getPosition(User user) {
-		return users.indexOf(user);
-	}
-	
-	public void addUser(User user) {
-		users.add(user);
-		notifyDataSetChanged();
-	}
-	
-	public void removeUser(long userId) {
-		for(User u : users) {
-			if(u.getId() == userId) {
-				users.remove(u);
-				break;
-			}
-		}
-		
-		notifyDataSetChanged();
-	}
-	
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		if(convertView == null) convertView = inflater.inflate(R.layout.user_list_item, parent, false);
-
-        final TextView title = (TextView) convertView.findViewById(R.id.title);
-		final TextView summary = (TextView) convertView.findViewById(R.id.summary);
-		final TextView custom = (TextView) convertView.findViewById(R.id.custom);
-        final ImageView icon = (ImageView) convertView.findViewById(R.id.icon);
-		
-		title.setText(users.get(position).getName());
-		if(users.get(position).getEmail() != null)
-            summary.setText(users.get(position).getEmail());
-        else
-            summary.setText(users.get(position).getUsername());
-		
-		custom.setText(users.get(position).getAccessLevel(convertView.getResources().getStringArray(R.array.role_names)));
-
-		int size = convertView.getResources().getDimensionPixelSize(R.dimen.image_size);
-
-        String url = "http://www.gravatar.com/avatar/00000000000000000000000000000000?s=" + size;
-
-        if(users.get(position).getEmail() != null)
-            url = Gravatar.init().with(users.get(position).getEmail()).size(size).build();
-        else if(users.get(position).getAvatarUrl() != null)
-            url = users.get(position).getAvatarUrl() + "&s=" + size;
-
-        Picasso.with(convertView.getContext()).load(url).into(icon);
-		
-		return convertView;
-	}
+import java.util.Collection;
+
+/**
+ * Created by Jawn on 7/28/2015.
+ */
+public class UserAdapter extends RecyclerView.Adapter<UserViewHolder> {
+
+    public interface Listener {
+        void onUserClicked(User user);
+    }
+
+    private Listener mListener;
+
+    private ArrayList<User> mValues;
+
+    private final View.OnClickListener mItemClickListener = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            int position = (int) v.getTag(R.id.list_position);
+            mListener.onUserClicked(getValueAt(position));
+        }
+    };
+
+    public User getValueAt(int position) {
+        return mValues.get(position);
+    }
+
+    public UserAdapter(Listener listener) {
+        mListener = listener;
+        mValues = new ArrayList<>();
+    }
+
+    public void setData(Collection<User> data) {
+        mValues.clear();
+        if (data != null) {
+            mValues.addAll(data);
+        }
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public UserViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+        UserViewHolder holder = UserViewHolder.create(parent);
+        holder.itemView.setOnClickListener(mItemClickListener);
+        return holder;
+    }
+
+    @Override
+    public void onBindViewHolder(final UserViewHolder holder, int position) {
+        User user = getValueAt(position);
+        holder.bind(user);
+        holder.itemView.setTag(R.id.list_position, position);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mValues.size();
+    }
+
+    public void addUser(User user) {
+        mValues.add(0, user);
+        notifyItemInserted(0);
+    }
+
+    public void removeUser(long userId) {
+        for(User u : mValues) {
+            if(u.getId() == userId) {
+                int index = mValues.indexOf(u);
+                mValues.remove(u);
+                notifyItemRemoved(index);
+                break;
+            }
+        }
+    }
 }

app/src/main/java/com/commit451/gitlab/fragments/UsersFragment.java

@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.commit451.gitlab.GitLabApp;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.activities.AddUserActivity;
-import com.commit451.gitlab.adapter.NewUserAdapter;
+import com.commit451.gitlab.adapter.UserAdapter;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.events.ProjectChangedEvent;
 import com.commit451.gitlab.events.UserAddedEvent;
@@ -33,7 +33,7 @@ public class UsersFragment extends BaseFragment implements SwipeRefreshLayout.On
 	
 	@Bind(R.id.add_user_button) View addUserButton;
 	@Bind(R.id.list) RecyclerView listView;
-    NewUserAdapter mAdapter;
+    UserAdapter mAdapter;
 	@Bind(R.id.error_text) TextView errorText;
     @Bind(R.id.swipe_layout) SwipeRefreshLayout swipeLayout;
@@ -46,7 +46,7 @@ public class UsersFragment extends BaseFragment implements SwipeRefreshLayout.On
 		View view = inflater.inflate(R.layout.fragment_users, container, false);
         ButterKnife.bind(this, view);
-        mAdapter = new NewUserAdapter(new NewUserAdapter.Listener() {
+        mAdapter = new UserAdapter(new UserAdapter.Listener() {
             @Override
             public void onUserClicked(User user) {
                 //TODO go to profile or allow kicking from group or something

app/src/main/res/layout/item_commit.xml

@@ -14,8 +14,7 @@
         android:id="@+id/commit_image"
         android:layout_width="@dimen/image_size"
         android:layout_height="@dimen/image_size"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginRight="8dp"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null"
         tools:src="@drawable/ic_doc"

app/src/main/res/layout/item_issue.xml

@@ -14,8 +14,7 @@
         android:id="@+id/issue_image"
         android:layout_width="@dimen/image_size"
         android:layout_height="@dimen/image_size"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp"
+        android:layout_marginRight="8dp"
         android:layout_gravity="center_vertical"
         android:contentDescription="@null"
         tools:src="@drawable/ic_doc"