From 0538256aaa787aff6bc1c8d8237990698e74e850 Mon Sep 17 00:00:00 2001
From: Mayank Narula <mayanknarula96@gmail.com>
Date: Wed, 8 Nov 2017 08:01:43 +0530
Subject: [PATCH] UI update Client App. User Presence Modify cloud data. 8:01
 AM 8/11/17

---
 .../inspectionProfiles/Project_Default.xml    |   2 +
 .../isecpowify/smarthome/Constants.java       |   6 +-
 .../isecpowify/smarthome/Helpers.java         | 245 +++++++++++++++++-
 .../isecpowify/smarthome/MainActivity.java    | 104 ++++++--
 .../solutions/isecpowify/smarthome/State.java |  13 +
 .../src/main/res/drawable/app_background.xml  |   2 +-
 .../app/src/main/res/drawable/ic_back.xml     |   9 +
 .../app/src/main/res/drawable/ic_enter.xml    |   4 +-
 .../app/src/main/res/drawable/ic_group.xml    |   6 +-
 .../app/src/main/res/drawable/ic_notifs.xml   |   6 +-
 .../app/src/main/res/drawable/ic_status.xml   |   6 +-
 .../app/src/main/res/layout/activity_main.xml | 156 +----------
 .../src/main/res/layout/fragment_sensors.xml  | 164 ++++++++++++
 .../main/res/layout/fragment_smart_home.xml   | 161 ++++++++++++
 .../app/src/main/res/values/dimens.xml        |   3 +-
 .../app/src/main/res/values/strings.xml       |   1 +
 server.js                                     |   6 +-
 17 files changed, 700 insertions(+), 194 deletions(-)
 create mode 100644 App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/State.java
 create mode 100644 App/SmartHome/app/src/main/res/drawable/ic_back.xml
 create mode 100644 App/SmartHome/app/src/main/res/layout/fragment_sensors.xml
 create mode 100644 App/SmartHome/app/src/main/res/layout/fragment_smart_home.xml

diff --git a/App/SmartHome/.idea/inspectionProfiles/Project_Default.xml b/App/SmartHome/.idea/inspectionProfiles/Project_Default.xml
index 19feec1..2a90906 100644
--- a/App/SmartHome/.idea/inspectionProfiles/Project_Default.xml
+++ b/App/SmartHome/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintCommitPrefEdits" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AndroidLintSetTextI18n" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintValidFragment" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
diff --git a/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/Constants.java b/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/Constants.java
index 633b2c4..442c0d6 100644
--- a/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/Constants.java
+++ b/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/Constants.java
@@ -5,5 +5,9 @@
  */
 
 class Constants {
-    static String TAG = "LOG_V";
+    static final String TAG = "LOG_V";
+    static final int SMART_HOME_OP = 1;
+    static final int SENSOR_OP_CODE = 2;
+    static final String[] OptionTitles = new String[]{"SMART HOME", "SENSORS"};
+    static final String ARG_OPTION_NUMBER = "OPTION_INDEX";
 }
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
index 869b014..35efdff 100644
--- 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
@@ -7,10 +7,18 @@
 import android.graphics.Shader;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.v7.widget.CardView;
+import android.util.Log;
 import android.view.View;
