App reduced to minimal functionality

m-a-y-a-n-k · Nov 28, 2017 · 44a4686 · 44a4686
1 parent 4927d96
commit 44a4686
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,7 +60,6 @@ typings/
 
 # All json files
 *.json
-!serviceAccountKey.json
 !package*
 
 # All rules

diff --git a/App/SmartHome/.idea/misc.xml b/App/SmartHome/.idea/misc.xml
diff --git a/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/Helpers.java b/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/Helpers.java
@@ -74,9 +74,12 @@ static void configSmartHome(View rootView, MainActivity current) {
         current.tv.setText("NO INTERNET CONNECTION");
         current.statusCard = rootView.findViewById(R.id.statusCard);
         current.alertCard = rootView.findViewById(R.id.notifCard);
+        current.roomCard = rootView.findViewById(R.id.roomCard);
+        current.peersCard = rootView.findViewById(R.id.groupCard);
         current.statusCard.setVisibility(View.INVISIBLE);
         current.alertCard.setVisibility(View.INVISIBLE);
         current.roomCard.setVisibility(View.INVISIBLE);
+        current.peersCard.setVisibility(View.INVISIBLE);
         rootView.findViewById(R.id.homePage)
                 .setBackgroundDrawable(current.getResources().getDrawable(R.drawable.app_background));
         Helpers.fixBackgroundRepeat(rootView.findViewById(R.id.homePage));
@@ -94,6 +97,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                     finalCurrent.alertCard.setVisibility(View.VISIBLE);
                     v.findViewById(R.id.roomCard).setVisibility(View.VISIBLE);
                     finalCurrent.roomCard.setVisibility(View.VISIBLE);
+                    finalCurrent.peersCard.setVisibility(View.VISIBLE);
                     finalCurrent.statusCard.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View view) {

diff --git a/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/MainActivity.java b/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/MainActivity.java
@@ -34,7 +34,7 @@ public class MainActivity extends AppCompatActivity {
     TextView tv,lightValue,humValue,tempValue,msg;
     DatabaseReference userDB,sensorDB,alertsDB;
     Switch motion;
-    CardView statusCard,roomCard,alertCard;
+    CardView statusCard,roomCard,alertCard,peersCard;
     ImageView img;
     RecyclerView alertsList;
     ArrayList<Alert> myAlerts;