Release 20.7.0: Custom recognition regions selection API

Author: Alexgolshtein

.gitignore

@@ -3,6 +3,10 @@ destTest/**
 # Created by https://www.gitignore.io/api/java,android,androidstudio
 # Edit at https://www.gitignore.io/?templates=java,android,androidstudio
 
+local.properties
+maven_push.gradle
+.idea/codeStyles
+
 ### Android ###
 # Built application files
 *.apk

.idea/codeStyles/Project.xml

@@ -10,9 +10,9 @@ In detail, it's a set of SDKs for optical character recognition and document sca
 
 It is easy to get started with Aspose.OCR Cloud, and there is nothing to install. Create an account at Aspose Cloud and get your application information, then you are ready to use [SDKs](#asposeocr-cloud-sdks)
 
-## Release 20.4:
+## Release 20.7:
 
-We are glad to introduce our new Android SDK.
+We released a feature of recognition regions selection.
 
 ## Features:
 
@@ -30,21 +30,22 @@ Our API is completely independent of your operating system, database system, or
 ## Example
 
 ```java
-Configuration.setAPI_KEY("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
-Configuration.setAPP_SID("XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
+import com.aspose.ocr.api.*;
+
+private static void setUpConfig() throws Exception {
+        Configuration.setAPP_SID("XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX");
+        Configuration.setAPI_KEY("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+    }
 
 public String RecognizeFromUrl(String url) {
-    Call<ResponseBody> call = api.RecognizeFromUrl(url);
-    Response<ResponseBody> res = call.execute();
-    OCRResponse ocrResp = OCRResponse.Deserialize(res.body());
-    return ocrResp.text;
+    String urlToFile = "https://upload.wikimedia.org/wikipedia/commons/2/2f/Book_of_Abraham_FirstPage.png";
+    OCRResponse ocrResponse = RecognizeFromUrl(urlToFile, Language.English);
+    return ocrResponse.text;
 }
 
 static String RecognizeFromContent(File f) {
-    RequestBody requestBody = RequestBody.create( MediaType.parse("application/octet-stream"), f);
-    Call<ResponseBody> call = api.RecognizeFromContent(requestBody);
-    Response<ResponseBody> res = call.execute();
-    OCRResponse ocrResp = OCRResponse.Deserialize(res.body());
+    File f = new File(Configuration.getTestSrcDir(), "de_1.jpg");
+    OCRResponse ocrResponse = RecognizeFromContent(f, Language.German);
     return ocrResp.text;
 }
 ```
@@ -92,7 +93,7 @@ Add this dependency to your project's POM:
 <dependency>
     <groupId>com.aspose</groupId>
     <artifactId>aspose-ocr-cloud-android</artifactId>
-    <version>20.4.0</version>
+    <version>20.7.0</version>
     <type>aar</type>
 </dependency>
 ```

README.md

@@ -19,8 +19,9 @@
 
 import com.aspose.ocr.cloud.android.ApiClient;
 import com.aspose.ocr.cloud.android.Configuration;
+import com.aspose.ocr.cloud.android.api.Language;
+import com.aspose.ocr.cloud.android.api.OCRAPI;
 import com.aspose.ocr.cloud.android.api.OCRResponse;
-import com.aspose.ocr.cloud.android.api.OcrApi;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -52,7 +53,7 @@ private void setUpConfig() throws Exception {
     private static final int IMAGE_PICK_CODE = 1000;
     private static final int PERMISSION_CODE = 1001;
 
-    private static OcrApi api;
+    private static OCRAPI api;
     String url = "https://upload.wikimedia.org/wikipedia/commons/2/2f/Book_of_Abraham_FirstPage.png";
 
     @Override
@@ -69,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
             e.printStackTrace();
         }
 
-        api = new ApiClient().createService(OcrApi.class);
+        api = new ApiClient().createService(OCRAPI.class);
 
 
         mImageView = findViewById(R.id.image_view);
@@ -137,23 +138,16 @@ protected void onActivityResult(int requestCode, int resultCode, @Nullable Inten
             inputStream.read(targetArray);
 
             RequestBody requestBody = RequestBody.create(MediaType.parse("application/octet-stream"), targetArray);
-            Call<ResponseBody> call = api.RecognizeFromContent(requestBody);
 
-            try {
-                Response<ResponseBody> res = call.execute();
-                ResponseBody answer = res.body();
+            OCRResponse ocrResponse = api.RecognizeFromContent(requestBody, Language.English);
 
-                OCRResponse ocrResponse = OCRResponse.Deserialize(answer);
-                String text = ocrResponse.text;
 
-                mChooseBtn.setVisibility(View.INVISIBLE);
-                mTextView.setText(text);
-                mImageView.setVisibility(View.INVISIBLE);
-                mTextView.setVisibility(View.VISIBLE);
+            String text = ocrResponse.text;
 
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            mChooseBtn.setVisibility(View.INVISIBLE);
+            mTextView.setText(text);
+            mImageView.setVisibility(View.INVISIBLE);
+            mTextView.setVisibility(View.VISIBLE);
 
         } catch (FileNotFoundException e) {
             e.printStackTrace();

app/src/main/java/aspose/ocr/cloud/sdk/android/MainActivity.java

@@ -46,7 +46,7 @@ task createPom {
         project {
             groupId 'com.aspose'
             artifactId 'aspose-cloud-ocr-android'
-            version '20.4.0'
+            version '20.7.0'
             packaging 'aar'
         }
     }.withXml {

aspose-ocr-cloud-android/build.gradle

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.aspose</groupId>
   <artifactId>aspose-cloud-ocr-android</artifactId>
-  <version>20.4.0</version>
+  <version>20.7.0</version>
   <packaging>aar</packaging>
   <description>Aspose Cloud OCR SDK for Android</description>
 

aspose-ocr-cloud-android/pom.xml

@@ -27,6 +27,7 @@
 
 package com.aspose.ocr.cloud.android;
 
+
 import com.google.gson.Gson;
 import com.google.gson.JsonParseException;
 
@@ -119,7 +120,7 @@ public Response intercept(Interceptor.Chain chain) throws IOException {
                 .addConverterFactory(GsonCustomConverterFactory.create(json.getGson()));
     }
 
-    static String getAccessToken( ){
+    static String getAccessToken(){
 
         OkHttpClient client = new OkHttpClient();
 

aspose-ocr-cloud-android/src/main/java/com/aspose/ocr/cloud/android/ApiClient.java

@@ -27,6 +27,7 @@
 package com.aspose.ocr.cloud.android;
 
 public class Configuration {
+
     static String basePath = "https://api.aspose.cloud/v3.0";
     static String authPath = "https://api.aspose.cloud/connect/token";
     static String apiKey;
@@ -70,15 +71,15 @@ public static void setAPI_KEY(String apiKey){
     }
 
     public static String getTestSrcDir() {
-        return System.getProperty("user.dir") + "/../" + Configuration.srcTest;
+        return System.getProperty("user.dir") + "/" + Configuration.srcTest;
     }
 
     public static void setTestSrcDir(String testSrcDir) {
         Configuration.srcTest = testSrcDir;
     }
 
     public static String getTestDstDir() {
-        return System.getProperty("user.dir") + "/../" + Configuration.dstTest;
+        return System.getProperty("user.dir") + "/" + Configuration.dstTest;
     }
 
     public static void setTestDstDir(String testDstDir) {

aspose-ocr-cloud-android/src/main/java/com/aspose/ocr/cloud/android/Configuration.java

@@ -1,26 +1,54 @@
 package com.aspose.ocr.cloud.android.api;
 
-import androidx.annotation.NonNull;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.annotations.SerializedName;
+
+import java.lang.reflect.Type;
 
 public enum Language {
+    @SerializedName("1")
     English (1),
-    French (2),
-    German(2)
+
+    @SerializedName("2")
+    German(2),
+
+    @SerializedName("3")
+    French (3),
+
+    @SerializedName("4")
+    Spanish (4),
+
+    @SerializedName("5")
+    Portuguese (5),
+
+    @SerializedName("6")
+    Italian (6)
     ;
 
-    private final int code;
+    private final int key;
+
+    Language(int key) {
+        this.key = key;
+    }
 
-    private Language(int code) {
-        this.code = code;
+    public int getKey() {
+        return this.key;
     }
 
-    public int getCode() {
-        return this.code;
+    public static Language fromKey(int key) {
+        for(Language type : Language.values()) {
+            if(type.getKey() == key) {
+                return type;
+            }
+        }
+        return null;
     }
 
-    @NonNull
     @Override
     public String toString() {
-        return Integer.toString(this.code);
+        return Integer.toString(this.key);
     }
 }