Skip to content

I
InstiApp
Commit 666a9d9c authored by Sajal Narang's avatar Sajal Narang
Browse files
Options

Merge branch 'yashkhem1-master'

parents dd380374 478c1a02
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 16 deletions
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/BodyCardAdapter.java 0 → 100644
View file @ 666a9d9c
package in.ac.iitb.gymkhana.iitbapp.adapter;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import com.squareup.picasso.Picasso;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
public class BodyCardAdapter extends RecyclerView.Adapter<BodyCardAdapter.ViewHolder>{
private List<Body> bodyList;
private ItemClickListener itemClickListener;
private Context context;
public BodyCardAdapter( List<Body> bodyList, ItemClickListener itemClickListener){
this.bodyList = bodyList;
this.itemClickListener = itemClickListener;
}
@Override
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
context = parent.getContext();
View v = LayoutInflater.from(context)
.inflate(R.layout.body_card_view,parent,false);
final ViewHolder postViewHolder = new ViewHolder(v);
v.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
itemClickListener.onItemClick(view,postViewHolder.getAdapterPosition());
}
});
return postViewHolder;
}
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
Body body = bodyList.get(position);
holder.name.setText(body.getBodyName());
holder.description.setText(body.getBodyShortDescription());
Picasso.with(context).load(body.getBodyImageURL()).into(holder.image);
}
@Override
public int getItemCount() {
return bodyList.size();
}
public class ViewHolder extends RecyclerView.ViewHolder {
public TextView name;
public TextView description;
public ImageView image;
public ViewHolder(View itemView) {
super(itemView);
name = (TextView) itemView.findViewById(R.id.body_card_name);
description = (TextView) itemView.findViewById(R.id.body_card_description);
image = (ImageView) itemView.findViewById(R.id.body_card_avatar);
}
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/AppDatabase.java
View file @ 666a9d9c
......@@ -10,7 +10,7 @@ import android.content.Context;
* Created by mrunz on 14/3/18.
*/
@Database(entities = {Event.class, Body.class, Venue.class}, version = 1)
@Database(entities = {Event.class, Body.class, Venue.class, User.class, Role.class}, version = 1)
@TypeConverters({Converters.class})
public abstract class AppDatabase extends RoomDatabase {
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Converters.java
View file @ 666a9d9c
......@@ -72,6 +72,20 @@ public class Converters {
return json;
}
@TypeConverter
public static List<Role> rolesfromString(String value){
Type listType = new TypeToken<List<Role>>(){
}.getType();
return new Gson().fromJson(value, listType);
}
@TypeConverter
public static String stringfromRoles(List<Role> list){
Gson gson = new Gson();
String json= gson.toJson(list);
return json;
}
@TypeConverter
public static Timestamp timestampfromString(String value) {
try {
......@@ -89,4 +103,33 @@ public class Converters {
String json = gson.toJson(timestamp);
return json;
}
@TypeConverter
public static Body bodyfromString(String value){
Type listType = new TypeToken<Body>(){
}.getType();
return new Gson().fromJson(value,listType);
}
@TypeConverter
public static String stringfromBody(Body body){
Gson gson = new Gson();
String json = gson.toJson(body);
return json;
}
@TypeConverter
public static List<String> stringsfromString(String value){
Type listType = new TypeToken<List<String>>(){
}.getType();
return new Gson().fromJson(value,listType);
}
@TypeConverter
public static String stringfromStrings(List<String> list) {
Gson gson = new Gson();
String json = gson.toJson(list);
return json;
}
}
\ No newline at end of file
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/DbDao.java
View file @ 666a9d9c
......@@ -21,6 +21,12 @@ public interface DbDao {
@Query("SELECT * FROM venues")
List<Venue> getAllVenues();
@Query("SELECT * FROM users")
List<User> getAllUsers();
@Query("SELECT * FROM roles")
List<Role> getAllRoles();
@Query("SELECT * FROM bodies WHERE id == :id")
public Body[] getBody(String id);
......@@ -33,9 +39,18 @@ public interface DbDao {
@Query("SELECT COUNT(*) from bodies")
int countBodies();
@Query("SELECT COUNT(*) from users")
int countUsers();
@Query("SELECT COUNT(*) from roles")
int countRoles();
@Insert
void insertEvents(List<Event> events);
@Insert
void insertEvent(Event event);
@Insert
void insertBodies(List<Body> bodies);
......@@ -45,6 +60,21 @@ public interface DbDao {
@Insert
void insertVenues(List<Venue> venues);
@Insert
void insertVenue(Venue venue);
@Insert
void insertUsers(List<User> users);
@Insert
void insertUser(User user);
@Insert
void insertRoles(List<Role> roles);
@Insert
void insertRole(Role role);
@Delete
void deleteEvent(Event event);
......@@ -54,6 +84,12 @@ public interface DbDao {
@Delete
void deleteBody(Body body);
@Delete
void deleteUser(User user);
@Delete
void deleteRole(Role role);
@Query("DELETE from events")
void deleteEvents();
......@@ -62,4 +98,10 @@ public interface DbDao {
@Query("DELETE from bodies")
void deleteBodies();
@Query("DELETE from users")
void deleteUsers();
@Query("DELETE from roles")
void deleteRoles();
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/User.java
View file @ 666a9d9c
......@@ -48,6 +48,12 @@ public class User {
@ColumnInfo(name = "followed_bodies_id")
@SerializedName("followed_bodies_id")
List<String> userFollowedBodiesID;
@ColumnInfo(name = "roles")
@SerializedName("roles")
List<Role>userRoles;
@ColumnInfo(name="institute_roles")
@SerializedName("institute_roles")
List<Role>userInstituteRoles;
@ColumnInfo(name = "website_url")
@SerializedName("website_url")
String userWebsiteURL;
......@@ -55,7 +61,7 @@ public class User {
@SerializedName("ldap_id")
String userLDAPId;
public User(String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID, String userWebsiteURL, String userLDAPID) {
public User(String userID, String userName, String userProfilePictureUrl, List<Event> userInterestedEvents, List<Event> userGoingEvents, String userEmail, String userRollNumber, String userContactNumber, String userAbout, List<Body> userFollowedBodies, List<String> userFollowedBodiesID, List<Role> userRoles, List<Role> userInstituteRoles, String userWebsiteURL, String userLDAPId) {
this.userID = userID;
this.userName = userName;
this.userProfilePictureUrl = userProfilePictureUrl;
......@@ -67,8 +73,10 @@ public class User {
this.userAbout = userAbout;
this.userFollowedBodies = userFollowedBodies;
this.userFollowedBodiesID = userFollowedBodiesID;
this.userRoles = userRoles;
this.userInstituteRoles = userInstituteRoles;
this.userWebsiteURL = userWebsiteURL;
this.userLDAPId = userLDAPID;
this.userLDAPId = userLDAPId;
}
public static User fromString(String json) {
......@@ -163,6 +171,22 @@ public class User {
this.userFollowedBodiesID = userFollowedBodiesID;
}
public List<Role> getUserRoles() {
return userRoles;
}
public void setUserRoles(List<Role> userRoles) {
this.userRoles = userRoles;
}
public List<Role> getUserInstituteRoles() {
return userInstituteRoles;
}
public void setUserInstituteRoles(List<Role> userInstituteRoles) {
this.userInstituteRoles = userInstituteRoles;
}
public String getUserWebsiteURL() {
return userWebsiteURL;
}
......
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyCardFragment.java
View file @ 666a9d9c
package in.ac.iitb.gymkhana.iitbapp.fragment;
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.google.gson.Gson;
import com.squareup.picasso.Picasso;
import in.ac.iitb.gymkhana.iitbapp.MainActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.data.Body;
......@@ -95,7 +90,7 @@ public class BodyCardFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_body_card, container, false);
return inflater.inflate(R.layout.body_card_view, container, false);
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
View file @ 666a9d9c
......@@ -7,6 +7,8 @@ import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
......@@ -26,11 +28,14 @@ import org.w3c.dom.Text;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import in.ac.iitb.gymkhana.iitbapp.Constants;
import in.ac.iitb.gymkhana.iitbapp.ItemClickListener;
import in.ac.iitb.gymkhana.iitbapp.MainActivity;
import in.ac.iitb.gymkhana.iitbapp.R;
import in.ac.iitb.gymkhana.iitbapp.ShareURLMaker;
import in.ac.iitb.gymkhana.iitbapp.adapter.BodyCardAdapter;
import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
import in.ac.iitb.gymkhana.iitbapp.data.Event;
......@@ -51,6 +56,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
Button notGoingButton;
ImageButton shareEventButton;
ImageButton webEventButton;
RecyclerView bodyRecyclerView;
String TAG = "EventFragment";
public EventFragment() {
......@@ -104,7 +110,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
eventVenueName.append(", ").append(venue.getVenueName());
}
if(((LinearLayout) getActivity().findViewById(R.id.body_container)).getChildCount() == 0) {
/* if(((LinearLayout) getActivity().findViewById(R.id.body_container)).getChildCount() == 0) {
for (Body body : event.getEventBodies()) {
Fragment bodyCardFragment = BodyCardFragment.newInstance(body);
getChildFragmentManager().beginTransaction()
......@@ -112,7 +118,24 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
.disallowAddToBackStack()
.commit();
}
}
}*/
final List<Body> bodyList = event.getEventBodies();
bodyRecyclerView= (RecyclerView) getActivity().findViewById(R.id.body_card_RecyclerView);
BodyCardAdapter bodyCardAdapter = new BodyCardAdapter(bodyList, new ItemClickListener() {
@Override
public void onItemClick(View v, int position) {
Body body = bodyList.get(position);
BodyFragment bodyFragment = BodyFragment.newInstance(body);
bodyFragment.setArguments(getArguments());
FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
ft.addToBackStack(bodyFragment.getTag());
ft.commit();
}
});
bodyRecyclerView.setAdapter(bodyCardAdapter);
bodyRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
if (!eventVenueName.toString().equals(""))
eventVenue.setText(eventVenueName.toString().substring(2));
......
app/src/main/res/layout/fragment_event.xml
View file @ 666a9d9c
......@@ -203,13 +203,13 @@
android:textColor="#777"
android:textSize="16sp" />
<LinearLayout
android:id="@+id/body_container"
<android.support.v7.widget.RecyclerView
android:id="@+id/body_card_RecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</LinearLayout>
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