App/event36/app/src/main/AndroidManifest.xml

@@ -14,6 +14,13 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Event36">
+        <activity
+            android:name=".EditEvent"
+            android:exported="false">
+            <meta-data
+                android:name="android.app.lib_name"
+                android:value="" />
+        </activity>
         <activity
             android:name=".RowReview"
             android:exported="false">

App/event36/app/src/main/java/com/example/event36/AddEventActivity.java

@@ -175,7 +175,7 @@ public class AddEventActivity extends AppCompatActivity implements View.OnClickL
 
         /*
          *This is the callback for when the next activity closes.
-         */
+
         mStartForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
                 new ActivityResultCallback<ActivityResult>() {
                     @Override
@@ -191,7 +191,7 @@ public class AddEventActivity extends AppCompatActivity implements View.OnClickL
                         }
 
                     }
-                });
+                });*/
 
 
         // Set the click listener for the button to open the gallery

App/event36/app/src/main/java/com/example/event36/EditEvent.java

+package com.example.event36;
+
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.app.Activity;
+import android.app.DatePickerDialog;
+import android.content.Intent;
+import android.icu.util.GregorianCalendar;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.DatePicker;
+import android.widget.EditText;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class EditEvent extends AppCompatActivity implements View.OnClickListener {
+
+    private String eName, eStartDate, eEndDate,eLocation,eDescription,eTags,eLinks;
+    ArrayList<String> eLinkL = new ArrayList<>();
+    ArrayList<String> eTagsL = new ArrayList<>();
+    DatePickerDialog eventDateTextView;
+    EditText name, startDate,endDate,location,tags,description,links;
+    Button save,cancel;
+    ArrayList<String> event = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_edit_event);
+
+        name =(EditText) findViewById(R.id.editNew_eventName);
+        startDate =(EditText) findViewById(R.id.editNew_eventDate);
+        endDate =(EditText) findViewById(R.id.editNew_eventEndDate);
+        location =(EditText) findViewById(R.id.editNew_eventLocation);
+        tags =(EditText) findViewById(R.id.editNew_eventTags);
+        description =(EditText) findViewById(R.id.editNew_eventDescription);
+        links= findViewById(R.id.editNew_eventLinks);
+        save =(Button) findViewById(R.id.edit_save);
+        cancel =(Button) findViewById(R.id.edit_cancel);
+
+
+        //get event info from previous activity
+        Intent data = getIntent();
+        event = data.getStringArrayListExtra("edit_event");
+        eName =event.get(0);
+        eStartDate =event.get(1);
+        eEndDate = event.get(2);
+        eLocation = event.get(3);
+        eDescription =event.get(4);
+        int count = 0;
+        for (int i=0; i<Integer.valueOf(event.get(5)); i++,count++){
+            eLinkL.add(event.get(6+i));
+        }
+        for (int i=0; i<Integer.valueOf(event.get(6+count)); i++){
+            eTagsL.add(event.get(7+count+i));
+        }
+        //set the old event info
+        name.setText(eName);
+        startDate.setText(eStartDate);
+        endDate.setText(eEndDate);
+        location.setText(eLocation);
+        description.setText(eDescription);
+        eTags= String.join(" , ",eTagsL);
+        tags.setText(eTags);
+        eLinks=String.join("\n",eLinkL);
+        links.setText(eLinks);
+
+
+
+        startDate.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Calendar calendar = Calendar.getInstance();
+                int year = calendar.get(Calendar.YEAR);
+                int month = calendar.get(Calendar.MONTH);
+                int day = calendar.get(Calendar.DAY_OF_MONTH);
+                eventDateTextView = new DatePickerDialog(EditEvent.this, new DatePickerDialog.OnDateSetListener() {
+                    @Override
+                    public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+                        startDate.setText(dayOfMonth + "/" + (month + 1) + "/" + year);
+
+                    }
+                },year,month,day);
+                eventDateTextView.show();
+            }
+        });
+
+        endDate.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Calendar calendar = Calendar.getInstance();
+                int year = calendar.get(Calendar.YEAR);
+                int month = calendar.get(Calendar.MONTH);
+                int day = calendar.get(Calendar.DAY_OF_MONTH);
+                eventDateTextView = new DatePickerDialog(EditEvent.this, new DatePickerDialog.OnDateSetListener() {
+                    @Override
+                    public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
+                        endDate.setText(dayOfMonth + "/" + (month + 1) + "/" + year);
+
+                    }
+                },year,month,day);
+                eventDateTextView.show();
+            }
+        });
+
+
+
+        cancel.setOnClickListener(this);
+        save.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent =new Intent();
+                intent.putExtra("name",name.getText().toString());
+                intent.putExtra("startDate",startDate.getText().toString());
+                intent.putExtra("endDate",endDate.getText().toString());
+                intent.putExtra("location",location.getText().toString());
+                intent.putExtra("description",description.getText().toString());
+                String newTags=tags.getText().toString();
+                transTags(newTags,intent);
+                String newLinks= links.getText().toString();
+                transLinks(newLinks,intent);
+                setResult(RESULT_OK,intent);
+                finish();
+            }
+        });
+
+    }
+
+    @Override
+    public void onClick(View v) {
+        setResult(Activity.RESULT_CANCELED);
+        finish();
+    }
+
+
+    public void transTags(String NeededTags, Intent intent){
+        String[] ArrTags = NeededTags.split("[,]");
+        if (ArrTags.length > 0){
+            int count = 0;
+            for (int i = 0; i < ArrTags.length; i++){
+                if (!Objects.equals(ArrTags[i], "")){
+                    intent.putExtra("tag"+i, ArrTags[i]);
+                    count++;
+                }
+            }
+            intent.putExtra("tags_size", String.valueOf(count));
+        } else {
+            intent.putExtra("tags_size", "0");
+        }
+    }
+    public void transLinks(String neededLinks, Intent intent){
+        String[] ArrLinks =neededLinks.split("\n");
+        if (ArrLinks.length > 0) {
+            int count = 0;
+            for (int i = 0; i < ArrLinks.length; i++) {
+                if (!Objects.equals(ArrLinks[i], "")) {
+                    intent.putExtra("link" + i, ArrLinks[i]);
+                    count++;
+                }
+            }
+            intent.putExtra("links_size", String.valueOf(count));
+        }
+        else {
+            intent.putExtra("links_size","0");
+        }
+    }
+
+}
+
+
+

