package util moved to root

LuoGuoXin · Sep 27, 2018 · 5f34487 · 5f34487
1 parent dc5c534
commit 5f34487
Show file tree

Hide file tree

Showing 48 changed files with 851 additions and 451 deletions.
diff --git a/android-3D-model-viewer.iml b/android-3D-model-viewer.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="android-3D-model-viewer" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
diff --git a/app/app.iml b/app/app.iml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <afterSyncTasks>
+          <task>generateDebugSources</task>
+        </afterSyncTasks>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processing-tools" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.1.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.1.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.0" level="project" />
+    <orderEntry type="library" name="Gradle: android-android-27" level="project" />
+  </component>
+</module>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
             android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
         </activity>
         <activity
-            android:name="org.andresoviedo.app.util.view.TextActivity"
+            android:name="org.andresoviedo.util.view.TextActivity"
             android:label="@string/title_activity_text"
             android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
         </activity>

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/MainActivity.java b/app/src/main/java/org/andresoviedo/app/model3D/MainActivity.java
@@ -7,7 +7,7 @@
 
 import org.andresoviedo.app.model3D.view.MenuActivity;
 import org.andresoviedo.app.model3D.view.ModelActivity;
-import org.andresoviedo.app.util.android.AndroidURLStreamHandlerFactory;
+import org.andresoviedo.util.android.AndroidURLStreamHandlerFactory;
 import org.andresoviedo.dddmodel2.R;
 
 import java.net.URL;