-import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.google.firebase.database.ChildEventListener;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.ValueEventListener;
 
 /**
  * Created by mayank on 5/11/17.
@@ -46,4 +54,237 @@ static void restartApplication(Activity current) {
         current.finish();
         current.startActivity(i);
     }
+
+    static void configSmartHome(View rootView, MainActivity current) {
+
+        current.tv = rootView.findViewById(R.id.welcome);
+        current.tv.setText("NO INTERNET CONNECTION");
+        current.statusCard = rootView.findViewById(R.id.statusCard);
+        rootView.findViewById(R.id.homePage)
+                .setBackgroundDrawable(current.getResources().getDrawable(R.drawable.app_background));
+        Helpers.fixBackgroundRepeat(rootView.findViewById(R.id.homePage));
+
+        final MainActivity finalCurrent = current;
+        final View v = rootView;
+
+        current.userDB.child(current.sp.getString(current.getString(R.string.OTRK),"")).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                User regUser = dataSnapshot.getValue(User.class);
+                if(regUser != null ){
+                    finalCurrent.tv.setText("Registered User :\nName- " + regUser.name + "\nPhone- " + regUser.contact);
+                    finalCurrent.statusCard.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            finalCurrent.selectItem(Constants.SENSOR_OP_CODE);
+                        }
+                    });
+                    setRoomEvent(v,finalCurrent);
+
+                } else{
+                    finalCurrent.tv.setText("Welcome !. You are not registered in our DataBase ");
+                }
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+                Log.v(Constants.TAG,"The read failed: " + databaseError.getCode());
+            }
+        });
+    }
+
+
+
+    private static void setRoomEvent(View rootView, MainActivity curr) {
+
+        curr.msg = rootView.findViewById(R.id.join);
+        curr.img = rootView.findViewById(R.id.room);
+        curr.roomCard = rootView.findViewById(R.id.roomCard);
+
+        final MainActivity current = curr;
+
+        class roomJoin extends AsyncTask<Void,Void,Void>{
+
+            @Override
+            protected Void doInBackground(Void... voids) {
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    Thread.interrupted();
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void aVoid) {
+                if( getSharedPreferences(current.getApplicationContext())
+                        .contains(current.getString(R.string.joined))){
+                    current.msg.setText("Exit");
+                    current.img.setBackgroundDrawable(current.getDrawable(R.drawable.ic_exit));
+                } else {
+                    current.msg.setText("Enter");
+                    current.img.setBackgroundDrawable(current.getDrawable(R.drawable.ic_enter));
+                }
+            }
+        }
+
+        new roomJoin().execute();
+        current.sensorDB.addChildEventListener(new ChildEventListener() {
+            @Override
+            public void onChildAdded(DataSnapshot dataSnapshot, String s) {
+                State latestSensor = dataSnapshot.getValue(State.class);
+                if( latestSensor != null ){
+
+                    if( getSharedPreferences(current.getApplicationContext())
+                            .contains(current.getString(R.string.joined))){
+                        current.sensorDB
+                                .child(dataSnapshot.getKey())
+                                .child("members")
+                                .child(
+                                        getSharedPreferences(current.getApplicationContext())
+                                                .getString(current.getString(R.string.OTRK),"NONE")
+                                )
+                                .setValue(true);
+                    } else {
+
+                        current.sensorDB
+                                .child(dataSnapshot.getKey())
+                                .child("members")
+                                .child(
+                                        getSharedPreferences(current.getApplicationContext())
+                                                .getString(current.getString(R.string.OTRK),"NONE")
+                                )
+                                .setValue(null);
+                    }
+
+                    current.sensorDB
+                            .child(dataSnapshot.getKey())
+                            .child("members")
+                            .addListenerForSingleValueEvent(new ValueEventListener() {
+                        @Override
+                        public void onDataChange(DataSnapshot snap) {
+                            if( snap.child(
+                                    getSharedPreferences(current.getApplicationContext())
+                                            .getString(current.getString(R.string.OTRK),"NONE")).exists() ){
+                                getSharedPreferences(current.getApplicationContext())
+                                        .edit()
+                                        .putBoolean(current.getString(R.string.joined),true)
+                                .apply();
+                            }
+                        }
+
+                        @Override
+                        public void onCancelled(DatabaseError databaseError) {
+
+                        }
+                    });
+                    current.roomCard.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View view) {
+                            if( getSharedPreferences(current.getApplicationContext())
+                                    .contains(current.getString(R.string.joined))){
+                                getSharedPreferences(current.getApplicationContext())
+                                        .edit()
+                                        .remove(current.getString(R.string.joined))
+                                        .apply();
+                            } else {
+                                getSharedPreferences(current.getApplicationContext())
+                                        .edit()
+                                        .putBoolean(current.getString(R.string.joined),true)
+                                        .apply();
+                            }
+                        }
+                    });
+                    new roomJoin().execute();
+                }
+            }
+
+            @Override
+            public void onChildChanged(DataSnapshot dataSnapshot, String s) {
+
+            }
+
+            @Override
+            public void onChildRemoved(DataSnapshot dataSnapshot) {
+
+            }
+
+            @Override
+            public void onChildMoved(DataSnapshot dataSnapshot, String s) {
+
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    static void configSensorData(View rootView, MainActivity current) {
+        showLatestSensorReadings(rootView, current);
+    }
+
+    private static void showLatestSensorReadings(View rootView,MainActivity current) {
+
+        rootView.findViewById(R.id.sensorsStatus)
+                .setBackgroundDrawable(current.getResources().getDrawable(R.drawable.app_background));
+        fixBackgroundRepeat(rootView.findViewById(R.id.sensorsStatus));
+
+        current.lightValue = rootView.findViewById(R.id.lightValue);
+        current.tempValue = rootView.findViewById(R.id.tempValue);
+        current.humValue = rootView.findViewById(R.id.humValue);
+        current.inStatus = rootView.findViewById(R.id.inSwitch);
+        current.outStatus = rootView.findViewById(R.id.outSwitch);
+
+        final MainActivity finalCurrent = current;
+
+        current.sensorDB.addChildEventListener(new ChildEventListener() {
+            @Override
+            public void onChildAdded(DataSnapshot snap, String s) {
+//                Log.v(Constants.TAG, String.valueOf(snap.getValue()));
+                State latestSensor = snap.getValue(State.class);
+                if( latestSensor != null ){
+                    finalCurrent.lightValue.setText(String.valueOf(latestSensor.light));
+                    finalCurrent.humValue.setText(String.valueOf(latestSensor.humidity));
+                    finalCurrent.tempValue.setText(String.valueOf(latestSensor.temp));
+                    finalCurrent.inStatus.setChecked(latestSensor.inDoorMotion);
+                    finalCurrent.outStatus.setChecked(latestSensor.outDoorMotion);
+                }
+            }
+
+            @Override
+            public void onChildChanged(DataSnapshot dataSnapshot, String s) {
+
+            }
+
+            @Override
+            public void onChildRemoved(DataSnapshot dataSnapshot) {
+
+            }
+
+            @Override
+            public void onChildMoved(DataSnapshot dataSnapshot, String s) {
+
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+        CardView back = rootView.findViewById(R.id.backCard);
+
+        back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                goBack(finalCurrent);
+            }
+        });
+
+    }
+
+    private static void goBack(MainActivity current){
+        current.selectItem(Constants.SMART_HOME_OP);
+    }
 }
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
index 86cf3e7..f19b943 100644
--- 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
@@ -1,16 +1,23 @@
 package com.solutions.isecpowify.smarthome;
 
+import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.CardView;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Switch;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.DatabaseReference;
@@ -21,39 +28,24 @@ public class MainActivity extends AppCompatActivity {
 
     SharedPreferences sp;
     EditText OTRK;
-    TextView tv;
-    DatabaseReference userDB;
+    TextView tv,lightValue,humValue,tempValue,msg;
+    DatabaseReference userDB,sensorDB;
+    Switch inStatus,outStatus;
+    CardView statusCard,roomCard;
+    ImageView img;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         sp = Helpers.getSharedPreferences(getApplicationContext());
         userDB = FirebaseDatabase.getInstance().getReference().child("users");
+        sensorDB = FirebaseDatabase.getInstance().getReference().child("state");
 
         if( sp.contains(getString(R.string.OTRK)) ){
-            setContentView(R.layout.activity_main);
-
-            tv = (TextView)findViewById(R.id.welcome);
-            findViewById(R.id.homePage)
-                    .setBackgroundDrawable(getResources().getDrawable(R.drawable.app_background));
-            Helpers.fixBackgroundRepeat(findViewById(R.id.homePage));
 
-            userDB.child(sp.getString(getString(R.string.OTRK),"")).addListenerForSingleValueEvent(new ValueEventListener() {
-                @Override
-                public void onDataChange(DataSnapshot dataSnapshot) {
-                    User regUser = dataSnapshot.getValue(User.class);
-                    if(regUser != null ){
-                        tv.setText("Registered as :\nName- " + regUser.name + "\nPhone- " + regUser.contact);
-                    } else{
-                        tv.setText("Welcome !. You are not registered in our DataBase ");
-                    }
-                }
+            setContentView(R.layout.activity_main);
+            selectItem(Constants.SMART_HOME_OP);
 
-                @Override
-                public void onCancelled(DatabaseError databaseError) {
-                    Log.v(Constants.TAG,"The read failed: " + databaseError.getCode());
-                }
-            });
         } else {
             setContentView(R.layout.key_spec_layout);
             findViewById(R.id.keySpecLayout)
@@ -105,8 +97,72 @@ public void onCancelled(DatabaseError databaseError) {
         }
     }
 
+    void selectItem(int position) {
+        // update the main content by replacing fragments
+        Fragment fragment = new OptionsFragment(MainActivity.this);
+        Bundle args = new Bundle();
+        args.putInt(Constants.ARG_OPTION_NUMBER, position);
+
+        fragment.setArguments(args);
+
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
+
+        // update selected item and title, then close the drawer
+        setTitle(Constants.OptionTitles[position-1]);
+    }
+
     private void showKeyboardByDefault(EditText pin) {
         pin.requestFocus();
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
     }
+
+    public static class OptionsFragment extends Fragment {
+
+        private MainActivity current;
+
+        public OptionsFragment() {
+            // Empty constructor required for fragment subclasses
+        }
+
+        @SuppressLint("ValidFragment")
+        public OptionsFragment(MainActivity current) {
+            this.current = current;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                                 Bundle savedInstanceState) {
+            int option = getArguments().getInt(Constants.ARG_OPTION_NUMBER);
+            View rootView = inflateCorrectFragment(option, inflater, container);
+            setView(rootView, option, current);
+            return rootView;
+        }
+
+        private View inflateCorrectFragment(int option, LayoutInflater inflater, ViewGroup container) {
+            switch (option) {
+                case Constants.SENSOR_OP_CODE:
+                    return inflater.inflate(R.layout.fragment_sensors, container, false);
+                case Constants.SMART_HOME_OP:
+                default:
+                    return inflater.inflate(R.layout.fragment_smart_home, container, false);
+            }
+        }
+
+        private void setView(View rootView, int option, MainActivity current) {
+            String optionName = Constants.OptionTitles[option-1];
+            switch (option) {
+                case Constants.SENSOR_OP_CODE:
+                    if (current != null && rootView != null)
+                        Helpers.configSensorData(rootView, current);
+                    break;
+                case Constants.SMART_HOME_OP:
+                    if (current != null && rootView != null)
+                        Helpers.configSmartHome(rootView, current);
+                default:
+                    ;
+            }
+            getActivity().setTitle(optionName);
+        }
+    }
 }
diff --git a/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/State.java b/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/State.java
new file mode 100644
index 0000000..6595d12
--- /dev/null
+++ b/App/SmartHome/app/src/main/java/com/solutions/isecpowify/smarthome/State.java
@@ -0,0 +1,13 @@
+package com.solutions.isecpowify.smarthome;
+
+/**
+ * Created by mayank on 7/11/17.
+ */
+
+class State {
+    public Double temp,humidity,light,ax,ay,az,timestamp,latestIndoorMovement,latestOutdoorMovement;
+    public boolean inDoorMotion,outDoorMotion;
+    State(){
+        // empty constructor
+    }
+}
diff --git a/App/SmartHome/app/src/main/res/drawable/app_background.xml b/App/SmartHome/app/src/main/res/drawable/app_background.xml
index 1a06db7..6c62ebe 100644
--- a/App/SmartHome/app/src/main/res/drawable/app_background.xml
+++ b/App/SmartHome/app/src/main/res/drawable/app_background.xml
@@ -1,4 +1,4 @@
-<vector android:alpha="0.4" android:height="16dp"
+<vector android:alpha="0.5" android:height="16dp"
     android:viewportHeight="500" android:viewportWidth="390"
     android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#040404"
