fix add RepoDetail code

Author: zhouxingrong

app/src/main/java/com/jusenr/androidgithub/MainTest.java

@@ -0,0 +1,21 @@
+package com.jusenr.androidgithub;
+
+import com.jusenr.androidgithub.utils.Utils;
+
+/**
+ * Description:
+ * Copyright  : Copyright (c) 2017
+ * Email      : jusenr@163.com
+ * Author     : Jusenr
+ * Date       : 2017/10/13
+ * Time       : 17:05
+ * Project    ：androidgithub.
+ */
+public class MainTest {
+
+    public static void main(String[] args) {
+        String githubTime="2017-10-13T08:11:48Z";
+        String s = Utils.formatDateGithub(githubTime);
+        System.out.println(s);
+    }
+}

app/src/main/java/com/jusenr/androidgithub/home/model/interactor/RepoDetailInteractorImpl.java

@@ -9,7 +9,7 @@
 import com.jusenr.androidgithub.user.model.model.UserModel;
 import com.jusenr.androidgithub.utils.AccountHelper;
 import com.jusenr.androidgithub.utils.Constants;
-import com.jusenr.androidgithub.utils.StringUtil;
+import com.jusenr.androidgithub.utils.Utils;
 import com.jusenr.androidlibrary.di.scope.ActivityScope;
 
 import java.util.ArrayList;
