Merge branch 'master' of https://github.com/unstablebrainiac/IITB-App

app/src/main/java/app/insti/fragment/MessMenuFragment.java

@@ -83,7 +83,9 @@ public class MessMenuFragment extends BaseFragment {
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
                 if (i == 16)
-                    displayMenu("Tansa");
+                    displayMenu("tansa");
+                else if (i == 17)
+                    displayMenu("qip");
                 else
                     displayMenu(Integer.toString(i + 1));
             }
@@ -94,8 +96,10 @@ public class MessMenuFragment extends BaseFragment {
             }
         });
 
-        if (hostel.equals("Tansa"))
+        if (hostel.equals("tansa"))
             hostelSpinner.setSelection(16);
+        else if (hostel.equals("qip"))
+            hostelSpinner.setSelection(17);
         else
             hostelSpinner.setSelection(Integer.parseInt(hostel) - 1);
     }

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

@@ -430,7 +430,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="20dp"
                     android:gravity="center"
-                    android:text="Abhijeet Tomar"
+                    android:text="Abhijit Tomar"
                     android:textSize="13sp"
                     android:textStyle="bold" />
 
@@ -451,7 +451,7 @@
                     android:layout_marginStart="25dp"
                     android:gravity="center"
                     android:textSize="13sp"
-                    android:text="Dheerendra Rathore"
+                    android:text="Dheerendra Rathor"
                     android:textStyle="bold" />
 
             </LinearLayout>
@@ -463,16 +463,15 @@
                 android:gravity="center"
                 android:orientation="horizontal">
 
-
                 <de.hdodenhof.circleimageview.CircleImageView
-                    android:id="@+id/amangourimg"
+                    android:id="@+id/ranveerimg"
                     android:layout_width="75dp"
                     android:layout_height="75dp"
                     android:layout_gravity="center"
                     android:layout_marginEnd="45dp" />
 
                 <de.hdodenhof.circleimageview.CircleImageView
-                    android:id="@+id/ranveerimg"
+                    android:id="@+id/amangourimg"
                     android:layout_width="75dp"
                     android:layout_height="75dp"
                     android:layout_gravity="center"

app/src/main/res/values/strings.xml

@@ -34,5 +34,6 @@
         <item>Hostel 15</item>
         <item>Hostel 16</item>
         <item>Tansa House</item>
+        <item>QIP</item>
     </string-array>
 </resources>