diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java index 888f6c0..d1ccdc1 100644 --- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java +++ b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/DevicesFragments/ViewDevicesFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -23,6 +24,11 @@ public class ViewDevicesFragment extends Fragment { private Button btnEditSend; private Button btnDeleteCancel; + private Drawable cancelIcon; + private Drawable saveIcon; + + private Drawable editIcon; + private Drawable removeIcon; @Nullable @Override @@ -51,6 +57,13 @@ public void onClick(View view) { btnDeleteCancel.setText("Cancelar"); btnEditSend.setText("Salvar"); + + cancelIcon = getResources().getDrawable(R.drawable.ic_clear_black_24dp); + saveIcon = getResources().getDrawable(R.drawable.ic_save_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(saveIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(cancelIcon, null, null, null); + }else{ //connection = new ServerConnection(); System.out.println("ENVIAR"); @@ -73,6 +86,12 @@ public void onClick(View view) { btnDeleteCancel.setText("Remover"); btnEditSend.setText("Editar"); + editIcon = getResources().getDrawable(R.drawable.ic_edit_black_24dp); + removeIcon = getResources().getDrawable(R.drawable.ic_delete_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(editIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(removeIcon, null, null, null); + txtDevice.setText(intent.getStringExtra("Device")); txtDescription.setText(intent.getStringExtra("Description")); diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java index 842c8c2..6964ddf 100644 --- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java +++ b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/InteractionsFragments/ViewInteractionFragment.java @@ -23,6 +23,7 @@ import com.gazeboindustries.sextafeiramobile.R; import com.gazeboindustries.sextafeiramobile.ServerConnection; +import com.google.android.material.drawable.DrawableUtils; public class ViewInteractionFragment extends Fragment { private Intent intent; @@ -40,6 +41,12 @@ public class ViewInteractionFragment extends Fragment { private AlertDialog.Builder removeAlert; private AlertDialog removeDialog; + private Drawable cancelIcon; + private Drawable saveIcon; + + private Drawable editIcon; + private Drawable removeIcon; + @Nullable @Override @@ -102,9 +109,11 @@ public void onClick(View view) { btnDeleteCancel.setText("Cancelar"); btnEditSend.setText("Salvar"); - //Drawable icon = new Drawable(); + cancelIcon = getResources().getDrawable(R.drawable.ic_clear_black_24dp); + saveIcon = getResources().getDrawable(R.drawable.ic_save_black_24dp); - btnDeleteCancel.setCompoundDrawables(null, null, null, null); + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(saveIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(cancelIcon, null, null, null); }else{ //connection = new ServerConnection(); @@ -137,6 +146,12 @@ public void onClick(View view) { btnDeleteCancel.setText("Remover"); btnEditSend.setText("Editar"); + editIcon = getResources().getDrawable(R.drawable.ic_edit_black_24dp); + removeIcon = getResources().getDrawable(R.drawable.ic_delete_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(editIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(removeIcon, null, null, null); + keyWord1.setText(intent.getStringExtra("Keyword1")); keyWord2.setText(intent.getStringExtra("Keyword2")); keyWord3.setText(intent.getStringExtra("Keyword3")); diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java index fb22c32..0b0406d 100644 --- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java +++ b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/AddHomeWorkFragment.java @@ -15,6 +15,15 @@ public class AddHomeWorkFragment extends Fragment { @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + /*checa se é uma data: + try { + sdf.parse(txtDelivery.getText().toString()); + + } catch (ParseException e) { + Toast.makeText(view.getContext(), "Insira um formato válido", Toast.LENGTH_SHORT).show(); + }*/ + return inflater.inflate(R.layout.fragment_addhomework, container, false); + } } diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java index 6455da8..40ab62c 100644 --- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java +++ b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/HomeworkFragments/ViewHomeWorkFragment.java @@ -2,12 +2,14 @@ import android.annotation.SuppressLint; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; +import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -15,6 +17,10 @@ import com.gazeboindustries.sextafeiramobile.R; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + public class ViewHomeWorkFragment extends Fragment { private Intent intent; private EditText txtType; @@ -26,11 +32,22 @@ public class ViewHomeWorkFragment extends Fragment { private Button btnEditSend; private Button btnDeleteCancel; + private Drawable saveIcon; + private Drawable cancelIcon; + + private Drawable editIcon; + private Drawable removeIcon; + + private SimpleDateFormat sdf; + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_viewhomework, container, false); + sdf = new SimpleDateFormat("dd/MM/yyyy"); + + txtType = view.findViewById(R.id.txtViewHomeWorkType); txtSubject = view.findViewById(R.id.txtViewHomeWorkSubject); txtHomeWork = view.findViewById(R.id.txtViewHomeWork); @@ -62,9 +79,22 @@ public void onClick(View view) { btnDeleteCancel.setText("Cancelar"); btnEditSend.setText("Salvar"); + + cancelIcon = getResources().getDrawable(R.drawable.ic_clear_black_24dp); + saveIcon = getResources().getDrawable(R.drawable.ic_save_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(saveIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(cancelIcon, null, null, null); + }else{ + try { + sdf.parse(txtDelivery.getText().toString()); + + } catch (ParseException e) { + Toast.makeText(view.getContext(), "Insira um formato válido", Toast.LENGTH_SHORT).show(); + } + //connection = new ServerConnection(); - System.out.println("ENVIAR"); //connection.sendRequest(connection.prepareRequest()); } } @@ -87,6 +117,12 @@ public void onClick(View view) { btnDeleteCancel.setText("Remover"); btnEditSend.setText("Editar"); + editIcon = getResources().getDrawable(R.drawable.ic_edit_black_24dp); + removeIcon = getResources().getDrawable(R.drawable.ic_delete_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(editIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(removeIcon, null, null, null); + txtType.setText(intent.getStringExtra("Type")); txtSubject.setText(intent.getStringExtra("Subject")); txtHomeWork.setText(intent.getStringExtra("HomeWork")); diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java index 693cac9..d9f32f0 100644 --- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java +++ b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/Fragments/SkillsFragments/ProjectsFragments/ViewProjectsFragment.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -23,6 +24,12 @@ public class ViewProjectsFragment extends Fragment { private Button btnEditSend; private Button btnDeleteCancel; + private Drawable saveIcon; + private Drawable cancelIcon; + + private Drawable editIcon; + private Drawable removeIcon; + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -50,6 +57,13 @@ public void onClick(View view) { btnDeleteCancel.setText("Cancelar"); btnEditSend.setText("Salvar"); + + cancelIcon = getResources().getDrawable(R.drawable.ic_clear_black_24dp); + saveIcon = getResources().getDrawable(R.drawable.ic_save_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(saveIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(cancelIcon, null, null, null); + }else{ //connection = new ServerConnection(); System.out.println("ENVIAR"); @@ -69,10 +83,15 @@ public void onClick(View view) { txtProject.setEnabled(false); txtRepository.setEnabled(false); - btnDeleteCancel.setText("Remover"); btnEditSend.setText("Editar"); + editIcon = getResources().getDrawable(R.drawable.ic_edit_black_24dp); + removeIcon = getResources().getDrawable(R.drawable.ic_delete_black_24dp); + + btnEditSend.setCompoundDrawablesWithIntrinsicBounds(editIcon, null, null, null); + btnDeleteCancel.setCompoundDrawablesWithIntrinsicBounds(removeIcon, null, null, null); + txtProject.setText(intent.getStringExtra("Project")); txtRepository.setText(intent.getStringExtra("Repository")); diff --git a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java index 95e2fd8..ec55257 100644 --- a/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java +++ b/App/app/src/main/java/com/gazeboindustries/sextafeiramobile/ServerConnection.java @@ -77,11 +77,49 @@ protected ArrayList doInBackground(JSONObject... params) { return null; } - public JSONObject prepareRequest(String request){ + public JSONObject prepareInteraction(String request, String key1, String key2, String key3, String res1, String res2, String res3, String command){ + try { + this.jsonRequest = new JSONObject(); + this.jsonRequest.put("header", "gazeboindustries09082004"); + this.jsonRequest.put("request", request); + this.jsonRequest.put("key1", key1); + this.jsonRequest.put("key2", key2); + this.jsonRequest.put("key3", key3); + this.jsonRequest.put("res1", res1); + this.jsonRequest.put("res2", res2); + this.jsonRequest.put("res3", res3); + this.jsonRequest.put("command", command); + + } catch (JSONException e) { + e.printStackTrace(); + } + return jsonRequest; + } + + public JSONObject prepareDevice(String request, String device, String desc){ + try { + this.jsonRequest = new JSONObject(); + this.jsonRequest.put("header", "gazeboindustries09082004"); + this.jsonRequest.put("request", request); + this.jsonRequest.put("device", device); + this.jsonRequest.put("description", desc); + + } catch (JSONException e) { + e.printStackTrace(); + } + return jsonRequest; + } + + public JSONObject prepareHomework(String request, String type, String subject, String homework, String delivery, String desc){ try { this.jsonRequest = new JSONObject(); this.jsonRequest.put("header", "gazeboindustries09082004"); this.jsonRequest.put("request", request); + this.jsonRequest.put("type", type); + this.jsonRequest.put("subject", subject); + this.jsonRequest.put("homeWork", homework); + this.jsonRequest.put("delivery", delivery); + this.jsonRequest.put("description", desc); } catch (JSONException e) { e.printStackTrace(); @@ -89,4 +127,29 @@ public JSONObject prepareRequest(String request){ return jsonRequest; } + public JSONObject prepareProject(String request, String project, String desc){ + try { + this.jsonRequest = new JSONObject(); + this.jsonRequest.put("header", "gazeboindustries09082004"); + this.jsonRequest.put("request", request); + this.jsonRequest.put("project", project); + this.jsonRequest.put("description", desc); + + } catch (JSONException e) { + e.printStackTrace(); + } + return jsonRequest; + } + + public JSONObject prepareRequest(String request){ + try { + this.jsonRequest = new JSONObject(); + this.jsonRequest.put("header", "gazeboindustries09082004"); + this.jsonRequest.put("request", request); + } catch (JSONException e) { + e.printStackTrace(); + } + return jsonRequest; + } + }