added Camera/Media UI

Author: EricBatlle

UnityNativeToolkit/Assets/NativeToolkit.unity

@@ -1,31 +1,48 @@
 using System.Collections;
 using System.IO;
 using System.Text;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 using static NativeToolkitPlugin;
 
 public class NativeToolkit : MonoBehaviour, INativeToolkitPlugin
 {
     private NativeToolkitPlugin plugin = null;
-    public Button btn = null;
-    public Button btn_bot = null;
-    public Button btn_bot2 = null;
-    public Texture2D target = null;
-    public RawImage rawImage = null;
+
+    public TextMeshProUGUI resultText = null;
+    [Header("Camera/Media")]
+    public Button takeShot_btn = null;
+    public Button visualizeShot_btn = null;
+    public RawImage shotRawImg = null;
+    [Space()]
+    public Button pickPhotoFromGallery_btn = null;
+    public Button visualizeGalleryPhoto_btn = null;
+    public RawImage galleryPhotoImg = null;
+    [Space()]
+    public Toggle saveShotsOnGallery = null;
+    public Toggle saveShotsOnPrivateDirectory = null;
+    private string shotPath = "";
+    private string galleryPhotoPath = "";
 
     void Start()
     {
         plugin = NativeToolkitPlugin.GetPlatformPluginVersion(this.gameObject.name);
-        
-        btn.onClick.AddListener(() => plugin.ShareText("Title of sharing", "https://github.com/EricBatlle"));
-        btn_bot.onClick.AddListener(() => {
-            plugin.Speak("Hello Eric, either you got a missile? Can you please say something longer to check if this is working? Thanks!", "en", "US");
-        });
-        btn_bot2.onClick.AddListener(() => {
-            plugin.Speak("Hello Eric, either you got a missile? Can you please say something longer to check if this is working? Thanks!", "en", "IE");
-        });
+        //Camera/Media
+        takeShot_btn.onClick.AddListener(() => { plugin.TakeShot(); });
+        visualizeShot_btn.onClick.AddListener(() => { shotRawImg.texture = LoadPNG(shotPath); });
+        visualizeGalleryPhoto_btn.onClick.AddListener(() => { galleryPhotoImg.texture = LoadPNG(galleryPhotoPath); });
+        saveShotsOnGallery.onValueChanged.AddListener((isOn) => { plugin.SaveShotsOnGallery(isOn); });
+        saveShotsOnPrivateDirectory.onValueChanged.AddListener((isOn) => { plugin.SaveShotsOnGallery(isOn); });
+        pickPhotoFromGallery_btn.onClick.AddListener(() => { plugin.PickPhotoFromGallery(); });
+        //
+    }
+
+    public void SetResultText(string result)
+    {
+        resultText.text = result;
     }
+
     public static Texture2D LoadPNG(string filePath)
     {
         Texture2D tex = null;
@@ -49,42 +66,46 @@ public void OnResult(string recognizedResult)
         Debug.Log(recognizedResult);
         //rawImage.texture = LoadPNG(recognizedResult);
     }
+
     #region FeaturesCallbacks
-    public void OnDialogPositive(string result)
+    #region Camera/Media
+    public void OnShotTaken(string shotPath)
     {
-        Debug.Log(result);
+        SetResultText("Shot taken and saved in: " + shotPath);
+        this.shotPath = shotPath;
     }
 
-    public void OnDialogNegative(string result)
+    public void OnGalleryPhotoPicked(string galleryPhotoPath)
     {
-        Debug.Log(result);
+        SetResultText("Photo picked from: " + galleryPhotoPath);
+        this.galleryPhotoPath = galleryPhotoPath;
     }
-
-    public void OnDialogNeutral(string result)
+    #endregion
+    public void OnDialogPositive(string result)
     {
         Debug.Log(result);
     }
 
-    public void OnDatePicked(string result)
+    public void OnDialogNegative(string result)
     {
         Debug.Log(result);
     }
 
-    public void OnTimePicked(string result)
+    public void OnDialogNeutral(string result)
     {
         Debug.Log(result);
     }
 
-    public void OnShotTaken(string result)
+    public void OnDatePicked(string result)
     {
         Debug.Log(result);
     }
 
-    public void OnGalleryPhotoPicked(string result)
+    public void OnTimePicked(string result)
     {
         Debug.Log(result);
     }
-
+    
     public void OnRatedApp(string result)
     {
         Debug.Log(result);

UnityNativeToolkit/Assets/NativeToolkit.unity.meta

@@ -31,15 +31,15 @@ public interface INativeToolkitPlugin : INativeCamera, INativeDialog, INativeCon
     {
         void OnResult(string result);        
     }    
+    protected abstract void SetUp();
 
     //Features
     #region Camera/Media
     public interface INativeCamera
     {
-        void OnShotTaken(string result);
-        void OnGalleryPhotoPicked(string result);
+        void OnShotTaken(string shotPath);
+        void OnGalleryPhotoPicked(string galleryPhotoPath);
     }
-    protected abstract void SetUp();
     public abstract void TakeShot();
     public abstract void SaveShotsOnGallery(bool saveShotsOnGallery);
     public abstract void SaveShotsOnPrivateDirectory(bool saveShotsOnPrivateDirectory);

UnityNativeToolkit/Assets/Plugins/NativeToolkit/Android/NativeToolkit.aar

@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: LiberationSans SDF Material
   m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
-  m_ShaderKeywords: 
+  m_ShaderKeywords: UNDERLAY_ON
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -34,7 +34,7 @@ Material:
     - _PerspectiveFilter: 0.875
     - _ScaleRatioA: 0.9
     - _ScaleRatioB: 1
-    - _ScaleRatioC: 0.73125
+    - _ScaleRatioC: 0.365625
     - _ScaleX: 1
     - _ScaleY: 1
     - _ShaderFlags: 0
@@ -46,9 +46,9 @@ Material:
     - _StencilWriteMask: 255
     - _TextureHeight: 1024
     - _TextureWidth: 1024
-    - _UnderlayDilate: 0
-    - _UnderlayOffsetX: 0
-    - _UnderlayOffsetY: 0
+    - _UnderlayDilate: 1
+    - _UnderlayOffsetX: 1
+    - _UnderlayOffsetY: 1
     - _UnderlaySoftness: 0
     - _VertexOffsetX: 0
     - _VertexOffsetY: 0
@@ -7798,6 +7798,7 @@ Texture2D:
   m_TextureFormat: 1
   m_MipCount: 1
   m_IsReadable: 0
+  m_IgnoreMasterTextureLimit: 0
   m_StreamingMipmaps: 0
   m_StreamingMipmapsPriority: -92
   m_AlphaIsTransparency: 0

UnityNativeToolkit/Assets/Scripts/Plugins/NativeToolkit/NativeToolkit.cs

@@ -4,5 +4,8 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/NativeToolkit.unity
+    guid: 9fc0d4010bbf28b4594072e72b8655ab
   m_configObjects: {}

UnityNativeToolkit/Assets/Scripts/Plugins/NativeToolkit/NativeToolkitPlugin.cs

@@ -35,6 +35,10 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

UnityNativeToolkit/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset

@@ -12,7 +12,7 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: DefaultCompany
+  companyName: Eric
   productName: UnityNativeToolkit
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
@@ -165,7 +165,7 @@ PlayerSettings:
   applicationIdentifier: {}
   buildNumber: {}
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 19
+  AndroidMinSdkVersion: 24
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -274,7 +274,99 @@ PlayerSettings:
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1