Feature/callback from cpp to java

AS3/.gitignore

@@ -1,10 +1,9 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
 /captures
 .externalNativeBuild
-app/src/main/java/com/sureshjoshi/core
+app/src/main/java/com/sureshjoshi/core

AS3/app/src/main/cpp/ISeePlusPlus.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "ISeePlusPlusInterface.h"
 
 /**
  *  @file 
@@ -54,6 +55,9 @@ namespace SJ {
          */
         virtual std::vector<std::string> Sort(const std::vector<std::string> &inStrings)=0;
 
+        virtual void returnViaCallback(const std::string input, ISeePlusPlusInterface * callbackInterface)=0;
+
     }; // class ISeePlusPlus
+
 } // namespace SJ
 #endif // __SJ_ISEEPLUSPLUS_H__

AS3/app/src/main/cpp/ISeePlusPlusInterface.h

@@ -0,0 +1,15 @@
+#ifndef _ISEEPLUSPLUSINTERFACE_H__
+#define _ISEEPLUSPLUSINTERFACE_H__
+
+#include <string>
+
+//namespace SJ {
+
+    struct ISeePlusPlusInterface {
+        virtual ~ISeePlusPlusInterface() {}
+
+        virtual void print(const std::string &text) = 0;
+    };
+//}
+
+#endif // _ISEEPLUSPLUSINTERFACE_H__

AS3/app/src/main/cpp/SeePlusPlus.cpp

@@ -38,4 +38,8 @@ std::vector<std::string> SeePlusPlus::Sort(const std::vector<std::string> &inStr
     std::vector<std::string> sortedList(inStringList);
     std::sort(std::begin(sortedList), std::end(sortedList));
     return sortedList;
-}
+}
+
+void SeePlusPlus::returnViaCallback(const std::string input, ISeePlusPlusInterface * callbackInterface) {
+    callbackInterface->print(input);
+}

AS3/app/src/main/cpp/SeePlusPlus.h

@@ -60,6 +60,8 @@ namespace SJ {
          */
         virtual std::vector<std::string> Sort(const std::vector<std::string> &inStrings);
 
+        virtual void returnViaCallback(const std::string input, ISeePlusPlusInterface * callbackInterface);
+
     }; // class SeePlusPlus
 } // namespace SJ
 #endif // __SJ_SEEPLUSPLUS_H__

AS3/app/src/main/cpp/SeePlusPlus.i

@@ -1,11 +1,14 @@
 /* File : SeePlusPlus.i */
-%module SeePlusPlus_Wrapper
+%module(directors="1") SeePlusPlus_Wrapper
 
 /* Anything in the following section is added verbatim to the .cxx wrapper file */ 
 %{
 #include "SeePlusPlus.h"
+#include "ISeePlusPlusInterface.h"
 %}
 
+%feature("director") ISeePlusPlusInterface;
+
 /* This will allow us to iterate through arrays defined by STL containers */
 %include "std_string.i"
 %include "std_vector.i"
@@ -20,3 +23,4 @@ namespace std {
 /* For Java, it seems we need the file of interest and all files up the inheritance tree */
 %include "ISeePlusPlus.h"
 %include "SeePlusPlus.h"
+%include "ISeePlusPlusInterface.h"

AS3/app/src/main/java/com/sureshjoshi/android/ndkexample/MainActivity.java

@@ -4,6 +4,7 @@
 import android.os.Bundle;
 import android.widget.TextView;
 
+import com.sureshjoshi.core.ISeePlusPlusInterface;
 import com.sureshjoshi.core.IntVector;
 import com.sureshjoshi.core.SeePlusPlus;
 import com.sureshjoshi.core.StringVector;
@@ -41,6 +42,9 @@ public class MainActivity extends Activity {
     @BindView(R.id.textview_android_studio_ndk_integration)
     TextView mTextviewAndroidStudioNdkIntegration;
 
+    @BindView(R.id.textview_android_studio_ndk_callback)
+    TextView mTextviewAndroidStudioNdkCallback;
+
     @OnClick(R.id.button_refresh)
     void onClick() {
         runNativeFunctions();
@@ -62,6 +66,17 @@ void runNativeFunctions() {
         mTextviewRandomNumbers.setText(runRandomNumbers());
         mTextviewSortedStrings.setText(runSortString());
 //        mTextviewAndroidStudioNdkIntegration.setText(runAndroidStudioNativeString());
+        getStringFromCppCallback();
+    }
+
+    private void getStringFromCppCallback() {
+        mCpp.returnViaCallback("test string", new ISeePlusPlusInterface() {
+
+            @Override
+            public void print(String text) {
+                mTextviewAndroidStudioNdkCallback.setText(text);
+            }
+        });
     }
 
     String runMultiplyInts() {

AS3/app/src/main/res/layout/activity_main.xml

@@ -60,4 +60,11 @@
         android:layout_height="wrap_content"
         android:textSize="20sp" />
 
+    <TextView
+        android:id="@+id/textview_android_studio_ndk_callback"
+        android:text="@string/string_callback"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="20sp" />
+
 </LinearLayout>

AS3/app/src/main/res/values/strings.xml

@@ -8,4 +8,5 @@
     <string name="sorted_strings">Becomes this list of sorted strings: </string>
     <string name="action_settings">Settings</string>
     <string name="refresh">Refresh</string>
+    <string name="string_callback">String returned from C++ via callback</string>
 </resources>