From b9585131dbadd745467baf4f9f1890c8110d25ec Mon Sep 17 00:00:00 2001
From: Priyanka-Sachan <priyanka_1901cs43@iitp.ac.in>
Date: Sat, 25 Jan 2020 18:44:32 +0530
Subject: [PATCH 1/2] Alignment in nav header.

---
 .../info/anwesha/iitp/home/MainActivity.java    |  4 ++--
 app/src/main/res/layout/nav_header_main.xml     | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/info/anwesha/iitp/home/MainActivity.java b/app/src/main/java/info/anwesha/iitp/home/MainActivity.java
index 39d5135..dbb3e3c 100644
--- a/app/src/main/java/info/anwesha/iitp/home/MainActivity.java
+++ b/app/src/main/java/info/anwesha/iitp/home/MainActivity.java
@@ -178,9 +178,9 @@ else if (day == 9)
 
         if (v != null) {
             String name = prefs.getString("first_name", "");
-            ((TextView) v.findViewById(R.id.name)).setText(name.isEmpty() ? " Anwesha" : name);
+            ((TextView) v.findViewById(R.id.name)).setText(name.isEmpty() ? " Anwesha " : name);
             String IITP = prefs.getString("college_name", "");
-            ((TextView) v.findViewById(R.id.iitp)).setText(IITP.isEmpty() ? "    IIT Patna" : name);
+            ((TextView) v.findViewById(R.id.iitp)).setText(IITP.isEmpty() ? " IIT Patna " : name);
             String id = prefs.getString("celesta_id", "");
             ((TextView) v.findViewById(R.id.anwesha_id)).setText(id.isEmpty() ? str : id);
             ImageView profileImage = v.findViewById(R.id.image);
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index c88434b..5d7b172 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -21,7 +21,7 @@
             android:scaleType="centerCrop" />
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:layout_marginStart="20dp"
@@ -33,32 +33,35 @@
 
             <TextView
                 android:id="@+id/name"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="3dp"
                 android:textColor="@color/white"
                 android:maxLines="1"
                 android:textSize="16sp"
-                android:text="Somenath Sarkar" />
+                android:text="Somenath Sarkar"
+                android:gravity="center"/>
 
             <TextView
                 android:id="@+id/iitp"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="3dp"
                 android:textColor="@color/white"
                 android:maxLines="1"
                 android:textSize="14sp"
-                android:text="Sep14" />
+                android:text="Sep14"
+                android:gravity="center"/>
 
             <TextView
                 android:id="@+id/anwesha_id"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="3dp"
                 android:textSize="14sp"
                 android:textColor="@color/white"
-                android:text="ANW2500" />
+                android:text="ANW2500"
+                android:gravity="center"/>
 
 
         </LinearLayout>

From 400ebcd231561e408976357db7f3e45804ffa299 Mon Sep 17 00:00:00 2001
From: Priyanka-Sachan <priyanka_1901cs43@iitp.ac.in>
Date: Sat, 25 Jan 2020 19:05:13 +0530
Subject: [PATCH 2/2] Show correct action bar title.

---
 .../anwesha/iitp/events/EventsFragment.java   | 25 +++++++++++++++++--
 .../main/res/navigation/mobile_navigation.xml |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java b/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java
index 7764e02..45f6c21 100644
--- a/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java
+++ b/app/src/main/java/info/anwesha/iitp/events/EventsFragment.java
@@ -65,9 +65,30 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-
+        String new_show="Test";
         if (getActivity() != null)
-            ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(category + " Events");
+        {
+            if(category.equals("awelfare"))
+                new_show="Arts and Welfare";
+            else
+            if(category.equals("cultural"))
+                new_show="Cultural";
+            else
+            if(category.equals("technical"))
+                new_show="Technical";
+            else
+            if(category.equals("proshow"))
+                new_show="Proshow";
+            else
+            if(category.equals("pronite"))
+                new_show="Pronite";
+            else
+            if(category.equals("pre-anwesha"))
+                new_show="Pre-Anwesha";
+            else
+            if(category.equals("informal"))
+                new_show="Informal";
+            ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(new_show + " Events");}
 
         swipeRefreshLayout = view.findViewById(R.id.swipe_refresh_events);
         swipeRefreshLayout.setOnRefreshListener(this::updateData);
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 0f5790b..bab1e68 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -78,7 +78,7 @@
     <fragment
         android:id="@+id/nav_ongoing"
         android:name="info.anwesha.iitp.livefeed.LiveFeedFragment"
-        android:label="News Feed"
+        android:label="Live Feed"
         tools:layout="@layout/fragment_events" />
 
     <fragment