WIP update everything and support kappacore based cabal-core

android/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>cabalmobile</name>
+	<comment>Project cabalmobile created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/app/.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>app</name>
+	<comment>Project app created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>

android/app/BUCK

@@ -45,12 +45,12 @@ android_library(
 
 android_build_config(
     name = "build_config",
-    package = "chat.cabal.mobile",
+    package = "com.cabalmobile",
 )
 
 android_resource(
     name = "res",
-    package = "chat.cabal.mobile",
+    package = "com.cabalmobile",
     res = "src/main/res",
 )
 

android/app/build.gradle

@@ -104,6 +104,10 @@ android {
         versionCode 1
         versionName "1.0"
 
+        aaptOptions {
+            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
+        }
+
         externalNativeBuild {
             cmake {
                 version "3.7.1"
@@ -155,6 +159,8 @@ android {
 }
 
 dependencies {
+    implementation project(':react-native-gesture-handler')
+    implementation project(':nodejs-mobile-react-native')
     implementation project(':nodejs-mobile-react-native')
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.android.support:appcompat-v7:28.0.0"

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="chat.cabal.mobile">
+    package="com.cabalmobile">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

android/app/src/main/java/com/cabalmobile/MainActivity.java

@@ -1,6 +1,9 @@
-package chat.cabal.mobile;
+package com.cabalmobile;
 
 import com.facebook.react.ReactActivity;
+// import com.facebook.react.ReactActivityDelegate;
+// import com.facebook.react.ReactRootView;
+// import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
 public class MainActivity extends ReactActivity {
 
@@ -12,4 +15,14 @@ public class MainActivity extends ReactActivity {
     protected String getMainComponentName() {
         return "cabalmobile";
     }
+
+    // @Override
+    // protected ReactActivityDelegate createReactActivityDelegate() {
+    //     return new ReactActivityDelegate(this, getMainComponentName()) {
+    //         @Override
+    //           protected ReactRootView createRootView() {
+    //           return new RNGestureHandlerEnabledRootView(MainActivity.this);
+    //         }
+    //     };
+    // }
 }

android/app/src/main/java/com/cabalmobile/MainApplication.java

@@ -1,4 +1,4 @@
-package chat.cabal.mobile;
+package com.cabalmobile;
 
 import android.app.Application;
 

android/settings.gradle

@@ -1,4 +1,8 @@
 rootProject.name = 'cabalmobile'
+include ':react-native-gesture-handler'
+project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
+include ':nodejs-mobile-react-native'
+project(':nodejs-mobile-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/nodejs-mobile-react-native/android')
 include ':nodejs-mobile-react-native'
 project(':nodejs-mobile-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/nodejs-mobile-react-native/android')
 

frontend/App.js

@@ -1,4 +1,4 @@
-import {createSwitchNavigator, createStackNavigator} from 'react-navigation'
+import { createSwitchNavigator, createStackNavigator } from 'react-navigation'
 import ChannelsList from './screens/ChannelsList'
 import ChatScreen from './screens/ChatScreen'
 import HomeScreen from './screens/HomeScreen'
@@ -50,7 +50,7 @@ export default createSwitchNavigator(
     },
     transitionConfig: () => ({
       screenInterpolator: props => ({
-        transform: [{translateX: 0}, {translateY: 0}]
+        transform: [{ translateX: 0 }, { translateY: 0 }]
       })
     })
   }

frontend/components/Avatar.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {View, StyleSheet} from 'react-native'
+import { View, StyleSheet } from 'react-native'
 import Blockies from 'blockies-bmp/react-native-component'
 global.Buffer = require('buffer').Buffer // Import Buffer globally for the Blockies component
 
@@ -17,12 +17,12 @@ const styles = StyleSheet.create({
 
 export default class Avatar extends React.Component {
   render () {
-    const {isHidden, message} = this.props
-    const hiddenStyle = isHidden ? {height: 0} : null
+    const { isHidden, message } = this.props
+    const hiddenStyle = isHidden ? { opacity: 0 } : null
     return (
       <View style={[styles.avatar, hiddenStyle]}>
         <Blockies
-          opts={{seed: message.author}}
+          opts={{ seed: message.user.name }}
           size={40}
           style={styles.avatarImage}
           bgColor='#fff'

frontend/components/Bubble.js

@@ -8,9 +8,9 @@ import {
   View,
   Platform
 } from 'react-native'
-import {MessageText, MessageImage, Time, utils} from 'react-native-gifted-chat'
+import { MessageText, MessageImage, Time, utils } from 'react-native-gifted-chat'
 
-const {isSameUser, isSameDay} = utils
+const { isSameUser, isSameDay } = utils
 
 export default class Bubble extends React.Component {
   constructor (props) {
@@ -27,7 +27,7 @@ export default class Bubble extends React.Component {
       this.context
         .actionSheet()
         .showActionSheetWithOptions(
-          {options, cancelButtonIndex},
+          { options, cancelButtonIndex },
           buttonIndex => {
             if (buttonIndex === 0) {
               Clipboard.setString(this.props.currentMessage.text)
@@ -67,7 +67,7 @@ export default class Bubble extends React.Component {
 
   renderMessageImage () {
     if (this.props.currentMessage.image) {
-      const {containerStyle, wrapperStyle, ...messageImageProps} = this.props
+      const { containerStyle, wrapperStyle, ...messageImageProps } = this.props
       if (this.props.renderMessageImage) {
         return this.props.renderMessageImage(messageImageProps)
       }
@@ -84,7 +84,7 @@ export default class Bubble extends React.Component {
   renderUsername () {
     const username = this.props.currentMessage.user.name
     if (username) {
-      const {containerStyle, wrapperStyle, ...usernameProps} = this.props
+      const { containerStyle, wrapperStyle, ...usernameProps } = this.props
       if (this.props.renderUsername) {
         return this.props.renderUsername(usernameProps)
       }
@@ -106,14 +106,14 @@ export default class Bubble extends React.Component {
 
   renderTime () {
     if (this.props.currentMessage.createdAt) {
-      const {containerStyle, wrapperStyle, ...timeProps} = this.props
+      const { containerStyle, wrapperStyle, ...timeProps } = this.props
       if (this.props.renderTime) {
         return this.props.renderTime(timeProps)
       }
       return (
         <Time
           {...timeProps}
-          containerStyle={{left: [styles.timeContainer]}}
+          containerStyle={{ left: [styles.timeContainer] }}
           textStyle={{
             left: [
               styles.standardFont,

frontend/components/Message.js

@@ -1,14 +1,14 @@
 import React from 'react'
-import {View, StyleSheet} from 'react-native'
-import {Day, utils} from 'react-native-gifted-chat'
+import { View, StyleSheet } from 'react-native'
+import { Day, utils } from 'react-native-gifted-chat'
 import Bubble from './Bubble'
 import Avatar from './Avatar'
 
-const {isSameUser, isSameDay} = utils
+const { isSameUser, isSameDay } = utils
 
 export default class Message extends React.Component {
   getInnerComponentProps () {
-    const {containerStyle, ...props} = this.props
+    const { containerStyle, ...props } = this.props
     return {
       ...props,
       position: 'left',
@@ -31,7 +31,7 @@ export default class Message extends React.Component {
   }
 
   renderAvatar () {
-    const {currentMessage, previousMessage} = this.props
+    const { currentMessage, previousMessage } = this.props
     const isHidden =
       isSameUser(currentMessage, previousMessage) &&
       isSameDay(currentMessage, previousMessage)
@@ -43,16 +43,12 @@ export default class Message extends React.Component {
     const marginBottom = isSameUser(
       this.props.currentMessage,
       this.props.nextMessage
-    )
-      ? 2
-      : 10
+    ) ? 2 : 10
 
     return (
       <View>
         {this.renderDay()}
-        <View
-          style={[styles.container, {marginBottom}, this.props.containerStyle]}
-        >
+        <View style={[styles.container, { marginBottom }, this.props.containerStyle]}>
           {this.renderAvatar()}
           {this.renderBubble()}
         </View>

frontend/screens/ChannelsList.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import {
+  Alert,
   AsyncStorage,
   FlatList,
   View,
@@ -19,7 +20,7 @@ class HomeHeader extends React.Component {
 
   onPressCopy () {
     Clipboard.setString(this.props.value)
-    alert('Copied to the clipboard!')
+    Alert.alert('Copied to the clipboard!')
   }
 
   render () {
@@ -43,7 +44,7 @@ class HomeHeader extends React.Component {
 }
 
 export default class HomeScreen extends React.Component {
-  static navigationOptions = ({navigation}) => ({
+  static navigationOptions = ({ navigation }) => ({
     headerTitle: <HomeHeader value={navigation.getParam('key', '')} />
   });
 
@@ -82,14 +83,14 @@ export default class HomeScreen extends React.Component {
   startOrJoinInstance () {
     const key = this.props.navigation.getParam('key', '')
     const nick = this.state.nick
-    var msg = {type: 'join', key, nick}
+    var msg = { type: 'join', key, nick }
     var raw = JSON.stringify(msg)
     backend.channel.send(raw)
   }
 
   async updateKey (key) {
-    this.props.navigation.setParams({key, nick: this.state.nick})
-    this.setState(prev => ({...prev, key}))
+    this.props.navigation.setParams({ key, nick: this.state.nick })
+    this.setState(prev => ({ ...prev, key }))
 
     if (this._initialLoad) {
       this._initialLoad = false
@@ -101,13 +102,13 @@ export default class HomeScreen extends React.Component {
   }
 
   updateChannels (channels) {
-    this.setState(prev => ({...prev, channels}))
+    this.setState(prev => ({ ...prev, channels }))
   }
 
   enterChannel (channel) {
     AsyncStorage.setItem('favorite-channel', channel)
     const nick = this.state.nick
-    this.props.navigation.navigate('Chat', {channel, nick})
+    this.props.navigation.navigate('Chat', { channel, nick })
   }
 
   renderHeader () {