diff --git a/App/SmartHome/app/src/main/res/drawable/ic_back.xml b/App/SmartHome/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 0000000..abb5f0b
--- /dev/null
+++ b/App/SmartHome/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="40dp"
+        android:height="40dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="#66bb6a"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>
diff --git a/App/SmartHome/app/src/main/res/drawable/ic_enter.xml b/App/SmartHome/app/src/main/res/drawable/ic_enter.xml
index 3ceb7d2..ab8013e 100644
--- a/App/SmartHome/app/src/main/res/drawable/ic_enter.xml
+++ b/App/SmartHome/app/src/main/res/drawable/ic_enter.xml
@@ -1,7 +1,7 @@
 <vector
     android:alpha="0.9"
-    android:height="40dp" android:viewportHeight="450"
-    android:viewportWidth="450" android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:height="36dp" android:viewportHeight="450"
+    android:viewportWidth="450" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#079b25"
         android:pathData="M87.8,62.1C87.8,118.5 87.8,124.2 88.1,124.3C88.3,124.3 93.8,124.4 100.3,124.4L112.2,124.4 112.2,74.5L112.2,24.6 224.4,24.6C286.2,24.6 336.9,24.7 337.1,24.7C338,25 337.5,26.4 336.6,26.4C336.4,26.4 336.2,26.5 336.1,26.7C336.1,26.9 335.8,27 335.6,27C335.3,27 334.8,27.2 334.5,27.4C334.2,27.6 333.8,27.8 333.6,27.8C333.4,27.8 333.1,27.9 333,28.1C332.9,28.3 332.5,28.4 332.3,28.4C332,28.4 331.7,28.6 331.5,28.9C331.3,29.2 330.9,29.4 330.5,29.5C330.1,29.6 329.8,29.8 329.7,29.9C329.7,30.1 329.4,30.2 329.2,30.2C329,30.2 328.5,30.4 328.2,30.6C327.8,30.8 327.4,31 327.2,31C327,31 326.7,31.1 326.6,31.3C326.5,31.5 326.1,31.6 325.9,31.6C325.6,31.6 325.4,31.7 325.4,31.8C325.4,31.9 325.2,32 324.9,32.1C324.6,32.2 324.4,32.4 324.3,32.5C324.3,32.7 324,32.8 323.8,32.8C323.6,32.8 323.3,32.9 323.2,33.1C323.1,33.3 322.8,33.4 322.7,33.4C322.6,33.4 322.3,33.5 322.2,33.7C322.1,33.9 321.7,34 321.3,34.1C320.9,34.2 320.5,34.4 320.4,34.5C320.3,34.7 319.9,34.8 319.6,34.8C319.3,34.8 319,34.9 318.9,35.1C318.9,35.3 318.6,35.4 318.4,35.4C318.1,35.4 317.6,35.7 317.2,36C316.9,36.3 316.4,36.6 316.2,36.6C316,36.6 315.8,36.7 315.7,36.9C315.7,37.1 315.5,37.2 315.4,37.2C315.2,37.2 314.8,37.4 314.3,37.6C313.9,37.8 313.4,38 313.2,38C313,38 312.7,38.1 312.6,38.3C312.5,38.5 312.1,38.6 311.9,38.6C311.6,38.6 311.4,38.7 311.3,38.9C311.3,39.1 311,39.2 310.7,39.2C310.4,39.2 310.2,39.3 310.2,39.4C310.2,39.5 310,39.7 309.8,39.8C309.5,39.9 308.9,40.3 308.3,40.6C307.8,40.9 307.1,41.2 306.9,41.2C306.6,41.2 306.4,41.3 306.3,41.5C306.3,41.7 306,41.8 305.6,41.8C305.3,41.8 305,41.9 304.9,42.1C304.9,42.3 304.6,42.4 304.4,42.4C304.2,42.4 303.8,42.7 303.4,43C303,43.3 302.5,43.6 302.2,43.6C302,43.6 301.7,43.7 301.7,43.9C301.6,44.1 301.5,44.2 301.3,44.2C301.2,44.2 300.8,44.4 300.3,44.6C299.9,44.8 299.4,45 299.1,45C298.9,45 298.6,45.1 298.5,45.3C298.5,45.5 298.2,45.6 298,45.6C297.8,45.6 297.2,45.8 296.8,46.2C295.3,47.1 295.1,47.2 294.5,47.5C294.1,47.6 293.8,47.9 293.7,48C293.6,48.1 293.3,48.2 293,48.2C292.7,48.2 292.3,48.4 292.1,48.6C291.9,48.8 291.7,48.9 291.5,48.9C291.3,48.8 291.1,48.9 291,49.1C290.9,49.3 290.6,49.4 290.3,49.4C290,49.4 289.6,49.7 289.2,50C288.9,50.3 288.5,50.6 288.3,50.6C288.1,50.6 287.7,50.8 287.5,51C287.2,51.2 286.8,51.4 286.7,51.4C286.5,51.4 286.2,51.5 286.1,51.7C285.9,51.9 285.5,52 285.2,52C284.9,52 284.6,52.1 284.5,52.3C284.5,52.5 284.2,52.6 284,52.6C283.7,52.6 283.4,52.7 283.2,52.9C282.8,53.2 281.5,54 280.5,54.5C280.1,54.7 279.8,54.9 279.7,55C279.6,55.1 279.3,55.2 278.9,55.2C278.5,55.2 278.2,55.3 278.1,55.5C278.1,55.7 277.8,55.8 277.5,55.8C277.2,55.8 276.9,55.9 276.9,56.1C276.8,56.2 276.5,56.4 276.2,56.5C276,56.6 275.5,56.8 275.2,57C274.2,57.7 271.6,59 271.2,59C271,59 270.6,59.2 270.4,59.4C270.2,59.6 269.9,59.8 269.7,59.8C269.5,59.8 269,60 268.6,60.3C268.2,60.6 267.8,60.8 267.7,60.8C267.6,60.8 267.3,61 267.1,61.2C266.8,61.4 266.4,61.6 266.3,61.6C266.1,61.6 265.8,61.7 265.7,61.9C265.5,62.1 265.2,62.2 264.9,62.2C264.7,62.2 264.4,62.3 264.3,62.5C264.3,62.7 264,62.8 263.7,62.8C263.5,62.8 263.1,62.9 263,63.1C262.8,63.2 262.5,63.4 262.2,63.5C261.9,63.6 261.4,63.9 261.1,64.1C260.7,64.4 260.2,64.6 259.9,64.7C259.7,64.8 259.4,65 259.3,65.1C259.3,65.3 259,65.4 258.7,65.4C258.4,65.4 258.2,65.5 258.2,65.6C258.2,65.7 257.8,65.9 257.3,66C256.8,66.1 256.4,66.3 256.4,66.4C256.4,66.5 256.1,66.6 255.8,66.7C255.5,66.8 255.1,67 254.9,67.2C254.7,67.4 254.2,67.7 253.8,67.8C253.4,68 253,68.2 252.8,68.3C252.7,68.5 252.4,68.6 252.2,68.6C252,68.6 251.8,68.7 251.8,68.9C251.8,69.1 251.6,69.2 251.2,69.2C250.9,69.2 250.5,69.3 250.3,69.5C250.1,69.6 249.7,69.8 249.4,69.9C249.1,70 248.8,70.2 248.6,70.3C248.5,70.5 248.2,70.6 247.9,70.6C247.7,70.6 247.4,70.8 247.3,71C247.1,71.2 246.7,71.5 246.3,71.6C245.8,71.7 245.4,72 245.3,72.1C245.3,72.3 245,72.4 244.7,72.4C244.5,72.4 244.1,72.5 244,72.7C243.9,72.8 243.5,73 243.2,73.1C242.9,73.1 242.4,73.3 242.3,73.5C242.1,73.7 241.8,73.8 241.6,73.8C241.3,73.8 241,74 240.8,74.3C240.5,74.6 240.3,74.8 240.2,74.8C240.1,74.8 239.5,75 239,75.3L238,75.7 238,188C238,249.7 238,300.3 237.9,300.4C237.8,300.5 212.6,300.6 175,300.6L112.2,300.6 112.2,263.2L112.2,225.8 100,225.8L87.8,225.8 87.8,275C87.8,321.4 87.8,324.2 88.1,324.3C88.3,324.4 89.2,324.4 90.1,324.4C91,324.4 124.6,324.4 164.8,324.4L238,324.4 238,361.6L238.1,398.8 238.6,398.4C238.9,398.2 239.5,397.9 239.8,397.9C240.1,397.8 240.5,397.6 240.5,397.5C240.6,397.3 240.9,397.2 241.3,397.2C241.7,397.2 242,397.1 242.1,396.9C242.1,396.7 242.4,396.6 242.7,396.6C243,396.6 243.3,396.5 243.3,396.3C243.4,396.2 243.8,395.9 244.3,395.7C244.7,395.5 245.5,395.1 245.9,394.7C246.4,394.4 247.1,394.1 247.5,394.1C247.9,394 248.3,393.8 248.3,393.7C248.4,393.5 248.7,393.4 249,393.4C249.3,393.4 249.6,393.2 249.8,393C249.9,392.8 250.2,392.6 250.4,392.6C250.7,392.6 251,392.5 251.2,392.3C251.8,391.8 255,390.2 255.5,390.2C255.7,390.2 256,390.1 256.1,389.9C256.1,389.7 256.3,389.6 256.5,389.6C256.9,389.6 259,388.4 259.5,388C259.7,387.8 260,387.6 260.2,387.6C260.3,387.6 260.7,387.5 260.9,387.3C261.1,387.1 261.5,387 261.8,387C262.2,387 262.4,386.9 262.4,386.7C262.4,386.5 262.5,386.4 262.7,386.4C262.9,386.4 263.3,386.2 263.7,386C264.2,385.8 264.6,385.6 264.8,385.6C265,385.6 265.4,385.3 265.6,385C265.9,384.7 266.3,384.4 266.5,384.4C266.8,384.4 267.1,384.3 267.2,384.1C267.3,383.9 267.7,383.8 267.9,383.8C268.2,383.8 268.4,383.7 268.4,383.6C268.4,383.5 268.8,383.3 269.2,383.2C269.6,383.1 270.1,382.9 270.2,382.7C270.3,382.5 270.7,382.4 270.9,382.4C271.2,382.4 271.4,382.3 271.5,382.1C271.5,382 271.9,381.8 272.4,381.6C272.9,381.4 273.3,381.2 273.3,381.1C273.4,380.9 273.7,380.8 274.1,380.7C274.5,380.6 274.8,380.5 274.8,380.4C274.8,380.3 275.1,380.1 275.5,380C275.9,379.9 276.5,379.6 276.8,379.5C277.1,379.3 277.4,379.2 277.5,379.2C277.7,379.2 277.8,379.1 277.8,379C277.8,378.9 278.1,378.8 278.4,378.7C278.8,378.6 279.3,378.4 279.5,378.2C279.9,377.8 282.2,376.6 282.5,376.6C282.6,376.6 282.8,376.5 282.9,376.3C283.1,376.1 283.4,376 283.7,376C284,376 284.2,375.9 284.2,375.8C284.2,375.7 284.4,375.6 284.7,375.5C285.3,375.3 286.5,374.7 286.9,374.4C287.4,374 291,372.2 291.4,372.2C291.6,372.2 291.9,372.1 292,371.9C292.1,371.7 292.5,371.6 292.7,371.6C293,371.6 293.2,371.4 293.3,371.2C293.4,371 293.8,370.7 294.2,370.6C294.6,370.5 295.1,370.2 295.2,370.1C295.3,369.9 295.6,369.8 295.7,369.8C295.9,369.8 296.3,369.6 296.7,369.4C297.2,369.2 297.7,369 297.8,369C298,369 298.2,368.9 298.2,368.8C298.2,368.7 298.4,368.5 298.8,368.5C299.1,368.4 299.4,368.2 299.6,368.1C299.9,367.8 301.5,367 302.5,366.6C302.8,366.5 303,366.3 303,366.2C303,366.1 303.3,366 303.8,365.9C304.2,365.8 304.5,365.7 304.6,365.6C304.8,365.4 306.4,364.6 306.8,364.6C307,364.6 307.3,364.4 307.4,364.2C307.5,364 307.8,363.8 308,363.8C308.1,363.9 308.6,363.7 308.9,363.4C309.2,363 309.6,362.8 309.8,362.8C310,362.8 310.4,362.6 310.7,362.4C311,362.2 311.5,362 311.7,362C312,362 312.3,361.9 312.4,361.7C312.5,361.5 312.9,361.4 313.1,361.4C313.4,361.4 313.6,361.3 313.7,361.1C313.7,360.9 314,360.8 314.3,360.8C314.5,360.8 314.8,360.7 314.9,360.5C314.9,360.3 315.1,360.2 315.3,360.2C315.4,360.2 315.6,360.1 315.7,359.9C315.7,359.7 315.9,359.6 316.1,359.6C316.3,359.6 316.8,359.4 317.1,359.2C317.4,359 317.9,358.8 318.1,358.8C318.4,358.8 318.6,358.7 318.7,358.5C318.7,358.3 319,358.2 319.4,358.2C319.7,358.2 320,358.1 320.1,357.9C320.1,357.7 320.4,357.6 320.7,357.6C320.9,357.6 321.3,357.4 321.5,357.2C321.7,357 322,356.8 322.1,356.8C322.3,356.8 322.4,356.7 322.4,356.6C322.5,356.6 323,356.2 323.7,355.9C324.3,355.6 324.9,355.3 324.9,355.2C325,355.1 325.3,355 325.7,355C326.1,355 326.4,354.9 326.5,354.7C326.5,354.5 326.8,354.4 327,354.4C327.4,354.4 328.6,353.7 328.8,353.4C328.8,353.3 329,353.2 329.2,353.2C329.4,353.2 329.7,353.1 329.8,352.9C329.9,352.8 330.2,352.6 330.5,352.5C330.8,352.4 331,352.3 331,352.2C331,352.1 331.4,351.9 331.8,351.9C332.2,351.8 332.6,351.6 332.7,351.5C332.7,351.3 333.1,351.2 333.4,351.2C333.7,351.2 334,351.1 334.1,350.9C334.1,350.7 334.4,350.6 334.7,350.6C334.9,350.6 335.4,350.3 335.8,350C336.2,349.7 336.6,349.4 336.7,349.4C336.8,349.4 337.1,349.3 337.2,349.1C337.3,348.9 337.7,348.8 338.1,348.7C338.5,348.6 338.9,348.4 339,348.3C339.1,348.1 339.5,348 339.8,348C340.1,348 340.4,347.9 340.5,347.7C340.5,347.5 340.8,347.4 341,347.4C341.2,347.4 341.5,347.2 341.7,347C341.9,346.8 342.2,346.6 342.3,346.6C342.7,346.6 343.8,346 343.8,345.8C343.8,345.7 344.1,345.6 344.4,345.5C344.7,345.4 345,345.2 345.1,345.1C345.1,344.9 345.5,344.8 345.9,344.8C346.2,344.8 346.7,344.7 346.8,344.5C346.9,344.3 347.3,344.2 347.5,344.2C347.8,344.2 348,344.1 348.1,343.9C348.1,343.8 348.5,343.6 348.9,343.5C349.3,343.4 349.8,343.1 350,342.9C350.3,342.6 350.6,342.4 350.7,342.4C350.8,342.4 351.1,342.2 351.4,342C351.7,341.8 352.1,341.6 352.4,341.6C352.7,341.6 353,341.5 353.1,341.3C353.1,341.1 353.4,341 353.7,341C354,341 354.3,340.9 354.3,340.7C354.4,340.6 354.7,340.4 355.1,340.3C355.5,340.2 355.8,340.1 355.8,340C355.8,339.9 356.3,339.7 356.8,339.4C357.4,339.2 357.8,338.9 357.8,338.8C357.8,338.7 358.1,338.6 358.4,338.5C358.7,338.4 359.1,338.2 359.2,338.1C359.3,337.9 359.8,337.8 360.1,337.8C360.5,337.8 360.8,337.7 360.8,337.6C360.8,337.5 361.1,337.3 361.5,337.1C361.8,337 362.2,336.7 362.3,336.6C362.4,336.5 362.6,336.4 362.9,336.4C363.1,336.4 363.5,336.3 363.6,336.1C363.9,335.7 367.4,334 367.9,334C368.1,334 368.4,333.9 368.5,333.7C368.5,333.6 368.8,333.4 369.1,333.3C369.4,333.2 370,333 370.3,332.7C370.7,332.4 371.1,332.2 371.3,332.2C371.4,332.2 371.7,332 371.9,331.8C372.1,331.6 372.5,331.4 372.7,331.4C373,331.4 373.2,331.3 373.2,331.2C373.2,331.1 373.6,330.9 374,330.8C374.4,330.7 374.8,330.5 374.9,330.4C374.9,330.3 375.2,330.2 375.5,330.1C375.8,330 376.2,329.9 376.3,329.7C376.5,329.5 376.8,329.4 377.1,329.4C377.4,329.4 377.6,329.3 377.6,329.2C377.6,329.1 377.8,329 378,328.8C378.3,328.7 378.9,328.4 379.3,328.1C379.7,327.8 380.2,327.6 380.4,327.6C380.6,327.6 380.9,327.5 381,327.3C381.1,327.2 381.5,327 381.9,326.9C382.3,326.8 382.6,326.7 382.7,326.5C382.7,326.3 383,326.2 383.2,326.2C383.6,326.2 385.9,324.9 386.1,324.6C386.2,324.5 386.4,324.4 386.6,324.4C387,324.4 387,322.6 387,162.2L387,0 237.4,0L87.8,0 87.8,62.1M138.2,125.9C138.2,139.2 138.1,150.1 138.1,150.2C138,150.3 110.3,150.4 75.5,150.4L13,150.4 13,175L13,199.6 13.5,199.7C13.8,199.8 41.4,199.8 74.9,199.8C108.5,199.8 136.4,199.8 137.1,199.8L138.2,199.8 138.2,223.7C138.2,237.3 138.3,247.6 138.4,247.6C138.5,247.6 138.7,247.5 138.8,247.3C138.9,247.1 139.1,247 139.2,247C139.3,247 139.7,246.7 140,246.4C140.3,246.1 140.7,245.8 140.8,245.8C140.9,245.8 141,245.7 141,245.6C141,245.4 141.1,245.2 141.3,245C142.4,243.7 143.7,242.6 144,242.6C144.1,242.6 144.2,242.5 144.2,242.3C144.2,242.1 144.3,242 144.5,242C144.7,242 144.8,241.9 144.8,241.7C144.8,241.5 145.5,240.7 147.5,238.8C148.2,238.2 148.9,237.4 149.1,237.2C149.8,236.4 150.7,235.6 151,235.6C151.1,235.6 151.2,235.5 151.2,235.3C151.2,235.1 151.3,234.9 151.5,234.9C151.6,234.8 152,234.3 152.4,233.9C152.7,233.4 153.2,233 153.3,233C153.4,233 153.6,232.9 153.7,232.7C153.7,232.5 153.9,232.4 154.1,232.4C154.3,232.4 154.4,232.2 154.4,232C154.4,231.8 154.5,231.6 154.6,231.6C154.7,231.6 155.2,231.2 155.7,230.7C156.1,230.2 156.6,229.6 156.8,229.5C157.6,228.8 158.8,227.6 159.4,226.8C159.8,226.2 160.2,225.8 160.4,225.8C160.6,225.8 160.8,225.7 160.8,225.6C160.8,225.5 160.9,225.4 161.1,225.4C161.3,225.4 161.4,225.3 161.4,225.1C161.4,225 161.6,224.8 161.8,224.6C161.9,224.4 162.5,223.8 163,223.2C163.5,222.7 164,222.2 164.2,222.2C164.4,222.2 164.6,222.1 164.6,222C164.6,221.8 164.9,221.4 165.4,221C165.8,220.6 166.3,220 166.6,219.7C167.7,218.5 169.4,217 169.6,217C169.7,217 169.8,216.8 169.7,216.6C169.7,216.4 169.7,216.2 169.8,216.2C169.9,216.2 170.2,216 170.5,215.7C170.8,215.4 171.2,215.2 171.3,215.2C171.5,215.2 171.6,215.1 171.6,215C171.6,214.8 172,214.4 172.5,213.9C173,213.4 173.4,212.9 173.4,212.7C173.5,212.5 173.8,212.2 174.1,212C175,211.5 175.4,211.1 175.4,210.9C175.4,210.7 175.6,210.6 175.8,210.6C176,210.6 176.2,210.5 176.2,210.4C176.2,210.1 176.5,209.7 177.5,208.8C179.1,207.4 180.6,205.7 180.9,205.3C181.1,205 181.3,204.8 181.4,204.8C181.6,204.8 183.8,202.6 183.8,202.4C183.8,202.3 184.3,201.9 184.8,201.5C185.4,201.1 185.8,200.6 185.8,200.6C185.8,200.5 185.9,200.4 186.1,200.4C186.3,200.4 186.4,200.3 186.4,200.1C186.4,199.9 186.5,199.8 186.7,199.8C186.9,199.8 187,199.7 187,199.6C187,199.3 188.2,197.8 188.4,197.8C188.7,197.8 190.8,195.7 190.8,195.5C190.8,195.4 191.1,195 191.5,194.7C192.7,193.7 193.9,192.4 194.6,191.6C195,191.2 195.3,190.8 195.5,190.8C195.6,190.8 195.9,190.5 196.2,190.2C196.5,189.9 196.8,189.6 196.9,189.6C197.1,189.6 197.2,189.5 197.2,189.4C197.2,189 199.1,187 199.5,187C199.7,187 199.8,186.9 199.8,186.7C199.8,186.5 199.9,186.4 200.1,186.4C200.3,186.4 200.4,186.3 200.4,186.2C200.4,186.1 200.6,185.7 200.9,185.4C201.3,185.1 201.7,184.7 201.9,184.4C202.1,184 202.3,183.8 202.4,183.8C202.5,183.8 203.1,183.2 203.8,182.6C205.5,180.7 206.3,180 206.5,180C206.7,180 206.8,179.9 206.8,179.8C206.8,179.7 207.1,179.2 207.5,178.8C207.9,178.4 208.4,177.8 208.8,177.4C209.1,177.1 209.5,176.8 209.7,176.8C209.9,176.8 210,176.7 210,176.5C210,176.3 210.1,176.2 210.3,176.2C210.5,176.2 210.6,176.1 210.6,175.9C210.6,175.7 210.7,175.5 210.9,175.5C211.1,175.4 211.2,175.2 211.2,174.9C211.2,174.6 211.1,174.6 211,174.8C210.6,175.1 210.4,175 210.5,174.6C210.6,174.2 209.4,172.8 209,172.8C208.9,172.8 208.8,172.7 208.8,172.6C208.8,172.4 207.2,170.8 207,170.8C206.9,170.8 206.8,170.7 206.8,170.6C206.8,170.4 204.7,168.2 204.4,168.2C204.3,168.2 204.2,168.1 204.2,167.9C204.2,167.7 204.1,167.6 203.9,167.6C203.7,167.6 203.6,167.5 203.6,167.4C203.6,167.2 200.8,164.4 200.6,164.4C200.5,164.4 200.4,164.3 200.4,164.2C200.4,164 197,160.6 196.8,160.6C196.7,160.6 196.6,160.5 196.6,160.4C196.6,160.1 195.8,159.3 195.3,159.1C195.1,159.1 194.9,158.9 194.9,158.7C194.7,158.2 193.9,157.4 193.6,157.4C193.5,157.4 193.4,157.3 193.4,157.2C193.4,157 191.9,155.4 191.7,155.4C191.6,155.4 191.3,155.1 191.1,154.8C190.9,154.5 190.6,154.2 190.4,154.2C190.3,154.2 190.2,154.1 190.2,153.9C190.2,153.7 190.1,153.6 189.9,153.6C189.7,153.6 189.6,153.5 189.6,153.4C189.6,153.2 186.8,150.4 186.6,150.4C186.5,150.4 186.4,150.3 186.4,150.1C186.4,149.9 186.3,149.8 186,149.9C185.7,149.9 185.6,149.9 185.6,149.6C185.6,149.2 183.7,147.2 183.4,147.2C183.3,147.2 183.2,147.1 183.2,147C183.2,146.9 182.8,146.4 182.4,146C182,145.6 181.5,145.2 181.4,145.2C181.3,145.2 181.2,145.1 181.2,145C181.2,144.8 178.4,142 178.2,142C178.1,142 177.9,141.8 177.7,141.5C177.3,140.9 170.2,133.8 170,133.8C170,133.8 169.7,133.6 169.5,133.3C168.8,132.4 168.2,131.8 168.1,131.8C167.9,131.8 166,129.8 166,129.6C166,129.5 165.8,129.4 165.6,129.3C165.4,129.2 165.2,129 165.2,128.9C165.2,128.7 165.1,128.6 164.9,128.6C164.7,128.6 164.6,128.5 164.6,128.4C164.6,128.2 163.2,126.8 163,126.8C162.9,126.8 162.8,126.7 162.8,126.6C162.8,126.5 162.4,126 161.9,125.5C159.5,123.3 158.8,122.5 158.8,122.4C158.8,122.3 158.7,122.2 158.5,122.2C158.3,122.2 158.2,122.1 158.2,122C158.2,121.8 156.8,120.4 156.6,120.4C156.5,120.4 156.4,120.3 156.4,120.2C156.4,119.9 154.8,118.4 154.6,118.4C154.5,118.4 154.4,118.3 154.4,118.2C154.4,118 152.3,115.8 152,115.8C151.9,115.8 151.8,115.7 151.8,115.5C151.8,115.3 151.7,115.2 151.5,115.2C151.3,115.2 151.2,115.1 151.2,114.9C151.2,114.8 150.9,114.5 150.7,114.3C150,113.8 149.5,113.3 148.6,112.2C148.2,111.8 147.7,111.4 147.6,111.4C147.5,111.4 147.4,111.3 147.4,111.2C147.4,111.1 147.2,110.8 147,110.6C146.8,110.4 146.5,110.2 146.4,110.2C146.3,110.2 146.2,110.1 146.2,110C146.2,109.7 144.7,108.2 144.4,108.2C144.3,108.2 144.2,108.1 144.2,108C144.2,107.7 140.9,104.4 140.6,104.4C140.5,104.4 140.4,104.3 140.4,104.2C140.4,103.9 139.5,103 139.3,103C139.2,103 138.9,102.7 138.7,102.4L138.2,101.7 138.2,125.9" android:strokeColor="#00000000"/>
     <path android:fillColor="#121012"
