Merge pull request #52 from GabrielSirtoriCorrea/ArquivoJsonDeLeitura…

…Interface Arquivo json de leitura interface
GabrielSirtoriCorrea · Jul 28, 2020 · 954dc10 · 954dc10
2 parents 4bb6dd3 + b2d2037
commit 954dc10
Show file tree

Hide file tree

Showing 98 changed files with 9,895 additions and 329 deletions.
diff --git a/...afeiramobile/ExampleInstrumentedTest.java → ...tries/friday/ExampleInstrumentedTest.java b/...afeiramobile/ExampleInstrumentedTest.java → ...tries/friday/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import android.content.Context;
 

diff --git a/App/app/src/main/AndroidManifest.xml b/App/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gazeboindustries.sextafeiramobile">
+    package="com.gazeboindustries.friday">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <application
@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".MainActivity"
+            android:name="com.gazeboindustries.friday.MainActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...ile/Fragments/ConfigurationsFragment.java → ...day/Fragments/ConfigurationsFragment.java b/...ile/Fragments/ConfigurationsFragment.java → ...day/Fragments/ConfigurationsFragment.java
@@ -1,17 +1,15 @@
-package com.gazeboindustries.sextafeiramobile.Fragments;
+package com.gazeboindustries.friday.Fragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.AddProjectFragment;
-import com.gazeboindustries.sextafeiramobile.R;
+import com.gazeboindustries.friday.R;
 
 public class ConfigurationsFragment extends Fragment {
     @Nullable

diff --git a/...s/DevicesFragments/AddDeviceFragment.java → ...s/DevicesFragments/AddDeviceFragment.java b/...s/DevicesFragments/AddDeviceFragment.java → ...s/DevicesFragments/AddDeviceFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments;
+package com.gazeboindustries.friday.Fragments.DevicesFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class AddDeviceFragment extends Fragment {
     private Button btnAddDevice;

diff --git a/...nts/DevicesFragments/DevicesFragment.java → ...nts/DevicesFragments/DevicesFragment.java b/...nts/DevicesFragments/DevicesFragment.java → ...nts/DevicesFragments/DevicesFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments;
+package com.gazeboindustries.friday.Fragments.DevicesFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,11 +14,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments.AddInteractionFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ViewProjectsFragment;
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/...DevicesFragments/ViewDevicesFragment.java → ...DevicesFragments/ViewDevicesFragment.java b/...DevicesFragments/ViewDevicesFragment.java → ...DevicesFragments/ViewDevicesFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments;
+package com.gazeboindustries.friday.Fragments.DevicesFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -17,15 +17,12 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
-import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.util.ArrayList;
-
 public class ViewDevicesFragment extends Fragment {
     private Intent intent;
     private EditText txtDevice;

diff --git a/...tafeiramobile/Fragments/HomeFragment.java → ...stries/friday/Fragments/HomeFragment.java b/...tafeiramobile/Fragments/HomeFragment.java → ...stries/friday/Fragments/HomeFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments;
+package com.gazeboindustries.friday.Fragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,8 +10,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class HomeFragment extends Fragment {
     private Button startFriday;

diff --git a/...ionsFragments/AddInteractionFragment.java → ...ionsFragments/AddInteractionFragment.java b/...ionsFragments/AddInteractionFragment.java → ...ionsFragments/AddInteractionFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments;
+package com.gazeboindustries.friday.Fragments.InteractionsFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class AddInteractionFragment extends Fragment {
     private ServerConnection connection;

diff --git a/...actionsFragments/InteractionFragment.java → ...actionsFragments/InteractionFragment.java b/...actionsFragments/InteractionFragment.java → ...actionsFragments/InteractionFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments;
+package com.gazeboindustries.friday.Fragments.InteractionsFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,16 +14,14 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments.ViewHomeWorkFragment;
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import static java.lang.Thread.sleep;
 

diff --git a/...onsFragments/ViewInteractionFragment.java → ...onsFragments/ViewInteractionFragment.java b/...onsFragments/ViewInteractionFragment.java → ...onsFragments/ViewInteractionFragment.java
@@ -1,13 +1,10 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments;
+package com.gazeboindustries.friday.Fragments.InteractionsFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,14 +13,12 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
-import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
-import com.google.android.material.drawable.DrawableUtils;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class ViewInteractionFragment extends Fragment {
     private Intent intent;

diff --git a/...omeworkFragments/AddHomeWorkFragment.java → ...omeworkFragments/AddHomeWorkFragment.java b/...omeworkFragments/AddHomeWorkFragment.java → ...omeworkFragments/AddHomeWorkFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

diff --git a/...s/HomeworkFragments/HomeWorkFragment.java → ...s/HomeworkFragments/HomeWorkFragment.java b/...s/HomeworkFragments/HomeWorkFragment.java → ...s/HomeworkFragments/HomeWorkFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,12 +14,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.AddProjectFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ProjectFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ViewProjectsFragment;
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/...meworkFragments/ViewHomeWorkFragment.java → ...meworkFragments/ViewHomeWorkFragment.java b/...meworkFragments/ViewHomeWorkFragment.java → ...meworkFragments/ViewHomeWorkFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -17,8 +17,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

diff --git a/...ProjectsFragments/AddProjectFragment.java → ...ProjectsFragments/AddProjectFragment.java b/...ProjectsFragments/AddProjectFragment.java → ...ProjectsFragments/AddProjectFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class AddProjectFragment extends Fragment {
     private Button btnAddProject;

diff --git a/...ts/ProjectsFragments/ProjectFragment.java → ...ts/ProjectsFragments/ProjectFragment.java b/...ts/ProjectsFragments/ProjectFragment.java → ...ts/ProjectsFragments/ProjectFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -14,9 +14,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.ListItemRow;
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.ListItemRow;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/...ojectsFragments/ViewProjectsFragment.java → ...ojectsFragments/ViewProjectsFragment.java b/...ojectsFragments/ViewProjectsFragment.java → ...ojectsFragments/ViewProjectsFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -17,8 +17,8 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.R;
-import com.gazeboindustries.sextafeiramobile.ServerConnection;
+import com.gazeboindustries.friday.R;
+import com.gazeboindustries.friday.ServerConnection;
 
 public class ViewProjectsFragment extends Fragment {
     private Intent intent;

diff --git a/...ments/SkillsFragments/SkillsFragment.java → ...ments/SkillsFragments/SkillsFragment.java b/...ments/SkillsFragments/SkillsFragment.java → ...ments/SkillsFragments/SkillsFragment.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments;
+package com.gazeboindustries.friday.Fragments.SkillsFragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -10,12 +10,9 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments.AddDeviceFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments.AddHomeWorkFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.HomeworkFragments.HomeWorkFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.AddProjectFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.ProjectsFragments.ProjectFragment;
-import com.gazeboindustries.sextafeiramobile.R;
+import com.gazeboindustries.friday.Fragments.SkillsFragments.HomeworkFragments.HomeWorkFragment;
+import com.gazeboindustries.friday.Fragments.SkillsFragments.ProjectsFragments.ProjectFragment;
+import com.gazeboindustries.friday.R;
 
 public class SkillsFragment extends Fragment {
     @Nullable

diff --git a/...ustries/sextafeiramobile/ListItemRow.java → .../gazeboindustries/friday/ListItemRow.java b/...ustries/sextafeiramobile/ListItemRow.java → .../gazeboindustries/friday/ListItemRow.java
@@ -1,6 +1,5 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/...stries/sextafeiramobile/MainActivity.java → ...gazeboindustries/friday/MainActivity.java b/...stries/sextafeiramobile/MainActivity.java → ...gazeboindustries/friday/MainActivity.java
@@ -1,12 +1,12 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import android.os.Bundle;
 
-import com.gazeboindustries.sextafeiramobile.Fragments.ConfigurationsFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.DevicesFragments.DevicesFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.HomeFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.InteractionsFragments.InteractionFragment;
-import com.gazeboindustries.sextafeiramobile.Fragments.SkillsFragments.SkillsFragment;
+import com.gazeboindustries.friday.Fragments.ConfigurationsFragment;
+import com.gazeboindustries.friday.Fragments.DevicesFragments.DevicesFragment;
+import com.gazeboindustries.friday.Fragments.HomeFragment;
+import com.gazeboindustries.friday.Fragments.InteractionsFragments.InteractionFragment;
+import com.gazeboindustries.friday.Fragments.SkillsFragments.SkillsFragment;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import androidx.appcompat.app.AppCompatActivity;

diff --git a/...es/sextafeiramobile/ServerConnection.java → ...boindustries/friday/ServerConnection.java b/...es/sextafeiramobile/ServerConnection.java → ...boindustries/friday/ServerConnection.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import android.os.AsyncTask;
 

diff --git a/...ies/sextafeiramobile/ExampleUnitTest.java → ...eboindustries/friday/ExampleUnitTest.java b/...ies/sextafeiramobile/ExampleUnitTest.java → ...eboindustries/friday/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.gazeboindustries.sextafeiramobile;
+package com.gazeboindustries.friday;
 
 import org.junit.Test;
 

diff --git a/Configurations.json b/Configurations.json
@@ -1,17 +1,12 @@
 {
     "FridayConfigs": {
         "ID": "Sexta-Feira",
-        "ServerHost": "192.168.0.5",
+        "ServerHost": "192.168.0.4",
         "Port": 5000
     },
     "ServerConfigs": {
         "ID": "Server",
-        "Host": "192.168.0.5",
-        "Port": 5000
-    },
-    "InterfaceConfigs": {
-        "ID": "Interface",
-        "ServerHost": "192.168.0.5",
+        "Host": "192.168.0.4",
         "Port": 5000
     }
 }
diff --git a/...ain/resources/styles/BackgroundFriday.jpg → Images/BackgroundFriday.jpg b/...ain/resources/styles/BackgroundFriday.jpg → Images/BackgroundFriday.jpg
diff --git a/Images/BackgroundFriday.png b/Images/BackgroundFriday.png