Android preferences stage I.

Author: philip-lamb

Android/.idea/deploymentTargetDropDown.xml

@@ -46,4 +46,9 @@ 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"
+
 }

Android/app/build.gradle

@@ -55,25 +55,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.cameracalibration.CameraCalibrationActivity"
             android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"

Android/app/src/main/AndroidManifest.xml

@@ -117,6 +117,7 @@ set(SOURCE
     ${ARTOOLKITX_CAMERA_CALIBRATION_HOME}/flow.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

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

@@ -0,0 +1,56 @@
+package org.artoolkitx.utilities.cameracalibration;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.net.Uri;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+
+import org.libsdl.app.R;
+import org.libsdl.app.SDLActivity;
+
+public class CameraCalibrationActivity extends SDLActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        //ViewGroup layout = mLayout;
+
+        ActionBar actionBar = getSupportActionBar();
+        actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setHomeAsUpIndicator(android.R.drawable.ic_menu_close_clear_cancel);
+        actionBar.setDisplayHomeAsUpEnabled(true);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                this.finish();
+                return true;
+            case R.id.menu_help:
+                startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/artoolkitx/artoolkitx-calibration/wiki")));
+                return true;
+            case R.id.menu_print:
+                return true;
+            case R.id.menu_settings:
+                getSupportFragmentManager().beginTransaction()
+                        .replace(android.R.id.content, new CameraCalibrationSettingsFragment())
+                        .addToBackStack("Settings")
+                        .commit();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.main_menu, menu);
+        return true;
+    }
+
+}

Android/app/src/main/java/org/artoolkitx/arx/arxj/ARX_jni.java

@@ -0,0 +1,72 @@
+package org.artoolkitx.utilities.cameracalibration;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreferenceCompat;
+
+import org.artoolkitx.arx.arxj.ARX_jni;
+import org.libsdl.app.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CameraCalibrationSettingsFragment extends PreferenceFragmentCompat {
+    @Override
+    @SuppressWarnings("ConstantConditions")
+    public void onCreatePreferences(Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.cameracalibrationsettings, rootKey);
+        final ListPreference camera = (ListPreference)findPreference("camera");
+        final SwitchPreferenceCompat upload_canonical = (SwitchPreferenceCompat)findPreference("upload_canonical");
+        final SwitchPreferenceCompat upload_user = (SwitchPreferenceCompat)findPreference("upload_user");
+        final EditTextPreference upload_user_csuu = (EditTextPreference)findPreference("upload_user_csuu");
+        final EditTextPreference upload_user_csat= (EditTextPreference)findPreference("upload_user_csat");
+        if (Config.ARTOOLKITX_CSAT.isEmpty() || Config.ARTOOLKITX_CSUU.isEmpty()) {
+            upload_canonical.setVisible(false);
+            upload_user.setVisible(true);
+            upload_user_csuu.setVisible(true);
+            upload_user_csat.setVisible(true);
+        } else {
+            upload_canonical.setVisible(true);
+            upload_user.setVisible(false);
+            upload_user_csuu.setVisible(false);
+            upload_user_csat.setVisible(false);
+        }
+        setCameraInputList(camera);
+    }
+
+    @NonNull
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = super.onCreateView(inflater, container, savedInstanceState);
+        view.setBackgroundColor(Color.WHITE);
+        return view;
+    }
+
+    protected static void setCameraInputList(ListPreference lp) {
+        List<String> entriesList = new ArrayList<>();
+        List<String> entryValuesList = new ArrayList<>();
+        int cameraCount = ARX_jni.arwCreateVideoSourceInfoList("-module=Android");
+        for (int i = 0; i < cameraCount; i++) {
+            String[] name = new String[1];
+            String[] model = new String[1];
+            String[] UID = new String[1];
+            int[] flags = new int[1];
+            String[] openToken = new String[1];
+            if (ARX_jni.arwGetVideoSourceInfoListEntry(i, name, model, UID, flags, openToken)) {
+                entriesList.add(name[0]);
+                entryValuesList.add(openToken[0]);
+            }
+        }
+        lp.setEntries(entriesList.toArray(new String[0]));
+        lp.setEntryValues(entryValuesList.toArray(new String[0]));
+    }
+}

Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationActivity.java

@@ -0,0 +1,6 @@
+package org.artoolkitx.utilities.cameracalibration;
+public class Config
+{
+    public static final String ARTOOLKITX_CSAT = "";
+    public static final String ARTOOLKITX_CSUU = "";
+}

Android/app/src/main/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationSettingsFragment.java

@@ -50,14 +50,16 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.util.Hashtable;
 import java.util.Locale;
 
 
 /**
     SDL Activity
 */
-public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
+public class SDLActivity extends AppCompatActivity implements View.OnSystemUiVisibilityChangeListener {
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 3;
     private static final int SDL_MINOR_VERSION = 0;