Wrap settings fragment in activity. Add toolbar to main screen and connect buttons.

Author: philip-lamb

Android/app/build.gradle

@@ -50,5 +50,6 @@ dependencies {
     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

@@ -91,6 +91,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/java/org/artoolkitx/utilities/cameracalibration/CameraCalibrationActivity.java

@@ -8,7 +8,6 @@
 import android.view.MenuItem;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
 
 import org.libsdl.app.R;
 import org.libsdl.app.SDLActivity;
@@ -17,14 +16,18 @@ 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);
+        findViewById(R.id.btn_cancel).setOnClickListener(view -> {
+            CameraCalibrationActivity.handleBackButton();
+        });
+        findViewById(R.id.btn_add).setOnClickListener(view -> {
+            CameraCalibrationActivity.handleAddButton();
+        });
     }
 
+    public static native void handleBackButton();
+    public static native void handleAddButton();
+
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
@@ -37,10 +40,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             case R.id.menu_print:
                 return true;
             case R.id.menu_settings:
-                getSupportFragmentManager().beginTransaction()
-                        .replace(android.R.id.content, new CameraCalibrationSettingsFragment())
-                        .addToBackStack("Settings")
-                        .commit();
+                startActivity(new Intent(this, CameraCalibrationSettingsActivity.class));
                 return true;
         }
         return super.onOptionsItemSelected(item);

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

@@ -0,0 +1,26 @@
+package org.artoolkitx.utilities.cameracalibration;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import org.libsdl.app.R;
+
+public class CameraCalibrationSettingsActivity extends AppCompatActivity
+{
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.cameracalibrationsettingsactivity);
+
+        Toolbar settingsToolbar = (Toolbar) findViewById(R.id.settings_toolbar);
+        setSupportActionBar(settingsToolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowHomeEnabled(true);
+
+        getSupportFragmentManager().beginTransaction()
+            .replace(R.id.settings_content, new CameraCalibrationSettingsFragment())
+            .commit();
+    }
+}

Android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -51,6 +51,7 @@
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 import java.util.Hashtable;
 import java.util.Locale;
@@ -398,7 +399,9 @@ public void onClick(DialogInterface dialog,int id) {
         // Set up the surface
         mSurface = createSDLSurface(this);
 
-        mLayout = new RelativeLayout(this);
+        //mLayout = new RelativeLayout(this);
+        setContentView(R.layout.cameracalibrationactivity);
+        mLayout = findViewById(R.id.content);
         mLayout.addView(mSurface);
 
         // Get our current screen orientation and pass it down.
@@ -415,7 +418,7 @@ public void onClick(DialogInterface dialog,int id) {
         } catch(Exception ignored) {
         }
 
-        setContentView(mLayout);
+        //setContentView(mLayout);
 
         setWindowStyle(false);