@@ -26,7 +26,7 @@ public class MainActivity extends Activity {
 
     // Custom handler: org/andresoviedo/app/util/url/android/Handler.class
     static {
-        System.setProperty("java.protocol.handler.pkgs", "org.andresoviedo.app.util.android");
+        System.setProperty("java.protocol.handler.pkgs", "org.andresoviedo.util.android");
         URL.setURLStreamHandlerFactory(new AndroidURLStreamHandlerFactory());
     }
 

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/animation/JointTransform.java b/app/src/main/java/org/andresoviedo/app/model3D/animation/JointTransform.java
@@ -3,7 +3,7 @@
 import android.opengl.Matrix;
 
 import org.andresoviedo.app.model3D.services.collada.entities.Vector3f;
-import org.andresoviedo.app.util.math.Quaternion;
+import org.andresoviedo.util.math.Quaternion;
 
 /**
  * 

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/collision/CollisionDetection.java b/app/src/main/java/org/andresoviedo/app/model3D/collision/CollisionDetection.java
@@ -6,7 +6,7 @@
 import org.andresoviedo.app.model3D.entities.BoundingBox;
 import org.andresoviedo.app.model3D.model.Object3DData;
 import org.andresoviedo.app.model3D.view.ModelRenderer;
-import org.andresoviedo.app.util.math.Math3DUtils;
+import org.andresoviedo.util.math.Math3DUtils;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/collision/Octree.java b/app/src/main/java/org/andresoviedo/app/model3D/collision/Octree.java
@@ -5,7 +5,7 @@
 
 import org.andresoviedo.app.model3D.entities.BoundingBox;
 import org.andresoviedo.app.model3D.model.Object3DData;
-import org.andresoviedo.app.util.math.Math3DUtils;
+import org.andresoviedo.util.math.Math3DUtils;
 
 import java.nio.FloatBuffer;
 import java.nio.IntBuffer;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/model/Object3DBuilder.java b/app/src/main/java/org/andresoviedo/app/model3D/model/Object3DBuilder.java
@@ -13,9 +13,9 @@
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader.Material;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader.Materials;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader.Tuple3;
-import org.andresoviedo.app.util.android.ContentUtils;
-import org.andresoviedo.app.util.io.IOUtils;
-import org.andresoviedo.app.util.math.Math3DUtils;
+import org.andresoviedo.util.android.ContentUtils;
+import org.andresoviedo.util.io.IOUtils;
+import org.andresoviedo.util.math.Math3DUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/model/Object3DData.java b/app/src/main/java/org/andresoviedo/app/model3D/model/Object3DData.java
@@ -12,7 +12,7 @@
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader.Faces;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader.Materials;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader.Tuple3;
-import org.andresoviedo.app.util.math.Math3DUtils;
+import org.andresoviedo.util.math.Math3DUtils;
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/ExampleSceneLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/ExampleSceneLoader.java
@@ -10,8 +10,8 @@
 import org.andresoviedo.app.model3D.model.Object3DBuilder;
 import org.andresoviedo.app.model3D.model.Object3DData;
 import org.andresoviedo.app.model3D.view.ModelActivity;
-import org.andresoviedo.app.util.android.ContentUtils;
-import org.andresoviedo.app.util.io.IOUtils;
+import org.andresoviedo.util.android.ContentUtils;
+import org.andresoviedo.util.io.IOUtils;
 
 import java.io.InputStream;
 import java.util.ArrayList;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/SceneLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/SceneLoader.java
@@ -14,8 +14,8 @@
 import org.andresoviedo.app.model3D.services.stl.STLLoaderTask;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoaderTask;
 import org.andresoviedo.app.model3D.view.ModelActivity;
-import org.andresoviedo.app.util.android.ContentUtils;
-import org.andresoviedo.app.util.io.IOUtils;
+import org.andresoviedo.util.android.ContentUtils;
+import org.andresoviedo.util.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -86,6 +86,10 @@ public class SceneLoader implements LoaderTask.Callback {
      * Toggle collision detection
      */
     private boolean isCollision = false;
+    /**
+     * Toggle 3d anaglyph
+     */
+    private boolean isAnaglyph = false;
     /**
      * Object selected by the user
      */
@@ -307,6 +311,10 @@ public boolean isCollision() {
         return isCollision;
     }
 
+    public boolean isAnaglyph() {
+        return isAnaglyph;
+    }
+
     @Override
     public void onStart(){
         ContentUtils.setThreadActivity(parent);

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/AnimationLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/AnimationLoader.java
@@ -6,7 +6,7 @@
 import org.andresoviedo.app.model3D.services.collada.entities.AnimationData;
 import org.andresoviedo.app.model3D.services.collada.entities.JointTransformData;
 import org.andresoviedo.app.model3D.services.collada.entities.KeyFrameData;
-import org.andresoviedo.app.util.xml.XmlNode;
+import org.andresoviedo.util.xml.XmlNode;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/ColladaLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/ColladaLoader.java
@@ -19,8 +19,8 @@
 import org.andresoviedo.app.model3D.services.collada.entities.SkeletonData;
 import org.andresoviedo.app.model3D.services.collada.entities.SkinningData;
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader;
-import org.andresoviedo.app.util.xml.XmlNode;
-import org.andresoviedo.app.util.xml.XmlParser;
+import org.andresoviedo.util.xml.XmlNode;
+import org.andresoviedo.util.xml.XmlParser;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/GeometryLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/GeometryLoader.java
@@ -12,7 +12,7 @@
 import org.andresoviedo.app.model3D.services.collada.entities.Vector4f;
 import org.andresoviedo.app.model3D.services.collada.entities.Vertex;
 import org.andresoviedo.app.model3D.services.collada.entities.VertexSkinData;
-import org.andresoviedo.app.util.xml.XmlNode;
+import org.andresoviedo.util.xml.XmlNode;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/SkeletonLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/SkeletonLoader.java
@@ -6,8 +6,8 @@
 import org.andresoviedo.app.model3D.services.collada.entities.JointData;
 import org.andresoviedo.app.model3D.services.collada.entities.SkeletonData;
 import org.andresoviedo.app.model3D.services.collada.entities.SkinningData;
-import org.andresoviedo.app.util.math.Math3DUtils;
-import org.andresoviedo.app.util.xml.XmlNode;
+import org.andresoviedo.util.math.Math3DUtils;
+import org.andresoviedo.util.xml.XmlNode;
 
 import java.util.List;
 

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/SkinLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/collada/loader/SkinLoader.java
@@ -5,8 +5,8 @@
 
 import org.andresoviedo.app.model3D.services.collada.entities.SkinningData;
 import org.andresoviedo.app.model3D.services.collada.entities.VertexSkinData;
-import org.andresoviedo.app.util.math.Math3DUtils;
-import org.andresoviedo.app.util.xml.XmlNode;
+import org.andresoviedo.util.math.Math3DUtils;
+import org.andresoviedo.util.xml.XmlNode;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/stl/STLASCIIParser.java b/app/src/main/java/org/andresoviedo/app/model3D/services/stl/STLASCIIParser.java
@@ -13,7 +13,7 @@
 
 // External imports
 
-import org.andresoviedo.app.util.io.ProgressMonitorInputStream;
+import org.andresoviedo.util.io.ProgressMonitorInputStream;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/stl/STLBinaryParser.java b/app/src/main/java/org/andresoviedo/app/model3D/services/stl/STLBinaryParser.java
@@ -13,7 +13,7 @@
 
 // External imports
 
-import org.andresoviedo.app.util.io.ProgressMonitorInputStream;
+import org.andresoviedo.util.io.ProgressMonitorInputStream;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/wavefront/WavefrontLoader.java b/app/src/main/java/org/andresoviedo/app/model3D/services/wavefront/WavefrontLoader.java
@@ -34,7 +34,7 @@ a display list (modelDispList), which is drawn by calls to
 import android.support.annotation.Nullable;
 import android.util.Log;
 
-import org.andresoviedo.app.util.android.ContentUtils;
+import org.andresoviedo.util.android.ContentUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/services/wavefront/WavefrontLoaderTask.java b/app/src/main/java/org/andresoviedo/app/model3D/services/wavefront/WavefrontLoaderTask.java
@@ -8,7 +8,7 @@
 import org.andresoviedo.app.model3D.model.Object3DBuilder;
 import org.andresoviedo.app.model3D.model.Object3DData;
 import org.andresoviedo.app.model3D.services.LoaderTask;
-import org.andresoviedo.app.util.android.ContentUtils;
+import org.andresoviedo.util.android.ContentUtils;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/view/DemoActivity.java b/app/src/main/java/org/andresoviedo/app/model3D/view/DemoActivity.java
@@ -18,7 +18,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.andresoviedo.app.util.android.ContentUtils;
+import org.andresoviedo.util.android.ContentUtils;
 import org.andresoviedo.dddmodel2.R;
 
 import java.io.IOException;

diff --git a/app/src/main/java/org/andresoviedo/app/model3D/view/MenuActivity.java b/app/src/main/java/org/andresoviedo/app/model3D/view/MenuActivity.java
@@ -16,11 +16,11 @@
 import android.widget.Toast;
 
 import org.andresoviedo.app.model3D.services.wavefront.WavefrontLoader;
-import org.andresoviedo.app.util.android.AndroidUtils;
-import org.andresoviedo.app.util.android.AssetUtils;
-import org.andresoviedo.app.util.android.ContentUtils;
-import org.andresoviedo.app.util.android.FileUtils;
-import org.andresoviedo.app.util.view.TextActivity;
+import org.andresoviedo.util.android.AndroidUtils;
+import org.andresoviedo.util.android.AssetUtils;
+import org.andresoviedo.util.android.ContentUtils;
+import org.andresoviedo.util.android.FileUtils;
+import org.andresoviedo.util.view.TextActivity;
 import org.andresoviedo.dddmodel2.R;
 
 import java.io.File;