App/event36/app/src/main/java/com/example/event36/Event.java

@@ -115,7 +115,8 @@ public class Event implements EventRestoSuperClass,java.io.Serializable, Parcela
      * @param t tags
      * @param pics pictures
      */
-    public void changeSetting(GregorianCalendar  sDate, GregorianCalendar  eDate, String loc, String eventDes, String[] lks, String[] t, Drawable[] pics, String s){
+    public void changeSetting(String sname, GregorianCalendar  sDate, GregorianCalendar  eDate, String loc, String eventDes, String[] lks, String[] t, Drawable[] pics, String s){
+        name =sname;
         startDate = sDate;
         endDate = eDate;
         location = loc;
@@ -208,6 +209,8 @@ public class Event implements EventRestoSuperClass,java.io.Serializable, Parcela
     public Drawable[] getImages() {
         return pictures;
     }
+    
+    
 
     /***
      * Function to fill the description in the cards

App/event36/app/src/main/java/com/example/event36/EventActivity.java

@@ -18,6 +18,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultCallback;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
@@ -40,15 +42,18 @@ public class EventActivity extends AppCompatActivity {
     Map<String, String> map; //Map to handle out bringing data to next activity
     List<ReviewSuperClass> ourReviews = new ArrayList<>();
     private RecyclerView recyclerView;
+    public ReviewAdapter revAdapter;
+    private ArrayList<String> eventInfo = new ArrayList<>();
+    private ArrayList<String> backToMain = new ArrayList<>();
+    private Boolean edit =false;
+    ActivityResultLauncher<Intent> EditResult;
+    Bundle event;
     public ReviewAdapter reviewAdapter;
     private static int RatingAndReviewCode = 1;
     private Event selectedEvent;
     private PersistentModel pModel;
 
 
-    //ActivityResultLauncher<Intent> RatingResult;
-
-
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -158,46 +163,79 @@ public class EventActivity extends AppCompatActivity {
             datesView.setText(dates);
             descView.setText(extras.getString("description"));
 
+            //get info to list from previous activity
+            eventInfo.add(extras.getString("name"));
+            eventInfo.add(extras.getString("startDate"));
+            eventInfo.add(extras.getString("endDate"));
+            eventInfo.add(extras.getString("location"));
+            eventInfo.add(extras.getString("description"));
+            eventInfo.add(extras.getString("links_size"));
+
+
+
+
+            EditResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(),
+                    new ActivityResultCallback<ActivityResult>() {
+                        @Override
+                        public void onActivityResult(ActivityResult result) {
+                            if(result.getResultCode()==RESULT_CANCELED){
+                                finish();
+                            }
+                            else{
+
+                                    edit=true;
+                                    nameView.setText(result.getData().getExtras().get("name").toString());
+                                    locationView.setText(result.getData().getExtras().get("location").toString());
+                                    descView.setText(result.getData().getExtras().get("description").toString());
+                                    String dates =result.getData().getExtras().get("startDate").toString()+" to "+result.getData().getExtras().get("endDate").toString();
+                                    String[] st=result.getData().getExtras().get("startDate").toString().split("[, ]]");
+                                    /*String stt = "";
+                                    if (st.length > 0){
+                                        for (int i = 0; i < st.length; i++) {
+                                            stt = stt + st[i];
+                                        }
+                                    }*/
+                                    datesView.setText(dates);
+                                    String LinksSize =result.getData().getExtras().get("links_size").toString();
+                                    listLinks(result.getData().getExtras(),LinksSize);
+                                    String TagsSize =result.getData().getExtras().get("tags_size").toString();
+                                    listTags(result.getData().getExtras(),TagsSize);
+                                    event=result.getData().getExtras();
+
+                                    /*backToMain.add(result.getData().getExtras().get("name").toString());
+                                    backToMain.add(result.getData().getExtras().get("location").toString());
+                                    backToMain.add(result.getData().getExtras().get("description").toString());
+                                    backToMain.add(result.getData().getExtras().get("startDate").toString());
+                                    backToMain.add(result.getData().getExtras().get("endDate").toString());
+                                    backToMain.add(result.getData().getExtras().get("links_size").toString());
+                                    backToMain.add(result.getData().getExtras().get("name").toString());*/
+                                    //Toast.makeText(EventActivity.this,stt,Toast.LENGTH_SHORT ).show();
+
+
+
+                                    //locationView.setText(results.get("").toString());
+
+
+                            }
+
+                        }
+                    });
+
+            if(edit==false){
+                String linksSize = extras.getString("links_size");
+
+                //Add the links to the layout if they exist
+                listLinks(extras,linksSize);
+                eventInfo.add(extras.getString("tags_size"));
+                Toast.makeText(EventActivity.this,"access the original stuff",Toast.LENGTH_LONG).show();
+
+                //Add the Tags to the layout if they exist
+                String tagsSize = extras.getString("tags_size");
+                listTags(extras,tagsSize);
 
-            //Get the number of links
-            String linksSize = extras.getString("links_size");
-
-            //Add the links to the layout if they exist
-            if (extras.getString("links_size")!=null){
-                LinearLayout linksLayout = findViewById(R.id.links_view);
-                int numberOfLinks = Integer.parseInt(linksSize);
-                for (int i = 0; i <  numberOfLinks; i++){
-                    TextView textView = new TextView(this);
-                    String tempString = "link"+i; //Make the key
-                    textView.setText(extras.getString(tempString)); //Get string
-                    textView.setLayoutParams(new ViewGroup.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
-                            LinearLayout.LayoutParams.WRAP_CONTENT));
-
-                    textView.setTextAppearance(R.style.detail_text);
-                    linksLayout.addView(textView);
-                }
-            }
-            //Add the Tags to the layout if they exist
-            String tagsSize = extras.getString("tags_size");
-            if (extras.getString("tags_size")!=null){
-                LinearLayout tagsLayout = findViewById(R.id.tags_view);
-                int numberOfTags = Integer.parseInt(tagsSize);
-                for (int i = 0; i <  numberOfTags; i++){
-                    TextView textView = new TextView(this);
-
-                    String tagKey = "tag"+i; //Make the key
-                    String tagValue = extras.getString(tagKey); //Get string
-                    if (i < numberOfTags-1){ //Penultimate index
-                        String tempString = tagValue+", ";
-                        textView.setText(tempString);
-                    } else {
-                        textView.setText(tagValue);
-                    }
-                    textView.setLayoutParams(new ViewGroup.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-                    textView.setTextAppearance(R.style.detail_text);
-                    tagsLayout.addView(textView);
-                }
             }
+            //Get the number of links
+
 
 
 
@@ -265,7 +303,12 @@ public class EventActivity extends AppCompatActivity {
                  */
                 Intent sendIntent = new Intent();
                 if (isPinned) {
-                    setResult(RESULT_OK, sendIntent);
+                    if (edit){
+                        sendIntent.putExtra("edit","true");
+                        sendIntent.putExtras(event);
+                    }
+                    setResult(RESULT_OK,sendIntent);
+
                 } else {
                     setResult(RESULT_CANCELED, sendIntent);
                 }
@@ -273,6 +316,9 @@ public class EventActivity extends AppCompatActivity {
                 break;
             case R.id.edit_icon:
                 Toast.makeText(this, "Edit", Toast.LENGTH_SHORT).show();
+                Intent i =new Intent(getApplicationContext(),EditEvent.class);
+                i.putStringArrayListExtra("edit_event", eventInfo);
+                EditResult.launch(i);
                 break;
             case R.id.pin_event_icon:
                 if (isPinned) {
@@ -290,6 +336,49 @@ public class EventActivity extends AppCompatActivity {
         return super.onOptionsItemSelected(item);
     }
 
+    public void listLinks(Bundle extras,String linksSize){
+        //Add the links to the layout if they exist
+        if (extras.getString("links_size")!=null){
+            LinearLayout linksLayout = findViewById(R.id.links_view);
+            linksLayout.removeAllViews();
+            int numberOfLinks = Integer.parseInt(linksSize);
+            for (int i = 0; i <  numberOfLinks; i++){
+                TextView textView = new TextView(this);
+                String tempString = "link"+i; //Make the key
+                textView.setText(extras.getString(tempString)); //Get string
+                eventInfo.add(extras.getString(tempString));
+                backToMain.add(extras.get("links_size").toString());
+                textView.setLayoutParams(new ViewGroup.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
+                        LinearLayout.LayoutParams.WRAP_CONTENT));
+                //Toast.makeText(EventActivity.this,tempString,Toast.LENGTH_LONG).show();
+                textView.setTextAppearance(R.style.detail_text);
+                linksLayout.addView(textView);
+            }
+        }
+    }
+
+    public void listTags(Bundle extras, String tagsSize){
+        if (extras.getString("tags_size")!=null){
+            LinearLayout tagsLayout = findViewById(R.id.tags_view);
+            tagsLayout.removeAllViews();
+            int numberOfTags = Integer.parseInt(tagsSize);
+            for (int i = 0; i <  numberOfTags; i++){
+                TextView textView = new TextView(this);
+                String tagKey = "tag"+i; //Make the key
+                String tagValue = extras.getString(tagKey); //Get string
+                eventInfo.add(extras.getString(tagKey));
+                backToMain.add(extras.getString(tagKey));
+                if (i < numberOfTags-1){ //Penultimate index
+                    String tempString = tagValue+", ";
+                    textView.setText(tempString);
+                } else {
+                    textView.setText(tagValue);
+                }
+                textView.setLayoutParams(new ViewGroup.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
+                textView.setTextAppearance(R.style.detail_text);
+                tagsLayout.addView(textView);
+
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         Log.d("EventActivity onActivityResult", "Request code: " + requestCode + ", resultCode: " + resultCode);
@@ -306,7 +395,6 @@ public class EventActivity extends AppCompatActivity {
                 persistedEvent.setReviews(selectedEvent.getCustomReviews());
 
 
-                Log.d("EventActivity onActivityResult", "Event reviews count: " + selectedEvent.getReviews().size());
             }
         }
     }

App/event36/app/src/main/java/com/example/event36/EventRestoSuperClass.java

@@ -21,7 +21,7 @@ public interface EventRestoSuperClass {
     Double getRating();
     List<ReviewSuperClass> getReviews();
     PlaceType getPlaceType();
-
+    String getHost();
 }
 
 

App/event36/app/src/main/java/com/example/event36/MainActivity.java

@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.net.wifi.WifiManager;
 import android.graphics.drawable.Drawable;
 import android.icu.util.GregorianCalendar;
@@ -22,6 +23,7 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.core.content.res.ResourcesCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -29,12 +31,18 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.tabs.TabLayout;
-
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.security.PrivilegedActionException;
+
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Stack;
 
 public class MainActivity extends AppCompatActivity implements CustomAdapter.ItemClickListener {
     private static Context context;
@@ -47,6 +55,7 @@ public class MainActivity extends AppCompatActivity implements CustomAdapter.Ite
     private PersistentModel pModel;
     private User mUser;
     private ArrayList<String> additionEvent;
+    private GregorianCalendar startDate= new GregorianCalendar(), endDate=new GregorianCalendar();
 
     private int currentTabPosition = 0; //Initial tab position
     private String finalYear, finalMonth, finalDay,finalYear2, finalMonth2, finalDay2;
@@ -59,6 +68,7 @@ public class MainActivity extends AppCompatActivity implements CustomAdapter.Ite
     //This is to handle the return code from next activity
     ActivityResultLauncher<Intent> mStartForResult;
     ActivityResultLauncher<Intent> slideMenuStartForResult;
+    ActivityResultLauncher<Intent> edit;
 
 
     @Override
@@ -160,7 +170,6 @@ public class MainActivity extends AppCompatActivity implements CustomAdapter.Ite
                         //RESULT_CANCELLED means the pin icon was deselected
                         if (result.getResultCode() == RESULT_OK){
                             mModel.addPin(eventRestoSelected);
-
                         } else if (result.getResultCode() == RESULT_CANCELED){
                             if (currentTabPosition == 2){
                                 // Currently in pinned list therefore it needs to be removed
@@ -419,8 +428,16 @@ public class MainActivity extends AppCompatActivity implements CustomAdapter.Ite
             finalMonth = month;
             finalDay = day;
         }
-
-
+    }
+    public void translate(String date,String lettter) throws ParseException {
+        DateFormat dt= new SimpleDateFormat("MMM dd, yyyy");
+        Date newDate =dt.parse(date);
+        if (lettter=="a"){
+            startDate.setTime(newDate);
+        }
+        else {
+            endDate.setTime(newDate);
+        }
     }
     public void translateEndDate(String end_event_date) {
         String day = "", month = "", year = "";

App/event36/app/src/main/java/com/example/event36/Model.java

@@ -31,6 +31,7 @@ public class Model {
     private EventRestoList popList;
     private EventRestoList curList;
     private EventRestoList pinList;
+    private EventRestoList EpopList;
 
     private CustomAdapter popAdapter;
     private CustomAdapter curAdapter;
@@ -111,6 +112,17 @@ public class Model {
         }
     }
 
+    public  void updateEvent(Event event,EventRestoSuperClass eventC){
+        for (int i = 0; i< popList.getEventRestoList().size(); i++){
+            if(event.getId().equals(popList.getEventRestoList().get(i).getId())){
+                popList.removeEvent(eventC);
+                popAdapter.removeFromAdapter(i);
+                popList.addItem(event);
+                popAdapter.addToAdapter(0,event);
+            }
+        }
+    }
+
     /*
      * This is to return the list in the form the adapter uses
      * @return List of Events
@@ -307,9 +319,13 @@ public class Model {
     public void addEventToList(Event event){
         popList.addItem(event);
         popAdapter.addToAdapter(0,event);
-
+        pinList.addItem(event);
+        pinAdapter.addToAdapter(0,event);
+    }
+    public void getPic(Drawable draw){
+        Resources res = application.getResources(); // Needed to get image_file //TODO
+        draw = ResourcesCompat.getDrawable(res, R.drawable.no_image, null);
     }
-
 
 }
 

App/event36/app/src/main/java/com/example/event36/Restaurant.java

@@ -265,7 +265,12 @@ public class Restaurant implements EventRestoSuperClass,java.io.Serializable, Pa
         return PlaceType.RESTAURANT;
     }
 
-    public List<UserlessReview> getGoogleReviews() {
+    @Override
+    public String getHost() {
+        return null;
+    }
+
+    public ArrayList<UserlessReview> getGoogleReviews() {
         return this.googleReviews;
     }
 

App/event36/app/src/main/res/layout/activity_edit_event.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".EditEvent">
+
+    <TextView
+        android:id="@+id/editPage_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="Edit Event"
+        android:textSize="34sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/old_eventName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:singleLine="true"
+        android:text="Event name"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editPage_title" />
+
+    <EditText
+        android:id="@+id/editNew_eventName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:imeOptions="actionNext"
+        android:hint="Entry new event name"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventName"></EditText>
+
+    <TextView
+        android:id="@+id/old_eventStartDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:text="Event Start Date"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editNew_eventName"></TextView>
+
+    <EditText
+        android:id="@+id/editNew_eventDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:hint="Entry new event start date"
+        android:imeOptions="actionNext"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventStartDate"></EditText>
+
+    <TextView
+        android:id="@+id/old_eventEndDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:text="Event End Date"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editNew_eventDate"></TextView>
+
+    <EditText
+        android:id="@+id/editNew_eventEndDate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:hint="Entry new event end date"
+        android:imeOptions="actionNext"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventEndDate"></EditText>
+
+    <TextView
+        android:id="@+id/old_eventLocation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:text="Event Location"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editNew_eventEndDate"></TextView>
+
+    <EditText
+        android:id="@+id/editNew_eventLocation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:hint="Entry new event location"
+        android:imeOptions="actionNext"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventLocation"></EditText>
+
+    <TextView
+        android:id="@+id/old_eventLinks"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:text="Event Links"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editNew_eventLocation"></TextView>
+
+    <EditText
+        android:id="@+id/editNew_eventLinks"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:hint="Entry new event links"
+        android:imeOptions="actionNext"
+        android:lines="3"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventLinks"></EditText>
+
+    <TextView
+        android:id="@+id/old_eventTags"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:text="Event Tags"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editNew_eventLinks"></TextView>
+    <EditText
+        android:id="@+id/editNew_eventTags"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:imeOptions="actionNext"
+        android:hint="Entry new event name"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventTags"
+        ></EditText>
+
+    <TextView
+        android:id="@+id/old_eventDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:text="Event Description"
+
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editNew_eventTags"></TextView>
+    <EditText
+        android:id="@+id/editNew_eventDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="left"
+        android:imeOptions="actionNext"
+        android:hint="Entry new event name"
+        android:lines="10"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/old_eventDescription"
+        ></EditText>
+
+    <Button
+        android:id="@+id/edit_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="52dp"
+        android:layout_marginBottom="4dp"
+        android:text="Save"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/edit_cancel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="96dp"
+        android:layout_marginBottom="4dp"
+        android:text="CANCEL"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/edit_save" />
+
+
+    <!--<LinearLayout
+        android:id="@+id/linear_zero"
+        android:layout_width="match_parent"
+        android:layout_height="684dp"
+        android:orientation="vertical"
+        app:layout_constraintTop_toBottomOf="@+id/textView2"
+        tools:layout_editor_absoluteX="1dp">-->
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

App/event36/app/src/main/res/values/ids.xml

@@ -7,4 +7,7 @@
     <item name="eventDescription" type="id" />
     <item name="eventImage" type="id" />
     <item name="website_view" type="id">@+id/website_view</item>
+    <item name="editPage_title" type="id" />
+    <item name="old_eventName" type="id" />
+    <item name="editNew_eventName" type="id" />
 </resources>
\ No newline at end of file