@@ -72,7 +72,7 @@ public RepoDetail call(Repo repo, ArrayList<UserModel> users, ArrayList<Repo> fo
                         detail.setForks(forks);
 
                         // because the readme content is encode with Base64 by github.
-                        readme.content = StringUtil.base64Decode(readme.content);
+                        readme.content = Utils.base64Decode(readme.content);
                         detail.setReadme(readme);
                         detail.setContributors(users);
                         return detail;

app/src/main/java/com/jusenr/androidgithub/home/ui/activity/RepoDetailActivity.java

@@ -35,6 +35,8 @@
 
 public class RepoDetailActivity extends PTMVPActivity<RepoDetailPresenter> implements RepoDetailContract.View {
 
+    @BindView(R.id.ll_root_layout)
+    LinearLayout mLlRootLayout;
     @BindView(R.id.riv_repo_item_view)
     RepoItemView mRivRepoItemView;
     @BindView(R.id.contributors_count)
@@ -57,12 +59,12 @@ public class RepoDetailActivity extends PTMVPActivity<RepoDetailPresenter> imple
     TextView mTvReadmeLabel;
     @BindView(R.id.ll_readme_layout)
     LinearLayout mLlReadmeLayout;
-    private String mRepoName;
-    private String mOwner;
 
     private ForkUserListAdapter mForkUserAdapter;
     private ContributorListAdapter mContributorAdapter;
 
+    private String mRepoName;
+    private String mOwner;
     private RepoDetail mRepoDetail;
 
     @Override
@@ -102,6 +104,7 @@ protected void onViewCreated(@Nullable Bundle savedInstanceState) {
 
     @Override
     public void loadRepoDetailsResult(RepoDetail detail) {
+        mLlRootLayout.setVisibility(View.VISIBLE);
         mRepoDetail = detail;
         mOwner = detail.getBaseRepo().getOwner().getLogin();
         mRepoName = detail.getBaseRepo().getName();
@@ -133,11 +136,15 @@ public void loadRepoDetailsFailed(int code, String msg) {
     @Override
     public void starRepoResult(boolean b) {
         Snackbar.make(mRivRepoItemView, b ? "Star Success" : "Star Failed", Snackbar.LENGTH_LONG).show();
+        if (b)
+            mPresenter.onLoadRepoDetails(mOwner, mRepoName);
     }
 
     @Override
     public void unstarRepoResult(boolean b) {
         Snackbar.make(mRivRepoItemView, b ? "UnStar Success" : "UnStar Failed", Snackbar.LENGTH_LONG).show();
+        if (b)
+            mPresenter.onLoadRepoDetails(mOwner, mRepoName);
     }
 
     @Override
@@ -162,6 +169,7 @@ public void onViewClicked(View view) {
     }
 
     private void initViews() {
+        mLlRootLayout.setVisibility(View.INVISIBLE);
         mContributorAdapter = new ContributorListAdapter(null);
         mContributorAdapter.setOnRecyclerViewItemClickListener(new BaseQuickAdapter.OnRecyclerViewItemClickListener() {
             @Override

app/src/main/java/com/jusenr/androidgithub/home/ui/adapter/RepoListRecyclerAdapter.java

@@ -4,7 +4,7 @@
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.jusenr.androidgithub.R;
 import com.jusenr.androidgithub.home.model.model.Repo;
-import com.jusenr.androidgithub.utils.StringUtil;
+import com.jusenr.androidgithub.utils.Utils;
 
 import java.util.List;
 
@@ -19,7 +19,7 @@ public RepoListRecyclerAdapter(List<Repo> data) {
 
     @Override
     protected void convert(BaseViewHolder holder, Repo repo) {
-        holder.setText(R.id.name, StringUtil.replaceAllBlank(repo.getName()));
-        holder.setText(R.id.desc, StringUtil.trimNewLine(repo.getDescription()));
+        holder.setText(R.id.name, Utils.replaceAllBlank(repo.getName()));
+        holder.setText(R.id.desc, Utils.trimNewLine(repo.getDescription()));
     }
 }

app/src/main/java/com/jusenr/androidgithub/user/ui/activity/UserActivity.java

@@ -6,6 +6,7 @@
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.LinearLayout;
 
 import com.jusenr.androidgithub.R;
 import com.jusenr.androidgithub.base.PTMVPActivity;
@@ -25,6 +26,8 @@
 
 public class UserActivity extends PTMVPActivity<UserPresenter> implements UserContract.View {
 
+    @BindView(R.id.ll_root_layout)
+    LinearLayout mLlRootLayout;
     @BindView(R.id.user_card)
     UserCardView mUserCardView;
 
@@ -61,11 +64,15 @@ protected void onViewCreated(@Nullable Bundle savedInstanceState) {
             setTitle(mUsername);
             mPresenter.onUserInfo(mUsername);
         }
+
+        mLlRootLayout.setVisibility(View.INVISIBLE);
     }
 
     @Override
     public void getUserinfoResult(UserModel bean) {
-        mUserCardView.setUser(bean);
+        mLlRootLayout.setVisibility(View.VISIBLE);
+        if (bean != null)
+            mUserCardView.setUser(bean);
     }
 
     @Override

app/src/main/java/com/jusenr/androidgithub/utils/StringUtil.java renamed to app/src/main/java/com/jusenr/androidgithub/utils/Utils.java

@@ -3,13 +3,16 @@
 import android.text.TextUtils;
 import android.util.Base64;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
  * Created by mingjun on 16/7/20.
  */
-public class StringUtil {
+public class Utils {
 
     public static String replaceAllBlank(String str) {
         if (TextUtils.isEmpty(str)) return "";
@@ -35,4 +38,22 @@ public static String base64Decode(String originalString) {
 
         return new String(Base64.decode(originalString, 0));
     }
+
+    /**
+     * Github时间字符串格式化
+     *
+     * @param githubTime 2017-10-13T08:11:48Z
+     * @return 时间字符串
+     */
+    public static String formatDateGithub(String githubTime) {
+        githubTime = githubTime.replace("Z", " UTC");
+        try {
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss Z");
+            Date date = formatter.parse(githubTime);
+            return date.toLocaleString();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 }

app/src/main/java/com/jusenr/androidgithub/widgets/RepoItemView.java

@@ -13,6 +13,7 @@
 import com.flyco.labelview.LabelView;
 import com.jusenr.androidgithub.R;
 import com.jusenr.androidgithub.home.model.model.Repo;
+import com.jusenr.androidgithub.utils.Utils;
 import com.jusenr.androidlibrary.widgets.fresco.FrescoImageView;
 
 import butterknife.BindView;
@@ -80,9 +81,8 @@ public void setRepo(Repo repo) {
             } else {
                 mLabelView.setVisibility(GONE);
             }
-
-            mUpdateTime.setText(repo.getUpdated_at());
-            mStarCount.setText(String.valueOf(repo.getStargazers_count()));
+            mUpdateTime.setText(Utils.formatDateGithub(repo.getUpdated_at()));
+            mStarCount.setText(Integer.toString(repo.getStargazers_count()));
 
             mStarIcon.setImageResource(repo.isStarred() ? R.mipmap.ic_star_selected : R.mipmap.ic_star);
         }

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

@@ -55,10 +55,9 @@
                 <com.jusenr.androidlibrary.widgets.recyclerView.BaseRecyclerView
                     android:id="@+id/rlv_contributor_list"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:layout_marginTop="2dp"
-                    app:columnCount="1"
-                    app:layoutMode="grid"/>
+                    android:layout_height="50dp"
+                    android:layout_marginTop="3dp"
+                    app:layoutMode="horizontal"/>
 
             </LinearLayout>
 
@@ -91,10 +90,9 @@
                 <com.jusenr.androidlibrary.widgets.recyclerView.BaseRecyclerView
                     android:id="@+id/rlv_fork_list"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:layout_marginTop="2dp"
-                    app:columnCount="1"
-                    app:layoutMode="grid"/>
+                    android:layout_height="50dp"
+                    android:layout_marginTop="3dp"
+                    app:layoutMode="horizontal"/>
 
             </LinearLayout>
 

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

@@ -6,6 +6,7 @@
     android:padding="10dp">
 
     <LinearLayout
+        android:id="@+id/ll_root_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">

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

@@ -7,8 +7,10 @@
     <com.jusenr.androidlibrary.widgets.fresco.FrescoImageView
         android:id="@+id/user_icon"
         style="@style/image_round_4dp"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:padding="2dp"
+        android:layout_gravity="center"
         android:scaleType="centerInside"/>
 
 </LinearLayout>