Resolve merge conflicts

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/MainActivity.java

@@ -291,7 +291,14 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         FragmentManager manager = getSupportFragmentManager();
         if (fragment instanceof FeedFragment)
             manager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+
         FragmentTransaction transaction = manager.beginTransaction();
+
+        /* Animate only for ProfileFragment */
+        if (fragment instanceof ProfileFragment) {
+            transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
+        }
+
         transaction.replace(R.id.framelayout_for_fragment, fragment, fragment.getTag());
         transaction.addToBackStack(fragment.getTag()).commit();
     }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/NewsAdapter.java

@@ -54,21 +54,18 @@ public class NewsAdapter extends RecyclerView.Adapter<NewsAdapter.ViewHolder> {
         NewsArticle article = newsArticles.get(position);
         Markwon.setMarkdown(holder.articleTitle, article.getTitle());
         holder.articleBody.setText(article.getBody().getBodyName());
-        try {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
-            Date publishedDate = dateFormat.parse(article.getPublished());
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(publishedDate);
-            DateFormat displayFormat;
-            if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
-                displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
-            } else {
-                displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
-            }
-            holder.articlePublished.setText(displayFormat.format(publishedDate));
-        } catch (ParseException e) {
-            e.printStackTrace();
+
+        Date publishedDate = article.getPublished();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(publishedDate);
+        DateFormat displayFormat;
+        if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
+            displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
+        } else {
+            displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
         }
+        holder.articlePublished.setText(displayFormat.format(publishedDate));
+
         Markwon.setMarkdown(holder.articleContent, article.getContent());
     }
 

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/PlacementBlogAdapter.java

@@ -51,21 +51,18 @@ public class PlacementBlogAdapter extends RecyclerView.Adapter<PlacementBlogAdap
     public void onBindViewHolder(ViewHolder holder, int position) {
         PlacementBlogPost post = posts.get(position);
         Markwon.setMarkdown(holder.postTitle, post.getTitle());
-        try {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
-            Date publishedDate = dateFormat.parse(post.getPublished());
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(publishedDate);
-            DateFormat displayFormat;
-            if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
-                displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
-            } else {
-                displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
-            }
-            holder.postPublished.setText(displayFormat.format(publishedDate));
-        } catch (ParseException e) {
-            holder.postPublished.setText(post.getPublished());
+
+        Date publishedDate = post.getPublished();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(publishedDate);
+        DateFormat displayFormat;
+        if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
+            displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
+        } else {
+            displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
         }
+        holder.postPublished.setText(displayFormat.format(publishedDate));
+
         Markwon.setMarkdown(holder.postContent, post.getContent());
     }
 

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/adapter/TrainingBlogAdapter.java

@@ -51,21 +51,18 @@ public class TrainingBlogAdapter extends RecyclerView.Adapter<TrainingBlogAdapte
     public void onBindViewHolder(ViewHolder holder, int position) {
         TrainingBlogPost post = posts.get(position);
         Markwon.setMarkdown(holder.postTitle, post.getTitle());
-        try {
-            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX", Locale.US);
-            Date publishedDate = dateFormat.parse(post.getPublished());
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(publishedDate);
-            DateFormat displayFormat;
-            if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
-                displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
-            } else {
-                displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
-            }
-            holder.postPublished.setText(displayFormat.format(publishedDate));
-        } catch (ParseException e) {
-            holder.postPublished.setText(post.getPublished());
+
+        Date publishedDate = post.getPublished();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(publishedDate);
+        DateFormat displayFormat;
+        if (calendar.get(Calendar.YEAR) == Calendar.getInstance().get(Calendar.YEAR)) {
+            displayFormat = new SimpleDateFormat("EEE, MMM d, HH:mm", Locale.US);
+        } else {
+            displayFormat = new SimpleDateFormat("EEE, MMM d, ''yy, HH:mm", Locale.US);
         }
+        holder.postPublished.setText(displayFormat.format(publishedDate));
+
         Markwon.setMarkdown(holder.postContent, post.getContent());
     }
 

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/AppDatabase.java

@@ -18,7 +18,7 @@ public abstract class AppDatabase extends RoomDatabase {
                     Room.databaseBuilder(context.getApplicationContext(), AppDatabase.class, "database")
                             // allow queries on the main thread.
                             // Don't do this on a real app! See PersistenceBasicSample for an example.
-                            .allowMainThreadQueries()
+                            // .allowMainThreadQueries()
                             .build();
         }
         return INSTANCE;

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/NewsArticle.java

@@ -6,7 +6,7 @@ import android.arch.persistence.room.PrimaryKey;
 
 import com.google.gson.annotations.SerializedName;
 
-import java.util.Map;
+import java.sql.Timestamp;
 
 @Entity(tableName = "news")
 
@@ -33,13 +33,13 @@ public class NewsArticle {
 
     @ColumnInfo(name = "published")
     @SerializedName("published")
-    private String published;
+    private Timestamp published;
 
     @ColumnInfo(name = "body")
     @SerializedName("body")
     private Body body;
 
-    public NewsArticle(String articleID, String link, String title, String content, String published, Body body) {
+    public NewsArticle(String articleID, String link, String title, String content, Timestamp published, Body body) {
         this.articleID = articleID;
         this.link = link;
         this.title = title;
@@ -80,11 +80,11 @@ public class NewsArticle {
         this.content = content;
     }
 
-    public String getPublished() {
+    public Timestamp getPublished() {
         return published;
     }
 
-    public void setPublished(String published) {
+    public void setPublished(Timestamp published) {
         this.published = published;
     }
 

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/PlacementBlogPost.java

@@ -6,6 +6,8 @@ import android.arch.persistence.room.PrimaryKey;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.sql.Timestamp;
+
 @Entity(tableName = "placementBlogPosts")
 
 public class PlacementBlogPost {
@@ -31,9 +33,9 @@ public class PlacementBlogPost {
 
     @ColumnInfo(name = "published")
     @SerializedName("published")
-    private String published;
+    private Timestamp published;
 
-    public PlacementBlogPost(String postID, String link, String title, String content, String published) {
+    public PlacementBlogPost(String postID, String link, String title, String content, Timestamp published) {
         this.postID = postID;
         this.link = link;
         this.title = title;
@@ -73,11 +75,11 @@ public class PlacementBlogPost {
         this.content = content;
     }
 
-    public String getPublished() {
+    public Timestamp getPublished() {
         return published;
     }
 
-    public void setPublished(String published) {
+    public void setPublished(Timestamp published) {
         this.published = published;
     }
 }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/TrainingBlogPost.java

@@ -6,6 +6,8 @@ import android.arch.persistence.room.PrimaryKey;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.sql.Timestamp;
+
 @Entity(tableName = "trainingBlogPosts")
 
 public class TrainingBlogPost {
@@ -31,9 +33,9 @@ public class TrainingBlogPost {
 
     @ColumnInfo(name = "published")
     @SerializedName("published")
-    private String published;
+    private Timestamp published;
 
-    public TrainingBlogPost(String postID, String link, String title, String content, String published) {
+    public TrainingBlogPost(String postID, String link, String title, String content, Timestamp published) {
         this.postID = postID;
         this.link = link;
         this.title = title;
@@ -73,11 +75,11 @@ public class TrainingBlogPost {
         this.content = content;
     }
 
-    public String getPublished() {
+    public Timestamp getPublished() {
         return published;
     }
 
-    public void setPublished(String published) {
+    public void setPublished(Timestamp published) {
         this.published = published;
     }
 }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/BodyFragment.java

@@ -93,12 +93,7 @@ public class BodyFragment extends Fragment {
         /* Initialize */
         appDatabase = AppDatabase.getAppDatabase(getContext());
 
-        Body[] inLocalDb = appDatabase.dbDao().getBody(min_body.getBodyID());
-        if (inLocalDb.length > 0) {
-            displayBody(inLocalDb[0]);
-        } else {
-            updateBody();
-        }
+        new getDbBody().execute(min_body.getBodyID());
         bodySwipeRefreshLayout=getActivity().findViewById(R.id.body_swipe_refresh_layout);
         bodySwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
@@ -116,7 +111,7 @@ public class BodyFragment extends Fragment {
                 if (response.isSuccessful()) {
                     Body body = response.body();
 
-                    appDatabase.dbDao().insertBody(body);
+                    new insertDbBody().execute(body);
 
                     displayBody(body);
                     bodySwipeRefreshLayout.setRefreshing(false);
@@ -209,6 +204,7 @@ public class BodyFragment extends Fragment {
                 EventFragment eventFragment = new EventFragment();
                 eventFragment.setArguments(bundle);
                 FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
                 ft.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
                 ft.addToBackStack(eventFragment.getTag());
                 ft.commit();
@@ -226,6 +222,30 @@ public class BodyFragment extends Fragment {
         }
     }
 
+    private class insertDbBody extends AsyncTask<Body, Void, Integer> {
+        @Override
+        protected Integer doInBackground(Body... body) {
+            appDatabase.dbDao().insertBody(body[0]);
+            return 1;
+        }
+    }
+
+    private class getDbBody extends AsyncTask<String, Void, Body[]> {
+        @Override
+        protected Body[] doInBackground(String... id) {
+            return appDatabase.dbDao().getBody(min_body.getBodyID());
+        }
+
+        @Override
+        protected void onPostExecute(Body[] result) {
+            if (result.length > 0) {
+                displayBody(result[0]);
+            } else {
+                updateBody();
+            }
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java

@@ -112,22 +112,22 @@ public class EventFragment extends BaseFragment {
             eventVenueName.append(", ").append(venue.getVenueShortName());
         }
 
-        final List<Body> bodyList = event.getEventBodies();
-        bodyRecyclerView = (RecyclerView) getActivity().findViewById(R.id.body_card_recycler_view);
-        BodyAdapter bodyAdapter = new BodyAdapter(bodyList, new ItemClickListener() {
-            @Override
-            public void onItemClick(View v, int position) {
-                Body body = bodyList.get(position);
-                BodyFragment bodyFragment = BodyFragment.newInstance(body);
-                FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
-                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
-                ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
-                ft.addToBackStack(bodyFragment.getTag());
-                ft.commit();
-            }
-        });
-        bodyRecyclerView.setAdapter(bodyAdapter);
-        bodyRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+       final List<Body> bodyList = event.getEventBodies();
+       bodyRecyclerView = (RecyclerView) getActivity().findViewById(R.id.body_card_recycler_view);
+       BodyAdapter bodyAdapter = new BodyAdapter(bodyList, new ItemClickListener() {
+           @Override
+           public void onItemClick(View v, int position) {
+               Body body = bodyList.get(position);
+               BodyFragment bodyFragment = BodyFragment.newInstance(body);
+               FragmentTransaction ft = getActivity().getSupportFragmentManager().beginTransaction();
+               ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
+               ft.replace(R.id.framelayout_for_fragment, bodyFragment, bodyFragment.getTag());
+               ft.addToBackStack(bodyFragment.getTag());
+               ft.commit();
+           }
+       });
+       bodyRecyclerView.setAdapter(bodyAdapter);
+       bodyRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
 
         if (!eventVenueName.toString().equals(""))

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/FeedFragment.java

@@ -64,6 +64,7 @@ public class FeedFragment extends BaseFragment {
                 AddEventFragment addEventFragment = new AddEventFragment();
                 addEventFragment.setArguments(getArguments());
                 FragmentTransaction ft = getChildFragmentManager().beginTransaction();
+                ft.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
                 ft.replace(R.id.relative_layout, addEventFragment);
                 ft.addToBackStack("addEvent");
                 ft.commit();
@@ -146,6 +147,7 @@ public class FeedFragment extends BaseFragment {
                 eventFragment.setArguments(bundle);
                 FragmentManager manager = getActivity().getSupportFragmentManager();
                 FragmentTransaction transaction = manager.beginTransaction();
+                transaction.setCustomAnimations(R.anim.slide_in_left, R.anim.slide_out_left, R.anim.slide_in_right, R.anim.slide_out_right);
                 transaction.replace(R.id.framelayout_for_fragment, eventFragment, eventFragment.getTag());
                 transaction.addToBackStack(eventFragment.getTag()).commit();
             }

app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/ProfileFragment.java

@@ -12,6 +12,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.jakewharton.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
 
 import java.util.List;
@@ -22,6 +23,7 @@ import in.ac.iitb.gymkhana.iitbapp.R;
 import in.ac.iitb.gymkhana.iitbapp.adapter.RoleAdapter;
 import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
 import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
+import in.ac.iitb.gymkhana.iitbapp.api.UnsafeOkHttpClient;
 import in.ac.iitb.gymkhana.iitbapp.data.Body;
 import in.ac.iitb.gymkhana.iitbapp.data.Role;
 import in.ac.iitb.gymkhana.iitbapp.data.User;
@@ -95,7 +97,15 @@ public class ProfileFragment extends BaseFragment {
         userRoleRecyclerView.setAdapter(roleAdapter);
         userRoleRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
-        Picasso.with(getContext()).load(user.getUserProfilePictureUrl()).into(userProfilePictureImageView);
+        Picasso.Builder picassoBuilder = new Picasso.Builder(getContext());
+        picassoBuilder.downloader(
+                new OkHttp3Downloader((
+                        UnsafeOkHttpClient.getUnsafeOkHttpClient()
+                )
+                ));
+        Picasso picasso = picassoBuilder.build();
+
+        picasso.load(user.getUserProfilePictureUrl()).into(userProfilePictureImageView);
         userNameTextView.setText(user.getUserName());
         userRollNumberTextView.setText(user.getUserRollNumber());
         userEmailIDTextView.setText(user.getUserEmail());

app/src/main/res/anim/slide_in_left.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+        android:propertyName="x"
+        android:valueType="floatType"
+        android:valueFrom="1280"
+        android:valueTo="0"
+        android:duration="400"/>
+</set>
\ No newline at end of file

app/src/main/res/anim/slide_in_right.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+        android:propertyName="x"
+        android:valueType="floatType"
+        android:valueFrom="-1280"
+        android:valueTo="0"
+        android:duration="400"/>
+</set>
\ No newline at end of file

app/src/main/res/anim/slide_out_left.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+        android:propertyName="x"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="-1280"
+        android:duration="400"/>
+</set>
\ No newline at end of file

app/src/main/res/anim/slide_out_right.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set>
+    <objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
+        android:propertyName="x"
+        android:valueType="floatType"
+        android:valueFrom="0"
+        android:valueTo="1280"
+        android:duration="400"/>
+</set>
\ No newline at end of file

app/src/main/res/layout/fragment_feed.xml

@@ -13,8 +13,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/feed_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="8dp" />
+            android:layout_height="match_parent" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
 

app/src/main/res/layout/fragment_news.xml

@@ -13,8 +13,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/news_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="8dp" />
+            android:layout_height="match_parent" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>

app/src/main/res/layout/fragment_placement_blog.xml

@@ -13,8 +13,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/placement_feed_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="8dp" />
+            android:layout_height="match_parent" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>

app/src/main/res/layout/fragment_training_blog.xml

@@ -13,8 +13,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/training_feed_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:paddingTop="8dp" />
+            android:layout_height="match_parent" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
 </RelativeLayout>