adding advanced menu options

.idea/modules.xml

@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/IITB-App.iml" filepath="$PROJECT_DIR$/IITB-App.iml" />
-      <module fileurl="file://$PROJECT_DIR$/IITBApp.iml" filepath="$PROJECT_DIR$/IITBApp.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="in.ac.iitb.gymkhana.iitbapp">
+
+    package="in.ac.iitb.gymkhana.iitbapp" >
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

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

-package in.ac.iitb.gymkhana.iitbapp;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import android.widget.EditText;
-import android.widget.TextView;
-
-/**
- * Created by mrunz on 15/7/17.
- */
-
-public class AddEventAdapter extends BaseAdapter {
-
-    LayoutInflater inflater;
-    public int publicStatus = 0;
-    int permission = 0;
-    public String location = "";
-
-    @Override
-    public int getCount() {
-        return 3;
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return getItem(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    public View getView(int position, View convertView, ViewGroup parent) {
-        if (inflater == null) {
-            inflater = (LayoutInflater) parent.getContext()
-                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        }
-
-
-        int type = getItemViewType(position);
-        if (convertView == null) {
-            switch (type) {
-                case 0: {
-                    convertView = inflater.inflate(R.layout.advanced_options_view, null);
-                    CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.cb_public);
-                    if (checkBox.isChecked()) publicStatus = 1;
-                    break;
-                }
-                case 1: {
-                    convertView = inflater.inflate(R.layout.advanced_options_view_2, null);
-                    EditText editText = (EditText) convertView.findViewById(R.id.map_location);
-                    location = editText.getText().toString();
-                    break;
-                }
-                case 2: {
-                    convertView = inflater.inflate(R.layout.advanced_options_view_3, null);
-                    CheckBox checkBox = (CheckBox) convertView.findViewById(R.id.cb_permission);
-                    if (checkBox.isChecked()) permission = 1;
-                    break;
-                }
-
-            }
-        }
-            return convertView;
-
-    }
-
-}
-
-
-

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

@@ -15,6 +15,7 @@ import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TimePicker;
@@ -25,7 +26,6 @@ import java.util.Calendar;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import in.ac.iitb.gymkhana.iitbapp.AddEventAdapter;
 import in.ac.iitb.gymkhana.iitbapp.R;
 import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
 import in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator;
@@ -56,13 +56,21 @@ public class AddEventFragment extends Fragment {
     ImageButton imageButton;
     Timestamp timestamp_start;
     Timestamp timestamp_end;
-    Image image;
+
     @BindView(R.id.advanced_menu)
-    TextView advancedMenu;
+    RelativeLayout advancedMenu;
+    @BindView(R.id.cb_public)
+    CheckBox cb_public;
+    @BindView(R.id.cb_permission)
+    CheckBox cb_permission;
+    @BindView(R.id.map_location)
+    EditText et_mapLocation;
+    @BindView(R.id.open)
+            ImageView open;
+    @BindView(R.id.close)
+            ImageView close;
     int publicStatus;
     View view;
-    ListPopupWindow popupWindow;
-    AddEventAdapter addEventAdapter;
 
 
     public AddEventFragment() {
@@ -78,8 +86,17 @@ public class AddEventFragment extends Fragment {
         view = inflater.inflate(R.layout.fragment_add_event, container, false);
         ButterKnife.bind(this, view);
 
-        popupWindow=new ListPopupWindow(getContext());
-        addEventAdapter=new AddEventAdapter();
+
+
+        cb_permission.setVisibility(View.GONE);
+        cb_public.setVisibility(View.GONE);
+        et_mapLocation.setVisibility(View.GONE);
+
+
+        close.setVisibility(View.GONE);
+        open.setVisibility(View.VISIBLE);
+
+
 
         start.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -145,12 +162,26 @@ public class AddEventFragment extends Fragment {
 
             }
         });
+        if (cb_permission.isChecked()) {
+            publicStatus = 1;
+        } else publicStatus = 0;
 
         advancedMenu.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
-                createPopup();
+                if (cb_public.getVisibility() == View.VISIBLE) {
+                    open.setVisibility(View.VISIBLE);
+                    close.setVisibility(View.GONE);
+                    cb_permission.setVisibility(View.GONE);
+                    cb_public.setVisibility(View.GONE);
+                    et_mapLocation.setVisibility(View.GONE);
+                } else {
+                    close.setVisibility(View.VISIBLE);
+                    open.setVisibility(View.GONE);
+                    cb_permission.setVisibility(View.VISIBLE);
+                    cb_public.setVisibility(View.VISIBLE);
+                    et_mapLocation.setVisibility(View.VISIBLE);
+                }
             }
         });
 