diff --git a/App/SmartHome/app/src/main/res/drawable/ic_group.xml b/App/SmartHome/app/src/main/res/drawable/ic_group.xml
index 49d63ff..a2bcb97 100644
--- a/App/SmartHome/app/src/main/res/drawable/ic_group.xml
+++ b/App/SmartHome/app/src/main/res/drawable/ic_group.xml
@@ -1,4 +1,6 @@
-<vector android:height="40dp" android:viewportHeight="30.0"
-    android:viewportWidth="30.0" android:width="40dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector  android:viewportHeight="30.0"
+    android:viewportWidth="30.0" android:width="32dp"
+    android:height="32dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#006064" android:pathData="M9.266,14c-1.625,0.047 -3.094,0.75 -4.141,2h-2.094c-1.563,0 -3.031,-0.75 -3.031,-2.484 0,-1.266 -0.047,-5.516 1.937,-5.516 0.328,0 1.953,1.328 4.062,1.328 0.719,0 1.406,-0.125 2.078,-0.359 -0.047,0.344 -0.078,0.688 -0.078,1.031 0,1.422 0.453,2.828 1.266,4zM26,23.953c0,2.531 -1.672,4.047 -4.172,4.047h-13.656c-2.5,0 -4.172,-1.516 -4.172,-4.047 0,-3.531 0.828,-8.953 5.406,-8.953 0.531,0 2.469,2.172 5.594,2.172s5.063,-2.172 5.594,-2.172c4.578,0 5.406,5.422 5.406,8.953zM10,4c0,2.203 -1.797,4 -4,4s-4,-1.797 -4,-4 1.797,-4 4,-4 4,1.797 4,4zM21,10c0,3.313 -2.688,6 -6,6s-6,-2.688 -6,-6 2.688,-6 6,-6 6,2.688 6,6zM30,13.516c0,1.734 -1.469,2.484 -3.031,2.484h-2.094c-1.047,-1.25 -2.516,-1.953 -4.141,-2 0.812,-1.172 1.266,-2.578 1.266,-4 0,-0.344 -0.031,-0.688 -0.078,-1.031 0.672,0.234 1.359,0.359 2.078,0.359 2.109,0 3.734,-1.328 4.062,-1.328 1.984,0 1.937,4.25 1.937,5.516zM28,4c0,2.203 -1.797,4 -4,4s-4,-1.797 -4,-4 1.797,-4 4,-4 4,1.797 4,4z"/>
 </vector>
