Skip to content
Snippets Groups Projects
Commit ee86bf76 authored by John Carlson's avatar John Carlson
Browse files

More style updates

parent a83796b2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 312 additions and 298 deletions
app/src/main/AndroidManifest.xml
+ 22
− 0
View file @ ee86bf76
@@ -31,52 +31,74 @@
android:name=".activity.ProjectsActivity"
android:launchMode="singleTask"
android:theme="@style/Activity.Projects" />
<activity
android:name=".activity.GroupsActivity"
android:launchMode="singleTask"
android:theme="@style/Activity.Groups" />
<activity
android:name=".activity.ActivityActivity"
android:launchMode="singleTask"
android:theme="@style/Activity.Activity" />
<activity
android:name=".activity.TodosActivity"
android:launchMode="singleTask"
android:theme="@style/Activity.Todos" />
<activity android:name=".activity.ProjectActivity" />
<activity
android:name=".activity.LoginActivity"
android:theme="@style/Activity.Login" />
<activity android:name=".activity.FileActivity" />
<activity android:name=".activity.IssueActivity" />
<activity android:name=".activity.DiffActivity" />
<activity android:name=".activity.AboutActivity" />
<activity android:name=".activity.AddUserActivity" />
<activity
android:name=".activity.UserActivity"
android:theme="@style/Activity.User" />
<activity android:name=".activity.SearchActivity" />
<activity
android:name=".activity.GroupActivity"
android:theme="@style/Activity.Group" />
<activity android:name=".activity.MergeRequestActivity" />
<activity android:name=".activity.AddIssueActivity" />
<activity android:name=".activity.MilestoneActivity" />
<activity android:name=".activity.AddMilestoneActivity" />
<activity android:name=".activity.BuildActivity" />
<activity
android:name=".activity.LoadSomeInfoActivity"
android:theme="@style/Activity.Translucent" />
<activity android:name=".activity.SettingsActivity" />
<activity android:name=".activity.AddLabelActivity" />
<activity android:name=".activity.AddNewLabelActivity" />
<activity
android:name=".activity.PickBranchOrTagActivity"
android:theme="@style/Activity.Translucent" />
<activity android:name=".activity.WebviewLoginActivity" />
<activity
android:name=".activity.AttachActivity"
android:theme="@style/Activity.Translucent" />
<activity
android:name=".activity.RoutingActivity"
android:launchMode="singleTask"
app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.java
+ 3
− 3
View file @ ee86bf76
@@ -18,7 +18,7 @@ import android.widget.EditText;
import com.commit451.alakazam.HideRunnable;
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.UsersAdapter;
import com.commit451.gitlab.adapter.UserAdapter;
import com.commit451.gitlab.dialog.AccessDialog;
import com.commit451.gitlab.event.MemberAddedEvent;
import com.commit451.gitlab.model.api.Group;
@@ -79,7 +79,7 @@ public class AddUserActivity extends MorphActivity {
View buttonClear;
 
GridLayoutManager layoutManager;
UsersAdapter adapter;
UserAdapter adapter;
AccessDialog dialogAccess;
UserBasic selectedUser;
Teleprinter teleprinter;
@@ -150,7 +150,7 @@ public class AddUserActivity extends MorphActivity {
}
});
 
