Added VERA option in V-Portal.

app/src/arrow/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:icon="@mipmap/ic_launcher"
         tools:replace="android:icon">
         <activity
-            android:name=".chat.ChatActivity"
+            android:name=".ui.ChatActivity"
             android:label="@string/chat_activity_label"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|stateHidden">

app/src/ge/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:icon="@mipmap/ic_launcher"
         tools:replace="android:icon">
         <activity
-            android:name=".chat.ChatActivity"
+            android:name=".ui.ChatActivity"
             android:label="@string/chat_activity_label"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|stateHidden">

app/src/main/java/com/vsoft/servicenow/menu/ChatMenuItemData.java

@@ -3,8 +3,7 @@ package com.vsoft.servicenow.menu;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.vsoft.servicenow.chat.ChatActivity;
-import com.vsoft.servicenow.ui.ReportIncidentScreen;
+import com.vsoft.servicenow.ui.ChatActivity;
 
 /**
  * Created by Kunj on 23/03/18.

app/src/main/java/com/vsoft/servicenow/menu/NotificationMenuItemData.java

@@ -3,7 +3,6 @@ package com.vsoft.servicenow.menu;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.vsoft.servicenow.chat.ChatActivity;
 import com.vsoft.servicenow.ui.NotificationScreen;
 
 /**

app/src/main/java/com/vsoft/servicenow/speechRecognizer/DroidSpeech.java

@@ -25,7 +25,7 @@ import android.widget.LinearLayout.LayoutParams;
 import android.widget.TextView;
 
 import com.vsoft.servicenow.R;
-import com.vsoft.servicenow.chat.ChatActivity;
+import com.vsoft.servicenow.ui.ChatActivity;
 
 import java.util.List;
 

app/src/main/java/com/vsoft/servicenow/chat/ChatActivity.java → app/src/main/java/com/vsoft/servicenow/ui/ChatActivity.java

-package com.vsoft.servicenow.chat;
+package com.vsoft.servicenow.ui;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -25,11 +25,13 @@ import com.github.nkzawa.socketio.client.Socket;
 import com.vsoft.servicenow.CatalogueApplication;
 import com.vsoft.servicenow.R;
 import com.vsoft.servicenow.api.managers.LoginApiManager;
+import com.vsoft.servicenow.chat.Message;
+import com.vsoft.servicenow.chat.MessageAdapter;
+import com.vsoft.servicenow.chat.Speaker;
 import com.vsoft.servicenow.enums.SyncStatus;
 import com.vsoft.servicenow.speechRecognizer.DroidSpeech;
 import com.vsoft.servicenow.speechRecognizer.OnDSListener;
 import com.vsoft.servicenow.speechRecognizer.OnDSPermissionsListener;
-import com.vsoft.servicenow.ui.HandleNotificationActivity;
 import com.vsoft.servicenow.utils.CatalogueLog;
 import com.vsoft.servicenow.utils.Constants;
 import com.vsoft.servicenow.utils.PrefManager;

app/src/main/java/com/vsoft/servicenow/ui/HomeScreen.java

@@ -2,7 +2,6 @@ package com.vsoft.servicenow.ui;
 
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
@@ -13,7 +12,6 @@ import com.vsoft.servicenow.CatalogueApplication;
 import com.vsoft.servicenow.MenuProvider;
 import com.vsoft.servicenow.R;
 import com.vsoft.servicenow.adapters.HomeScreenAdapter;
-import com.vsoft.servicenow.chat.ChatActivity;
 import com.vsoft.servicenow.menu.HomeScreenMenuItemData;
 import com.vsoft.servicenow.utils.PrefManager;
 import com.vsoft.servicenow.utils.Util;

app/src/main/res/layout/chat_activity.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".chat.ChatActivity">
+    tools:context=".ui.ChatActivity">
 
     <include layout="@layout/toolbar" />
 
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        tools:context=".chat.ChatActivity">
+        tools:context=".ui.ChatActivity">
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/messages"

app/src/vportal/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:icon="@mipmap/ic_launcher"
         tools:replace="android:icon">
         <activity
-            android:name=".chat.ChatActivity"
+            android:name=".ui.ChatActivity"
             android:label="@string/chat_activity_label"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize|stateHidden">
@@ -15,6 +15,28 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    </application>
 
+        <activity
+            android:name="com.vsoft.servicenow.ui.NotificationScreen"
+            android:screenOrientation="portrait"/>
+
+        <service android:name=".service.NotificationInstanceIdService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+            </intent-filter>
+        </service>
+
+        <service
+            android:name=".service.NotificationMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT"/>
+            </intent-filter>
+        </service>
+
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_icon"/>
+    </application>
 </manifest>

app/src/vportal/java/com/vsoft/servicenow/MenuProvider.java

@@ -4,6 +4,7 @@ import com.vsoft.servicenow.menu.ChatMenuItemData;
 import com.vsoft.servicenow.menu.HomeScreenMenuItemData;
 import com.vsoft.servicenow.menu.MyIncidentMenuItemData;
 import com.vsoft.servicenow.menu.MyRequestMenuItemData;
+import com.vsoft.servicenow.menu.NotificationMenuItemData;
 import com.vsoft.servicenow.menu.OrderServicesMenuItemData;
 import com.vsoft.servicenow.menu.ReportIncidentMenuItemData;
 
@@ -35,6 +36,10 @@ public class MenuProvider {
             new ChatMenuItemData.Builder()
                     .setTitle(R.string.home_screen_chat_title)
                     .setMenuIconResId(R.string.home_screen_chat_icon)
+                    .build(),
+            new NotificationMenuItemData.Builder()
+                    .setTitle(R.string.home_screen_notification_title)
+                    .setMenuIconResId(R.string.home_screen_notification_icon)
                     .build()
     );
 }

app/src/vportal/res/values/strings.xml

@@ -17,5 +17,8 @@
 
 	<string name="home_screen_chat_title">Chatbot</string>
 	<string name="home_screen_chat_icon">chatbot</string>
+
+	<string name="home_screen_notification_title">Notifications</string>
+	<string name="home_screen_notification_icon">notifications</string>
 	<!--End-->
 </resources>