diff --git a/App/SmartHome/app/src/main/res/drawable/ic_notifs.xml b/App/SmartHome/app/src/main/res/drawable/ic_notifs.xml
index 47ca96b..999571d 100644
--- a/App/SmartHome/app/src/main/res/drawable/ic_notifs.xml
+++ b/App/SmartHome/app/src/main/res/drawable/ic_notifs.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="40dp"
-        android:height="40dp"
-        android:viewportWidth="25"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="25"
         android:viewportHeight="25">
     <path
         android:fillColor="#ffe100"
diff --git a/App/SmartHome/app/src/main/res/drawable/ic_status.xml b/App/SmartHome/app/src/main/res/drawable/ic_status.xml
index ee98ca8..027dfb9 100644
--- a/App/SmartHome/app/src/main/res/drawable/ic_status.xml
+++ b/App/SmartHome/app/src/main/res/drawable/ic_status.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="44dp"
-        android:height="44dp"
-        android:viewportWidth="24"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="24"
         android:viewportHeight="24">
     <path
         android:fillColor="#cfd8dc"
diff --git a/App/SmartHome/app/src/main/res/layout/activity_main.xml b/App/SmartHome/app/src/main/res/layout/activity_main.xml
index e6e9375..03bb9e9 100644
--- a/App/SmartHome/app/src/main/res/layout/activity_main.xml
+++ b/App/SmartHome/app/src/main/res/layout/activity_main.xml
@@ -1,163 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/homePage"
-    android:background="@drawable/app_background"
+    android:id="@+id/mainApp"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="8dp"
     android:padding="6dp"
     tools:context="com.solutions.isecpowify.smarthome.MainActivity">
 