adapter = new UsersAdapter(new UsersAdapter.Listener() {
adapter = new UserAdapter(new UserAdapter.Listener() {
@Override
public void onUserClicked(UserBasic user, UserViewHolder userViewHolder) {
selectedUser = user;
app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java
+ 1
− 1
View file @ ee86bf76
@@ -79,7 +79,7 @@ public class GroupsActivity extends BaseActivity {
private final GroupAdapter.Listener groupAdapterListener = new GroupAdapter.Listener() {
@Override
public void onGroupClicked(Group group, GroupViewHolder groupViewHolder) {
Navigator.navigateToGroup(GroupsActivity.this, groupViewHolder.mImageView, group);
Navigator.navigateToGroup(GroupsActivity.this, groupViewHolder.image, group);
}
};
 
app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java
+ 2
− 2
View file @ ee86bf76
@@ -434,8 +434,8 @@ public class IssueActivity extends BaseActivity {
 
@Subscribe
public void onIssueChanged(IssueChangedEvent event) {
if (issue.getId() == event.mIssue.getId()) {
issue = event.mIssue;
if (issue.getId() == event.issue.getId()) {
issue = event.issue;
bindIssue();
loadNotes();
}
app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.java
+ 5
− 5
View file @ ee86bf76
@@ -18,7 +18,7 @@ import android.widget.TextView;
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.DividerItemDecoration;
import com.commit451.gitlab.adapter.MilestoneIssuesAdapter;
import com.commit451.gitlab.adapter.MilestoneIssueAdapter;
import com.commit451.gitlab.event.MilestoneChangedEvent;
import com.commit451.gitlab.model.api.Issue;
import com.commit451.gitlab.model.api.Milestone;
@@ -67,7 +67,7 @@ public class MilestoneActivity extends BaseActivity {
@BindView(R.id.progress)
View progress;
 
MilestoneIssuesAdapter adapterMilestoneIssues;
MilestoneIssueAdapter adapterMilestoneIssues;
LinearLayoutManager layoutManagerIssues;
MenuItem menuItemOpenClose;
 
@@ -130,7 +130,7 @@ public class MilestoneActivity extends BaseActivity {
}
});
 
adapterMilestoneIssues = new MilestoneIssuesAdapter(new MilestoneIssuesAdapter.Listener() {
adapterMilestoneIssues = new MilestoneIssueAdapter(new MilestoneIssueAdapter.Listener() {
@Override
public void onIssueClicked(Issue issue) {
Navigator.navigateToIssue(MilestoneActivity.this, project, issue);
@@ -279,8 +279,8 @@ public class MilestoneActivity extends BaseActivity {
 
@Subscribe
public void onMilestoneChanged(MilestoneChangedEvent event) {
if (milestone.getId() == event.mMilestone.getId()) {
milestone = event.mMilestone;
if (milestone.getId() == event.milestone.getId()) {
milestone = event.milestone;
bind(milestone);
}
}
app/src/main/java/com/commit451/gitlab/activity/ProjectsActivity.java
+ 2
− 2
View file @ ee86bf76
@@ -14,7 +14,7 @@ import android.view.View;
 
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.gitlab.adapter.ProjectsPagerAdapter;
import com.commit451.gitlab.adapter.ProjectPagerAdapter;
import com.commit451.gitlab.event.CloseDrawerEvent;
import com.commit451.gitlab.navigation.Navigator;
 
@@ -74,7 +74,7 @@ public class ProjectsActivity extends BaseActivity {
});
toolbar.inflateMenu(R.menu.menu_search);
toolbar.setOnMenuItemClickListener(onMenuItemClickListener);
viewPager.setAdapter(new ProjectsPagerAdapter(this, getSupportFragmentManager()));
viewPager.setAdapter(new ProjectPagerAdapter(this, getSupportFragmentManager()));
tabLayout.setupWithViewPager(viewPager);
}
 
app/src/main/java/com/commit451/gitlab/adapter/AccountsAdapter.java → app/src/main/java/com/commit451/gitlab/adapter/AccountAdapter.java
+ 25
− 29
View file @ ee86bf76
@@ -20,54 +20,48 @@ import java.util.Collection;
/**
* Adapter to show all the accounts
*/
public class AccountsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
public class AccountAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private static final int TYPE_ACCOUNT = 0;
private static final int TYPE_FOOTER = 1;
 
private static final int FOOTER_COUNT = 1;
 
public interface Listener {
void onAccountClicked(Account account);
void onAddAccountClicked();
void onAccountLogoutClicked(Account account);
}
private Listener mListener;
private ArrayList<Account> mAccounts;
private int mColorControlHighlight;
private Listener listener;
private ArrayList<Account> accounts;
private int colorControlHighlight;
 
private View.OnClickListener mOnItemClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
mListener.onAccountClicked(getItemAtPosition(position));
listener.onAccountClicked(getItemAtPosition(position));
}
};
 
private View.OnClickListener mOnFooterClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
mListener.onAddAccountClicked();
listener.onAddAccountClicked();
}
};
 
public AccountsAdapter(Context context, Listener listener) {
mListener = listener;
mAccounts = new ArrayList<>();
mColorControlHighlight = Easel.getThemeAttrColor(context, R.attr.colorControlHighlight);
public AccountAdapter(Context context, Listener listener) {
this.listener = listener;
accounts = new ArrayList<>();
colorControlHighlight = Easel.getThemeAttrColor(context, R.attr.colorControlHighlight);
}
 
public void setAccounts(Collection<Account> accounts) {
mAccounts.clear();
this.accounts.clear();
if (accounts != null) {
mAccounts.addAll(accounts);
this.accounts.addAll(accounts);
}
notifyDataSetChanged();
}
 
public void addAccount(Account account) {
if (!mAccounts.contains(account)) {
mAccounts.add(0, account);
if (!accounts.contains(account)) {
accounts.add(0, account);
notifyItemInserted(0);
}
}
@@ -91,17 +85,17 @@ public class AccountsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof AccountViewHolder) {
final Account account = getItemAtPosition(position);
((AccountViewHolder) holder).bind(account, account.equals(App.get().getAccount()), mColorControlHighlight);
((AccountViewHolder) holder).bind(account, account.equals(App.get().getAccount()), colorControlHighlight);
holder.itemView.setTag(R.id.list_position, position);
((AccountViewHolder) holder).mPopupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_sign_out:
int itemPosition = mAccounts.indexOf(account);
mAccounts.remove(account);
int itemPosition = accounts.indexOf(account);
accounts.remove(account);
notifyItemRemoved(itemPosition);
mListener.onAccountLogoutClicked(account);
listener.onAccountLogoutClicked(account);
return true;
}
return false;
@@ -116,19 +110,21 @@ public class AccountsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
 
@Override
public int getItemCount() {
return mAccounts.size() + FOOTER_COUNT;
return accounts.size() + FOOTER_COUNT;
}
 
@Override
public int getItemViewType(int position) {
return position == mAccounts.size() ? TYPE_FOOTER : TYPE_ACCOUNT;
return position == accounts.size() ? TYPE_FOOTER : TYPE_ACCOUNT;
}
 
private Account getItemAtPosition(int position) {
return mAccounts.get(position);
return accounts.get(position);
}
 
public int getAccountsCount() {
return mAccounts.size();
public interface Listener {
void onAccountClicked(Account account);
void onAddAccountClicked();
void onAccountLogoutClicked(Account account);
}
}
app/src/main/java/com/commit451/gitlab/adapter/AddIssueLabelAdapter.java
+ 16
− 16
View file @ ee86bf76
@@ -16,34 +16,34 @@ import java.util.Collection;
*/
public class AddIssueLabelAdapter extends RecyclerView.Adapter<AddLabelViewHolder> {
 
private ArrayList<Label> mValues;
private Listener mListener;
private ArrayList<Label> values;
private Listener listener;
 
public AddIssueLabelAdapter(Listener listener) {
mValues = new ArrayList<>();
mListener = listener;
values = new ArrayList<>();
this.listener = listener;
}
 
public void setLabels(Collection<Label> labels) {
mValues.clear();
values.clear();
addLabels(labels);
}
 
public void addLabels(Collection<Label> labels) {
if (labels != null) {
mValues.addAll(labels);
values.addAll(labels);
}
notifyDataSetChanged();
}
 
public void addLabel(Label label) {
mValues.add(label);
notifyItemInserted(mValues.size()-1);
values.add(label);
notifyItemInserted(values.size()-1);
}
 
public void removeLabel(Label label) {
int indexOf = mValues.indexOf(label);
mValues.remove(indexOf);
int indexOf = values.indexOf(label);
values.remove(indexOf);
notifyItemRemoved(indexOf);
}
 
@@ -54,7 +54,7 @@ public class AddIssueLabelAdapter extends RecyclerView.Adapter<AddLabelViewHolde
@Override
public boolean onLongClick(View v) {
Label label = getEntry(holder.getAdapterPosition());
mListener.onLabelLongClicked(label);
listener.onLabelLongClicked(label);
return true;
}
});
@@ -68,24 +68,24 @@ public class AddIssueLabelAdapter extends RecyclerView.Adapter<AddLabelViewHolde
 
@Override
public int getItemCount() {
return mValues.size();
return values.size();
}
 
private Label getEntry(int position) {
return mValues.get(position);
return values.get(position);
}
 
public boolean containsLabel(Label label) {
return mValues.contains(label);
return values.contains(label);
}
 
@Nullable
public String getCommaSeperatedStringOfLabels() {
if (mValues.isEmpty()) {
if (values.isEmpty()) {
return null;
}
String labels = "";
for (Label label : mValues) {
for (Label label : values) {
labels = labels + label.getName() + ",";
}
//Remove last ","
app/src/main/java/com/commit451/gitlab/adapter/BranchesAdapter.java → app/src/main/java/com/commit451/gitlab/adapter/BranchAdapter.java
+ 21
− 19
View file @ ee86bf76
@@ -16,35 +16,33 @@ import java.util.Collection;
/**
* Adapts the feeds
*/
public class BranchesAdapter extends RecyclerView.Adapter<BranchViewHolder> {
public class BranchAdapter extends RecyclerView.Adapter<BranchViewHolder> {
 
public interface Listener {
void onBranchClicked(Branch entry);
}
private Listener mListener;
 
private ArrayList<Branch> mValues;
private Listener listener;
private ArrayList<Branch> values;
@Nullable
private Ref mRef;
private Ref ref;
 
public BranchesAdapter(@Nullable Ref currentRef, Listener listener) {
mListener = listener;
mValues = new ArrayList<>();
mRef = currentRef;
public BranchAdapter(@Nullable Ref currentRef, Listener listener) {
this.listener = listener;
values = new ArrayList<>();
ref = currentRef;
}
 
private final View.OnClickListener mOnItemClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
mListener.onBranchClicked(getEntry(position));
listener.onBranchClicked(getEntry(position));
}
};
 
public void setEntries(Collection<Branch> entries) {
mValues.clear();
values.clear();
if (entries != null) {
mValues.addAll(entries);
values.addAll(entries);
}
notifyDataSetChanged();
}
@@ -61,9 +59,9 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchViewHolder> {
holder.itemView.setTag(R.id.list_position, position);
Branch branch = getEntry(position);
boolean selected = false;
if (mRef != null) {
if (mRef.getType() == Ref.TYPE_BRANCH
&& mRef.getRef().equals(branch.getName())) {
if (ref != null) {
if (ref.getType() == Ref.TYPE_BRANCH
&& ref.getRef().equals(branch.getName())) {
selected = true;
}
}
@@ -72,10 +70,14 @@ public class BranchesAdapter extends RecyclerView.Adapter<BranchViewHolder> {
 
@Override
public int getItemCount() {
return mValues.size();
return values.size();
}
 
private Branch getEntry(int position) {
return mValues.get(position);
return values.get(position);
}
public interface Listener {
void onBranchClicked(Branch entry);
}
}
app/src/main/java/com/commit451/gitlab/adapter/BreadcrumbAdapter.java
+ 8
− 8
View file @ ee86bf76
@@ -15,10 +15,10 @@ import java.util.List;
* Shows the current file path
*/
public class BreadcrumbAdapter extends RecyclerView.Adapter<BreadcrumbViewHolder> {
private List<Breadcrumb> mValues;
private List<Breadcrumb> values;
 
public BreadcrumbAdapter() {
mValues = new ArrayList<>();
values = new ArrayList<>();
notifyDataSetChanged();
}
 
@@ -43,7 +43,7 @@ public class BreadcrumbAdapter extends RecyclerView.Adapter<BreadcrumbViewHolder
@Override
public void onBindViewHolder(final BreadcrumbViewHolder holder, int position) {
String title = "";
boolean showArrow = position != mValues.size() - 1;
boolean showArrow = position != values.size() - 1;
 
Breadcrumb breadcrumb = getValueAt(position);
if (breadcrumb != null) {
@@ -56,24 +56,24 @@ public class BreadcrumbAdapter extends RecyclerView.Adapter<BreadcrumbViewHolder
 
@Override
public int getItemCount() {
return mValues.size();
return values.size();
}
 
public void setData(Collection<Breadcrumb> breadcrumbs) {
mValues.clear();
values.clear();
if (breadcrumbs != null) {
mValues.addAll(breadcrumbs);
values.addAll(breadcrumbs);
notifyItemRangeInserted(0, breadcrumbs.size());
}
notifyDataSetChanged();
}
 
public Breadcrumb getValueAt(int position) {
if (position < 0 || position >= mValues.size()) {
if (position < 0 || position >= values.size()) {
return null;
}
 
return mValues.get(position);
return values.get(position);
}
 
public static class Breadcrumb {
app/src/main/java/com/commit451/gitlab/adapter/BuildsAdapter.java → app/src/main/java/com/commit451/gitlab/adapter/BuildAdapter.java
+ 31
− 34
View file @ ee86bf76
@@ -4,7 +4,6 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.view.ViewGroup;
 
import com.commit451.gitlab.R;
import com.commit451.gitlab.model.api.Build;
import com.commit451.gitlab.viewHolder.BuildViewHolder;
import com.commit451.gitlab.viewHolder.LoadingFooterViewHolder;
@@ -15,39 +14,34 @@ import java.util.Collection;
/**
* Builds adapter
*/
public class BuildsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
public class BuildAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
private static final int FOOTER_COUNT = 1;
 
private static final int TYPE_ITEM = 0;
private static final int TYPE_FOOTER = 1;
 
public interface Listener {
void onBuildClicked(Build issue);
}
private Listener mListener;
private ArrayList<Build> mValues;
private boolean mLoading = false;
private Listener listener;
private ArrayList<Build> values;
private boolean loading = false;
 
public BuildsAdapter(Listener listener) {
mListener = listener;
mValues = new ArrayList<>();
public BuildAdapter(Listener listener) {
this.listener = listener;
values = new ArrayList<>();
}
 
private final View.OnClickListener onProjectClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
mListener.onBuildClicked(getValueAt(position));
}
};
@Override
public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
switch (viewType) {
case TYPE_ITEM:
BuildViewHolder holder = BuildViewHolder.inflate(parent);
holder.itemView.setOnClickListener(onProjectClickListener);
final BuildViewHolder holder = BuildViewHolder.inflate(parent);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = holder.getAdapterPosition();
listener.onBuildClicked(getValueAt(position));
}
});
return holder;
case TYPE_FOOTER:
return LoadingFooterViewHolder.inflate(parent);
@@ -60,9 +54,8 @@ public class BuildsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
if (holder instanceof BuildViewHolder) {
Build build = getValueAt(position);
((BuildViewHolder) holder).bind(build);
holder.itemView.setTag(R.id.list_position, position);
} else if (holder instanceof LoadingFooterViewHolder) {
((LoadingFooterViewHolder) holder).bind(mLoading);
((LoadingFooterViewHolder) holder).bind(loading);
} else {
throw new IllegalStateException("What is this holder?");
}
@@ -70,12 +63,12 @@ public class BuildsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
 
@Override
public int getItemCount() {
return mValues.size() + FOOTER_COUNT;
return values.size() + FOOTER_COUNT;
}
 
@Override
public int getItemViewType(int position) {
if (position == mValues.size()) {
if (position == values.size()) {
return TYPE_FOOTER;
} else {
return TYPE_ITEM;
@@ -83,38 +76,42 @@ public class BuildsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
}
 
public void setValues(Collection<Build> values) {
mValues.clear();
this.values.clear();
addValues(values);
}
 
public void addValues(Collection<Build> values) {
if (values != null) {
mValues.addAll(values);
this.values.addAll(values);
}
notifyDataSetChanged();
}
 
public void updateBuild(Build build) {
int indexToDelete = -1;
for (int i=0; i<mValues.size(); i++) {
if (mValues.get(i).getId() == build.getId()) {
for (int i = 0; i< values.size(); i++) {
if (values.get(i).getId() == build.getId()) {
indexToDelete = i;
break;
}
}
if (indexToDelete != -1) {
mValues.remove(indexToDelete);
mValues.add(indexToDelete, build);
values.remove(indexToDelete);
values.add(indexToDelete, build);
}
notifyItemChanged(indexToDelete);
}
 
public Build getValueAt(int position) {
return mValues.get(position);
return values.get(position);
}
 
public void setLoading(boolean loading) {
mLoading = loading;
notifyItemChanged(mValues.size());
this.loading = loading;
notifyItemChanged(values.size());
}
public interface Listener {
void onBuildClicked(Build build);
}
}
app/src/main/java/com/commit451/gitlab/adapter/BuildSectionsPagerAdapter.java
+ 10
− 10
View file @ ee86bf76
@@ -16,15 +16,15 @@ import com.commit451.gitlab.model.api.Project;
*/
public class BuildSectionsPagerAdapter extends FragmentPagerAdapter {
 
private Project mProject;
private Build mBuild;
private String[] mTitles;
private Project project;
private Build build;
private String[] titles;
 
public BuildSectionsPagerAdapter(Context context, FragmentManager fm, Project project, Build build) {
super(fm);
mProject = project;
mBuild = build;
mTitles = context.getResources().getStringArray(R.array.build_tabs);
this.project = project;
this.build = build;
titles = context.getResources().getStringArray(R.array.build_tabs);
}
 
@Override
@@ -32,9 +32,9 @@ public class BuildSectionsPagerAdapter extends FragmentPagerAdapter {
 
switch(position) {
case 0:
return BuildDescriptionFragment.newInstance(mProject, mBuild);
return BuildDescriptionFragment.newInstance(project, build);
case 1:
return BuildLogFragment.newInstance(mProject, mBuild);
return BuildLogFragment.newInstance(project, build);
}
 
throw new IllegalStateException("Position exceeded on view pager");
@@ -42,11 +42,11 @@ public class BuildSectionsPagerAdapter extends FragmentPagerAdapter {
 
@Override
public int getCount() {
return mTitles.length;
return titles.length;
}
 
@Override
public CharSequence getPageTitle(int position) {
return mTitles[position];
return titles[position];
}
}
app/src/main/java/com/commit451/gitlab/adapter/CommitsAdapter.java → app/src/main/java/com/commit451/gitlab/adapter/CommitAdapter.java
+ 26
− 27
View file @ ee86bf76
@@ -15,31 +15,20 @@ import java.util.Collection;
/**
* Shows a list of commits to a project, seen in a project overview
*/
public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
public class CommitAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
private static final int FOOTER_COUNT = 1;
 
private static final int TYPE_ITEM = 0;
private static final int TYPE_FOOTER = 1;
 
public interface Listener {
void onCommitClicked(RepositoryCommit commit);
}
private Listener mListener;
private ArrayList<RepositoryCommit> mValues;
private boolean mLoading = false;
private final View.OnClickListener onProjectClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
mListener.onCommitClicked(getValueAt(position));
}
};
private Listener listener;
private ArrayList<RepositoryCommit> values;
private boolean loading = false;
 
public CommitsAdapter(Listener listener) {
mListener = listener;
mValues = new ArrayList<>();
public CommitAdapter(Listener listener) {
this.listener = listener;
values = new ArrayList<>();
}
 
@Override
@@ -47,7 +36,13 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
switch (viewType) {
case TYPE_ITEM:
CommitViewHolder holder = CommitViewHolder.inflate(parent);
holder.itemView.setOnClickListener(onProjectClickListener);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
listener.onCommitClicked(getValueAt(position));
}
});
return holder;
case TYPE_FOOTER:
return LoadingFooterViewHolder.inflate(parent);
@@ -62,18 +57,18 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
((CommitViewHolder) holder).bind(commit);
holder.itemView.setTag(R.id.list_position, position);
} else if (holder instanceof LoadingFooterViewHolder) {
((LoadingFooterViewHolder) holder).bind(mLoading);
((LoadingFooterViewHolder) holder).bind(loading);
}
}
 
@Override
public int getItemCount() {
return mValues.size() + FOOTER_COUNT;
return values.size() + FOOTER_COUNT;
}
 
@Override
public int getItemViewType(int position) {
if (position == mValues.size()) {
if (position == values.size()) {
return TYPE_FOOTER;
} else {
return TYPE_ITEM;
@@ -81,25 +76,29 @@ public class CommitsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
}
 
public RepositoryCommit getValueAt(int position) {
return mValues.get(position);
return values.get(position);
}
 
public void addData(Collection<RepositoryCommit> commits) {
if (commits != null) {
mValues.addAll(commits);
values.addAll(commits);
notifyItemRangeInserted(0, commits.size());
}
notifyDataSetChanged();
}
 
public void setData(Collection<RepositoryCommit> commits) {
mValues.clear();
values.clear();
addData(commits);
}
 
public void setLoading(boolean loading) {
mLoading = loading;
notifyItemChanged(mValues.size());
this.loading = loading;
notifyItemChanged(values.size());
}
public interface Listener {
void onCommitClicked(RepositoryCommit commit);
}
}
 
app/src/main/java/com/commit451/gitlab/adapter/DiffAdapter.java
+ 18
− 17
View file @ ee86bf76
@@ -18,32 +18,29 @@ import java.util.Collection;
*/
public class DiffAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
public static final int TYPE_HEADER = 0;
private static final int TYPE_HEADER = 0;
public static final int TYPE_ITEM = 1;
 
public static final int HEADER_COUNT = 1;
private static final int HEADER_COUNT = 1;
 
public interface Listener {
void onDiffClicked(Diff diff);
}
private Listener mListener;
private RepositoryCommit mRepositoryCommit;
private ArrayList<Diff> mValues;
private Listener listener;
private RepositoryCommit repositoryCommit;
private ArrayList<Diff> values;
 
public Diff getValueAt(int position) {
return mValues.get(position - HEADER_COUNT);
return values.get(position - HEADER_COUNT);
}
 
public DiffAdapter(RepositoryCommit repositoryCommit, Listener listener) {
mRepositoryCommit = repositoryCommit;
mListener = listener;
mValues = new ArrayList<>();
this.repositoryCommit = repositoryCommit;
this.listener = listener;
values = new ArrayList<>();
}
 
public void setData(Collection<Diff> diffs) {
mValues.clear();
values.clear();
if (diffs != null) {
mValues.addAll(diffs);
values.addAll(diffs);
}
notifyDataSetChanged();
}
@@ -52,7 +49,7 @@ public class DiffAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
mListener.onDiffClicked(getValueAt(position));
listener.onDiffClicked(getValueAt(position));
}
};
 
@@ -72,7 +69,7 @@ public class DiffAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@Override
public void onBindViewHolder(final RecyclerView.ViewHolder holder, int position) {
if (holder instanceof DiffHeaderViewHolder) {
((DiffHeaderViewHolder) holder).bind(mRepositoryCommit);
((DiffHeaderViewHolder) holder).bind(repositoryCommit);
} else if (holder instanceof DiffViewHolder) {
Diff diff = getValueAt(position);
((DiffViewHolder) holder).bind(diff);
@@ -82,7 +79,7 @@ public class DiffAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@Override
public int getItemCount() {
return mValues.size() + HEADER_COUNT;
return values.size() + HEADER_COUNT;
}
 
@Override
@@ -93,4 +90,8 @@ public class DiffAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
return TYPE_ITEM;
}
}
public interface Listener {
void onDiffClicked(Diff diff);
}
}
app/src/main/java/com/commit451/gitlab/adapter/DividerItemDecoration.java
+ 14
− 13
View file @ ee86bf76
@@ -29,22 +29,23 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
private static final int[] ATTRS = new int[]{
android.R.attr.listDivider
};
private Drawable mDivider;
private int mDividerHeight;
 
private boolean mShowFirstDivider = true;
private boolean mShowLastDivider = false;
private Drawable divider;
private int dividerHeight;
private boolean showFirstDivider = true;
private boolean showLastDivider = false;
 
public DividerItemDecoration(Context context) {
final TypedArray a = context.obtainStyledAttributes(ATTRS);
mDivider = a.getDrawable(0);
divider = a.getDrawable(0);
a.recycle();
mDividerHeight = context.getResources().getDimensionPixelSize(R.dimen.divider_height);
dividerHeight = context.getResources().getDimensionPixelSize(R.dimen.divider_height);
}
 
public DividerItemDecoration(Context context, boolean first) {
this(context);
mShowFirstDivider = first;
showFirstDivider = first;
}
 
@Override
@@ -62,9 +63,9 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
.getLayoutParams();
final int top = child.getBottom() + params.bottomMargin;
final int bottom = top + mDividerHeight;
mDivider.setBounds(left, top, right, bottom);
mDivider.draw(c);
final int bottom = top + dividerHeight;
divider.setBounds(left, top, right, bottom);
divider.draw(c);
}
}
 
@@ -72,15 +73,15 @@ public class DividerItemDecoration extends RecyclerView.ItemDecoration {
public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
RecyclerView.State state) {
if (isSkipped(view, parent)) return;
outRect.set(0, 0, 0, mDividerHeight);
outRect.set(0, 0, 0, dividerHeight);
}
 
private boolean isSkipped(View child, RecyclerView parent) {
int position = parent.getChildAdapterPosition(child);
// Skip the first divider if needed
if (!mShowFirstDivider && position == 0) return true;
if (!showFirstDivider && position == 0) return true;
// Skip the last divider if needed
if (!mShowLastDivider && position == parent.getAdapter().getItemCount() - 1) return true;
if (!showLastDivider && position == parent.getAdapter().getItemCount() - 1) return true;
// Otherwise don't skip
return false;
}
app/src/main/java/com/commit451/gitlab/adapter/FeedAdapter.java
+ 20
− 22
View file @ ee86bf76
@@ -16,38 +16,32 @@ import java.util.Collection;
*/
public class FeedAdapter extends RecyclerView.Adapter<FeedEntryViewHolder> {
 
public interface Listener {
void onFeedEntryClicked(Entry entry);
}
private Listener mListener;
private ArrayList<Entry> mValues;
Listener listener;
ArrayList<Entry> values;
 
public FeedAdapter(Listener listener) {
mListener = listener;
mValues = new ArrayList<>();
this.listener = listener;
values = new ArrayList<>();
}
 
private final View.OnClickListener mOnItemClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
mListener.onFeedEntryClicked(getEntry(position));
}
};
public void setEntries(Collection<Entry> entries) {
mValues.clear();
values.clear();
if (entries != null) {
mValues.addAll(entries);
values.addAll(entries);
}
notifyDataSetChanged();
}
 
@Override
public FeedEntryViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
FeedEntryViewHolder holder = FeedEntryViewHolder.inflate(parent);
holder.itemView.setOnClickListener(mOnItemClickListener);
final FeedEntryViewHolder holder = FeedEntryViewHolder.inflate(parent);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = holder.getAdapterPosition();
listener.onFeedEntryClicked(getEntry(position));
}
});
return holder;
}
 
@@ -59,10 +53,14 @@ public class FeedAdapter extends RecyclerView.Adapter<FeedEntryViewHolder> {
 
@Override
public int getItemCount() {
return mValues.size();
return values.size();
}
 
private Entry getEntry(int position) {
return mValues.get(position);
return values.get(position);
}
public interface Listener {
void onFeedEntryClicked(Entry entry);
}
}
app/src/main/java/com/commit451/gitlab/adapter/FilesAdapter.java → app/src/main/java/com/commit451/gitlab/adapter/FileAdapter.java
+ 35
− 36
View file @ ee86bf76
@@ -16,41 +16,32 @@ import java.util.Collection;
/**
* Shows the files
*/
public class FilesAdapter extends RecyclerView.Adapter<FileViewHolder> {
public class FileAdapter extends RecyclerView.Adapter<FileViewHolder> {
 
public interface Listener {
void onFolderClicked(RepositoryTreeObject treeItem);
void onFileClicked(RepositoryTreeObject treeItem);
void onCopyClicked(RepositoryTreeObject treeItem);
void onShareClicked(RepositoryTreeObject treeItem);
void onOpenInBrowserClicked(RepositoryTreeObject treeItem);
}
private Listener mListener;
private ArrayList<RepositoryTreeObject> mValues;
private final View.OnClickListener onProjectClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
RepositoryTreeObject treeItem = getValueAt(position);
if (treeItem.getType().equals(RepositoryTreeObject.TYPE_FOLDER)) {
mListener.onFolderClicked(treeItem);
} else if (treeItem.getType().equals(RepositoryTreeObject.TYPE_FILE)) {
mListener.onFileClicked(treeItem);
}
}
};
private Listener listener;
private ArrayList<RepositoryTreeObject> values;
 
public FilesAdapter(Listener listener) {
mListener = listener;
mValues = new ArrayList<>();
public FileAdapter(Listener listener) {
this.listener = listener;
values = new ArrayList<>();
}
 
@Override
public FileViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
FileViewHolder holder = FileViewHolder.inflate(parent);
holder.itemView.setOnClickListener(onProjectClickListener);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
RepositoryTreeObject treeItem = getValueAt(position);
if (treeItem.getType().equals(RepositoryTreeObject.TYPE_FOLDER)) {
listener.onFolderClicked(treeItem);
} else if (treeItem.getType().equals(RepositoryTreeObject.TYPE_FILE)) {
listener.onFileClicked(treeItem);
}
}
});
return holder;
}
 
@@ -64,13 +55,13 @@ public class FilesAdapter extends RecyclerView.Adapter<FileViewHolder> {
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_copy:
mListener.onCopyClicked(treeItem);
listener.onCopyClicked(treeItem);
return true;
case R.id.action_share:
mListener.onShareClicked(treeItem);
listener.onShareClicked(treeItem);
return true;
case R.id.action_open:
mListener.onOpenInBrowserClicked(treeItem);
listener.onOpenInBrowserClicked(treeItem);
return true;
}
return false;
@@ -80,23 +71,31 @@ public class FilesAdapter extends RecyclerView.Adapter<FileViewHolder> {
 
@Override
public int getItemCount() {
return mValues.size();
return values.size();
}
 
public void setData(Collection<RepositoryTreeObject> values) {
mValues.clear();
this.values.clear();
if (values != null) {
mValues.addAll(values);
this.values.addAll(values);
}
notifyDataSetChanged();
}
 
public void clear() {
mValues.clear();
values.clear();
notifyDataSetChanged();
}
 
public RepositoryTreeObject getValueAt(int position) {
return mValues.get(position);
return values.get(position);
}
public interface Listener {
void onFolderClicked(RepositoryTreeObject treeItem);
void onFileClicked(RepositoryTreeObject treeItem);
void onCopyClicked(RepositoryTreeObject treeItem);
void onShareClicked(RepositoryTreeObject treeItem);
void onOpenInBrowserClicked(RepositoryTreeObject treeItem);
}
}
app/src/main/java/com/commit451/gitlab/adapter/GroupAdapter.java
+ 13
− 12
View file @ ee86bf76
@@ -16,16 +16,13 @@ import java.util.Collection;
*/
public class GroupAdapter extends RecyclerView.Adapter<GroupViewHolder> {
 
public interface Listener {
void onGroupClicked(Group group, GroupViewHolder groupViewHolder);
}
private Listener mListener;
private Listener listener;
 
private ArrayList<Group> mValues;
private ArrayList<Group> values;
 
public GroupAdapter(Listener listener) {
mListener = listener;
mValues = new ArrayList<>();
this.listener = listener;
values = new ArrayList<>();
}
 
private final View.OnClickListener mOnItemClickListener = new View.OnClickListener() {
@@ -33,18 +30,18 @@ public class GroupAdapter extends RecyclerView.Adapter<GroupViewHolder> {
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
GroupViewHolder holder = (GroupViewHolder) v.getTag(R.id.list_view_holder);
mListener.onGroupClicked(getEntry(position), holder);
listener.onGroupClicked(getEntry(position), holder);
}
};
 
public void setGroups(Collection<Group> groups) {
mValues.clear();
values.clear();
addGroups(groups);
}
 
public void addGroups(Collection<Group> groups) {
if (groups != null) {
mValues.addAll(groups);
values.addAll(groups);
}
notifyDataSetChanged();
}
@@ -65,10 +62,14 @@ public class GroupAdapter extends RecyclerView.Adapter<GroupViewHolder> {
 
@Override
public int getItemCount() {
return mValues.size();
return values.size();
}
 
private Group getEntry(int position) {
return mValues.get(position);
return values.get(position);
}
public interface Listener {
void onGroupClicked(Group group, GroupViewHolder groupViewHolder);
}
}
app/src/main/java/com/commit451/gitlab/adapter/GroupMembersAdapter.java
+ 29
− 31
View file @ ee86bf76
@@ -24,22 +24,13 @@ public class GroupMembersAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
private static final int FOOTER_COUNT = 1;
 
private Listener mListener;
private ArrayList<Member> mData;
private boolean mLoading = false;
private final View.OnClickListener mItemClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
ProjectMemberViewHolder holder = (ProjectMemberViewHolder) v.getTag(R.id.list_view_holder);
mListener.onUserClicked(getMember(position), holder);
}
};
private Listener listener;
private ArrayList<Member> values;
private boolean loading = false;
 
public GroupMembersAdapter(Listener listener) {
mListener = listener;
mData = new ArrayList<>();
this.listener = listener;
values = new ArrayList<>();
}
 
@Override
@@ -47,7 +38,14 @@ public class GroupMembersAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
switch (viewType) {
case TYPE_MEMBER:
ProjectMemberViewHolder holder = ProjectMemberViewHolder.inflate(parent);
holder.itemView.setOnClickListener(mItemClickListener);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
int position = (int) v.getTag(R.id.list_position);
ProjectMemberViewHolder holder = (ProjectMemberViewHolder) v.getTag(R.id.list_view_holder);
listener.onUserClicked(getMember(position), holder);
}
});
return holder;
case TYPE_FOOTER:
return LoadingFooterViewHolder.inflate(parent);
@@ -59,17 +57,17 @@ public class GroupMembersAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
@Override
public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
if (holder instanceof ProjectMemberViewHolder) {
final Member member = mData.get(position);
final Member member = values.get(position);
((ProjectMemberViewHolder) holder).bind(member);
((ProjectMemberViewHolder) holder).mPopupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
((ProjectMemberViewHolder) holder).popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_change_access:
mListener.onUserChangeAccessClicked(member);
listener.onUserChangeAccessClicked(member);
return true;
case R.id.action_remove:
mListener.onUserRemoveClicked(member);
listener.onUserRemoveClicked(member);
return true;
}
return false;
@@ -78,13 +76,13 @@ public class GroupMembersAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
holder.itemView.setTag(R.id.list_position, position);
holder.itemView.setTag(R.id.list_view_holder, holder);
} else if(holder instanceof LoadingFooterViewHolder) {
((LoadingFooterViewHolder) holder).bind(mLoading);
((LoadingFooterViewHolder) holder).bind(loading);
}
}
 
@Override
public int getItemViewType(int position) {
if (position == mData.size()) {
if (position == values.size()) {
return TYPE_FOOTER;
} else {
return TYPE_MEMBER;
@@ -93,43 +91,43 @@ public class GroupMembersAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
 
@Override
public int getItemCount() {
return mData.size() + FOOTER_COUNT;
return values.size() + FOOTER_COUNT;
}
 
private Member getMember(int position) {
return mData.get(position);
return values.get(position);
}
 
public void setData(Collection<Member> members) {
mData.clear();
values.clear();
addData(members);
}
 
public void addData(Collection<Member> members) {
if (members != null) {
mData.addAll(members);
values.addAll(members);
}
notifyDataSetChanged();
}
 
public void addMember(Member member) {
mData.add(0, member);
values.add(0, member);
notifyItemInserted(0);
}
 
public void removeMember(Member member) {
int index = mData.indexOf(member);
mData.remove(index);
int index = values.indexOf(member);
values.remove(index);
notifyItemRemoved(index);
}
 
public void setLoading(boolean loading) {
mLoading = loading;
notifyItemChanged(mData.size());
this.loading = loading;
notifyItemChanged(values.size());
}
 
public boolean isLoading() {
return mLoading;
return loading;
}
 
public boolean isFooter(int position) {
app/src/main/java/com/commit451/gitlab/adapter/GroupPagerAdapter.java
+ 11
− 11
View file @ ee86bf76
@@ -24,27 +24,27 @@ public class GroupPagerAdapter extends FragmentPagerAdapter {
private static final int PROJECTS_POS = 1;
private static final int MEMBERS_POS = 2;
 
private final Group mGroup;
private final String[] mTitles;
private final Set<Integer> mDisabledSections = new HashSet<>();
private final Group group;
private final String[] titles;
private final Set<Integer> disabledSections = new HashSet<>();
 
public GroupPagerAdapter(Context context, FragmentManager fm, Group group) {
super(fm);
 
mGroup = group;
mTitles = context.getResources().getStringArray(R.array.group_tabs);
this.group = group;
titles = context.getResources().getStringArray(R.array.group_tabs);
}
 
@Override
public int getCount() {
return SECTION_COUNT - mDisabledSections.size();
return SECTION_COUNT - disabledSections.size();
}
 
@Override
public CharSequence getPageTitle(int position) {
position = getCorrectPosition(position);
 
return mTitles[position];
return titles[position];
}
 
@Override
@@ -53,11 +53,11 @@ public class GroupPagerAdapter extends FragmentPagerAdapter {
 
switch (position) {
case ACTIVITY_POS:
return FeedFragment.newInstance(mGroup.getFeedUrl());
return FeedFragment.newInstance(group.getFeedUrl());
case PROJECTS_POS:
return ProjectsFragment.newInstance(mGroup);
return ProjectsFragment.newInstance(group);
case MEMBERS_POS:
return GroupMembersFragment.newInstance(mGroup);
return GroupMembersFragment.newInstance(group);
}
 
throw new IllegalStateException("Position exceeded on view pager");
@@ -65,7 +65,7 @@ public class GroupPagerAdapter extends FragmentPagerAdapter {
 
private int getCorrectPosition(int position) {
for (int i = 0; i <= position; i++) {
if (mDisabledSections.contains(i)) {
if (disabledSections.contains(i)) {
position++;
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment