Merge pull request #128 from pulsejet/moremisc

More misc things

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

@@ -264,7 +264,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         }
         bundle.putString(Constants.SESSION_ID, session.pref.getString(Constants.SESSION_ID, "Error"));
         if (fragment instanceof MessMenuFragment)
-            bundle.putString(Constants.USER_HOSTEL, currentUser.getHostel());
+            bundle.putString(Constants.USER_HOSTEL, session.isLoggedIn() ? currentUser.getHostel() : "1");
         if (fragment instanceof SettingsFragment && session.isLoggedIn())
             bundle.putString(Constants.USER_ID, currentUser.getUserID());
         fragment.setArguments(bundle);

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -10,9 +11,8 @@ import java.util.List;
 
 @Entity(tableName = "bodies")
 public class Body {
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     String bodyID;

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -12,9 +13,8 @@ import java.util.List;
 @Entity(tableName = "events")
 
 public class Event {
-
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     String eventID;

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -10,9 +11,8 @@ import java.util.List;
 
 @Entity(tableName = "hostelMessMenus")
 public class HostelMessMenu {
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     private String menuID;

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

 package in.ac.iitb.gymkhana.iitbapp.data;
 
+import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
+
 import com.google.gson.annotations.SerializedName;
 
 public class MessMenu {
+    @NonNull()
+    @PrimaryKey()
     @SerializedName("id")
     private String mealID;
 

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -11,10 +12,8 @@ import java.sql.Timestamp;
 @Entity(tableName = "news")
 
 public class NewsArticle {
-
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     private String articleID;

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -11,10 +12,8 @@ import java.sql.Timestamp;
 @Entity(tableName = "placementBlogPosts")
 
 public class PlacementBlogPost {
-
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     private String postID;

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -12,10 +13,8 @@ import java.util.List;
 
 
 public class Role {
-
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     String roleID;

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

@@ -3,6 +3,7 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -11,10 +12,8 @@ import java.sql.Timestamp;
 @Entity(tableName = "trainingBlogPosts")
 
 public class TrainingBlogPost {
-
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     private String postID;

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

@@ -4,6 +4,7 @@ import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.Ignore;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
@@ -12,9 +13,8 @@ import java.util.List;
 
 @Entity(tableName = "users")
 public class User {
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
-
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     String userID;
@@ -70,8 +70,7 @@ public class User {
     @Ignore
     String currentRole;
 
-    public User(int db_id, 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, String hostel) {
-        this.db_id = db_id;
+    public User(@NonNull 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, String hostel) {
         this.userID = userID;
         this.userName = userName;
         this.userProfilePictureUrl = userProfilePictureUrl;

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

@@ -3,13 +3,14 @@ package in.ac.iitb.gymkhana.iitbapp.data;
 import android.arch.persistence.room.ColumnInfo;
 import android.arch.persistence.room.Entity;
 import android.arch.persistence.room.PrimaryKey;
+import android.support.annotation.NonNull;
 
 import com.google.gson.annotations.SerializedName;
 
 @Entity(tableName = "venues")
 public class Venue {
-    @PrimaryKey(autoGenerate = true)
-    int db_id;
+    @NonNull()
+    @PrimaryKey()
     @ColumnInfo(name = "id")
     @SerializedName("id")
     String venueID;

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

@@ -115,7 +115,7 @@ public class BodyFragment extends Fragment {
                 if (response.isSuccessful()) {
                     Body body = response.body();
 
-                    new insertDbBody().execute(body);
+                    new updateDbBody().execute(body);
 
                     displayBody(body);
                     bodySwipeRefreshLayout.setRefreshing(false);
@@ -130,7 +130,18 @@ public class BodyFragment extends Fragment {
         });
     }
 
+    private void setVisibleIfHasElements(int[] viewIds, List list) {
+        if (list != null && list.size() > 0) {
+            for (int viewId: viewIds){
+                getActivity().findViewById(viewId).setVisibility(View.VISIBLE);
+            }
+        }
+    }
+
     private void displayBody(final Body body) {
+        /* Skip if we're already destroyed */
+        if (getView() == null) return;
+
         TextView bodyName = (TextView) getView().findViewById(R.id.body_name);
         TextView bodyDescription = (TextView) getView().findViewById(R.id.body_description);
         ImageView eventPicture = (ImageView) getActivity().findViewById(R.id.body_picture);
@@ -138,6 +149,12 @@ public class BodyFragment extends Fragment {
         ImageButton shareBodyButton = getActivity().findViewById(R.id.share_body_button);
         final Button followButton = getActivity().findViewById(R.id.follow_button);
 
+        /* Show relevant card titles */
+        setVisibleIfHasElements(new int[]{R.id.body_events_title, R.id.event_card_recycler_view}, body.getBodyEvents());
+        setVisibleIfHasElements(new int[]{R.id.body_orgs_title, R.id.org_card_recycler_view}, body.getBodyChildren());
+        setVisibleIfHasElements(new int[]{R.id.body_parents_title, R.id.parentorg_card_recycler_view}, body.getBodyParents());
+        setVisibleIfHasElements(new int[]{R.id.body_people_title, R.id.people_card_recycler_view}, body.getBodyRoles());
+
         /* Set body information */
         bodyName.setText(body.getBodyName());
         Picasso.with(getContext()).load(body.getBodyImageURL()).into(eventPicture);
@@ -306,15 +323,11 @@ public class BodyFragment extends Fragment {
     private class updateDbBody extends AsyncTask<Body, Void, Integer> {
         @Override
         protected Integer doInBackground(Body... body) {
-            appDatabase.dbDao().updateBody(body[0]);
-            return 1;
-        }
-    }
-
-    private class insertDbBody extends AsyncTask<Body, Void, Integer> {
-        @Override
-        protected Integer doInBackground(Body... body) {
-            appDatabase.dbDao().insertBody(body[0]);
+            if (appDatabase.dbDao().getBody(body[0].getBodyID()).length > 0) {
+                appDatabase.dbDao().updateBody(body[0]);
+            } else {
+                appDatabase.dbDao().insertBody(body[0]);
+            }
             return 1;
         }
     }

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

@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CalendarView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.gson.Gson;
@@ -134,6 +135,8 @@ public class CalendarFragment extends BaseFragment {
     }
 
     private void showEventsForDate(Date date) {
+        /* Skip if we're already destroyed */
+        if (getActivity() == null) return;
 
         final List<Event> filteredEvents = new ArrayList<Event>();
         for (Event event : events) {
@@ -144,6 +147,16 @@ public class CalendarFragment extends BaseFragment {
             }
         }
 
+        /* Show number of events */
+        TextView noEvents = getActivity().findViewById(R.id.number_of_events);
+        if (filteredEvents.size() == 0) {
+            noEvents.setText("No Events");
+        } else if (filteredEvents.size() == 1) {
+            noEvents.setText("1 Event");
+        } else {
+            noEvents.setText(Integer.toString(filteredEvents.size()) + " Events");
+        }
+
         RecyclerView eventRecyclerView = (RecyclerView) getActivity().findViewById(R.id.calendar_event_card_recycler_view);
         FeedAdapter eventAdapter = new FeedAdapter(filteredEvents, new ItemClickListener() {
             @Override

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

@@ -42,6 +42,7 @@ public class FeedFragment extends BaseFragment {
     private SwipeRefreshLayout feedSwipeRefreshLayout;
     private AppDatabase appDatabase;
     private FloatingActionButton fab;
+    private boolean freshEventsDisplayed = false;
 
     public FeedFragment() {
         // Required empty public constructor
@@ -98,6 +99,7 @@ public class FeedFragment extends BaseFragment {
                 if (response.isSuccessful()) {
                     NewsFeedResponse newsFeedResponse = response.body();
                     List<Event> events = newsFeedResponse.getEvents();
+                    freshEventsDisplayed = true;
                     displayEvents(events);
 
                     new updateDatabase().execute(events);
@@ -115,6 +117,9 @@ public class FeedFragment extends BaseFragment {
     }
 
     private void displayEvents(final List<Event> events) {
+        /* Skip if we're already destroyed */
+        if (getActivity() == null) return;
+
         final FeedAdapter feedAdapter = new FeedAdapter(events, new ItemClickListener() {
             @Override
             public void onItemClick(View v, int position) {
@@ -163,7 +168,9 @@ public class FeedFragment extends BaseFragment {
         }
 
         protected void onPostExecute(List<Event> result) {
-            displayEvents(result);
+            if (!freshEventsDisplayed) {
+                displayEvents(result);
+            }
         }
     }
 }

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

@@ -15,7 +15,10 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.List;
+import java.util.Locale;
 
 import in.ac.iitb.gymkhana.iitbapp.ActivityBuffer;
 import in.ac.iitb.gymkhana.iitbapp.Constants;
@@ -25,6 +28,7 @@ import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
 import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
 import in.ac.iitb.gymkhana.iitbapp.data.AppDatabase;
 import in.ac.iitb.gymkhana.iitbapp.data.HostelMessMenu;
+import in.ac.iitb.gymkhana.iitbapp.data.MessMenu;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -133,7 +137,29 @@ public class MessMenuFragment extends BaseFragment {
     }
 
     private void displayMessMenu(HostelMessMenu hostelMessMenu) {
-        final MessMenuAdapter messMenuAdapter = new MessMenuAdapter(hostelMessMenu.getMessMenus());
+        /* Skip if we're already destroyed */
+        if (getActivity() == null) return;
+
+        List<MessMenu> messMenus = hostelMessMenu.getMessMenus();
+
+        /* Sort by day starting today
+         * This could have been done in a much simpler way with Java 8 :(
+         * Don't try to fix this */
+        final List<MessMenu> sortedMenus = new ArrayList();
+        final Calendar calendar = Calendar.getInstance(Locale.UK);
+        int today = calendar.get(Calendar.DAY_OF_WEEK) - 2;
+        if (today == -1) { today = 6; }
+
+        for (int i = 0; i < 7; i++) {
+            final int day = (today + i) % 7 + 1;
+            for(MessMenu menu : messMenus) {
+                if(menu.getDay() == day) {
+                    sortedMenus.add(menu);
+                }
+            }
+        }
+
+        final MessMenuAdapter messMenuAdapter = new MessMenuAdapter(sortedMenus);
         getActivityBuffer().safely(new ActivityBuffer.IRunnable() {
             @Override
             public void run(Activity pActivity) {

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

@@ -37,6 +37,7 @@ public class NewsFragment extends BaseFragment {
     private RecyclerView newsRecyclerView;
     private SwipeRefreshLayout newsSwipeRefreshLayout;
     private AppDatabase appDatabase;
+    private boolean freshNewsDisplayed = false;
 
     public NewsFragment() {
         // Required empty public constructor
@@ -75,6 +76,7 @@ public class NewsFragment extends BaseFragment {
             public void onResponse(Call<List<NewsArticle>> call, Response<List<NewsArticle>> response) {
                 if (response.isSuccessful()) {
                     List<NewsArticle> articles = response.body();
+                    freshNewsDisplayed = true;
                     displayNews(articles);
 
                     new updateDatabase().execute(articles);
@@ -92,6 +94,9 @@ public class NewsFragment extends BaseFragment {
     }
 
     private void displayNews(final List<NewsArticle> result) {
+        /* Skip if we're already destroyed */
+        if (getActivity() == null) return;
+
         final NewsAdapter newsAdapter = new NewsAdapter(result, new ItemClickListener() {
             @Override
             public void onItemClick(View v, int position) {
@@ -134,7 +139,9 @@ public class NewsFragment extends BaseFragment {
         }
 
         protected void onPostExecute(List<NewsArticle> result) {
-            displayNews(result);
+            if (!freshNewsDisplayed) {
+                displayNews(result);
+            }
         }
     }
 }

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

@@ -37,6 +37,7 @@ public class PlacementBlogFragment extends BaseFragment {
     private RecyclerView placementFeedRecyclerView;
     private SwipeRefreshLayout feedSwipeRefreshLayout;
     private AppDatabase appDatabase;
+    private boolean freshBlogDisplayed = false;
 
 
     public PlacementBlogFragment() {
@@ -76,6 +77,7 @@ public class PlacementBlogFragment extends BaseFragment {
             public void onResponse(Call<List<PlacementBlogPost>> call, Response<List<PlacementBlogPost>> response) {
                 if (response.isSuccessful()) {
                     List<PlacementBlogPost> posts = response.body();
+                    freshBlogDisplayed = true;
                     displayPlacementFeed(posts);
 
                     new updateDatabase().execute(posts);
@@ -93,6 +95,9 @@ public class PlacementBlogFragment extends BaseFragment {
     }
 
     private void displayPlacementFeed(final List<PlacementBlogPost> result) {
+        /* Skip if we're already destroyed */
+        if (getActivity() == null) return;
+
         final PlacementBlogAdapter placementBlogAdapter = new PlacementBlogAdapter(result, new ItemClickListener() {
             @Override
             public void onItemClick(View v, int position) {
@@ -135,7 +140,9 @@ public class PlacementBlogFragment extends BaseFragment {
         }
 
         protected void onPostExecute(List<PlacementBlogPost> result) {
-            displayPlacementFeed(result);
+            if (!freshBlogDisplayed) {
+                displayPlacementFeed(result);
+            }
         }
     }
 }

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

@@ -72,7 +72,11 @@ public class SettingsFragment extends Fragment {
         ImageView userProfilePictureImageView = getActivity().findViewById(R.id.user_card_avatar);
         TextView userNameTextView = getActivity().findViewById(R.id.user_card_name);
 
-        Picasso.with(getContext()).load(user.getUserProfilePictureUrl()).into(userProfilePictureImageView);
+        Picasso.with(getContext())
+                .load(user.getUserProfilePictureUrl())
+                .resize(800, 0)
+                .placeholder(R.drawable.user_placeholder)
+                .into(userProfilePictureImageView);
         userNameTextView.setText(user.getUserName());
 
         Button updateProfileButton = getActivity().findViewById(R.id.settings_update_profile);

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

@@ -37,6 +37,7 @@ public class TrainingBlogFragment extends BaseFragment {
     private RecyclerView trainingFeedRecyclerView;
     private SwipeRefreshLayout feedSwipeRefreshLayout;
     private AppDatabase appDatabase;
+    private boolean freshBlogDisplayed = false;
 
 
     public TrainingBlogFragment() {
@@ -76,6 +77,7 @@ public class TrainingBlogFragment extends BaseFragment {
             public void onResponse(Call<List<TrainingBlogPost>> call, Response<List<TrainingBlogPost>> response) {
                 if (response.isSuccessful()) {
                     List<TrainingBlogPost> posts = response.body();
+                    freshBlogDisplayed = true;
                     displayTrainingFeed(posts);
 
                     new updateDatabase().execute(posts);
@@ -93,6 +95,9 @@ public class TrainingBlogFragment extends BaseFragment {
     }
 
     private void displayTrainingFeed(final List<TrainingBlogPost> result) {
+        /* Skip if we're already destroyed */
+        if (getActivity() == null) return;
+
         final TrainingBlogAdapter trainingBlogAdapter = new TrainingBlogAdapter(result, new ItemClickListener() {
             @Override
             public void onItemClick(View v, int position) {
@@ -135,7 +140,9 @@ public class TrainingBlogFragment extends BaseFragment {
         }
 
         protected void onPostExecute(List<TrainingBlogPost> result) {
-            displayTrainingFeed(result);
+            if (!freshBlogDisplayed) {
+                displayTrainingFeed(result);
+            }
         }
     }
 }

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

@@ -44,7 +44,10 @@
                 android:id="@+id/body_card_description"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Description" />
+                android:text="Description"
+                android:scrollHorizontally="true"
+                android:ellipsize="end"
+                android:maxLines="1" />
 
         </LinearLayout>
     </LinearLayout>

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

@@ -78,7 +78,9 @@
                         android:layout_width="100dp"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
-                        android:text="LH 101" />
+                        android:text="LH 101"
+                        android:scrollHorizontally="true"
+                        android:maxLines="1"/>
                 </LinearLayout>
 
             </LinearLayout>

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

@@ -127,6 +127,8 @@
                     android:textSize="16sp" />
 
                 <TextView
+                    android:id="@+id/body_events_title"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
@@ -136,12 +138,15 @@
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/event_card_recycler_view"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false" />
 
                 <TextView
+                    android:id="@+id/body_orgs_title"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
@@ -151,12 +156,15 @@
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/org_card_recycler_view"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false" />
 
                 <TextView
+                    android:id="@+id/body_people_title"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
@@ -166,12 +174,15 @@
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/people_card_recycler_view"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false" />
 
                 <TextView
+                    android:id="@+id/body_parents_title"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
@@ -181,9 +192,10 @@
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/parentorg_card_recycler_view"
+                    android:visibility="gone"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"
                     android:nestedScrollingEnabled="false" />
 
             </LinearLayout>

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

@@ -41,13 +41,14 @@
                     android:background="@android:color/darker_gray" />
 
                 <TextView
+                    android:id="@+id/number_of_events"
                     android:layout_width="120dp"
                     android:layout_height="40dp"
                     android:layout_below="@id/simpleCalendarView"
                     android:layout_centerHorizontal="true"
                     android:background="@drawable/round_text_box"
                     android:gravity="center"
-                    android:text="# Events Today"
+                    android:text="No Events"
                     android:textColor="@color/secondaryTextColor" />
             </RelativeLayout>
 

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

@@ -17,20 +17,20 @@
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round" />
+        android:src="@drawable/user_placeholder" />
 
     <TextView
         android:id="@+id/user_name_nav_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="Android Studio"
+        android:text="Guest"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
         android:id="@+id/user_rollno_nav_header"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="android.studio@android.com" />
+        android:text="IITB User" />
 
 </LinearLayout>

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

@@ -44,7 +44,10 @@
                 android:id="@+id/role_card_role"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Role" />
+                android:text="Role"
+                android:scrollHorizontally="true"
+                android:ellipsize="end"
+                android:maxLines="1" />
 
         </LinearLayout>
     </LinearLayout>