diff --git a/InkRecognition/InkRecognizerSDK/build.gradle b/InkRecognition/InkRecognizerSDK/build.gradle deleted file mode 100644 index ff82468..0000000 --- a/InkRecognition/InkRecognizerSDK/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('InkRecognizer.jar')) \ No newline at end of file diff --git a/InkRecognition/app/build.gradle b/InkRecognition/app/build.gradle index c3f3812..649ffd8 100644 --- a/InkRecognition/app/build.gradle +++ b/InkRecognition/app/build.gradle @@ -25,5 +25,5 @@ dependencies { implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'com.android.support:design:28.0.0' - implementation project(':InkRecognizerSDK') + implementation project(':azure-cognitiveservices-inkrecognizer') } diff --git a/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkPointImplementor.java b/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkPointImplementor.java index 5705c34..6cd7221 100644 --- a/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkPointImplementor.java +++ b/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkPointImplementor.java @@ -1,6 +1,6 @@ package com.azure.cognitiveservices.inkrecognitionsample; -import com.azure.ai.inkrecognizer.InkPoint; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkPoint; // class InkPointImplementor implements InkPoint { diff --git a/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkStrokeImplementor.java b/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkStrokeImplementor.java index a53cd03..664c78e 100644 --- a/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkStrokeImplementor.java +++ b/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/InkStrokeImplementor.java @@ -1,9 +1,9 @@ package com.azure.cognitiveservices.inkrecognitionsample; import android.util.DisplayMetrics; -import com.azure.ai.inkrecognizer.InkPoint; -import com.azure.ai.inkrecognizer.InkStroke; -import com.azure.ai.inkrecognizer.InkStrokeKind; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkPoint; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkStroke; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkStrokeKind; import java.util.ArrayList; import java.util.List; diff --git a/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/NoteTaker.java b/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/NoteTaker.java index 1e23964..c5421b2 100644 --- a/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/NoteTaker.java +++ b/InkRecognition/app/src/main/java/com/azure/cognitiveservices/inkrecognitionsample/NoteTaker.java @@ -13,10 +13,15 @@ import android.view.View; import android.widget.Toast; -import com.azure.ai.inkrecognizer.*; -import com.azure.ai.inkrecognizer.model.InkDrawing; -import com.azure.ai.inkrecognizer.model.InkRecognitionRoot; -import com.azure.ai.inkrecognizer.model.InkWord; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkRecognizerAsyncClient; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkRecognizerClientBuilder; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkRecognizerCredentials; +import com.microsoft.azure.cognitiveservices.inkrecognizer.ApplicationKind; +import com.microsoft.azure.cognitiveservices.inkrecognizer.Response; +import com.microsoft.azure.cognitiveservices.inkrecognizer.InkStroke; +import com.microsoft.azure.cognitiveservices.inkrecognizer.model.InkDrawing; +import com.microsoft.azure.cognitiveservices.inkrecognizer.model.InkRecognitionRoot; +import com.microsoft.azure.cognitiveservices.inkrecognizer.model.InkWord; import reactor.core.publisher.Mono; import java.util.ArrayList; @@ -110,9 +115,9 @@ protected void onPostExecute(NoteTaker noteTaker) { // private void processResults(Response response) { - if (response.status == 200) { + if (response.status() == 200) { - InkRecognitionRoot root = response.root; + InkRecognitionRoot root = response.root(); recognizedWords.append("\r\nRecognized Text:\r\n"); Iterable words = root.inkWords(); diff --git a/InkRecognition/InkRecognizerSDK/InkRecognizer.jar b/InkRecognition/azure-cognitiveservices-inkrecognizer/azure-cognitiveservices-inkrecognizer.jar similarity index 95% rename from InkRecognition/InkRecognizerSDK/InkRecognizer.jar rename to InkRecognition/azure-cognitiveservices-inkrecognizer/azure-cognitiveservices-inkrecognizer.jar index 88383b0..7c4d133 100644 Binary files a/InkRecognition/InkRecognizerSDK/InkRecognizer.jar and b/InkRecognition/azure-cognitiveservices-inkrecognizer/azure-cognitiveservices-inkrecognizer.jar differ diff --git a/InkRecognition/azure-cognitiveservices-inkrecognizer/build.gradle b/InkRecognition/azure-cognitiveservices-inkrecognizer/build.gradle new file mode 100644 index 0000000..68cf3d4 --- /dev/null +++ b/InkRecognition/azure-cognitiveservices-inkrecognizer/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('azure-cognitiveservices-inkrecognizer.jar')) \ No newline at end of file diff --git a/InkRecognition/settings.gradle b/InkRecognition/settings.gradle index 7658f4d..ce18f8e 100644 --- a/InkRecognition/settings.gradle +++ b/InkRecognition/settings.gradle @@ -1 +1 @@ -include ':app', ':InkRecognizerSDK' +include ':app', ':azure-cognitiveservices-inkrecognizer'