Merge pull request #248 from the3deer/fix/247

content manager fixed #247

Author: andresoviedo

CHANGELOG.md

@@ -3,12 +3,16 @@ ChangeLog
 
 (f) fixed, (i) improved, (n) new feature
 
+- 4.1.1 (31/12/2024)
+    - (i) Android SDK and dependencies updated (API 35)  
+    - (f) Fixed Android Content Manager Loader
+    - (f) Fixed shader issue
 - 4.1.0 (22/10/2024)
     - (n) Gltf Animations
     - (n) Android Preferences for Settings
     - (n) Loader: Integrated Khronos repository
     - (i) Android view using Fragments
-    - (i) Android SDK and dependencies updated
+    - (i) Android SDK and dependencies updated (API 34)
 - 4.0.0 (04/09/2022)
     - (i) rebranding to org.the3deer
     - (i) master branch renamed to main

README.md

@@ -13,7 +13,7 @@ The purpose of this application is to learn and share how to draw using OpenGL l
 * GLTF format (gltf): https://www.khronos.org/gltf/
 
 
-News (22/10/2024)
+News (31/12/2024)
 =================
 
 * Gltf Animations :D
@@ -25,7 +25,7 @@ News (22/10/2024)
 Demo
 ====
 
-Checkout this to see the features of the application: https://www.youtube.com/watch?v=PV92DKohXXk
+Checkout this to see the features of the application (old video): https://www.youtube.com/watch?v=PV92DKohXXk
 
 
 Android Market
@@ -40,7 +40,7 @@ Notice
 
 * Collada support is limited. Collada renderer currently supports a maximum of 60 bones.
 * In order to see models in 3D virtual reality, you need red-cyan and/or VR glasses
-* If you have any issue in general,please open an issue and attach model if possible, specifying Android version and Device model.  
+* If you have any issue in general, please open an issue and attach model if possible, specifying Android version and Device model.  
 
 
 About
@@ -52,27 +52,19 @@ The main purpose of this app is to show how to draw in android using the OpenGL
 So please, don't expect this application to be much richer or nicer than the ones already published in the app store,
 but at least it's opened to anyone who wants to contribute or don't want to start a similar project from scratch.
 
