Skip to content

Commit f1d0497

Browse files
andresoviedoandresoviedo
authored
Merge pull request #139 from andresoviedo/3.0
full reengineering
2 parents 07e81fc + 6e05cf5 commit f1d0497

File tree

156 files changed

+17665
-10083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+17665
-10083
lines changed

‎README.md

Lines changed: 288 additions & 279 deletions
Large diffs are not rendered by default.

‎android-3D-model-viewer.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

‎app/app.iml

Lines changed: 25 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android-3D-model-viewer" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
66
<option name="GRADLE_PROJECT_PATH" value=":app" />
7+
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.0.0" />
8+
<option name="LAST_KNOWN_AGP_VERSION" value="4.0.0" />
79
</configuration>
810
</facet>
911
<facet type="android" name="Android">
@@ -17,31 +19,28 @@
1719
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1820
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1921
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
20-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
23+
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
2124
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
2225
</configuration>
2326
</facet>
2427
</component>
2528
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
26-
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
29+
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
30+
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
2831
<exclude-output />
2932
<content url="file://$MODULE_DIR$">
30-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
3336
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
4544
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -84,47 +83,17 @@
8483
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8584
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8685
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
99-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processing-tools" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
110-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
112-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
113-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
86+
<excludeFolder url="file://$MODULE_DIR$/build" />
11787
</content>
118-
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
88+
<orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
11989
<orderEntry type="sourceFolder" forTests="false" />
120-
<orderEntry type="library" name="Gradle: com.android.support:collections:28.0.0@jar" level="project" />
121-
<orderEntry type="library" name="Gradle: android.arch.core:common:1.1.1@jar" level="project" />
122-
<orderEntry type="library" name="Gradle: com.android.support:versionedparcelable-28.0.0" level="project" />
123-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:28.0.0@jar" level="project" />
124-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.1.1@jar" level="project" />
125-
<orderEntry type="library" name="Gradle: com.android.support:support-compat-28.0.0" level="project" />
126-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.1.1" level="project" />
90+
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
91+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-common:2.0.0@jar" level="project" />
92+
<orderEntry type="library" name="Gradle: androidx.arch.core:core-common:2.0.0@jar" level="project" />
93+
<orderEntry type="library" name="Gradle: androidx.annotation:annotation:1.0.0@jar" level="project" />
94+
<orderEntry type="library" name="Gradle: androidx.core:core:1.0.0@aar" level="project" />
95+
<orderEntry type="library" name="Gradle: androidx.versionedparcelable:versionedparcelable:1.0.0@aar" level="project" />
96+
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-runtime:2.0.0@aar" level="project" />
12797
<orderEntry type="module" module-name="engine" />
128-
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
12998
</component>
13099
</module>

‎app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 29
55

66
defaultConfig {
77
applicationId "org.andresoviedo.dddmodel2"
88
minSdkVersion 14
9-
targetSdkVersion 28
9+
targetSdkVersion 29
1010
}
1111

1212
signingConfigs {
@@ -32,6 +32,6 @@ android {
3232
}
3333

3434
dependencies {
35-
implementation 'com.android.support:support-compat:28.0.0'
35+
implementation 'androidx.core:core:1.0.0'
3636
implementation project(':engine')
3737
}

‎app/build/outputs/apk/release/app-release.apk

42.2 KB
Binary file not shown.

‎app/src/main/AndroidManifest.xml

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,51 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="org.andresoviedo.dddmodel2"
5-
android:versionCode="23"
6-
android:versionName="2.7.0" >
7-
8-
<uses-sdk
9-
android:minSdkVersion="14"
10-
android:targetSdkVersion="28"
11-
tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
12-
13-
<uses-feature
14-
android:glEsVersion="0x00020000"
15-
android:required="true" />
16-
17-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
18-
<uses-permission android:name="android.permission.INTERNET" />
19-
20-
<application
21-
android:allowBackup="true"
22-
android:icon="@drawable/ic_launcher"
23-
android:label="@string/app_name"
24-
android:theme="@style/AppTheme" >
25-
<activity
26-
android:name="org.andresoviedo.app.model3D.MainActivity"
27-
android:label="@string/app_name" >
28-
<intent-filter>
29-
<action android:name="android.intent.action.MAIN" />
30-
31-
<category android:name="android.intent.category.LAUNCHER" />
32-
</intent-filter>
33-
</activity>
34-
<activity
35-
android:name="org.andresoviedo.app.model3D.view.MenuActivity"
36-
android:label="@string/title_activity_menu"
37-
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
38-
</activity>
39-
<activity
40-
android:name="org.andresoviedo.util.view.TextActivity"
41-
android:label="@string/title_activity_text"
42-
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
43-
</activity>
44-
<activity
45-
android:name="org.andresoviedo.app.model3D.view.ModelActivity"
46-
android:label="@string/title_activity_model"
47-
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
48-
49-
<!-- android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" -->
50-
</activity>
51-
</application>
52-
53-
</manifest>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="org.andresoviedo.dddmodel2"
5+
android:versionCode="24"
6+
android:versionName="2.7.0">
7+
8+
<uses-sdk
9+
tools:overrideLibrary="android.support.compat, android.arch.lifecycle" />
10+
11+
<uses-feature
12+
android:glEsVersion="0x00020000"
13+
android:required="true" />
14+
15+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
16+
<uses-permission android:name="android.permission.INTERNET" />
17+
18+
<application
19+
android:allowBackup="true"
20+
android:icon="@drawable/ic_launcher"
21+
android:label="@string/app_name"
22+
android:theme="@style/AppTheme" android:largeHeap="true">
23+
<activity
24+
android:name="org.andresoviedo.app.model3D.MainActivity"
25+
android:label="@string/app_name" >
26+
<intent-filter>
27+
<action android:name="android.intent.action.MAIN" />
28+
29+
<category android:name="android.intent.category.LAUNCHER" />
30+
</intent-filter>
31+
</activity>
32+
<activity
33+
android:name="org.andresoviedo.app.model3D.view.MenuActivity"
34+
android:label="@string/title_activity_menu"
35+
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
36+
</activity>
37+
<activity
38+
android:name="org.andresoviedo.util.view.TextActivity"
39+
android:label="@string/title_activity_text"
40+
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
41+
</activity>
42+
<activity
43+
android:name="org.andresoviedo.app.model3D.view.ModelActivity"
44+
android:label="@string/title_activity_model"
45+
android:parentActivityName="org.andresoviedo.app.model3D.MainActivity" >
46+
47+
<!-- android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen" -->
48+
</activity>
49+
</application>
50+
51+
</manifest>

‎app/src/main/assets/models/triangle.obj renamed to ‎app/src/main/assets/models/triangles.obj

File renamed without changes.

0 commit comments

Comments
 (0)