Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 23 additions & 3 deletions ArJpctBaseLib/ArJpctBaseLib.iml
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,35 @@
<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/source/apt/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/source/apt/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" />
Expand Down Expand Up @@ -77,19 +85,31 @@
<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" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<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-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<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 17 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: __local_jars__:/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/libs/jpct_ae.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/libs/jpct_ae.jar:unspecified@jar" level="project" />
</component>
</module>
2 changes: 1 addition & 1 deletion ArJpctBaseLib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def versionName = '0.9'

android {
compileSdkVersion 17
buildToolsVersion '25.0.0'
buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 8
Expand Down
Original file line number Diff line number Diff line change
@@ -1,38 +1,35 @@
/* AUTO-GENERATED FILE. DO NOT MODIFY.
*
* This class was automatically generated by the
* aapt tool from the resource data it found. It
* gradle plugin from the resource data it found. It
* should not be modified by hand.
*/

package org.artoolkit.ar.jpct;

public final class R {
public static final class array {
public static int pref_entries_cameraIndex=0x7f040000;
public static int pref_entries_cameraResolution=0x7f040001;
public static int pref_entryValues_cameraIndex=0x7f040002;
public static int pref_entryValues_cameraResolution=0x7f040003;
}
public static final class attr {
public static int pref_entries_cameraIndex = 0x7f030001;
public static int pref_entries_cameraResolution = 0x7f030002;
public static int pref_entryValues_cameraIndex = 0x7f030003;
public static int pref_entryValues_cameraResolution = 0x7f030004;
}
public static final class drawable {
public static int settings=0x7f020000;
public static int settings = 0x7f090001;
}
public static final class id {
public static int settings=0x7f070000;
public static int settings = 0x7f0c0001;
}
public static final class menu {
public static int options=0x7f060000;
public static int options = 0x7f100001;
}
public static final class string {
public static int menuItem_settings=0x7f050000;
public static int prefCategory_title_camera=0x7f050001;
public static int pref_defaultValue_cameraResolution=0x7f050002;
public static int pref_title_cameraIndex=0x7f050003;
public static int pref_title_cameraResolution=0x7f050004;
public static int menuItem_settings = 0x7f150001;
public static int prefCategory_title_camera = 0x7f150002;
public static int pref_defaultValue_cameraResolution = 0x7f150003;
public static int pref_title_cameraIndex = 0x7f150004;
public static int pref_title_cameraResolution = 0x7f150005;
}
public static final class xml {
public static int preferences=0x7f030000;
public static int preferences = 0x7f190001;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 05 23:51:29 IST 2018
/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-hdpi/settings.png=/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/bundles/debug/res/drawable-hdpi-v4/settings.png
/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-mdpi/settings.png=/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/bundles/debug/res/drawable-mdpi-v4/settings.png
/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/menu/options.xml=/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/bundles/debug/res/menu/options.xml
/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-xhdpi/settings.png=/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/bundles/debug/res/drawable-xhdpi-v4/settings.png
/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/xml/preferences.xml=/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/bundles/debug/res/xml/preferences.xml
#Thu Sep 06 10:52:36 IST 2018
/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-mdpi/settings.png=/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/packaged_res/debug/drawable-mdpi-v4/settings.png
/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-xhdpi/settings.png=/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/packaged_res/debug/drawable-xhdpi-v4/settings.png
/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/menu/options.xml=/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/packaged_res/debug/menu/options.xml
/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-hdpi/settings.png=/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/packaged_res/debug/drawable-hdpi-v4/settings.png
/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/xml/preferences.xml=/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/intermediates/packaged_res/debug/xml/preferences.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res"/><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/rs/debug"/><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/debug/res"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res"><file name="options" path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/menu/options.xml" qualifiers="" type="menu"/><file name="preferences" path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/xml/preferences.xml" qualifiers="" type="xml"/><file path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/values/strings.xml" qualifiers=""><string-array name="pref_entryValues_cameraIndex">
<item>0</item>
</string-array><string-array name="pref_entries_cameraResolution">
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res"/><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/rs/debug"/><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res"><file path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/values/strings.xml" qualifiers=""><string name="menuItem_settings">Settings</string><string name="prefCategory_title_camera">Camera settings</string><string name="pref_title_cameraResolution">Camera resolution</string><string-array name="pref_entries_cameraResolution">
<item>320x240 (4:3)</item>
</string-array><string-array name="pref_entries_cameraIndex">
<item>Rear camera</item>
</string-array><string name="pref_title_cameraIndex">Change camera</string><string name="pref_title_cameraResolution">Camera resolution</string><string name="pref_defaultValue_cameraResolution">320x240</string><string name="menuItem_settings">Settings</string><string-array name="pref_entryValues_cameraResolution">
</string-array><string-array name="pref_entryValues_cameraResolution">
<item>320x240</item>
</string-array><string name="prefCategory_title_camera">Camera settings</string></file><file name="settings" path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-hdpi/settings.png" qualifiers="hdpi-v4" type="drawable"/><file name="settings" path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-mdpi/settings.png" qualifiers="mdpi-v4" type="drawable"/><file name="settings" path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-xhdpi/settings.png" qualifiers="xhdpi-v4" type="drawable"/></source><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/rs/debug"/><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/home/vips/AndroidStudioProjects/DBar/ArJpctBaseLib/src/debug/res"/></dataSet><mergedItems/></merger>
</string-array><string name="pref_defaultValue_cameraResolution">320x240</string><string name="pref_title_cameraIndex">Change camera</string><string-array name="pref_entries_cameraIndex">
<item>Rear camera</item>
</string-array><string-array name="pref_entryValues_cameraIndex">
<item>0</item>
</string-array></file><file name="settings" path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-xhdpi/settings.png" qualifiers="xhdpi-v4" type="drawable"/><file name="preferences" path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/xml/preferences.xml" qualifiers="" type="xml"/><file name="settings" path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-hdpi/settings.png" qualifiers="hdpi-v4" type="drawable"/><file name="options" path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/menu/options.xml" qualifiers="" type="menu"/><file name="settings" path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/main/res/drawable-mdpi/settings.png" qualifiers="mdpi-v4" type="drawable"/></source><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/rs/debug"/><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/build/generated/res/resValues/debug"/></dataSet><dataSet config="debug$Generated" generated="true"><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/debug/res"/></dataSet><dataSet config="debug" generated-set="debug$Generated"><source path="/Users/rohitramaswamy/AndroidStudioProjects/DBar/ArJpctBaseLib/src/debug/res"/></dataSet><mergedItems/></merger>
2 changes: 1 addition & 1 deletion DBar.iml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Loading