v3.0

manupillai308 · May 29, 2021 · e29225b · e29225b
1 parent ba2a272
commit e29225b
Show file tree

Hide file tree

Showing 24 changed files with 1,014 additions and 285 deletions.
diff --git a/App.js b/App.js
@@ -3,18 +3,21 @@ import {createAppContainer, createSwitchNavigator} from 'react-navigation';
 import {createStackNavigator} from 'react-navigation-stack';
 import {setNavigator} from './src/navigationRef';
 import ChatsScreen from './src/screens/ChatsScreen';
-import CreateChat from './src/components/CreateChat';
+import CreateChat from './src/screens/CreateChat';
 import ChatDetail from './src/screens/ChatDetail';
 import InitScreen from './src/screens/InitScreen';
 import {Provider as DataProvider} from './src/contexts/DataContext';
 import {Provider as ServerDataProvider} from './src/contexts/ServerDataContext';
 import {Provider as ClientDataProvider} from './src/contexts/ClientDataContext';
+import {Provider as OnlineProvider} from './src/contexts/OnlineClientContext';
 import FlashMessage from "react-native-flash-message";
+import CreateChatOnline from './src/screens/CreateChatOnline';
 
 
 const mainFlow = createStackNavigator({
   Chats: ChatsScreen,
   Room: CreateChat,
+  OnlineRoom: CreateChatOnline,
   ChatDetail,
 },{
   initialRouteName:'Chats'
@@ -32,8 +35,10 @@ export default (props) => {
     return <DataProvider>
         <ServerDataProvider>
             <ClientDataProvider>
-                <App ref={(navigator) => { setNavigator(navigator)}}/>
-                <FlashMessage position="top" />
+                <OnlineProvider>
+                  <App ref={(navigator) => { setNavigator(navigator)}}/>
+                  <FlashMessage position="top" />
+                </OnlineProvider>
             </ClientDataProvider>
         </ServerDataProvider>
         </DataProvider>

diff --git a/OnlineClient.js b/OnlineClient.js
@@ -0,0 +1,5 @@
+import {NativeModules} from 'react-native';
+
+const {OnlineClient} = NativeModules;
+
+export default OnlineClient;
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: "com.android.application"
-apply plugin: 'com.google.gms.google-services'
+// apply plugin: 'com.google.gms.google-services'
 
 import com.android.build.OutputFile
 
@@ -135,8 +135,8 @@ android {
         applicationId "com.shhtalk"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
-        versionName "2.0"
+        versionCode 3
+        versionName "3.0"
     }
     splits {
         abi {
@@ -211,6 +211,10 @@ dependencies {
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.flipper'
     }
+    implementation ('io.socket:socket.io-client:2.0.1') {
+        // excluding org.json which is provided by Android
+        exclude group: 'org.json', module: 'json'
+    }
 
     if (enableHermes) {
         def hermesPath = "../../node_modules/hermes-engine/android/";

diff --git a/android/app/google-services.json b/android/app/google-services.json
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -10,6 +10,8 @@
     </service>
     <service android:name="com.local_server.ClientService" android:enabled="true" android:exported="false">
     </service>
+    <service android:name="com.online_client.OnlineService" android:enabled="true" android:exported="false">
+    </service>
     <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />

diff --git a/android/app/src/main/java/com/local_server/ClientService.java b/android/app/src/main/java/com/local_server/ClientService.java
@@ -35,6 +35,8 @@ public class ClientService extends Service {
     public static DataInputStream din;
     public static DataOutputStream dout;
     private static Context context;
+    public static Notification msg_notification;
+    public static NotificationManager notificationManager;
 
     private static final int SERVICE_NOTIFICATION_ID = 100100;
 
@@ -125,6 +127,7 @@ public void run() {
                     }
                     else{
                         ClientService.messages.add(msg);
+                        ClientService.notificationManager.notify(0, ClientService.msg_notification);
                     }
                 }catch(SocketException e){
                     return;
@@ -169,6 +172,16 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             NotificationManager manager = getSystemService(NotificationManager.class);
             manager.createNotificationChannel(channel);
 
+            ClientService.msg_notification = new Notification.Builder(this, CHANNEL_ID)
+                .setContentTitle("ShhTalk")
+                .setContentText("You have new messages")
+                .setSmallIcon(R.mipmap.ic_launcher) //R.drawable.icon
+                .setContentIntent(contentIntent)
+                .build();
+            ClientService.msg_notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+            ClientService.notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+
             Notification notification = new Notification.Builder(this, CHANNEL_ID)
             // .setContentIntent(contentIntent)
             .setOngoing(true)
@@ -178,6 +191,15 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             .build();
             startForeground(SERVICE_NOTIFICATION_ID, notification);
         }else{
+            ClientService.msg_notification = new NotificationCompat.Builder(this)
+                .setContentTitle("ShhTalk")
+                .setContentText("You have new messages")
+                .setSmallIcon(R.mipmap.ic_launcher) //R.drawable.icon
+                .setContentIntent(contentIntent)
+                .build();
+            ClientService.msg_notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+            ClientService.notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
             Notification notification = new NotificationCompat.Builder(this)
                 // .setContentIntent(contentIntent)
                 .setSmallIcon(R.mipmap.ic_launcher)

diff --git a/android/app/src/main/java/com/local_server/ServerService.java b/android/app/src/main/java/com/local_server/ServerService.java
@@ -151,6 +151,7 @@ public void run(){
                 }
                 else{
                     ServerService.messages.add(msg);
+                    ServerService.notificationManager.notify(0, ServerService.msg_notification);
                 }
                 ServerService.lock.lock();
                 ServerService.broadcastMsg(this.socket.getInetAddress().toString(), msg);
@@ -205,6 +206,8 @@ public class ServerService extends Service {
     public static volatile boolean exit;
     public static ServerSocket socket;
     public static ArrayList<String> names;
+    public static Notification msg_notification;
+    public static NotificationManager notificationManager;
 
     private static final int SERVICE_NOTIFICATION_ID = 100100;
 
@@ -339,6 +342,16 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             NotificationManager manager = getSystemService(NotificationManager.class);
             manager.createNotificationChannel(channel);
 
+            ServerService.msg_notification = new Notification.Builder(this, CHANNEL_ID)
+                .setContentTitle("ShhTalk Online")
+                .setContentText("You have new messages")
+                .setSmallIcon(R.mipmap.ic_launcher) //R.drawable.icon
+                .setContentIntent(contentIntent)
+                .build();
+            ServerService.msg_notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+            ServerService.notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+
             Notification notification = new Notification.Builder(this, CHANNEL_ID)
             // .setContentIntent(contentIntent)
             .setOngoing(true)
@@ -348,6 +361,16 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             .build();
             startForeground(SERVICE_NOTIFICATION_ID, notification);
         }else{
+            ServerService.msg_notification = new NotificationCompat.Builder(this)
+                .setContentTitle("ShhTalk")
+                .setContentText("You have new messages")
+                .setSmallIcon(R.mipmap.ic_launcher) //R.drawable.icon
+                .setContentIntent(contentIntent)
+                .build();
+            ServerService.msg_notification.flags |= Notification.FLAG_AUTO_CANCEL;
+
+            ServerService.notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
+
             Notification notification = new NotificationCompat.Builder(this)
                 // .setContentIntent(contentIntent)
                 .setSmallIcon(R.mipmap.ic_launcher)