diff --git a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java index c7dca257..3ab321d7 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/NotificationsAdapter.java @@ -12,6 +12,7 @@ import androidx.annotation.NonNull; import androidx.core.content.res.ResourcesCompat; import androidx.core.text.HtmlCompat; import androidx.recyclerview.widget.RecyclerView; +import org.apache.commons.lang3.StringUtils; import org.gitnex.tea4j.models.NotificationThread; import org.mian.gitnex.R; import org.mian.gitnex.database.api.BaseApi; @@ -90,8 +91,10 @@ public class NotificationsAdapter extends RecyclerView.Adapter" + context.getResources().getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + ""; + String subjectId = ""; + + if(StringUtils.containsAny(notificationThread.getSubject().getType().toLowerCase(), "pull", "issue")) { + subjectId = "" + context.getResources().getString(R.string.hash) + url.substring(url.lastIndexOf("/") + 1) + ""; + } subject.setText(HtmlCompat.fromHtml(subjectId + " " + notificationThread.getSubject().getTitle(), HtmlCompat.FROM_HTML_MODE_LEGACY)); - repository.setText(notificationThread.getRepository().getFullName()); + if(!notificationThread.getSubject().getType().equalsIgnoreCase("repository")) { + repository.setText(notificationThread.getRepository().getFullName()); + } else { + repository.setVisibility(View.GONE); + pinned.setVisibility(View.GONE); + pinned = itemView.findViewById(R.id.pinnedVertical); + } if(notificationThread.isPinned()) { pinned.setVisibility(View.VISIBLE); @@ -127,15 +142,35 @@ public class NotificationsAdapter extends RecyclerView.Adapter + + + + - - - - + app:srcCompat="@drawable/ic_pin" /> + + + + + + + + +