diff --git a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java index 41c80252..1d7a7026 100644 --- a/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/IssueDetailActivity.java @@ -735,9 +735,17 @@ public class IssueDetailActivity extends BaseActivity implements LabelsListAdapt bundle.putInt("issueId", singleIssue.getNumber()); ReactionList reactionList = new ReactionList(ctx, bundle); + viewBinding.commentReactionBadges.removeAllViews(); viewBinding.commentReactionBadges.addView(reactionList); + reactionList.setOnReactionAddedListener(() -> { + + if(viewBinding.commentReactionBadges.getVisibility() != View.VISIBLE) { + viewBinding.commentReactionBadges.post(() -> viewBinding.commentReactionBadges.setVisibility(View.VISIBLE)); + } + }); + if(singleIssue.getMilestone() != null) { viewBinding.issueMilestone.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java index ea4ff8d0..13df14d1 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/IssueCommentsAdapter.java @@ -24,7 +24,6 @@ import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.fragments.BottomSheetReplyFragment; import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.AppUtil; -import org.mian.gitnex.helpers.ClickListener; import org.mian.gitnex.helpers.Markdown; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.helpers.TimeHelper; @@ -331,8 +330,8 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter TimeHelper.customDateFormatForToastDateFormat(issueComment.getCreated_at())); + } else if(timeFormat.equals("normal")) { @@ -355,7 +354,14 @@ public class IssueCommentsAdapter extends RecyclerView.Adapter { + + if(holder.commentReactionBadges.getVisibility() != View.VISIBLE) { + holder.commentReactionBadges.post(() -> holder.commentReactionBadges.setVisibility(View.VISIBLE)); + } + }); } diff --git a/app/src/main/java/org/mian/gitnex/views/ReactionList.java b/app/src/main/java/org/mian/gitnex/views/ReactionList.java index 3e13dfcd..e651e51e 100644 --- a/app/src/main/java/org/mian/gitnex/views/ReactionList.java +++ b/app/src/main/java/org/mian/gitnex/views/ReactionList.java @@ -33,6 +33,7 @@ import retrofit2.Response; public class ReactionList extends HorizontalScrollView { private enum ReactionType { COMMENT, ISSUE } + private OnReactionAddedListener onReactionAddedListener; @SuppressLint("SetTextI18n") public ReactionList(Context context, Bundle bundle) { @@ -127,7 +128,9 @@ public class ReactionList extends HorizontalScrollView { Emoji emoji = EmojiManager.getForAlias(content); ((TextView) reactionBadge.findViewById(R.id.symbol)).setText(((emoji == null) ? content : emoji.getUnicode()) + " " + issueReactions.size()); + root.post(() -> root.addView(reactionBadge)); + onReactionAddedListener.reactionAdded(); } @@ -137,4 +140,10 @@ public class ReactionList extends HorizontalScrollView { } + public void setOnReactionAddedListener(OnReactionAddedListener onReactionAddedListener) { + this.onReactionAddedListener = onReactionAddedListener; + } + + public interface OnReactionAddedListener { void reactionAdded(); } + } diff --git a/app/src/main/res/layout/activity_issue_detail.xml b/app/src/main/res/layout/activity_issue_detail.xml index d46c028c..8dae0cd5 100644 --- a/app/src/main/res/layout/activity_issue_detail.xml +++ b/app/src/main/res/layout/activity_issue_detail.xml @@ -230,6 +230,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/issueTimeFrame" + android:visibility="gone" android:layout_marginTop="10dp" android:orientation="horizontal" /> diff --git a/app/src/main/res/layout/list_issue_comments.xml b/app/src/main/res/layout/list_issue_comments.xml index aef721ce..a608472f 100644 --- a/app/src/main/res/layout/list_issue_comments.xml +++ b/app/src/main/res/layout/list_issue_comments.xml @@ -77,6 +77,7 @@ android:id="@+id/commentReactionBadges" android:layout_width="match_parent" android:layout_height="wrap_content" + android:visibility="gone" android:layout_marginTop="15dp" android:orientation="horizontal" /> diff --git a/build.gradle b/build.gradle index 9341bf2d..13ea7bad 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:4.1.1' } }