Merge branch 'develop'

app/src/main/java/com/commit451/gitlab/viewHolder/AccessViewHolder.java

@@ -8,7 +8,9 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/AccountFooterViewHolder.java

@@ -5,7 +5,9 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/AccountViewHolder.java

@@ -8,10 +8,12 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.Account;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.Bind;

app/src/main/java/com/commit451/gitlab/viewHolder/AssigneeSpinnerViewHolder.java

 package com.commit451.gitlab.viewHolder;
+import android.graphics.PorterDuff;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
@@ -8,10 +9,13 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
+import com.afollestad.appthemeengine.Config;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Member;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.Bind;
@@ -42,6 +46,9 @@ public class AssigneeSpinnerViewHolder extends RecyclerView.ViewHolder {
         if (user == null) {
             mUsernameView.setText(R.string.no_assignee);
             mImageView.setImageResource(R.drawable.ic_assign_24dp);
+            mImageView.getDrawable().setColorFilter(Config.textColorPrimary(
+                    mImageView.getContext(), AppThemeUtil.resolveThemeKey(mImageView.getContext())),
+                    PorterDuff.Mode.SRC_IN);
         } else {
             mUsernameView.setText(user.getUsername());
             GitLabClient.getPicasso()

app/src/main/java/com/commit451/gitlab/viewHolder/BreadcrumbViewHolder.java

 package com.commit451.gitlab.viewHolder;
-import android.support.v4.content.ContextCompat;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -8,7 +9,10 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.Config;
+import com.afollestad.appthemeengine.util.ATEUtil;
 import com.commit451.gitlab.R;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;
@@ -27,18 +31,26 @@ public class BreadcrumbViewHolder extends RecyclerView.ViewHolder {
     @Bind(R.id.breadcrumb_text) TextView mTextView;
     @Bind(R.id.breadcrumb_arrow) ImageView mArrowView;
+    private int mPrimaryTextColor;
+    private int mSecondaryTextColor;
+
     public BreadcrumbViewHolder(View view) {
         super(view);
         ButterKnife.bind(this, view);
+        mPrimaryTextColor = ATEUtil.isColorLight(Config.primaryColor(view.getContext(),
+                AppThemeUtil.resolveThemeKey(view.getContext()))) ? Color.BLACK : Color.WHITE;
+        mSecondaryTextColor = ATEUtil.adjustAlpha(mPrimaryTextColor, 0.5f);
+        // We need to tint arrow based on text color
+        mArrowView.setColorFilter(mSecondaryTextColor, PorterDuff.Mode.SRC_IN);
     }
     public void bind(String breadcrumb, boolean showArrow) {
         mTextView.setText(breadcrumb);
         if (showArrow) {
-            mTextView.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.white_60));
+            mTextView.setTextColor(mSecondaryTextColor);
             mArrowView.setVisibility(View.VISIBLE);
         } else {
-            mTextView.setTextColor(ContextCompat.getColor(itemView.getContext(), R.color.white));
+            mTextView.setTextColor(mPrimaryTextColor);
             mArrowView.setVisibility(View.GONE);
         }
     }

app/src/main/java/com/commit451/gitlab/viewHolder/CommitViewHolder.java

@@ -7,10 +7,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.RepositoryCommit;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.DateUtils;
 import com.commit451.gitlab.util.ImageUtil;

app/src/main/java/com/commit451/gitlab/viewHolder/DiffHeaderViewHolder.java

+package com.commit451.gitlab.viewHolder;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.commit451.gitlab.R;
+import com.commit451.gitlab.api.GitLabClient;
+import com.commit451.gitlab.model.api.RepositoryCommit;
+import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.DateUtils;
+import com.commit451.gitlab.util.ImageUtil;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
+/**
+ * Header that gives the details of a merge request
+ */
+public class DiffHeaderViewHolder extends RecyclerView.ViewHolder {
+
+    public static DiffHeaderViewHolder inflate(ViewGroup parent) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.header_diff, parent, false);
+        return new DiffHeaderViewHolder(view);
+    }
+
+    @Bind(R.id.commit_author_image) ImageView mImageView;
+    @Bind(R.id.commit_author) TextView mAuthorView;
+    @Bind(R.id.commit_time) TextView mTimeView;
+    @Bind(R.id.commit_title) TextView mTitleView;
+    @Bind(R.id.commit_message) TextView mMessageView;
+
+    public DiffHeaderViewHolder(View view) {
+        super(view);
+        ButterKnife.bind(this, view);
+    }
+
+    public void bind(RepositoryCommit commit) {
+        GitLabClient.getPicasso()
+                .load(ImageUtil.getAvatarUrl(commit.getAuthorEmail(), itemView.getResources().getDimensionPixelSize(R.dimen.image_size)))
+                .transform(new CircleTransformation())
+                .into(mImageView);
+
+        mAuthorView.setText(commit.getAuthorName());
+        mTimeView.setText(DateUtils.getRelativeTimeSpanString(itemView.getContext(), commit.getCreatedAt()));
+        mTitleView.setText(commit.getTitle());
+        String message = extractMessage(commit.getTitle(), commit.getMessage());
+        mMessageView.setText(message);
+        mMessageView.setVisibility(message.isEmpty() ? View.GONE : View.VISIBLE);
+    }
+
+    /**
+     * This extracts the trailing part of the title as it is displayed in the GitLab web interface
+     * (the commit message also contains the commit title)
+     */
+    private String extractMessage(String title, String message) {
+        boolean ellipsis = title.endsWith("\u2026") && message.charAt(title.length() - 1) != '\u2026';
+        String trailing = message.substring(title.length() - (ellipsis ? 1 : 0));
+        return trailing.equals("\u2026") ? "" : ((ellipsis ? "\u2026" : "") + trailing).trim();
+    }
+}

