From b31edbb3df78672eb19c435cf24e72c6f5d63f1b Mon Sep 17 00:00:00 2001
From: Anshu Sharma <ashar164@uottawa.ca>
Date: Wed, 7 Nov 2018 11:26:51 -0500
Subject: [PATCH 1/2] whatever

---
 .../.idea/caches/build_file_checksums.ser     | Bin 541 -> 541 bytes
 OlympusServices/app/build.gradle              |   2 +-
 .../EditServiceDialogFragment.java            |  69 ++++++++++++++
 .../NewServiceDialogFragment.java             |  89 ++++++++++++++++++
 4 files changed, 159 insertions(+), 1 deletion(-)
 create mode 100644 OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
 create mode 100644 OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java

diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser
index a8e3b6923237f7b5958e9bf40496fc34876403e5..5ddf3c25544f8e28043fdb4d0c60d9410f15af46 100644
GIT binary patch
delta 33
rcmV++0N($d1f2wsm;~<p*CMf;Z~+knI5^07kuZDHuYCv&J^Gz^^UDr#

delta 33
rcmV++0N($d1f2wsm;{2|yZEu3Z~+m0PBHoW3dfv*??uf|Wob-!3<eMo

diff --git a/OlympusServices/app/build.gradle b/OlympusServices/app/build.gradle
index 51596d7..1ffdc45 100644
--- a/OlympusServices/app/build.gradle
+++ b/OlympusServices/app/build.gradle
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
new file mode 100644
index 0000000..1e867d6
--- /dev/null
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
@@ -0,0 +1,69 @@
+package com.uottawa.olympus.olympusservices;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.widget.EditText;
+
+public class EditServiceDialogFragment extends DialogFragment{
+
+public interface NoticeDialogListener {
+    public void onDialogEdit(DialogFragment dialog);
+    public void onDialogDelete(DialogFragment dialog);
+    }
+    EditServiceDialogFragment.NoticeDialogListener mListener;
+
+    // Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        // Verify that the host activity implements the callback interface
+        try {
+            // Instantiate the NoticeDialogListener so we can send events to the host
+            mListener = (EditServiceDialogFragment.NoticeDialogListener) context;
+        } catch (ClassCastException e) {
+            // The activity doesn't implement the interface, throw exception
+            throw new ClassCastException(this.toString()
+                    + " must implement NoticeDialogListener");
+        }
+    }
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        // Get the layout inflater
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+
+        // Inflate and set the layout for the dialog
+        // Pass null as the parent view because its going in the dialog layout
+        builder.setView(inflater.inflate(R.layout.dialog_service_edit, null))
+                // Add action buttons
+                .setPositiveButton(R.string.update, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        Bundle args = new Bundle();
+                        //@anshu: get the name and rate to come from the dialog_service_new dialog
+                        EditText rateInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.RateInput);
+                        double rate = Double.parseDouble(rateInput.getText().toString());
+                        args.putDouble("rate", rate);
+                        //EditServiceDialogFragment.this.setArguments(args);
+                        mListener.onDialogEdit(EditServiceDialogFragment.this);
+                    }
+                })
+                .setNegativeButton(R.string.delete, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        Bundle args = new Bundle();
+                        //@anshu: get the name and rate to come from the dialog_service_new dialog
+                        args.putString("name", (String)getArguments().get("name"));
+                        //
+                        EditServiceDialogFragment.this.setArguments(args);
+                        mListener.onDialogDelete(EditServiceDialogFragment.this);
+                    }
+                })
+        .setTitle((String)getArguments().get("name"));
+        return builder.create();
+    }
+}
diff --git a/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java
new file mode 100644
index 0000000..ba7b746
--- /dev/null
+++ b/OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java
@@ -0,0 +1,89 @@
+package com.uottawa.olympus.olympusservices;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.view.View;
+
+import com.rengwuxian.materialedittext.MaterialEditText;
+
+public class NewServiceDialogFragment extends DialogFragment {
+
+
+    public interface NoticeDialogListener {
+        public void onDialogNew(DialogFragment dialog);
+        public void onDialogNevermind(DialogFragment dialog);
+    }
+    NoticeDialogListener mListener;
+
+    // Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        // Verify that the host activity implements the callback interface
+        try {
+            // Instantiate the NoticeDialogListener so we can send events to the host
+            mListener = (NoticeDialogListener) context;
+        } catch (ClassCastException e) {
+            // The activity doesn't implement the interface, throw exception
+            throw new ClassCastException(this.toString()
+                    + " must implement NoticeDialogListener");
+        }
+    }
+
+    //String name = ((EditText) view.findViewById(R.id.NameInput)).getText().toString();
+    //int rate = Integer.parseInt(((EditText) view.findViewById(R.id.RateInput)).getText().toString())
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        // Get the layout inflater
+        LayoutInflater inflater = getActivity().getLayoutInflater();
+        View view = inflater.inflate(R.layout.dialog_service_new, null);
+        builder.setView(view);
+
+
+        // Inflate and set the layout for the dialog
+        // Pass null as the parent view because its going in the dialog layout
+        builder.setView(view)
+                // Add action buttons
+                .setPositiveButton(R.string.add, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int id) {
+                        EditText nameInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.NameInput);
+                        EditText rateInput = (EditText) ((AlertDialog) dialog).findViewById(R.id.RateInput);
+                        String name = nameInput.getText().toString();
+                        double rate = Double.parseDouble(rateInput.getText().toString());
+                        Bundle args = new Bundle();
+                        args.putString("name", name);
+                        args.putDouble("rate", rate);
+                        NewServiceDialogFragment.this.setArguments(args);
+                        mListener.onDialogNew(NewServiceDialogFragment.this);
+                        //@anshu: get the name and rate to come from the dialog_service_new dialog
+                        dostuff();
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int id) {
+                        NewServiceDialogFragment.this.getDialog().cancel();
+                    }
+                });
+        return builder.create();
+    }
+
+    public void dostuff(){
+
+
+    }
+
+
+}

From 0445964fbb88084278d41d519aa72abf56578306 Mon Sep 17 00:00:00 2001
From: IvanaE <ebivibe@users.noreply.github.com>
Date: Wed, 7 Nov 2018 11:28:54 -0500
Subject: [PATCH 2/2] chaoe ensuing

---
 .../.idea/caches/build_file_checksums.ser         | Bin 541 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 OlympusServices/.idea/caches/build_file_checksums.ser

diff --git a/OlympusServices/.idea/caches/build_file_checksums.ser b/OlympusServices/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 5ddf3c25544f8e28043fdb4d0c60d9410f15af46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 541
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsNA?cJa2N<eoBg5>l-a(W(##Th_(
zR`y#54~r#SWM*J;W8likPfT%3OfJbU@?_vF$tX%K&dAS6sVJ~_U;qK0at<IV0K{xS
zi;7cAN;31(i=n<MEn;Abc3SgU{0AFH$O9$@29V7R0?YqN9iEuE^{GZwTyUDcs&okh
zPZG$#FkOWVbqs7Eh4~NEwE|ActG9B`&lmX^Fu8<5ASXXLF$WY{1*t_PnW@F4aK$_O
zp33UaS+irx#)Eve4^GvTFzD!q7N-^!>nG+FXOtFaBo^f+>O<|&M+7^DL04pZZuT>5
zVtLuXIpfU_r@9gbK|HDjc9#X5f2;Y!VwJ<ef=@~MKsP296zF635Q~MyiHeB^)tA@T
La`4*znp*(?7v;S}