Merge pull request #231 from tpb1908/issue_226

tpb1908 · web-flow · commit 4c87522af73a · 2017-04-03T00:25:20.000+01:00
Issue 226
diff --git a/app/build.gradle b/app/build.gradle
@@ -36,10 +36,12 @@ android {
         it.buildConfigField('String', 'BUG_EMAIL', project.hasProperty('BUG_EMAIL') ? BUG_EMAIL : System.getenv('BUG_EMAIL'))
         it.buildConfigField('String', 'IMGUR_CLIENT_ID', project.hasProperty('IMGUR_CLIENT_ID') ? IMGUR_CLIENT_ID : System.getenv('IMGUR_CLIENT_ID'))
         it.buildConfigField('String', 'IMGUR_CLIENT_SECRET', project.hasProperty('IMGUR_CLIENT_SECRET') ? IMGUR_CLIENT_SECRET : System.getenv('IMGUR_CLIENT_SECRET'))
+        it.buildConfigField('Boolean', 'IS_IN_DEBUG', 'true')
     }
 
     buildTypes {
         release {
+            it.buildConfigField('Boolean', 'IS_IN_DEBUG', 'true')
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
diff --git a/app/src/main/java/com/tpb/projects/commits/fragments/CommitInfoFragment.java b/app/src/main/java/com/tpb/projects/commits/fragments/CommitInfoFragment.java
@@ -9,23 +9,25 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
+import android.widget.TextView;
 
 import com.tpb.animatingrecyclerview.AnimatingRecyclerView;
 import com.tpb.github.data.APIHandler;
 import com.tpb.github.data.Loader;
 import com.tpb.github.data.models.Commit;
+import com.tpb.github.data.models.CompleteStatus;
+import com.tpb.github.data.models.Status;
+import com.tpb.mdtext.Markdown;
+import com.tpb.mdtext.views.MarkdownTextView;
 import com.tpb.projects.R;
 import com.tpb.projects.commits.CommitActivity;
 import com.tpb.projects.commits.CommitDiffAdapter;
-import com.tpb.projects.flow.IntentHandler;
-import com.tpb.mdtext.Markdown;
-import com.tpb.projects.markdown.Spanner;
 import com.tpb.projects.common.FixedLinearLayoutManger;
 import com.tpb.projects.common.NetworkImageView;
+import com.tpb.projects.flow.IntentHandler;
+import com.tpb.projects.markdown.Spanner;
 import com.tpb.projects.util.Util;
 
-import com.tpb.mdtext.views.MarkdownTextView;
-
 import java.util.Date;
 
 import butterknife.BindView;
@@ -37,6 +39,7 @@
  */
 
 public class CommitInfoFragment extends CommitFragment {
+    private static final String TAG = CommitInfoFragment.class.getSimpleName();
 
     private Unbinder unbinder;
 
@@ -66,6 +69,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         mRecyclerView.setLayoutManager(new FixedLinearLayoutManger(getContext()));
         mRecyclerView.setAdapter(mAdapter);
         mRefresher.setOnRefreshListener(() -> {
+            ButterKnife.findById(getActivity(), R.id.commit_status).setVisibility(View.GONE);
             mAdapter.clear();
             new Loader(getContext()).loadCommit(new Loader.ItemLoader<Commit>() {
                 @Override
@@ -103,7 +107,6 @@ public void commitLoaded(Commit commit) {
             user = mCommit.getCommitterName();
             IntentHandler.addOnClickHandler(getActivity(), mAvatar, user);
         }
-
         if(mCommit.getFiles() != null) {
             String builder =
                     "<br>" +
@@ -128,9 +131,44 @@ public void commitLoaded(Commit commit) {
             mRefresher.setRefreshing(false);
             mAdapter.setDiffs(mCommit.getFiles());
         }
+        new Loader(getContext()).loadCommitStatuses(new Loader.ItemLoader<CompleteStatus>() {
+            @Override
+            public void loadComplete(CompleteStatus data) {
+                if(data.getTotalCount() == 0) return; //We don't care if there is no integration
+                ButterKnife.findById(getActivity(), R.id.commit_status).setVisibility(View.VISIBLE);
+                final NetworkImageView niv = ButterKnife.findById(getActivity(), R.id.status_image);
+                final TextView status = ButterKnife.findById(getActivity(), R.id.status_state);
+                final TextView desc = ButterKnife.findById(getActivity(), R.id.status_context);
+                if("success".equals(data.getState())) {
+                    niv.setImageResource(R.drawable.ic_check);
+                } else if("pending".equals(data.getState())) {
+                    niv.setImageResource(R.drawable.ic_loading);
+                } else {
+                    niv.setImageResource(R.drawable.ic_failure);
+                }
+                status.setText(String.format(getString(R.string.text_ci_status), data.getState()));
+                final StringBuilder builder = new StringBuilder();
+                if(data.getStatuses() != null) {
+                    for(Status s: data.getStatuses()) {
+                        builder.append(
+                                String.format(getString(R.string.text_ci_info),
+                                        s.getContext(),
+                                        s.getDescription())
+                        );
+                        builder.append('\n');
+                    }
+                }
+                desc.setText(builder.toString());
+            }
+
+            @Override
+            public void loadError(APIHandler.APIError error) {
 
+            }
+        }, mCommit.getFullRepoName(), mCommit.getSha());
     }
 
+
     private void checkSharedElementEntry() {
         final Intent i = getActivity().getIntent();
         if(i.hasExtra(getString(R.string.transition_card))) {
diff --git a/app/src/main/java/com/tpb/projects/issues/fragments/IssueInfoFragment.java b/app/src/main/java/com/tpb/projects/issues/fragments/IssueInfoFragment.java
@@ -65,7 +65,8 @@ public class IssueInfoFragment extends IssueFragment {
 
     @BindView(R.id.issue_header_card) CardView mHeader;
     @BindView(R.id.issue_events_recycler) RecyclerView mRecycler;
-    @BindView(R.id.issue_assignees) LinearLayout mAssigneesLayout; //http://stackoverflow.com/a/29430226/4191572
+    @BindView(R.id.issue_assignees) LinearLayout mAssigneesLayout;
+    @BindView(R.id.text_issue_assignees) View mAssigneesTitle;
     @BindView(R.id.issue_menu_button) ImageButton mOverflowButton;
     @BindView(R.id.issue_user_avatar) NetworkImageView mUserAvatar;
     @BindView(R.id.issue_state) ImageView mImageState;
@@ -157,21 +158,22 @@ private void displayAssignees(Issue issue) {
         mAssigneesLayout.removeAllViews();
         if(issue != null && issue.getAssignees() != null && issue.getAssignees().length > 0) {
             mAssigneesLayout.setVisibility(View.VISIBLE);
-            for(int i = 0; i < issue.getAssignees().length; i++) {
-                final User u = issue.getAssignees()[i];
+            mAssigneesTitle.setVisibility(View.VISIBLE);
+            for(User u : issue.getAssignees()) {
                 final LinearLayout user = (LinearLayout) getActivity().getLayoutInflater()
                                                                       .inflate(R.layout.shard_user,
-                                                                              null
+                                                                              mAssigneesLayout,
+                                                                              false
                                                                       );
-                user.setId(i);
+                user.setId(View.generateViewId());
                 mAssigneesLayout.addView(user);
                 final NetworkImageView imageView = ButterKnife.findById(user, R.id.user_avatar);
                 imageView.setId(View.generateViewId());
                 imageView.setImageUrl(u.getAvatarUrl());
                 imageView.setScaleType(ImageView.ScaleType.FIT_XY);
                 final TextView login = ButterKnife.findById(user, R.id.user_login);
                 login.setId(View.generateViewId()); //Max 10 assignees
-                login.setText(issue.getAssignees()[i].getLogin());
+                login.setText(u.getLogin());
                 user.setOnClickListener((v) -> {
                     final Intent us = new Intent(getActivity(), UserActivity.class);
                     us.putExtra(getString(R.string.intent_username), u.getLogin());
@@ -192,6 +194,7 @@ private void displayAssignees(Issue issue) {
             }
         } else {
             mAssigneesLayout.setVisibility(View.GONE);
+            mAssigneesTitle.setVisibility(View.GONE);
         }
     }
 
diff --git a/app/src/main/java/com/tpb/projects/util/Logger.java b/app/src/main/java/com/tpb/projects/util/Logger.java
@@ -1,14 +1,13 @@
 package com.tpb.projects.util;
 
-import android.support.compat.BuildConfig;
 import android.util.Log;
 
 /**
  * Created by theo on 11/03/17.
  */
 
 public class Logger {
-    public static final boolean DEBUG = BuildConfig.DEBUG;
+    private static final boolean DEBUG = com.tpb.projects.BuildConfig.IS_IN_DEBUG;
 
 
     public static void logLong(String TAG, String s) {
@@ -55,4 +54,12 @@ public static void i(String tag, String msg, Throwable tr) {
         if(DEBUG) Log.i(tag, msg, tr);
     }
 
+    public static void e(String tag, String msg) {
+        if(DEBUG) Log.e(tag, msg);
+    }
+
+    public static void e(String tag, String msg, Throwable tr) {
+        if(DEBUG) Log.e(tag, msg, tr);
+    }
+
 }
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#6cc644"
+        android:pathData="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_failure.xml b/app/src/main/res/drawable/ic_failure.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#bd2c00"
+        android:pathData="M7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm0 1.3c1.3 0 2.5.44 3.47 1.17l-8 8A5.755 5.755 0 0 1 1.3 8c0-3.14 2.56-5.7 5.7-5.7zm0 11.41c-1.3 0-2.5-.44-3.47-1.17l8-8c.73.97 1.17 2.17 1.17 3.47 0 3.14-2.56 5.7-5.7 5.7z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_loading.xml b/app/src/main/res/drawable/ic_loading.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp"
+        android:width="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#FF5722"
+        android:pathData="M10.24 7.4a4.15 4.15 0 0 1-1.2 3.6 4.346 4.346 0 0 1-5.41.54L4.8 10.4.5 9.8l.6 4.2 1.31-1.26c2.36 1.74 5.7 1.57 7.84-.54a5.876 5.876 0 0 0 1.74-4.46l-1.75-.34zM2.96 5a4.346 4.346 0 0 1 5.41-.54L7.2 5.6l4.3.6-.6-4.2-1.31 1.26c-2.36-1.74-5.7-1.57-7.85.54C.5 5.03-.06 6.65.01 8.26l1.75.35A4.17 4.17 0 0 1 2.96 5z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_commit_info.xml b/app/src/main/res/layout/fragment_commit_info.xml
@@ -71,6 +71,44 @@
 
             </android.support.v7.widget.CardView>
 
+            <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                          android:id="@+id/commit_status"
+                          android:orientation="horizontal"
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:paddingStart="16dp"
+                          android:paddingEnd="16dp"
+                          android:visibility="gone">
+
+                <com.tpb.projects.common.NetworkImageView
+                    android:id="@+id/status_image"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
+                    android:layout_gravity="center_horizontal|top"/>
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:id="@+id/status_state"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@android:style/TextAppearance.Material.Subhead"/>
+
+                    <TextView
+                        android:id="@+id/status_context"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textAppearance="@android:style/TextAppearance.Material.Small"/>
+                </LinearLayout>
+
+            </LinearLayout>
+
             <com.tpb.animatingrecyclerview.AnimatingRecyclerView
                 android:id="@+id/commit_diff_recycler"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_issue_info.xml b/app/src/main/res/layout/fragment_issue_info.xml
@@ -88,11 +88,13 @@
             </android.support.v7.widget.CardView>
 
             <TextView
+                android:id="@+id/text_issue_assignees"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
-                android:text="@string/text_collaborators"/>
+                android:text="@string/text_assignees"
+                android:visibility="gone"/>
 
             <HorizontalScrollView
                 android:layout_width="match_parent"
@@ -103,7 +105,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:layout_margin="8dp">
+                    android:layout_margin="8dp"
+                    android:visibility="gone">
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -70,6 +70,8 @@
     <string name="text_committed_by">%1$s committed on %2$s</string>
     <string name="text_committed_by_with_has">%1$s committed %2$s on with %3$s</string>
     <string name="text_diff_changes">%1$s with %2$s and %3$s</string>
+    <string name="text_ci_status">Continuous integration status: %1$s</string>
+    <string name="text_ci_info">%1$s \n%2$s</string>
     <plurals name="text_commit_additions">
         <item quantity="one">%d addition</item>
         <item quantity="other">%d additions</item>
@@ -170,6 +172,7 @@
 
     <!-- Issue strings -->
     <string name="text_loading_collaborators">Loading collaborators</string>
+    <string name="text_assignees">Assignee</string>
     <string name="text_loading_labels">Loading labels</string>
     <string name="text_assigned_to">Assigned to </string>
     <string name="text_closed_by_link">Closed by [%1$s](%2$s) %3$s</string>
diff --git a/gitapi/src/main/java/com/tpb/github/data/Loader.java b/gitapi/src/main/java/com/tpb/github/data/Loader.java
@@ -18,6 +18,7 @@
 import com.tpb.github.data.models.Column;
 import com.tpb.github.data.models.Comment;
 import com.tpb.github.data.models.Commit;
+import com.tpb.github.data.models.CompleteStatus;
 import com.tpb.github.data.models.Event;
 import com.tpb.github.data.models.Gist;
 import com.tpb.github.data.models.Issue;
@@ -57,6 +58,7 @@ public class Loader extends APIHandler {
     private static final String SEGMENT_MARKDOWN = "/markdown";
     private static final String SEGMENT_BRANCHES = "/branches";
     private static final String SEGMENT_CONTRIBUTORS = "/contributors";
+    private static final String SEGMENT_STATUS = "/status";
 
     public Loader(Context context) {
         super(context);
@@ -1101,6 +1103,24 @@ public void onError(ANError anError) {
                 });
     }
 
+    public void loadCommitStatuses(@NonNull final ItemLoader<CompleteStatus> loader, final String repoFullName, String sha) {
+        AndroidNetworking.get(GIT_BASE + SEGMENT_REPOS + "/" + repoFullName + SEGMENT_COMMITS + "/" + sha + SEGMENT_STATUS)
+                .addHeaders(API_AUTH_HEADERS)
+                .build()
+                .getAsJSONObject(new JSONObjectRequestListener() {
+                    @Override
+                    public void onResponse(JSONObject response) {
+                        loader.loadComplete(new CompleteStatus(response));
+
+                    }
+
+                    @Override
+                    public void onError(ANError anError) {
+                        loader.loadError(parseError(anError));
+                    }
+                });
+    }
+
     private static String appendPage(int page) {
         return page > 1 ? "?page=" + page : "";
     }
diff --git a/gitapi/src/main/java/com/tpb/github/data/models/CompleteStatus.java b/gitapi/src/main/java/com/tpb/github/data/models/CompleteStatus.java
diff --git a/gitapi/src/main/java/com/tpb/github/data/models/Repository.java b/gitapi/src/main/java/com/tpb/github/data/models/Repository.java
diff --git a/gitapi/src/main/java/com/tpb/github/data/models/Status.java b/gitapi/src/main/java/com/tpb/github/data/models/Status.java

Original file line number	Diff line number	Diff line change
`@@ -36,10 +36,12 @@ android {`
`36`	`36`	`it.buildConfigField('String', 'BUG_EMAIL', project.hasProperty('BUG_EMAIL') ? BUG_EMAIL : System.getenv('BUG_EMAIL'))`
`37`	`37`	`it.buildConfigField('String', 'IMGUR_CLIENT_ID', project.hasProperty('IMGUR_CLIENT_ID') ? IMGUR_CLIENT_ID : System.getenv('IMGUR_CLIENT_ID'))`
`38`	`38`	`it.buildConfigField('String', 'IMGUR_CLIENT_SECRET', project.hasProperty('IMGUR_CLIENT_SECRET') ? IMGUR_CLIENT_SECRET : System.getenv('IMGUR_CLIENT_SECRET'))`
	`39`	`+ it.buildConfigField('Boolean', 'IS_IN_DEBUG', 'true')`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`buildTypes {`
`42`	`43`	`release {`
	`44`	`+ it.buildConfigField('Boolean', 'IS_IN_DEBUG', 'true')`
`43`	`45`	`minifyEnabled false`
`44`	`46`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`45`	`47`	`}`