app/src/main/java/com/commit451/gitlab/viewHolder/DiffViewHolder.java

@@ -6,9 +6,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.alorma.diff.lib.DiffTextView;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Diff;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/FeedEntryViewHolder.java

@@ -8,10 +8,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.rss.Entry;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/FileViewHolder.java

@@ -8,8 +8,10 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.RepositoryTreeObject;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/GroupViewHolder.java

@@ -8,9 +8,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Group;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/IssueHeaderViewHolder.java

@@ -9,10 +9,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.DateUtils;
 import com.commit451.gitlab.util.ImageUtil;

app/src/main/java/com/commit451/gitlab/viewHolder/IssueLabelsViewHolder.java

+package com.commit451.gitlab.viewHolder;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.commit451.gitlab.R;
+import com.commit451.gitlab.adapter.IssueLabelsAdapter;
+import com.commit451.gitlab.view.AdapterFlowLayout;
+
+import java.util.Collection;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
+/**
+ * Shows the labels for an issue
+ */
+public class IssueLabelsViewHolder extends RecyclerView.ViewHolder {
+
+    public static IssueLabelsViewHolder inflate(ViewGroup parent) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.header_issue_labels, parent, false);
+        return new IssueLabelsViewHolder(view);
+    }
+
+    @Bind(R.id.adapter_layout)
+    AdapterFlowLayout mFlowLayout;
+    IssueLabelsAdapter mAdapter;
+
+    private final IssueLabelsAdapter.Listener mListener = new IssueLabelsAdapter.Listener() {
+        @Override
+        public void onLabelClicked(String label, LabelViewHolder viewHolder) {
+
+        }
+    };
+
+    public IssueLabelsViewHolder(View view) {
+        super(view);
+        ButterKnife.bind(this, view);
+        mAdapter = new IssueLabelsAdapter(mListener);
+        mFlowLayout.setAdapter(mAdapter);
+    }
+
+    public void bind(Collection<String> labels) {
+        mAdapter.setLabels(labels);
+    }
+}
\ No newline at end of file

app/src/main/java/com/commit451/gitlab/viewHolder/IssueViewHolder.java

@@ -7,10 +7,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.Issue;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.DateUtils;
 import com.commit451.gitlab.util.ImageUtil;

app/src/main/java/com/commit451/gitlab/viewHolder/LabelViewHolder.java

+package com.commit451.gitlab.viewHolder;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.commit451.gitlab.R;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
+/**
+ * Shows the labels for an issue
+ */
+public class LabelViewHolder extends RecyclerView.ViewHolder {
+
+    public static LabelViewHolder inflate(ViewGroup parent) {
+        View view = LayoutInflater.from(parent.getContext())
+                .inflate(R.layout.viewholder_label, parent, false);
+        return new LabelViewHolder(view);
+    }
+
+    @Bind(R.id.title)
+    TextView mTitleView;
+
+    public LabelViewHolder(View view) {
+        super(view);
+        ButterKnife.bind(this, view);
+    }
+
+    public void bind(String label) {
+        mTitleView.setText(label);
+    }
+}
\ No newline at end of file

app/src/main/java/com/commit451/gitlab/viewHolder/MergeRequestHeaderViewHolder.java

@@ -9,10 +9,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.DateUtils;
 import com.commit451.gitlab.util.ImageUtil;
 import com.commit451.gitlab.util.PicassoImageGetter;
@@ -59,7 +61,7 @@ public class MergeRequestHeaderViewHolder extends RecyclerView.ViewHolder {
         if (mergeRequest.getAuthor() != null) {
             author += mergeRequest.getAuthor().getName() + " ";
         }
-        author += itemView.getResources().getString(R.string.created_issue);
+        author += itemView.getResources().getString(R.string.created_merge_request);
         if (mergeRequest.getCreatedAt() != null) {
             author += " " + DateUtils.getRelativeTimeSpanString(itemView.getContext(), mergeRequest.getCreatedAt());
         }

app/src/main/java/com/commit451/gitlab/viewHolder/MergeRequestViewHolder.java

@@ -7,10 +7,12 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.api.GitLabClient;
 import com.commit451.gitlab.model.api.MergeRequest;
 import com.commit451.gitlab.transformation.CircleTransformation;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.ImageUtil;
 import butterknife.Bind;

app/src/main/java/com/commit451/gitlab/viewHolder/MilestoneHeaderViewHolder.java

@@ -6,8 +6,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Milestone;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.DateUtils;
 import butterknife.Bind;

app/src/main/java/com/commit451/gitlab/viewHolder/MilestoneSpinnerViewHolder.java

@@ -7,8 +7,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Milestone;
+import com.commit451.gitlab.util.AppThemeUtil;
 import butterknife.Bind;
 import butterknife.ButterKnife;

app/src/main/java/com/commit451/gitlab/viewHolder/MilestoneViewHolder.java

@@ -6,8 +6,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import com.afollestad.appthemeengine.ATE;
 import com.commit451.gitlab.R;
 import com.commit451.gitlab.model.api.Milestone;
+import com.commit451.gitlab.util.AppThemeUtil;
 import com.commit451.gitlab.util.DateUtils;
 import butterknife.Bind;