From 23de20210f9e00a88ec75d2b28d9579feeb811ba Mon Sep 17 00:00:00 2001 From: Kosh Date: Sat, 13 May 2017 11:16:41 +0800 Subject: [PATCH] this commit fixes #287 --- .../adapter/viewholder/FeedsViewHolder.java | 22 +++++--- .../viewholder/GroupedReviewsViewHolder.java | 12 ++++- .../repos/code/prettifier/ViewerFragment.java | 10 ++-- .../grouped_review_timeline_row_item.xml | 51 +++++++++++-------- 4 files changed, 63 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java index d65f7651..d459539c 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/FeedsViewHolder.java @@ -92,21 +92,31 @@ public class FeedsViewHolder extends BaseViewHolder { .append(in) .append(" "); } else { - spannableBuilder.bold(itemView.getResources().getString(type - .getType()).toLowerCase()) - .append(" "); if (eventsModel.getPayload() != null) { PayloadModel payloadModel = eventsModel.getPayload(); if (payloadModel.getTarget() != null) { - spannableBuilder.append(payloadModel.getTarget().getLogin()) + spannableBuilder + .bold(payloadModel.getTarget().getLogin()) + .append(" ") + .append(in) .append(" "); } else if (payloadModel.getTeam() != null) { - spannableBuilder.append(payloadModel.getTeam().getName()) + spannableBuilder + .bold(payloadModel.getTeam().getName()) + .append(" ") + .append(in) .append(" "); } else if (payloadModel.getMember() != null) { - spannableBuilder.append(payloadModel.getMember().getName()) + spannableBuilder + .bold(payloadModel.getMember().getLogin()) + .append(" ") + .append(in) .append(" "); + } else { + spannableBuilder.bold(itemView.getResources().getString(type.getType()).toLowerCase()).append(" "); } + } else { + spannableBuilder.bold(itemView.getResources().getString(type.getType()).toLowerCase()).append(" "); } } } diff --git a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java index 72d0f94e..4289fa4f 100644 --- a/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java +++ b/app/src/main/java/com/fastaccess/ui/adapter/viewholder/GroupedReviewsViewHolder.java @@ -2,6 +2,8 @@ package com.fastaccess.ui.adapter.viewholder; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.transition.ChangeBounds; +import android.support.transition.TransitionManager; import android.view.View; import android.view.ViewGroup; @@ -34,6 +36,7 @@ public class GroupedReviewsViewHolder extends BaseViewHolder impl @BindView(R.id.name) FontTextView name; @BindView(R.id.toggle) ForegroundImageView toggle; @BindView(R.id.patch) FontTextView patch; + @BindView(R.id.minimized) View minimized; private final int patchAdditionColor; private final int patchDeletionColor; private final int patchRefColor; @@ -41,6 +44,7 @@ public class GroupedReviewsViewHolder extends BaseViewHolder impl private ReactionsCallback reactionsCallback; private String pathText; private PullRequestTimelineMvp.ReviewCommentCallback reviewCommentCallback; + private ViewGroup viewGroup; @Override public void onClick(View v) { int position = getAdapterPosition(); @@ -48,12 +52,13 @@ public class GroupedReviewsViewHolder extends BaseViewHolder impl onToggle(onToggleView.isCollapsed(position)); } - private GroupedReviewsViewHolder(@NonNull View itemView, @Nullable BaseRecyclerAdapter adapter, + private GroupedReviewsViewHolder(@NonNull View itemView, ViewGroup viewGroup, @Nullable BaseRecyclerAdapter adapter, @NonNull OnToggleView onToggleView, @NonNull ReactionsCallback reactionsCallback, @NonNull PullRequestTimelineMvp.ReviewCommentCallback reviewCommentCallback) { super(itemView, adapter); this.onToggleView = onToggleView; + this.viewGroup = viewGroup; this.reactionsCallback = reactionsCallback; this.reviewCommentCallback = reviewCommentCallback; patchAdditionColor = ViewHelper.getPatchAdditionColor(itemView.getContext()); @@ -67,7 +72,7 @@ public class GroupedReviewsViewHolder extends BaseViewHolder impl @NonNull OnToggleView onToggleView, @NonNull ReactionsCallback reactionsCallback, @NonNull PullRequestTimelineMvp.ReviewCommentCallback reviewCommentCallback) { - return new GroupedReviewsViewHolder(getView(viewGroup, R.layout.grouped_review_timeline_row_item), adapter, + return new GroupedReviewsViewHolder(getView(viewGroup, R.layout.grouped_review_timeline_row_item), viewGroup, adapter, onToggleView, reactionsCallback, reviewCommentCallback); } @@ -100,11 +105,14 @@ public class GroupedReviewsViewHolder extends BaseViewHolder impl } private void onToggle(boolean expanded) { + TransitionManager.beginDelayedTransition(viewGroup, new ChangeBounds()); if (!expanded) { + minimized.setVisibility(View.GONE); patch.setText("....."); name.setMaxLines(2); toggle.setRotation(0.0f); } else { + minimized.setVisibility(View.VISIBLE); name.setMaxLines(5); setPatchText(pathText); toggle.setRotation(180f); diff --git a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java index 39ffdaa2..9383d64c 100644 --- a/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java +++ b/app/src/main/java/com/fastaccess/ui/modules/repos/code/prettifier/ViewerFragment.java @@ -57,6 +57,7 @@ public class ViewerFragment extends BaseFragment @@ -43,6 +44,7 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="2" + android:padding="@dimen/spacing_normal" android:textColor="?android:textColorPrimary" tools:text="When one acquires"/> @@ -57,29 +59,36 @@ - - - + android:visibility="gone"> + + + + \ No newline at end of file