Commit 555043d2 authored by Varun Patil's avatar Varun Patil

Show offered achievements in event

parent c61457f3
...@@ -105,7 +105,7 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView. ...@@ -105,7 +105,7 @@ public abstract class CardAdapter<T extends CardInterface> extends RecyclerView.
// Build basic request // Build basic request
RequestCreator requestCreator; RequestCreator requestCreator;
if (t.getAvatarUrl() != null) if (t.getAvatarUrl() != null && !t.getAvatarUrl().equals(""))
requestCreator = Picasso.get().load(Utils.resizeImageUrl(t.getAvatarUrl())); requestCreator = Picasso.get().load(Utils.resizeImageUrl(t.getAvatarUrl()));
else if (getAvatarPlaceholder(t) != 0) { else if (getAvatarPlaceholder(t) != 0) {
requestCreator = Picasso.get().load(getAvatarPlaceholder(t)); requestCreator = Picasso.get().load(getAvatarPlaceholder(t));
......
...@@ -64,6 +64,9 @@ public class Event implements CardInterface { ...@@ -64,6 +64,9 @@ public class Event implements CardInterface {
@SerializedName("user_ues") @SerializedName("user_ues")
private int eventUserUes; private int eventUserUes;
@SerializedName("offered_achievements")
private List<OfferedAchievement> eventOfferedAchievements;
private boolean eventBigImage = false; private boolean eventBigImage = false;
public Event(@NonNull String eventID) { public Event(@NonNull String eventID) {
...@@ -215,6 +218,14 @@ public class Event implements CardInterface { ...@@ -215,6 +218,14 @@ public class Event implements CardInterface {
this.eventBigImage = eventBigImage; this.eventBigImage = eventBigImage;
} }
public List<OfferedAchievement> getEventOfferedAchievements() {
return eventOfferedAchievements;
}
public void setEventOfferedAchievements(List<OfferedAchievement> eventOfferedAchievements) {
this.eventOfferedAchievements = eventOfferedAchievements;
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;
......
package app.insti.api.model;
import androidx.annotation.NonNull;
import com.google.gson.annotations.SerializedName;
import java.util.Objects;
import app.insti.interfaces.CardInterface;
public class OfferedAchievement implements CardInterface {
@NonNull()
@SerializedName("id")
private String achievementID;
@SerializedName("title")
private String achievementTitle;
@SerializedName("description")
private String achievementDescription;
@SerializedName("body")
private String achievementBodyId;
@SerializedName("event")
private String achievementEventId;
@NonNull
public String getAchievementID() {
return achievementID;
}
public void setAchievementID(@NonNull String achievementID) {
this.achievementID = achievementID;
}
public String getAchievementTitle() {
return achievementTitle;
}
public void setAchievementTitle(String achievementTitle) {
this.achievementTitle = achievementTitle;
}
public String getAchievementDescription() {
return achievementDescription;
}
public void setAchievementDescription(String achievementDescription) {
this.achievementDescription = achievementDescription;
}
public String getAchievementBodyId() {
return achievementBodyId;
}
public void setAchievementBodyId(String achievementBodyId) {
this.achievementBodyId = achievementBodyId;
}
public String getAchievementEventId() {
return achievementEventId;
}
public void setAchievementEventId(String achievementEventId) {
this.achievementEventId = achievementEventId;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
OfferedAchievement achievement = (OfferedAchievement) o;
return Objects.equals(achievementID, achievement.achievementID);
}
public long getId() {
return getAchievementID().hashCode();
}
public String getTitle() {
return getAchievementTitle();
}
public String getSubtitle() {
return getAchievementDescription();
}
public String getAvatarUrl() {
return null;
}
}
...@@ -49,6 +49,7 @@ import com.squareup.picasso.Picasso; ...@@ -49,6 +49,7 @@ import com.squareup.picasso.Picasso;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -58,11 +59,13 @@ import app.insti.ShareURLMaker; ...@@ -58,11 +59,13 @@ import app.insti.ShareURLMaker;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity; import app.insti.activity.MainActivity;
import app.insti.adapter.BodyAdapter; import app.insti.adapter.BodyAdapter;
import app.insti.adapter.GenericAdapter;
import app.insti.api.EmptyCallback; import app.insti.api.EmptyCallback;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.Body; import app.insti.api.model.Body;
import app.insti.api.model.Event; import app.insti.api.model.Event;
import app.insti.api.model.Venue; import app.insti.api.model.Venue;
import app.insti.interfaces.CardInterface;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
...@@ -212,6 +215,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg ...@@ -212,6 +215,8 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
} }
private void inflateViews(final Event event) { private void inflateViews(final Event event) {
if (getActivity() == null || getView() == null) return;
eventPicture = (ImageView) getActivity().findViewById(R.id.event_picture_2); eventPicture = (ImageView) getActivity().findViewById(R.id.event_picture_2);
final TextView eventTitle = (TextView) getActivity().findViewById(R.id.event_page_title); final TextView eventTitle = (TextView) getActivity().findViewById(R.id.event_page_title);
final TextView eventDate = (TextView) getActivity().findViewById(R.id.event_page_date); final TextView eventDate = (TextView) getActivity().findViewById(R.id.event_page_date);
...@@ -241,10 +246,11 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg ...@@ -241,10 +246,11 @@ public class EventFragment extends BackHandledFragment implements TransitionTarg
} }
Markwon.setMarkdown(eventDescription, event.getEventDescription()); Markwon.setMarkdown(eventDescription, event.getEventDescription());
final List<Body> bodyList = event.getEventBodies(); final List<CardInterface> cardList = new ArrayList<>(event.getEventOfferedAchievements());
cardList.addAll(event.getEventBodies());
final RecyclerView bodyRecyclerView = getActivity().findViewById(R.id.body_card_recycler_view); final RecyclerView bodyRecyclerView = getActivity().findViewById(R.id.body_card_recycler_view);
BodyAdapter bodyAdapter = new BodyAdapter(bodyList, this); GenericAdapter genericAdapter = new GenericAdapter(cardList, this);
bodyRecyclerView.setAdapter(bodyAdapter); bodyRecyclerView.setAdapter(genericAdapter);
bodyRecyclerView.setLayoutManager(new LinearLayoutManager(getContext())); bodyRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
// Common // Common
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment