Merge pull request #6 from artoolkitx/android

Android

Author: philip-lamb

.gitignore

@@ -1,18 +1,69 @@
+#### OS-generated caches and resources
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+### git merge conflict files
+*.orig
+
+#### Intermediate build products
+*.o
+
+#### Intermediate Language products
+*.dex
+*.class
+
+# Android Studio
+**/.gradle/
+**/.idea/caches
+**/.idea/deploymentTargetDropDown.xml
+**/.idea/libraries
+**/.idea/workspace.xml
+**/.idea/navEditor.xml
+**/.idea/assetWizardSettings.xml
+**/captures/
+**/.externalNativeBuild/
+**/.cxx/
+local.properties
+
+# MonoDevelop/Xamarin Studio
+*.userprefs
+
+# Visual Studio
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+.vscode/settings.json
+
+# Xcode
+xcuserdata/
+*.mode1*
+*.pbxuser
+*.xccheckout
+*.xcscmblueprint
+
+# Dependencies
 depends/ios/include/ARX/
 depends/ios/lib/libARX.a
 depends/ios/Frameworks/opencv2.framework
 depends/macos/Frameworks/ARX.framework/
 depends/macos/Frameworks/opencv2.framework
+depends/android/artoolkitx
+artoolkitX.for.iOS.v*.dmg
+artoolkitX.for.macOS.v*.dmg
+
+# Build files
 Linux/build/
 iOS/user-config.xcconfig
 iOS/build/
 macOS/user-config.xcconfig
 macOS/build/
-xcuserdata/
-*.xcscmblueprint
-local.properties
-Android/app/.cxx
 Android/app/build
 Android/build
-Android/.gradle
-depends/android/artoolkitx
+
+# Other

Android/app/build.gradle

@@ -8,8 +8,9 @@ android {
         applicationId "org.artoolkitx.utilities.calibcameraandroid"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
+        compileSdkVersion 33
+        versionCode 1010000
+        versionName "1.1"
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_APP_PLATFORM=android-24", "-DANDROID_STL=c++_shared"
@@ -46,4 +47,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
+    def appcompat_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    def preference_version = "1.2.1"
+    implementation "androidx.preference:preference:$preference_version"
+    def constraintlayout_version = "2.1.4"
+    implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
 }

Android/app/src/main/AndroidManifest.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="1"
-    android:versionName="1.0"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera.any" />
     <uses-feature android:name="android.hardware.camera"
@@ -55,25 +54,17 @@
     <!-- if you want to capture audio, uncomment this. -->
     <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
 
-    <!-- Create a Java class extending SDLActivity and place it in a
-         directory under app/src/main/java matching the package, e.g. app/src/main/java/com/gamemaker/game/MyGame.java
- 
-         then replace "SDLActivity" with the name of your class (e.g. "MyGame")
-         in the XML below.
-
-         An example Java class can be found in README-android.md
-    -->
     <application android:label="@string/app_name"
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="true"
-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+        android:theme="@style/AppTheme"
         android:hardwareAccelerated="true" >
 
         <!-- Example of setting SDL hints from AndroidManifest.xml:
         <meta-data android:name="SDL_ENV.SDL_ACCELEROMETER_AS_JOYSTICK" android:value="0"/>
          -->
 
-        <activity android:name="SDLActivity"
+        <activity android:name="org.artoolkitx.utilities.cameracalibration.CameraCalibrationActivity"
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
@@ -99,6 +90,12 @@
             </intent-filter>
             -->
         </activity>
+        <activity
+            android:name="org.artoolkitx.utilities.cameracalibration.CameraCalibrationSettingsActivity"
+            android:label="@string/settings_activity_name"
+            android:parentActivityName="org.artoolkitx.utilities.cameracalibration.CameraCalibrationActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
     </application>
 
 </manifest>

Android/app/src/main/cpp/CMakeLists.txt

@@ -107,6 +107,7 @@ set(SOURCE
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/version.h
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calib_camera.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calib_camera.h
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calib_camera_jni.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Calibration.hpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Calibration.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/calc.cpp
@@ -115,8 +116,11 @@ set(SOURCE
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/fileUploader.h
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/flow.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/flow.hpp
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/loc_strings.cpp
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/loc_strings.hpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/prefs.hpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/prefsNull.cpp
+    ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/prefsAndroid.cpp
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Eden/Eden.h
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Eden/EdenError.h
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/Eden/EdenGLFont.c