Merge pull request #104 from BindCreative/development

Development

Author: tarmo888

README.md

@@ -132,23 +132,38 @@ Run `yarn ios`
     ![alt text](https://github.com/BindCreative/obbychat/raw/master/readmeImages/androidTestnetFolder.png)
 
 - Update `android/app/src/main/res/values/strings.xml`
+
 ```
 <resources>
     <string name="app_name">Obby chat testnet</string>
 </resources>
 ```
+
+- In `android/app/src/main/AndroidManifest.xml`:
+
+    ```package="chat.obby.testnet"```
+    
 - In `android/app/src/main/java/chat/obby/testnet/MainActivity.java`:
 
     ```package chat.obby.testnet;```
+    
+- In `android/app/src/main/java/chat/obby/mainnet/MainApplication.java`:
+
+    ```package chat.obby.testnet;```
+    ```import chat.obby.testnet.generated.BasePackageList;```
+    
 - In `android/app/src/main/java/chat/obby/testnet/generated/BasePackageList.java`:
 
     ```package chat.obby.testnet.generated;```
+    
 - In `android/app/src/main/AndroidManifest.xml`:
 
     ```package="chat.obby.testnet"```
+    
 - In `android/app/build.gradle`:
 
     ```applicationId "chat.obby.testnet"```
+    
 - In `android/app/_BUCK`:
 
 ```
@@ -226,15 +241,26 @@ android_resource(
     ![alt text](https://github.com/BindCreative/obbychat/raw/master/readmeImages/androidMainnetFolder.png)
 
 - Update `android/app/src/main/res/values/strings.xml`
+
 ```
 <resources>
     <string name="app_name">Obby chat</string>
 </resources>
 ```
+
+- In `android/app/src/main/AndroidManifest.xml`:
+
+    ```package="chat.obby.mainnet"```
+    
 - In `android/app/src/main/java/chat/obby/mainnet/MainActivity.java`:
 
     ```package chat.obby.mainnet;```
 
+- In `android/app/src/main/java/chat/obby/mainnet/MainApplication.java`:
+
+    ```package chat.obby.mainnet;```
+    ```import chat.obby.mainnet.generated.BasePackageList;```
+    
 - In `android/app/src/main/java/chat/obby/mainnet/generated/BasePackageList.java`:
 
     ```package chat.obby.mainnet.generated;```

android/app/build.gradle

@@ -137,8 +137,8 @@ android {
         applicationId "chat.obby.testnet"
         minSdkVersion 21
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 3
+        versionName "1.0.2"
         missingDimensionStrategy 'react-native-camera', 'general'
     }
     splits {

android/app/src/main/AndroidManifest.xml

@@ -1,4 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   package="chat.obby.testnet">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -21,6 +22,23 @@
       android:roundIcon="@mipmap/ic_launcher_round"
       android:allowBackup="false"
       android:theme="@style/AppTheme">
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="obby-chat-push-chanel-id-4-300"
+            tools:replace="android:value" />
+        <meta-data
+            android:name="com.dieam.reactnativepushnotification.notification_color"
+            android:resource="@color/cyan" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/cyan"
+            tools:replace="android:resource" />
+        <meta-data
+            android:name="com.dieam.reactnativepushnotification.notification_icon"
+            android:resource="@mipmap/ic_notification" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@mipmap/ic_notification" />
         <service
                 android:name="com.reactnativehce.services.CardService"
                 android:exported="true"
@@ -30,10 +48,9 @@
                 <action android:name="android.nfc.cardemulation.action.HOST_APDU_SERVICE" />
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
-
             <meta-data
-                    android:name="android.nfc.cardemulation.host_apdu_service"
-                    android:resource="@xml/aid_list" />
+                android:name="android.nfc.cardemulation.host_apdu_service"
+                android:resource="@xml/aid_list" />
         </service>
       <activity
         android:name=".MainActivity"

android/app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -0,0 +1,3 @@
+<resources>
+    <color name="cyan">#25C7D1</color>
+</resources>