Merge branch 'main' into deb-packages

Author: Denis-Averin

.editorconfig

@@ -8,14 +8,17 @@ charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+max_line_length = 120
 
 [*.{bat,cmd}]
 end_of_line = crlf
 
 [*.py]
 indent_style = space
 indent_size = 4
-max_line_length = 120
 
-[CODEOWNERS]
+[{CODEOWNERS,Makefile}]
 indent_style = tab
+
+[*.mustache]
+insert_final_newline = false

.github/workflows/check-codegen.yml

@@ -1,56 +1,44 @@
-# This is a basic workflow to help you get started with Actions
-
 name: CI
 
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events but only for the main branch
 on:
   push:
-    branches: [ master, main ]
+    branches: [main]
   pull_request:
-    branches: [ master, main ]
+    branches: [main]
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   check-submodules:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
-    - name: Check all submodules up-to-date
-      run: git diff --exit-code
+      - name: Check all submodules up-to-date
+        run: |
+          git submodule update --recursive --remote
+          git diff --exit-code
 
-  check-master:
+  check-urls:
     runs-on: ubuntu-latest
-    needs: [check-submodules]
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Check master points to main
-        run: |
-          for s in ./submodules/*/ ; do
-            pushd "$s"
-            rem_master_hash=$(git ls-remote --exit-code --quiet --heads origin master  | awk '{ print $1}')
-            git diff --exit-code ${rem_master_hash} || (echo "Broken Master in $s" ; exit 1)
-            popd > /dev/null
-          done
+      - name: Check all URLs
+        run: ./scripts/check_all_urls.sh
 
-  check-urls:
+  check-swagger:
     runs-on: ubuntu-latest
+    needs: [check-submodules]
     steps:
-    - uses: actions/checkout@v3
-
-    - name: Check all URLs
-      run: ./scripts/check_all_urls.sh
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
-    - name: Check existing swagger specification is up-to-date
-      run: curl https://api.aspose.cloud/v3.0/barcode/swagger/spec | diff --strip-trailing-cr -y --suppress-common-lines spec/aspose-barcode-cloud.json -
+      - name: Check existing swagger specification is up-to-date
+        run: curl https://api.aspose.cloud/v3.0/barcode/swagger/spec | diff --strip-trailing-cr -y --suppress-common-lines spec/aspose-barcode-cloud.json -

.gitignore

@@ -1,8 +1,10 @@
 *.suo
 *.user
 _ReSharper.*
-bin
-obj
-.vs
+bin/
+obj/
+.vs/
 codegen/.generated/
 codegen/debug*.json
+.idea/
+.vscode/

Makefile

@@ -0,0 +1,59 @@
+.PHONY: all
+all: sdk
+
+.PHONY: format
+format: format-black
+
+.PHONY: format-black
+format-black:
+	python -m black --line-length=120 -v .
+
+.PHONY: swagger
+swagger:
+	./scripts/update_swagger_spec.bash
+
+.PHONY: openapi
+openapi:
+	curl "https://converter.swagger.io/api/convert?url=https://api.aspose.cloud/v3.0/barcode/swagger/spec" | jq '.' > spec/aspose-barcode-cloud-openapi.json
+
+# Mark parameters as deprecated
+.PHONY: deprecated
+deprecated: openapi
+	jq '.paths[][].parameters? |= map(if .description and (.description | startswith("DEPRECATED:")) then . + {"deprecated": true} else . end)' spec/aspose-barcode-cloud-openapi.json > spec/aspose-barcode-cloud-with-deprecated.json
+
+
+# Making all SDKs
+.PHONY: sdk
+sdk: android dart dotnet go java node php python
+
+.PHONY: android
+android:
+	cd codegen && ./generate-android.bash
+
+.PHONY: dart
+dart:
+	cd codegen && ./generate-dart.bash
+
+.PHONY: dotnet
+dotnet:
+	cd codegen && ./generate-dotnet.bash
+
+.PHONY: go
+go:
+	cd codegen && ./generate-go.bash
+
+.PHONY: java
+java:
+	cd codegen && ./generate-java.bash
+
+.PHONY: node
+node:
+	cd codegen && ./generate-node.bash
+
+.PHONY: php
+php:
+	cd codegen && ./generate-php.bash
+
+.PHONY: python
+python:
+	cd codegen && ./generate-python.bash

codegen/Templates/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Aspose Pty Ltd
+Copyright (c) 2023 Aspose Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

codegen/Templates/android/README.mustache

@@ -1,5 +1,6 @@
 # {{artifactId}}
 
+[![Build Android App](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-android/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-android/actions/workflows/build.yml)
 ![API version: {{appVersion}}](https://img.shields.io/badge/api-v{{appVersion}}-lightgrey)
 [![GitHub license](https://img.shields.io/github/license/aspose-barcode-cloud/aspose-barcode-cloud-android)](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-android)
 
@@ -101,4 +102,4 @@ All Aspose.BarCode for Cloud SDKs, helper scripts and templates are licensed und
 | [GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-dotnet) | [GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-java) | [GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-php) | [GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-python) | [GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-node) | [GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-android) |[GitHub](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-go)|
 | [NuGet](https://www.nuget.org/packages/Aspose.barcode-Cloud/) | [Maven](https://repository.aspose.cloud/webapp/#/artifacts/browse/tree/General/repo/com/aspose/aspose-barcode-cloud) | [Composer](https://packagist.org/packages/aspose/barcode-cloud-php) | [PIP](https://pypi.org/project/aspose-barcode-cloud/) | [NPM](https://www.npmjs.com/package/aspose-barcode-cloud-node) | [Maven](https://repository.aspose.cloud/webapp/#/artifacts/browse/tree/General/repo/com/aspose/aspose-barcode-cloud) |[Go.Dev](https://pkg.go.dev/github.com/aspose-barcode-cloud/aspose-barcode-cloud-go/) |
 
-[Product Page](https://products.aspose.cloud/barcode/) | [Documentation](https://docs.aspose.cloud/display/barcodecloud/Home) | [API Reference](https://apireference.aspose.cloud/barcode/) | [Code Samples](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-android) | [Blog](https://blog.aspose.cloud/category/barcode/) | [Free Support](https://forum.aspose.cloud/c/barcode) | [Free Trial](https://dashboard.aspose.cloud/#/apps)
+[Product Page](https://products.aspose.cloud/barcode/) | [Documentation](https://docs.aspose.cloud/display/barcodecloud/Home) | [API Reference](https://apireference.aspose.cloud/barcode/) | [Code Samples](https://github.com/aspose-barcode-cloud/aspose-barcode-cloud-android) | [Blog](https://blog.aspose.cloud/categories/aspose.barcode-cloud-product-family/) | [Free Support](https://forum.aspose.cloud/c/barcode) | [Free Trial](https://dashboard.aspose.cloud/#/apps)

codegen/Templates/android/apiException.mustache

@@ -31,6 +31,7 @@ import java.io.File
 import java.io.FileOutputStream
 import kotlin.math.floor
 
+
 class MainActivity : AppCompatActivity() {
     companion object {
         const val PERMISSION_REQUEST_CALLBACK_CODE = 1
@@ -125,11 +126,12 @@ class MainActivity : AppCompatActivity() {
         requestCode: Int,
         permissions: Array<String>, grantResults: IntArray
     ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {
             PERMISSION_REQUEST_CALLBACK_CODE -> {
                 // If request is cancelled, the result arrays are empty.
                 if ((grantResults.isNotEmpty() &&
-                            grantResults[0] == PackageManager.PERMISSION_GRANTED)
+                        grantResults[0] == PackageManager.PERMISSION_GRANTED)
                 ) {
                     // Permission is granted. Continue the action or workflow
                     // in your app.
@@ -153,6 +155,7 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
@@ -169,15 +172,16 @@ class MainActivity : AppCompatActivity() {
                 if (resultCode == RESULT_OK) {
                     val bmpImage = data?.extras?.get("data") as Bitmap
                     recognizeBarcode(bmpImage)
+        }
                 }
-            }
 
             else -> {
                 showErrorMessage("No file selected")
             }
         }
     }
 
+
     private fun recognizeBarcode(image: Bitmap) {
         try {
             val smallerBmp = reduceBitmapSize(image)
@@ -215,7 +219,7 @@ class MainActivity : AppCompatActivity() {
                         stopRecognizeAnimation()
 
                         var message = e.message + ": " + e.details
-                        if (e.code == 0) {
+                        if (e.httpCode == 0) {
                             message = "Check ClientId and ClientSecret in ApiClient $message"
                         }
                         showErrorMessage(message)
@@ -260,7 +264,7 @@ class MainActivity : AppCompatActivity() {
             } catch (e: ApiException) {
                 runOnUiThread {
                     var message = e.message + ": " + e.details
-                    if (e.code == 0) {
+                    if (e.httpCode == 0) {
                         message = "Check ClientId and ClientSecret in ApiClient $message"
                     }
                     showErrorMessage(message)
@@ -287,8 +291,12 @@ class MainActivity : AppCompatActivity() {
     private fun pickFile() {
         val getContentIntent = Intent(Intent.ACTION_GET_CONTENT)
         getContentIntent.type = "image/*"
-        if (getContentIntent.resolveActivity(packageManager) != null) {
-            startActivityForResult(getContentIntent, ACTION_GET_CONTENT_CALLBACK_CODE)
+        getContentIntent.addCategory(Intent.CATEGORY_OPENABLE)
+        try {
+             startActivityForResult(Intent.createChooser(getContentIntent, "Select an Image to Recognize"), ACTION_GET_CONTENT_CALLBACK_CODE)
+        } catch (ex: java.lang.Exception) {
+            showErrorMessage("Unable to start file selector")
         }
+
     }
 }

codegen/Templates/android/build.mustache

@@ -1,26 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext.kotlin_version = '1.4.31'
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:{{{androidGradleVersion}}}'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+plugins {
+    id 'com.android.application' version '7.4.0' apply false
+    id 'com.android.library' version '7.4.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.21' apply false
 }
+ext.kotlin_version = '1.7.21'

codegen/Templates/android/git_push.sh.mustache

@@ -7,16 +7,18 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
+# Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true

codegen/Templates/android/gitignore.mustache

@@ -0,0 +1,43 @@
+# macOS
+.DS_Store
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
+.idea/
+*.iml
+
+# Keystore files
+*.jks