-    <TextView
-        android:textColor="@color/colorPrimaryDark"
-        android:id="@+id/welcome"
-        android:layout_centerHorizontal="true"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small.Inverse"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
 
-    <android.support.v7.widget.CardView
-        app:cardBackgroundColor="@android:color/holo_orange_light"
-        app:cardCornerRadius="50dp"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="9dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true"
-        android:id="@+id/roomCard">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:text="Enter"
-                android:textColor="@android:color/primary_text_dark"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/join"
-                android:layout_centerHorizontal="true"
-                android:layout_below="@+id/room"/>
-
-            <ImageView
-                android:id="@+id/room"
-                android:layout_centerInParent="true"
-                android:background="@drawable/ic_enter"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </RelativeLayout>
-
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView
-        app:cardBackgroundColor="#00c853"
-        app:cardCornerRadius="50dp"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:id="@+id/groupCard"
-        android:layout_marginEnd="16dp"
-        android:layout_above="@+id/roomCard"
-        android:layout_toStartOf="@+id/roomCard"
-        android:layout_marginBottom="20dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:text="Members"
-                android:textColor="@android:color/primary_text_dark"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/members"
-                android:layout_centerHorizontal="true"
-                android:layout_below="@+id/group"/>
-
-            <ImageView
-                android:id="@+id/group"
-                android:layout_centerInParent="true"
-                android:background="@drawable/ic_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </RelativeLayout>
-
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView
-        app:cardBackgroundColor="@android:color/holo_red_light"
-        app:cardCornerRadius="50dp"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:id="@+id/notifCard"
-        android:layout_alignParentBottom="true"
-        android:layout_alignEnd="@+id/groupCard"
-        android:layout_marginEnd="44dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:text="Alerts"
-                android:textColor="@android:color/primary_text_dark"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/alerts"
-                android:layout_centerHorizontal="true"
-                android:layout_below="@+id/notify"/>
-
-            <ImageView
-                android:id="@+id/notify"
-                android:layout_centerInParent="true"
-                android:background="@drawable/ic_notifs"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </RelativeLayout>
-
-    </android.support.v7.widget.CardView>
-
-    <android.support.v7.widget.CardView
-        app:cardBackgroundColor="@android:color/holo_purple"
-        app:cardCornerRadius="50dp"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:id="@+id/statusCard"
-        android:layout_marginBottom="52dp"
-        android:layout_alignBottom="@+id/groupCard"
-        android:layout_alignStart="@+id/roomCard">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:text="Sensors"
-                android:textColor="@android:color/primary_text_dark"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/sensors"
-                android:layout_centerHorizontal="true"
-                android:layout_below="@+id/status"/>
-
-            <ImageView
-                android:id="@+id/status"
-                android:layout_centerInParent="true"
-                android:background="@drawable/ic_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-        </RelativeLayout>
-
-    </android.support.v7.widget.CardView>
+    <FrameLayout
+        android:id="@+id/content_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
 </RelativeLayout>