@@ -164,7 +195,7 @@ public class AddEventFragment extends Fragment {
         createEvent.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                addEvent();
+                //addEvent();
             }
         });
 
@@ -173,7 +204,7 @@ public class AddEventFragment extends Fragment {
     }
 
     public void addEvent() {
-        EventCreateRequest eventCreateRequest = new EventCreateRequest(eventName.getText().toString(), details.getText().toString(), venue.getText().toString(), timestamp_start, timestamp_end, addEventAdapter.publicStatus, 0, 0);
+        EventCreateRequest eventCreateRequest = new EventCreateRequest(eventName.getText().toString(), details.getText().toString(), venue.getText().toString(), timestamp_start, timestamp_end, publicStatus, 0, 0);
         RetrofitInterface retrofitInterface = ServiceGenerator.createService(RetrofitInterface.class);
         retrofitInterface.eventCreate(eventCreateRequest).enqueue(new Callback<EventCreateResponse>() {
             @Override
@@ -188,17 +219,4 @@ public class AddEventFragment extends Fragment {
         });
     }
 
-    public void createPopup() {
-
-        popupWindow.setAdapter(addEventAdapter);
-        popupWindow.setAnchorView(advancedMenu);
-
-        popupWindow.setHeight(android.widget.LinearLayout.LayoutParams.WRAP_CONTENT);
-        popupWindow.setWidth(advancedMenu.getRight() - advancedMenu.getLeft());
-
-
-        popupWindow.show();
-
-    }
-
 }

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="16dp"
-    android:paddingTop="8dp"
-    android:paddingRight="16dp">
-
-    <CheckBox
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/cb_public"
-        android:text="Outsiders Allowed "/>
-
-
-
-</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="16dp"
-    android:paddingTop="8dp"
-    android:paddingRight="16dp">
-
-
-
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/map_location"
-        android:hint="Map Location"/>
-
-
-</LinearLayout>
\ No newline at end of file

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

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="16dp"
-    android:paddingTop="8dp"
-    android:paddingRight="16dp">
-
-
-
-    <CheckBox
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="Request User Info"
-        android:id="@+id/cb_permission"/>
-
-</LinearLayout>
\ No newline at end of file

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

@@ -4,6 +4,15 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.AddEventFragment">
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -96,13 +105,59 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"/>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/advanced_menu">
+
 
     <TextView android:layout_height="30dp"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:text="Advanced Options"
-        android:id="@+id/advanced_menu"
         android:paddingLeft="16dp"
+        android:textSize="20sp"
         android:paddingRight="16dp"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:layout_alignParentEnd="true"
+            android:id="@+id/close"
+            android:src="@mipmap/advanced_menu_close"/>
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="30dp"
+            android:id="@+id/open"
+            android:layout_alignParentEnd="true"
+            android:src="@mipmap/advanced_menu_open"/>
+    </RelativeLayout>
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/cb_public"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:text="Outsiders Allowed "/>
+
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/map_location"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:hint="Map Location"/>
+
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Request User Info"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:id="@+id/cb_permission"/>
+
+    </LinearLayout>
+    </ScrollView>
 
     <Button
         android:layout_width="match_parent"

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

 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.FeedFragment">
+    tools:context="in.ac.iitb.gymkhana.iitbapp.fragment.FeedFragment" xmlns="">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/feed_recycler_view"