-As this is my first android app and Im still learning the OpenGL 2.0 language, it is highly probable that there are bugs;
+As this is my first android app and Im still learning the OpenGL language, it is highly probable that there are bugs;
 but I will try to continue improving the app and adding more features. So please send me your comments, suggestions or
 complains by opening an [issue](https://github.com/the3deer/android-3D-model-viewer/issues).
 
 The app comes with some included 3D models that have different licenses.
 
 
-Whats next
-==========
-
-* Improve support for glTF standard format
-* VR without glasses (on hold)
-* Augmented reality
-
-
 Features
 ========
 
-  - [x] Supports >= Android 4.1 (Ice Cream Sandwich) - Min API Level 16 -> Target API Level 31
-  - [x] OpenGL ES 2.0 API
-  - [x] Multiple Formats: 
+  - [x] Supports >= Android Lollipop 5.0 (Min API Level 21 -> Target API Level 35)
+  - [x] Android API: OpenGL ES 2.0, Fragments, Preferences, Content Manager 
+  - [x] 3D Formats: 
     - [x] OBJ (wavefront)
     - [x] STL (STereoLithography)
     - [x] DAE (Collada-BETA)
@@ -115,6 +107,10 @@ You can install the application in either of these ways:
   * APK: [app-release.apk](app/build/outputs/apk/release/app-release.apk)
   * Source code: clone the repository, compile with gradle and install with adb
 
+Once you open the application, you can load any of the supported model formats.
+
+  * It's recommended to have all the model resources packed in a .zip file
+
 
 Compilation
 ===========

app/build.gradle

@@ -3,12 +3,12 @@ plugins {
 }
 
 android {
-    compileSdk 34
+    compileSdk 35
 
     defaultConfig {
         applicationId "org.andresoviedo.dddmodel2"
         minSdk 21
-        targetSdk 34
+        targetSdk 35
 
         multiDexEnabled true
     }
@@ -41,11 +41,11 @@ android {
 
 dependencies {
     implementation 'javax.inject:javax.inject:1'
-    implementation 'androidx.core:core:1.13.1'
-    implementation 'androidx.fragment:fragment:1.8.3'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-android:2.8.6'
+    implementation 'androidx.core:core:1.15.0'
+    implementation 'androidx.fragment:fragment:1.8.5'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-android:2.8.7'
     implementation 'androidx.preference:preference:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
     implementation 'com.google.android.material:material:1.12.0'
     implementation project(':engine')

app/release/app-release.apk renamed to app/build/outputs/apk/release/app-release.apk

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-    android:versionCode="35"
-    android:versionName="5.0.0">
+    android:versionCode="36"
+    android:versionName="4.1.1">
 
     <uses-sdk
         tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
@@ -20,7 +20,10 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" 
 	    android:largeHeap="true"
-        android:requestLegacyExternalStorage="true">
+        android:requestLegacyExternalStorage="true"
+        android:allowCrossUidActivitySwitchFromBelow="false"
+        tools:targetApi="35">
+
         <activity
             android:name="org.the3deer.app.model3D.MainActivity"
 	        android:exported="true"

app/debug/output-metadata.json

@@ -1,12 +1,16 @@
 package org.the3deer.app.model3D;
 
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.Toast;
 
 import androidx.activity.OnBackPressedCallback;
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
@@ -15,6 +19,8 @@
 import org.the3deer.android_3d_model_engine.ModelEngine;
 import org.the3deer.android_3d_model_engine.ModelFragment;
 import org.the3deer.android_3d_model_engine.ModelViewModel;
+import org.the3deer.app.model3D.view.HelpDialogFragment;
+import org.the3deer.app.model3D.view.LoadContentDialog;
 import org.the3deer.app.model3D.view.MainDialogFragment;
 
 /**
@@ -33,6 +39,9 @@ public class MainActivity extends AppCompatActivity implements DialogInterface.O
 	// variables
 	private Fragment fragmentMenu;
 	private ModelViewModel viewModel;
+	private ActivityResultLauncher<String> mGetContent;
+
+	private LoadContentDialog loadContentDialog = new LoadContentDialog(this);
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -54,7 +63,11 @@ protected void onCreate(Bundle savedInstanceState) {
             // Do something with the result.
             if ("load".equals(action)) {
                 showDialog();
-            } else if ("back".equals(action)){
+            } else if ("help".equals(action)){
+				showHelpDialog();
+			} else if ("pick".equals(action)){
+				loadContentDialog.start();
+			} else if ("back".equals(action)){
 				showDialog();
 			}
         });
@@ -66,18 +79,38 @@ public void handleOnBackPressed() {
 			}
 		});
 
+		ActivityResultContracts.GetContent contract = loadContentDialog.getActivityContract();
+
+		mGetContent = registerForActivityResult(contract,
+				uri -> {
+					try {
+						// Handle the returned Uri
+						Log.i(TAG, "Uri: " + uri);
+						loadContentDialog.load(uri);
+					} catch (Exception e) {
+						Log.e(TAG, "Exception loading uri: " + uri, e);
+						Toast.makeText(getApplication(), "Problem loading " + uri.toString()+
+										"\n"+e.getMessage(), Toast.LENGTH_LONG).show();
+					}
+});
+
 		showDialog();
 		//launchModelRendererActivity(Uri.parse("android://org.the3deer.dddmodel2/assets/models/teapot.obj"), "0");
 	}
 
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+	}
 
-
-	/*@Override
+/*@Override
 	public void onBackPressed() {
 		super.onBackPressed();
 		showDialog();
 	}*/
 
+
+
 	private void showDialog(){
 		//Log.i("MainActivity", "setUp: "+getSupportFragmentManager().findFragmentByTag("model"));
 		if (getSupportFragmentManager().findFragmentByTag("dialog") == null) {
@@ -86,11 +119,20 @@ private void showDialog(){
 		}
 	}
 
+	public void showHelpDialog() {
+		HelpDialogFragment fragment = HelpDialogFragment.newInstance(R.string.alert_dialog_help_title);
+		fragment.show(getSupportFragmentManager(), "help");
+	}
+
 	@Override
 	public void onDismiss(DialogInterface dialog) {
 		//showDialog();
 	}
 
+	public void pick(String mimeType){
+		this.mGetContent.launch(mimeType);
+	}
+
 	private void launchModelRendererActivity(Uri uri, String type) {
 
 		try {

app/src/main/AndroidManifest.xml

@@ -0,0 +1,88 @@
+package org.the3deer.app.model3D.view;
+
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.Toast;
+
+import org.andresoviedo.dddmodel2.R;
+import org.the3deer.android_3d_model_engine.ModelFragment;
+import org.the3deer.app.model3D.demo.EarCutDemoFragment;
+import org.the3deer.app.model3D.demo.GlyphsDemoFragment;
+import org.the3deer.util.android.ContentUtils;
+import org.the3deer.util.android.DialogFragment;
+import org.the3deer.util.view.TextActivity;
+
+public class HelpDialogFragment extends DialogFragment {
+
+    private enum Action {
+        DEMOS, HELP, ABOUT
+    }
+
+    public static HelpDialogFragment newInstance(int title) {
+        HelpDialogFragment frag = new HelpDialogFragment();
+        Bundle args = new Bundle();
+        args.putInt("title", title);
+        args.putInt("items", R.array.dialog_help_items);
+        frag.setArguments(args);
+        return frag;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialogI, int position) {
+        try {
+            Action action = Action.values()[position];
+            switch (action) {
+                case DEMOS:
+                    ContentUtils.showListDialog(activity, "Demos List", new String[]{"Simple Objects", "GUI", "Geometry"}, (DialogInterface dialog, int which) -> {
+                        if (which == 0) {
+                            ModelFragment modelFragment2 = ModelFragment.newInstance(null, null, true);
+                            activity.getSupportFragmentManager().beginTransaction()
+                                    .replace(R.id.main_container, modelFragment2, "demo_0")
+                                    .setReorderingAllowed(true)
+                                    .addToBackStack(null)
+                                    .commit();
+                            dismiss();
+                        } else if (which == 1) {
+                            ModelFragment modelFragment2 = new GlyphsDemoFragment();
+                            activity.getSupportFragmentManager().beginTransaction()
+                                    .replace(R.id.main_container, modelFragment2, "demo_1")
+                                    .setReorderingAllowed(true)
+                                    .addToBackStack(null)
+                                    .commit();
+                            dismiss();
+                        } else if (which == 2) {
+                            ModelFragment modelFragment2 = new EarCutDemoFragment();
+                            activity.getSupportFragmentManager().beginTransaction()
+                                    .replace(R.id.main_container, modelFragment2, "demo_2")
+                                    .setReorderingAllowed(true)
+                                    .addToBackStack(null)
+                                    .commit();
+                            dismiss();
+                        }
+                    });
+                    break;
+                case HELP:
+                    Intent helpIntent = new Intent(activity, TextActivity.class);
+                    helpIntent.putExtra("title", items[position]);
+                    helpIntent.putExtra("text", getResources().getString(R.string.help_text));
+                    startActivity(helpIntent);
+                    break;
+                case ABOUT:
+                    Intent aboutIntent = new Intent(activity, TextActivity.class);
+                    aboutIntent.putExtra("title", items[position]);
+                    aboutIntent.putExtra("text", getResources().getString(R.string.about_text));
+                    startActivity(aboutIntent);
+                    break;
+                default:
+                    Toast.makeText(activity, "Unrecognized action '" + action + "'",
+                            Toast.LENGTH_LONG).show();
+                    break;
+            }
+        } catch (Exception ex) {
+            Log.e("MainDialogFragment",ex.getMessage(),ex);
+            Toast.makeText(activity, ex.getMessage(), Toast.LENGTH_LONG).show();
+        }
+    }
+}