Merge branch 'develop'

Author: nunomonteiro

AppCoins_Unity_Package.unitypackage

@@ -641,10 +641,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 4
       objectReference: {fileID: 0}
-    - target: {fileID: 1087073868984312, guid: 53ffe963ba9e4624aac3b31b1619f682, type: 2}
-      propertyPath: m_Name
-      value: AppcoinsUnity1
-      objectReference: {fileID: 0}
     - target: {fileID: 114267058133941440, guid: 53ffe963ba9e4624aac3b31b1619f682,
         type: 2}
       propertyPath: purchaserObject

Appcoins Unity/Assets/AppcoinsUnity/Example/Scene/Test Scene.unity

@@ -56,7 +56,7 @@ MonoBehaviour:
   enablePOA: 1
   enableDebug: 1
   products:
-  - {fileID: 11400000, guid: 0d15512d72769f74ab15ddca55592937, type: 2}
-  - {fileID: 11400000, guid: 650461753210374449ff8c3efd539ff5, type: 2}
-  - {fileID: 11400000, guid: 248b1346f3a05b341b2d93ed2f017be5, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
   purchaserObject: {fileID: 0}

Appcoins Unity/Assets/AppcoinsUnity/Prefabs/AppcoinsUnity.prefab

@@ -80,7 +80,7 @@ void OnValidate()
             if (previousDebug != enableDebug)
             {
                 previousDebug = enableDebug;
-                updateVarOnMainTemplateGradle(DEBUG, enableDebug.ToString());
+                updateVarOnMainTemplateGradle(DEBUG, previousDebug.ToString());
             }
 
             if(previousName == null || !previousName.Equals(this.name))
@@ -169,7 +169,7 @@ private void changePrefabName()
                     while(line[i].Equals("\t") || line[i].Equals(" "))
                     {
                         i++;
-                        newLine = string.Concat(" ", "");
+                        newLine = string.Concat("\t", "");
                     }
 
                     newLine = string.Concat(newLine, line);
@@ -207,7 +207,7 @@ private void updateVarOnMainTemplateGradle(string varName, string varToCheck)
             string line;
             string contentToChange = null;
             string contentInTemplate = null;
-            int lineToChange = -1;
+            ArrayList linesToChange = new ArrayList();
             int counter = 0;
             int numberOfSpaces = 0;
             ArrayList fileLines = new ArrayList();
@@ -225,12 +225,6 @@ private void updateVarOnMainTemplateGradle(string varName, string varToCheck)
                 contentInTemplate = "resValue \"bool\", \"APPCOINS_ENABLE_DEBUG\", \"" + ((varToCheck.ToLower()).Equals("true") ? "false" : "true") + "\"";
             }
 
-            else if(varName.Equals(NAME))
-            {
-                contentToChange = "resValue \"string\", \"APPCOINS_PREFAB\", \"" + varToCheck + "\"";
-                contentInTemplate = "resValue \"string\", \"APPCOINS_PREFAB\", \"" + previousName + "\"";
-            }
-
             System.IO.StreamReader fileReader = new System.IO.StreamReader(pathToMainTemplate);
 
             //Read all lines and get the line numer to be changed
@@ -246,7 +240,7 @@ private void updateVarOnMainTemplateGradle(string varName, string varToCheck)
 
                 if (line.Length == contentInTemplate.Length && line.Substring(0, contentInTemplate.Length).Equals(contentInTemplate))
                 {
-                    lineToChange = counter;
+                    linesToChange.Add(counter);
                     numberOfSpaces = (int)a[1];
                 }
 
@@ -255,14 +249,19 @@ private void updateVarOnMainTemplateGradle(string varName, string varToCheck)
 
             fileReader.Close();
 
-            if (lineToChange > -1)
+            foreach(int lineToChange in linesToChange)
             {
-                for (int i = 0; i < numberOfSpaces; i++)
+                if (lineToChange > -1)
                 {
-                    contentToChange = string.Concat(" ", contentToChange);
-                }
+                    string change = contentToChange;
 
-                fileLines[lineToChange] = contentToChange;
+                    for (int i = 0; i < numberOfSpaces; i++)
+                    {
+                        change = string.Concat(" ", change);
+                    }
+
+                    fileLines[lineToChange] = change;
+                }
             }
 
             System.IO.StreamWriter fileWriter = new System.IO.StreamWriter(pathToMainTemplate);
@@ -304,4 +303,4 @@ private static ArrayList RemoveFirstsWhiteSpaces(string line)
             return a;
         }
     }
-}
+}

Appcoins Unity/Assets/AppcoinsUnity/Scripts/AppcoinsUnity.cs

@@ -23,9 +23,8 @@ allprojects {
 apply plugin: 'com.android.application'
 
 dependencies {
-  compile fileTree(dir: 'libs', include: ['*.jar'])
+  compile fileTree(dir: 'libs', excludes: ['com.android.support.support-annotations*.jar'], include: ['*.jar'])
   api 'com.asfoundation:appcoins:0.3.6a'
-  implementation(name: 'appcoinsunity-release', ext:'aar')
   **DEPS**
 }
 
@@ -65,14 +64,17 @@ android {
       useProguard false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-unity.txt'
       jniDebuggable true
+      resValue "bool", "APPCOINS_ENABLE_POA", "true"
+      resValue "bool", "APPCOINS_ENABLE_DEBUG", "true"
+      resValue "string", "APPCOINS_PREFAB", "AppcoinsUnity"
     }
     release {
       minifyEnabled false
       useProguard false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-unity.txt'
       resValue "bool", "APPCOINS_ENABLE_POA", "true"
       resValue "bool", "APPCOINS_ENABLE_DEBUG", "true"
-      resValue "string", "APPCOINS_PREFAB", "AppcoinsUnity1"
+      resValue "string", "APPCOINS_PREFAB", "AppcoinsUnity"
 
       **SIGNCONFIG**
     }