diff --git a/App/SmartHome/app/src/main/res/layout/fragment_sensors.xml b/App/SmartHome/app/src/main/res/layout/fragment_sensors.xml
new file mode 100644
index 0000000..de40fbd
--- /dev/null
+++ b/App/SmartHome/app/src/main/res/layout/fragment_sensors.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:id="@+id/sensorsStatus"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.CardView
+        android:layout_marginTop="@dimen/card_margin"
+        android:layout_marginLeft="@dimen/card_margin"
+        android:layout_marginRight="@dimen/card_margin"
+        card_view:cardCornerRadius="@dimen/card_radius"
+        card_view:cardBackgroundColor="@android:color/transparent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Switch
+            android:id="@+id/inSwitch"
+            android:text="Indoor Motion"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:checked="false"
+            android:clickable="false"
+            android:textColor="@android:color/holo_green_dark"
+            android:textAlignment="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/card_margin" />
+    </android.support.v7.widget.CardView>
+
+
+    <android.support.v7.widget.CardView
+        android:layout_marginTop="@dimen/card_margin"
+        android:layout_marginLeft="@dimen/card_margin"
+        android:layout_marginRight="@dimen/card_margin"
+        card_view:cardCornerRadius="@dimen/card_radius"
+        card_view:cardBackgroundColor="@android:color/transparent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <Switch
+            android:id="@+id/outSwitch"
+            android:text="OutDoor Motion"
+            android:clickable="false"
+            android:checked="false"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textColor="@android:color/holo_green_dark"
+            android:textAlignment="center"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/card_margin" />
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        android:padding="@dimen/card_margin"
+        android:layout_marginLeft="@dimen/card_margin"
+        android:layout_marginRight="@dimen/card_margin"
+        card_view:cardCornerRadius="@dimen/card_radius"
+        android:layout_marginTop="@dimen/card_margin"
+        android:clickable="false"
+        android:layout_width="match_parent"
+        card_view:cardBackgroundColor="@android:color/transparent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:padding="@dimen/card_radius"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_red_dark"
+            android:text="Temperature"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/tempValue"
+            android:padding="@dimen/card_radius"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textAlignment="textEnd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        card_view:cardBackgroundColor="@android:color/transparent"
+        android:layout_marginLeft="@dimen/card_margin"
+        android:layout_marginRight="@dimen/card_margin"
+        android:layout_marginTop="@dimen/card_margin"
+        card_view:cardCornerRadius="@dimen/card_radius"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:padding="@dimen/card_radius"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_blue_dark"
+            android:text="Humidity"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/humValue"
+            android:padding="@dimen/card_radius"
+            android:textAlignment="textEnd"
+            android:layout_width="match_parent"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:layout_height="wrap_content" />
+    </android.support.v7.widget.CardView>
+
+
+    <android.support.v7.widget.CardView
+        card_view:cardBackgroundColor="@android:color/transparent"
+        android:layout_marginLeft="@dimen/card_margin"
+        android:layout_marginRight="@dimen/card_margin"
+        card_view:cardCornerRadius="@dimen/card_radius"
+        android:layout_marginTop="@dimen/card_margin"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:padding="@dimen/card_radius"
+            android:textAlignment="center"
+            android:textColor="@android:color/holo_orange_dark"
+            android:text="Light"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/lightValue"
+            android:padding="@dimen/card_radius"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+            android:textAlignment="textEnd"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </android.support.v7.widget.CardView>
+
+
+    <android.support.v7.widget.CardView
+        android:layout_marginTop="100dp"
+        android:layout_marginStart="150dp"
+        card_view:cardBackgroundColor="@android:color/background_dark"
+        card_view:cardCornerRadius="30dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:id="@+id/backCard"
+        android:layout_marginBottom="52dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <ImageView
+                android:id="@+id/status"
+                android:layout_centerInParent="true"
+                android:background="@drawable/ic_back"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/App/SmartHome/app/src/main/res/layout/fragment_smart_home.xml b/App/SmartHome/app/src/main/res/layout/fragment_smart_home.xml
new file mode 100644
index 0000000..6e9be22
--- /dev/null
+++ b/App/SmartHome/app/src/main/res/layout/fragment_smart_home.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:id="@+id/homePage"
+    android:background="@drawable/app_background"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:textColor="@color/colorPrimaryDark"
+        android:id="@+id/welcome"
+        android:textAlignment="center"
+        android:layout_centerHorizontal="true"
+        android:textAppearance="@style/Base.TextAppearance.AppCompat.Small.Inverse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <android.support.v7.widget.CardView
+        app:cardBackgroundColor="@android:color/holo_orange_light"
+        app:cardCornerRadius="45dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="27dp"
+        android:id="@+id/roomCard"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:textColor="@android:color/primary_text_dark"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/join"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/room"/>
+
+            <ImageView
+                android:id="@+id/room"
+                android:layout_centerInParent="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        app:cardBackgroundColor="@android:color/holo_purple"
+        app:cardCornerRadius="45dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:id="@+id/statusCard"
+        android:layout_marginBottom="30dp"
+        android:layout_alignBottom="@+id/groupCard"
+        android:layout_alignStart="@+id/roomCard">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:text="Status"
+                android:textColor="@android:color/primary_text_dark"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/sensors"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/status"/>
+
+            <ImageView
+                android:id="@+id/status"
+                android:layout_centerInParent="true"
+                android:background="@drawable/ic_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        app:cardBackgroundColor="@android:color/holo_red_light"
+        app:cardCornerRadius="45dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:id="@+id/notifCard"
+        android:layout_alignTop="@+id/roomCard"
+        android:layout_toStartOf="@+id/roomCard"
+        android:layout_marginEnd="57dp"
+        android:layout_marginTop="7dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:text="Alerts"
+                android:textColor="@android:color/primary_text_dark"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/alerts"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/notify"/>
+
+            <ImageView
+                android:id="@+id/notify"
+                android:layout_centerInParent="true"
+                android:background="@drawable/ic_notifs"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
+    <android.support.v7.widget.CardView
+        app:cardBackgroundColor="#00c853"
+        app:cardCornerRadius="45dp"
+        android:layout_width="90dp"
+        android:layout_height="90dp"
+        android:id="@+id/groupCard"
+        android:layout_marginBottom="9dp"
+        android:layout_above="@+id/roomCard"
+        android:layout_toStartOf="@+id/statusCard"
+        android:layout_marginEnd="26dp">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <TextView
+                android:text="Peers"
+                android:textColor="@android:color/primary_text_dark"
+                android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/members"
+                android:layout_centerHorizontal="true"
+                android:layout_below="@+id/group"/>
+
+            <ImageView
+                android:id="@+id/group"
+                android:layout_centerInParent="true"
+                android:background="@drawable/ic_group"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+        </RelativeLayout>
+
+    </android.support.v7.widget.CardView>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/App/SmartHome/app/src/main/res/values/dimens.xml b/App/SmartHome/app/src/main/res/values/dimens.xml
index 194189c..5dd2a67 100644
--- a/App/SmartHome/app/src/main/res/values/dimens.xml
+++ b/App/SmartHome/app/src/main/res/values/dimens.xml
@@ -3,5 +3,6 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="fab_margin">20dp</dimen>
-
+    <dimen name="card_margin">14dp</dimen>
+    <dimen name="card_radius">7dp</dimen>
 </resources>
