Skip to content

I
InstiApp
Commit 61cc9621 authored by Sajal Narang's avatar Sajal Narang
Browse files
Options

Add data classes

parent 36358e7e
Hide whitespace changes
Inline Side-by-side
Showing with 381 additions and 78 deletions
app/build.gradle
View file @ 61cc9621
...@@ -29,6 +29,7 @@ ext { ...@@ -29,6 +29,7 @@ ext {
retrofitVersion = '2.1.0' retrofitVersion = '2.1.0'
okhttpVersion = '3.4.1' okhttpVersion = '3.4.1'
picassoVersion = '2.5.0' picassoVersion = '2.5.0'
archRoomVersion = "1.0.0-alpha1"
} }
...@@ -52,5 +53,7 @@ dependencies { ...@@ -52,5 +53,7 @@ dependencies {
compile "com.squareup.okhttp3:okhttp:${okhttpVersion}" compile "com.squareup.okhttp3:okhttp:${okhttpVersion}"
compile "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}" compile "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
compile "com.squareup.picasso:picasso:${picassoVersion}" compile "com.squareup.picasso:picasso:${picassoVersion}"
compile "android.arch.persistence.room:runtime:${archRoomVersion}"
annotationProcessor "android.arch.persistence.room:compiler:${archRoomVersion}"
} }
apply plugin: 'com.google.gms.google-services' apply plugin: 'com.google.gms.google-services'
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/FeedAdapter.java
View file @ 61cc9621
...@@ -14,7 +14,6 @@ import java.util.List; ...@@ -14,7 +14,6 @@ import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener; import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R; import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.api.model.Event;
public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> { public class FeedAdapter extends RecyclerView.Adapter<FeedAdapter.ViewHolder> {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/Event.java deleted 100644 → 0
View file @ 36358e7e
package in.ac.iitb.gymkhana.iitbapp.api.model;
import com.google.gson.annotations.SerializedName;
public class Event {
@SerializedName("event_name")
String eventName;
@SerializedName("event_description")
String eventDescription;
@SerializedName("event_image")
String eventImage;
@SerializedName("event_creator_name")
String eventCreatorName;
@SerializedName("event_creator_id")
String eventCreatorId;
@SerializedName("event_going_status")
int eventEnthu;
public Event(String eventName, String eventDescription, String eventImage, String eventCreatorName, String eventCreatorId, int eventEnthu) {
this.eventName = eventName;
this.eventDescription = eventDescription;
this.eventImage = eventImage;
this.eventCreatorName = eventCreatorName;
this.eventCreatorId = eventCreatorId;
this.eventEnthu = eventEnthu;
}
public String getEventName() {
return eventName;
}
public void setEventName(String eventName) {
this.eventName = eventName;
}
public String getEventDescription() {
return eventDescription;
}
public void setEventDescription(String eventDescription) {
this.eventDescription = eventDescription;
}
public String getEventImage() {
return eventImage;
}
public void setEventImage(String eventImage) {
this.eventImage = eventImage;
}
public String getEventCreatorName() {
return eventCreatorName;
}
public void setEventCreatorName(String eventCreatorName) {
this.eventCreatorName = eventCreatorName;
}
public String getEventCreatorId() {
return eventCreatorId;
}
public void setEventCreatorId(String eventCreatorId) {
this.eventCreatorId = eventCreatorId;
}
public int getEventEnthu() {
return eventEnthu;
}
public void setEventEnthu(int eventEnthu) {
this.eventEnthu = eventEnthu;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Body.java 0 → 100644
View file @ 61cc9621
package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import com.google.gson.annotations.SerializedName;
import java.util.List;
@Entity
class Body {
@ColumnInfo(name = "id")
@SerializedName("id")
String bodyID;
@ColumnInfo(name = "name")
@SerializedName("name")
String bodyName;
@ColumnInfo(name = "description")
@SerializedName("description")
String bodyDescription;
@ColumnInfo(name = "image_url")
@SerializedName("image_url")
String bodyImageURL;
@ColumnInfo(name = "children")
@SerializedName("children")
List<Body> bodyChildren;
@ColumnInfo(name = "parents")
@SerializedName("parents")
List<Body> bodyParents;
@ColumnInfo(name = "events")
@SerializedName("events")
List<Event> bodyEvents;
@ColumnInfo(name = "followers_count")
@SerializedName("followers_count")
int bodyFollowersCount;
public Body(String bodyID, String bodyName, String bodyDescription, String bodyImageURL, List<Body> bodyChildren, List<Body> bodyParents, List<Event> bodyEvents, int bodyFollowersCount) {
this.bodyID = bodyID;
this.bodyName = bodyName;
this.bodyDescription = bodyDescription;
this.bodyImageURL = bodyImageURL;
this.bodyChildren = bodyChildren;
this.bodyParents = bodyParents;
this.bodyEvents = bodyEvents;
this.bodyFollowersCount = bodyFollowersCount;
}
public String getBodyID() {
return bodyID;
}
public void setBodyID(String bodyID) {
this.bodyID = bodyID;
}
public String getBodyName() {
return bodyName;
}
public void setBodyName(String bodyName) {
this.bodyName = bodyName;
}
public String getBodyDescription() {
return bodyDescription;
}
public void setBodyDescription(String bodyDescription) {
this.bodyDescription = bodyDescription;
}
public String getBodyImageURL() {
return bodyImageURL;
}
public void setBodyImageURL(String bodyImageURL) {
this.bodyImageURL = bodyImageURL;
}
public List<Body> getBodyChildren() {
return bodyChildren;
}
public void setBodyChildren(List<Body> bodyChildren) {
this.bodyChildren = bodyChildren;
}
public List<Body> getBodyParents() {
return bodyParents;
}
public void setBodyParents(List<Body> bodyParents) {
this.bodyParents = bodyParents;
}
public List<Event> getBodyEvents() {
return bodyEvents;
}
public void setBodyEvents(List<Event> bodyEvents) {
this.bodyEvents = bodyEvents;
}
public int getBodyFollowersCount() {
return bodyFollowersCount;
}
public void setBodyFollowersCount(int bodyFollowersCount) {
this.bodyFollowersCount = bodyFollowersCount;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java 0 → 100644
View file @ 61cc9621
package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo;
import com.google.gson.annotations.SerializedName;
import java.util.List;
public class Event {
@ColumnInfo(name = "id")
@SerializedName("id")
String eventID;
@ColumnInfo(name = "name")
@SerializedName("name")
String eventName;
@ColumnInfo(name = "description")
@SerializedName("description")
String eventDescription;
@ColumnInfo(name = "image_url")
@SerializedName("image_url")
String eventImageURL;
@ColumnInfo(name = "start_time")
@SerializedName("start_time")
String eventStartTime;
@ColumnInfo(name = "end_time")
@SerializedName("end_time")
String eventEndTime;
@ColumnInfo(name = "all_day")
@SerializedName("all_day")
boolean allDayEvent;
@ColumnInfo(name = "venues")
@SerializedName("venues")
List<Venue> eventVenues;
@ColumnInfo(name = "bodies")
@SerializedName("bodies")
List<Body> eventBodies;
@ColumnInfo(name = "interested_count")
@SerializedName("interested_count")
int eventInterestedCount;
@ColumnInfo(name = "going_count")
@SerializedName("going_count")
int eventGoingCount;
@ColumnInfo(name = "interested")
@SerializedName("interested")
List<User> eventInterested;
@ColumnInfo(name = "going")
@SerializedName("going")
List<User> eventGoing;
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java 0 → 100644
View file @ 61cc9621
package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import com.google.gson.annotations.SerializedName;
import java.util.List;
@Entity
class User {
@ColumnInfo(name = "id")
@SerializedName("id")
String userID;
@ColumnInfo(name = "name")
@SerializedName("name")
String userName;
@ColumnInfo(name = "profile_pic")
@SerializedName("profile_pic")
String userProfilePictureUrl;
@ColumnInfo(name = "events_interested")
@SerializedName("events_interested")
List<Event> userInterestedEvents;
@ColumnInfo(name = "events_going")
@SerializedName("events_going")
List<Event> userGoingEvents;
@ColumnInfo(name = "email")
@SerializedName("email")
String userEmail;
@ColumnInfo(name = "year")
@SerializedName("year")
int userYear;
@ColumnInfo(name = "roll_no")
@SerializedName("roll_no")
String userRollNumber;
@ColumnInfo(name = "contact_no")
@SerializedName("contact_no")
String userContactNumber;
@ColumnInfo(name = "about")
@SerializedName("about")
String userAbout;
@ColumnInfo(name = "followed_bodies")
@SerializedName("followed_bodies")
List<Body> userFollowedBodies;
@ColumnInfo(name = "followed_bodies_id")
@SerializedName("followed_bodies_id")
List<String> userFollowedBodiesID;
public User(String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, int userYear, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID) {
this.userID = userID;
this.userName = userName;
this.userProfilePictureUrl = userProfilePictureUrl;
this.userInterestedEvents = userInterestedEvents;
this.userGoingEvents = userGoingEvents;
this.userEmail = userEmail;
this.userYear = userYear;
this.userRollNumber = userRollNumber;
this.userContactNumber = userContactNumber;
this.userAbout = userAbout;
this.userFollowedBodies = userFollowedBodies;
this.userFollowedBodiesID = userFollowedBodiesID;
}
public String getUserID() {
return userID;
}
public void setUserID(String userID) {
this.userID = userID;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getUserProfilePictureUrl() {
return userProfilePictureUrl;
}
public void setUserProfilePictureUrl(String userProfilePictureUrl) {
this.userProfilePictureUrl = userProfilePictureUrl;
}
public List<Event> getUserInterestedEvents() {
return userInterestedEvents;
}
public void setUserInterestedEvents(List<Event> userInterestedEvents) {
this.userInterestedEvents = userInterestedEvents;
}
public List<Event> getUserGoingEvents() {
return userGoingEvents;
}
public void setUserGoingEvents(List<Event> userGoingEvents) {
this.userGoingEvents = userGoingEvents;
}
public String getUserEmail() {
return userEmail;
}
public void setUserEmail(String userEmail) {
this.userEmail = userEmail;
}
public int getUserYear() {
return userYear;
}
public void setUserYear(int userYear) {
this.userYear = userYear;
}
public String getUserRollNumber() {
return userRollNumber;
}
public void setUserRollNumber(String userRollNumber) {
this.userRollNumber = userRollNumber;
}
public String getUserContactNumber() {
return userContactNumber;
}
public void setUserContactNumber(String userContactNumber) {
this.userContactNumber = userContactNumber;
}
public String getUserAbout() {
return userAbout;
}
public void setUserAbout(String userAbout) {
this.userAbout = userAbout;
}
public List<Body> getUserFollowedBodies() {
return userFollowedBodies;
}
public void setUserFollowedBodies(List<Body> userFollowedBodies) {
this.userFollowedBodies = userFollowedBodies;
}
public List<String> getUserFollowedBodiesID() {
return userFollowedBodiesID;
}
public void setUserFollowedBodiesID(List<String> userFollowedBodiesID) {
this.userFollowedBodiesID = userFollowedBodiesID;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Venue.java 0 → 100644
View file @ 61cc9621
package in.ac.iitb.gymkhana.iitbapp.data;
import android.arch.persistence.room.ColumnInfo;
import com.google.gson.annotations.SerializedName;
class Venue {
@ColumnInfo(name = "id")
@SerializedName("id")
String venueID;
@ColumnInfo(name = "name")
@SerializedName("name")
String venueName;
@ColumnInfo(name = "lat")
@SerializedName("lat")
double venueLatitude;
@ColumnInfo(name = "lng")
@SerializedName("lng")
double venueLongitude;
public Venue(String venueID, String venueName, double venueLatitude, double venueLongitude) {
this.venueID = venueID;
this.venueName = venueName;
this.venueLatitude = venueLatitude;
this.venueLongitude = venueLongitude;
}
public String getVenueID() {
return venueID;
}
public void setVenueID(String venueID) {
this.venueID = venueID;
}
public String getVenueName() {
return venueName;
}
public void setVenueName(String venueName) {
this.venueName = venueName;
}
public double getVenueLatitude() {
return venueLatitude;
}
public void setVenueLatitude(double venueLatitude) {
this.venueLatitude = venueLatitude;
}
public double getVenueLongitude() {
return venueLongitude;
}
public void setVenueLongitude(double venueLongitude) {
this.venueLongitude = venueLongitude;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
View file @ 61cc9621
...@@ -14,7 +14,6 @@ import com.squareup.picasso.Picasso; ...@@ -14,7 +14,6 @@ import com.squareup.picasso.Picasso;
import in.ac.iitb.gymkhana.iitbapp.Constants; import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.R; import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.api.model.Event;
/** /**
* A simple {@link Fragment} subclass. * A simple {@link Fragment} subclass.
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java
View file @ 61cc9621
...@@ -26,7 +26,6 @@ import in.ac.iitb.gymkhana.iitbapp.R; ...@@ -26,7 +26,6 @@ import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter; import in.ac.iitb.gymkhana.iitbapp.adapter.FeedAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface; import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator; import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.api.model.Event;
import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedRequest; import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedRequest;
import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse; import in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse;
import in.ac.iitb.gymkhana.iitbapp.data.DatabaseContract; import in.ac.iitb.gymkhana.iitbapp.data.DatabaseContract;
......
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