diff --git a/App/SmartHome/app/src/main/res/values/strings.xml b/App/SmartHome/app/src/main/res/values/strings.xml
index 8fd416b..f703dbd 100644
--- a/App/SmartHome/app/src/main/res/values/strings.xml
+++ b/App/SmartHome/app/src/main/res/values/strings.xml
@@ -3,5 +3,6 @@
     <string name="preference_file_key">AUTH_USER_PREFS</string>
     <string name="otr_message">ENTER OTR KEY ( Check Mail )</string>
     <string name="OTRK">ONE_TIME_REGISTRATION_KEY</string>
+    <string name="joined">JOINED</string>
     <string name="otr_hint">Your key goes here</string>
 </resources>
diff --git a/server.js b/server.js
index 4c971f0..d4bd6ce 100644
--- a/server.js
+++ b/server.js
@@ -32,7 +32,7 @@ var transporter = nodemailer.createTransport({
   }
 });
 
-app.set('port',process.env.port||5000);
+app.set('port',(process.env.PORT||5000));
 
 function allValid(){
     for (var i=0; i < arguments.length; i++) {
@@ -201,7 +201,7 @@ function updateStateRecordWindow(){
 				    			
 				    			return {
 								            light : chance.natural({min: 150, max: 500}),
-								            temp : chance.floating({min: 250, max: 750, fixed : 4}),
+								            temp : chance.floating({min: 250, max: 750, fixed : 3}),
 								            humidity : chance.floating({min: 0, max: 100, fixed : 2}) ,
 								            inDoorMotion : im,
 								            outDoorMotion : om,
@@ -304,8 +304,6 @@ app.get("/u/state",function(req,response){
 		}
 	});
 
-
-
    	if( isEmpty(q) ){
 
    		// acts as direct continous uploading server