From 0c89d68834a2be1aacd1b19deb28e829f11ce22a Mon Sep 17 00:00:00 2001 From: Remy Mellet Date: Thu, 11 Mar 2021 19:53:40 +0100 Subject: [PATCH] Rename package from hw demo to remmel + basic logo --- README.md | 4 +- Recorder3D/build.gradle | 2 +- .../recorder/ImageUtilsInstrumentedTest.java | 4 +- .../recorder3d}/recorder/PlyUtilsTest.java | 6 +- Recorder3D/src/main/AndroidManifest.xml | 37 +------ .../common/ConnectAppMarketActivity.java | 2 +- .../demos/common/PermissionManager.java | 2 +- .../recorder3d}/ChooseActivity.java | 15 ++- .../recorder3d}/measure/MeasureActivity.java | 4 +- .../measure/MeasureRenderManager.java | 4 +- .../recorder3d}/recorder/CsvPose.java | 2 +- .../recorder3d}/recorder/FpsMeter.java | 2 +- .../recorder3d}/recorder/ImageUtils.java | 2 +- .../recorder3d}/recorder/IoUtils.java | 15 +-- .../recorder3d}/recorder/PlyProp.java | 2 +- .../recorder3d}/recorder/PlyUtils.java | 2 +- .../recorder/RecorderActivity.java | 14 +-- .../recorder/RecorderRenderManager.java | 9 +- .../recorder3d}/recorder/Timer.java | 2 +- .../preferences/AppSharedPreference.java | 4 +- .../RecorderPreferenceActivity.java | 5 +- .../RecorderPreferenceFragment.java | 4 +- .../src/main/res/layout/activity_choose.xml | 11 +- .../main/res/layout/measure_activity_main.xml | 2 +- .../res/layout/recorder_activity_main.xml | 2 +- .../src/main/res/mipmap/ic_launcher.png | Bin 3563 -> 7214 bytes .../recorder3d}/recorder/BulkDemoTest.java | 2 +- .../recorder3d}/recorder/CsvPoseTest.java | 5 +- .../recorder3d}/recorder/ImageUtilsTest.java | 2 +- .../recorder3d}/recorder/RobolectricTest.java | 3 +- build.gradle | 2 +- logo.svg | 103 ++++++++++++++++++ 32 files changed, 170 insertions(+), 105 deletions(-) rename Recorder3D/src/androidTest/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/ImageUtilsInstrumentedTest.java (96%) rename Recorder3D/src/androidTest/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/PlyUtilsTest.java (92%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos => remmel/recorder3d}/ChooseActivity.java (86%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/measure/MeasureActivity.java (98%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/measure/MeasureRenderManager.java (98%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/CsvPose.java (98%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/FpsMeter.java (92%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/ImageUtils.java (99%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/IoUtils.java (80%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/PlyProp.java (98%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/PlyUtils.java (99%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/RecorderActivity.java (93%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/RecorderRenderManager.java (97%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/Timer.java (92%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/preferences/AppSharedPreference.java (96%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/preferences/RecorderPreferenceActivity.java (94%) rename Recorder3D/src/main/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/preferences/RecorderPreferenceFragment.java (92%) rename Recorder3D/src/test/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/BulkDemoTest.java (96%) rename Recorder3D/src/test/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/CsvPoseTest.java (83%) rename Recorder3D/src/test/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/ImageUtilsTest.java (99%) rename Recorder3D/src/test/java/com/{huawei/arengine/demos/java => remmel/recorder3d}/recorder/RobolectricTest.java (94%) create mode 100644 logo.svg diff --git a/README.md b/README.md index cfb440f..10e5f36 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,9 @@ I added 2 features : ## Recorder - ![](HwAREngineDemo/src/test/resources/00000012_depth.png) + ![](Recorder3D/src/test/resources/00000012_depth.png) -Every seconds save the rgb and depth image, and its pose in the /storage/emulated/0/Android/data/com.huawei.arenginesdk.demo/files/ +Every seconds save the rgb and depth image, and its pose in the /storage/emulated/0/Android/data/com.remmel.recorder3d/files/ Features : - Save depth (240x180 - fancy png, binary depth16) diff --git a/Recorder3D/build.gradle b/Recorder3D/build.gradle index cdda776..51c989e 100644 --- a/Recorder3D/build.gradle +++ b/Recorder3D/build.gradle @@ -4,7 +4,7 @@ android { compileSdkVersion 28 defaultConfig { - applicationId "com.huawei.arenginesdk.demo" + applicationId "com.remmel.recorder3d" minSdkVersion 26 targetSdkVersion 27 versionCode 2 diff --git a/Recorder3D/src/androidTest/java/com/huawei/arengine/demos/java/recorder/ImageUtilsInstrumentedTest.java b/Recorder3D/src/androidTest/java/com/remmel/recorder3d/recorder/ImageUtilsInstrumentedTest.java similarity index 96% rename from Recorder3D/src/androidTest/java/com/huawei/arengine/demos/java/recorder/ImageUtilsInstrumentedTest.java rename to Recorder3D/src/androidTest/java/com/remmel/recorder3d/recorder/ImageUtilsInstrumentedTest.java index c5204fc..92eaa52 100644 --- a/Recorder3D/src/androidTest/java/com/huawei/arengine/demos/java/recorder/ImageUtilsInstrumentedTest.java +++ b/Recorder3D/src/androidTest/java/com/remmel/recorder3d/recorder/ImageUtilsInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.graphics.Bitmap; @@ -20,7 +20,7 @@ public class ImageUtilsInstrumentedTest { private static final String TAG = ImageUtilsInstrumentedTest.class.getSimpleName(); private static final File DIR = InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalFilesDir("test"); -// private static final String DIR = "/storage/emulated/0/Android/data/com.huawei.arenginesdk.demo/files/test"; +// private static final String DIR = "/storage/emulated/0/Android/data/com.remmel.recorder3d/files/test"; private static final String IMAGE_YUVNV21 = DIR + "/00000012_image.bin"; private static final String TUMDEPTH = DIR + "/tum/1305031102.160407.png"; private static final int IMG_W = 1440; diff --git a/Recorder3D/src/androidTest/java/com/huawei/arengine/demos/java/recorder/PlyUtilsTest.java b/Recorder3D/src/androidTest/java/com/remmel/recorder3d/recorder/PlyUtilsTest.java similarity index 92% rename from Recorder3D/src/androidTest/java/com/huawei/arengine/demos/java/recorder/PlyUtilsTest.java rename to Recorder3D/src/androidTest/java/com/remmel/recorder3d/recorder/PlyUtilsTest.java index 20a1bb4..a816590 100644 --- a/Recorder3D/src/androidTest/java/com/huawei/arengine/demos/java/recorder/PlyUtilsTest.java +++ b/Recorder3D/src/androidTest/java/com/remmel/recorder3d/recorder/PlyUtilsTest.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.graphics.Bitmap; import android.util.Log; @@ -17,7 +17,7 @@ public class PlyUtilsTest { private static final String TAG = PlyUtilsTest.class.getSimpleName(); - private static final String DIR_DATASET = "/storage/emulated/0/Android/data/com.huawei.arenginesdk.demo/files/2020-12-17_141504"; + private static final String DIR_DATASET = "/storage/emulated/0/Android/data/com.remmel.recorder3d/files/2020-12-17_141504"; private static final File DIR = InstrumentationRegistry.getInstrumentation().getTargetContext().getExternalFilesDir("test"); private static final String DEPTH16 = DIR + "/00000012_depth16.bin"; private static final String IMAGE_YUVNV21 = DIR + "/00000012_image.bin"; @@ -60,7 +60,7 @@ public void mergePly() throws IOException { @Test public void bulkWritePly() throws IOException { - PlyUtils.bulkWritePly(new File("/storage/emulated/0/Android/data/com.huawei.arenginesdk.demo/files/2021-02-15_025939")); + PlyUtils.bulkWritePly(new File("/storage/emulated/0/Android/data/com.remmel.recorder3d/files/2021-02-15_025939")); } @Test diff --git a/Recorder3D/src/main/AndroidManifest.xml b/Recorder3D/src/main/AndroidManifest.xml index 590ad53..19ffe7a 100644 --- a/Recorder3D/src/main/AndroidManifest.xml +++ b/Recorder3D/src/main/AndroidManifest.xml @@ -1,7 +1,5 @@ + package="com.remmel.recorder3d"> @@ -33,42 +31,17 @@ android:value="androidhwext:style/Theme.Emui" /> - - - - - diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/common/ConnectAppMarketActivity.java b/Recorder3D/src/main/java/com/huawei/arengine/demos/common/ConnectAppMarketActivity.java index bd37c7e..f25995d 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/common/ConnectAppMarketActivity.java +++ b/Recorder3D/src/main/java/com/huawei/arengine/demos/common/ConnectAppMarketActivity.java @@ -24,8 +24,8 @@ import android.os.Bundle; import android.util.Log; -import com.huawei.arengine.demos.R; import com.huawei.hiar.exceptions.ARFatalException; +import com.remmel.recorder3d.R; /** * This activity is used to redirect the user to AppGallery and install the AR Engine server. diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/common/PermissionManager.java b/Recorder3D/src/main/java/com/huawei/arengine/demos/common/PermissionManager.java index 4b16243..6f5e8ec 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/common/PermissionManager.java +++ b/Recorder3D/src/main/java/com/huawei/arengine/demos/common/PermissionManager.java @@ -24,7 +24,7 @@ import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; -import com.huawei.arengine.demos.ChooseActivity; +import com.remmel.recorder3d.ChooseActivity; import java.util.ArrayList; import java.util.List; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/ChooseActivity.java b/Recorder3D/src/main/java/com/remmel/recorder3d/ChooseActivity.java similarity index 86% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/ChooseActivity.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/ChooseActivity.java index b6a5a05..37c939b 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/ChooseActivity.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/ChooseActivity.java @@ -14,23 +14,26 @@ * limitations under the License. */ -package com.huawei.arengine.demos; +package com.remmel.recorder3d; import android.app.Activity; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.util.Log; import android.view.View; import android.view.Window; import android.view.WindowManager; +import android.widget.TextView; import android.widget.Toast; import androidx.annotation.Nullable; +import com.remmel.recorder3d.R; import com.huawei.arengine.demos.common.PermissionManager; -import com.huawei.arengine.demos.java.measure.MeasureActivity; -import com.huawei.arengine.demos.java.recorder.RecorderActivity; -import com.huawei.arengine.demos.java.recorder.preferences.RecorderPreferenceActivity; +import com.remmel.recorder3d.measure.MeasureActivity; +import com.remmel.recorder3d.recorder.RecorderActivity; +import com.remmel.recorder3d.recorder.preferences.RecorderPreferenceActivity; /** * This class provides the permission verification and sub-AR example redirection functions. @@ -42,6 +45,7 @@ public class ChooseActivity extends Activity { private static final String TAG = ChooseActivity.class.getSimpleName(); private boolean isFirstClick = true; + TextView textView; @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -51,6 +55,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_choose); // AR Engine requires the camera permission. PermissionManager.checkPermission(this); + + textView = findViewById(R.id.txt_choose); + textView.setText(BuildConfig.APPLICATION_ID + "/" + BuildConfig.VERSION_NAME); } @Override diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/measure/MeasureActivity.java b/Recorder3D/src/main/java/com/remmel/recorder3d/measure/MeasureActivity.java similarity index 98% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/measure/MeasureActivity.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/measure/MeasureActivity.java index facb668..c9e4fdb 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/measure/MeasureActivity.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/measure/MeasureActivity.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.measure; +package com.remmel.recorder3d.measure; import android.app.Activity; import android.content.Intent; @@ -8,7 +8,7 @@ import android.view.View; import android.widget.Toast; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import com.huawei.arengine.demos.common.DisplayRotationManager; import com.huawei.hiar.ARConfigBase; import com.huawei.hiar.AREnginesApk; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/measure/MeasureRenderManager.java b/Recorder3D/src/main/java/com/remmel/recorder3d/measure/MeasureRenderManager.java similarity index 98% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/measure/MeasureRenderManager.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/measure/MeasureRenderManager.java index 8284e6d..4226732 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/measure/MeasureRenderManager.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/measure/MeasureRenderManager.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.measure; +package com.remmel.recorder3d.measure; import android.app.Activity; import android.content.Context; @@ -8,7 +8,7 @@ import android.util.Log; import android.widget.TextView; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import com.huawei.arengine.demos.common.ArDemoRuntimeException; import com.huawei.arengine.demos.common.DisplayRotationManager; import com.huawei.arengine.demos.common.TextureDisplay; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/CsvPose.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/CsvPose.java similarity index 98% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/CsvPose.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/CsvPose.java index 3e00fb6..73df4e4 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/CsvPose.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/CsvPose.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import com.huawei.hiar.ARPose; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/FpsMeter.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/FpsMeter.java similarity index 92% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/FpsMeter.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/FpsMeter.java index d56150b..1d082eb 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/FpsMeter.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/FpsMeter.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; public class FpsMeter { protected short frames = 0; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/ImageUtils.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/ImageUtils.java similarity index 99% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/ImageUtils.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/ImageUtils.java index 37f6617..be4b9ea 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/ImageUtils.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/ImageUtils.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/IoUtils.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/IoUtils.java similarity index 80% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/IoUtils.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/IoUtils.java index d8d54cd..1459622 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/IoUtils.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/IoUtils.java @@ -1,33 +1,24 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.graphics.Bitmap; import android.graphics.ImageFormat; import android.graphics.Rect; import android.graphics.YuvImage; -import android.media.Image; import android.util.Log; import java.io.BufferedOutputStream; -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; -import java.io.PrintStream; -import java.nio.ByteBuffer; -import java.nio.file.Files; //Multiple paths -//mContext.getFilesDir() /data/user/0/com.huawei.arenginesdk.demo/files/remy/myimage302.jpg +//mContext.getFilesDir() /data/user/0/com.remmel.recorder3d/files/remy/myimage302.jpg //Environment.getExternalStorageDirectory() /storage/emulated/0/remy/myimage460.jpg //Environment.getDataDirectory() /data/remy/myimage262.jpg //Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); /storage/emulated/0/Download/remy/myimage128.jpg -/// this.mContext.getExternalFilesDir("remy") /storage/emulated/0/Android/data/com.huawei.arenginesdk.demo/files/remy/myimage264.jpg +/// this.mContext.getExternalFilesDir("remy") /storage/emulated/0/Android/data/com.remmel.recorder3d/files/remy/myimage264.jpg public class IoUtils { private static final String TAG = IoUtils.class.getSimpleName(); diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/PlyProp.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/PlyProp.java similarity index 98% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/PlyProp.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/PlyProp.java index 4d1f149..be0280e 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/PlyProp.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/PlyProp.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/PlyUtils.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/PlyUtils.java similarity index 99% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/PlyUtils.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/PlyUtils.java index c36d96c..95fa5f7 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/PlyUtils.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/PlyUtils.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.graphics.Bitmap; import android.util.Log; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/RecorderActivity.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/RecorderActivity.java similarity index 93% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/RecorderActivity.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/RecorderActivity.java index 09dcbf0..982122d 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/RecorderActivity.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/RecorderActivity.java @@ -1,16 +1,9 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.app.Activity; -import android.content.Context; import android.content.Intent; -import android.content.SharedPreferences; -import android.graphics.SurfaceTexture; -import android.hardware.camera2.CameraAccessException; -import android.hardware.camera2.CameraCharacteristics; -import android.hardware.camera2.CameraManager; import android.opengl.GLSurfaceView; import android.os.Bundle; -import android.preference.PreferenceManager; import android.util.Log; import android.util.Size; import android.view.KeyEvent; @@ -18,10 +11,9 @@ import android.widget.Button; import android.widget.Toast; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import com.huawei.arengine.demos.common.DisplayRotationManager; -import com.huawei.arengine.demos.java.recorder.preferences.AppSharedPreference; -import com.huawei.hiar.ARConfigBase; +import com.remmel.recorder3d.recorder.preferences.AppSharedPreference; import com.huawei.hiar.AREnginesApk; import com.huawei.hiar.ARSession; import com.huawei.hiar.ARWorldTrackingConfig; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/RecorderRenderManager.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/RecorderRenderManager.java similarity index 97% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/RecorderRenderManager.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/RecorderRenderManager.java index a75b919..d7b728a 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/RecorderRenderManager.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/RecorderRenderManager.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; import android.app.Activity; import android.content.Context; @@ -14,11 +14,11 @@ import android.widget.TextView; import android.widget.Toast; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import com.huawei.arengine.demos.common.ArDemoRuntimeException; import com.huawei.arengine.demos.common.DisplayRotationManager; import com.huawei.arengine.demos.common.TextureDisplay; -import com.huawei.arengine.demos.java.recorder.preferences.AppSharedPreference; +import com.remmel.recorder3d.recorder.preferences.AppSharedPreference; import com.huawei.hiar.ARCamera; import com.huawei.hiar.ARCameraIntrinsics; import com.huawei.hiar.ARFrame; @@ -28,11 +28,8 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/Timer.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/Timer.java similarity index 92% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/Timer.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/Timer.java index 0847cf5..f01a473 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/Timer.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/Timer.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder; +package com.remmel.recorder3d.recorder; /** * Usage: diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/AppSharedPreference.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/AppSharedPreference.java similarity index 96% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/AppSharedPreference.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/AppSharedPreference.java index b02b2e1..8547d87 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/AppSharedPreference.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/AppSharedPreference.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder.preferences; +package com.remmel.recorder3d.recorder.preferences; import android.content.Context; import android.content.SharedPreferences; @@ -7,7 +7,7 @@ import androidx.annotation.StringRes; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import com.huawei.hiar.ARConfigBase; public class AppSharedPreference { diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/RecorderPreferenceActivity.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/RecorderPreferenceActivity.java similarity index 94% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/RecorderPreferenceActivity.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/RecorderPreferenceActivity.java index 09a0e50..440c83b 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/RecorderPreferenceActivity.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/RecorderPreferenceActivity.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder.preferences; +package com.remmel.recorder3d.recorder.preferences; import android.content.Context; import android.graphics.SurfaceTexture; @@ -6,7 +6,6 @@ import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraManager; import android.os.Bundle; -import android.util.Log; import android.util.Size; import android.view.Window; import android.view.WindowManager; @@ -14,7 +13,7 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import java.util.ArrayList; import java.util.List; diff --git a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/RecorderPreferenceFragment.java b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/RecorderPreferenceFragment.java similarity index 92% rename from Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/RecorderPreferenceFragment.java rename to Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/RecorderPreferenceFragment.java index b40c729..102cac2 100644 --- a/Recorder3D/src/main/java/com/huawei/arengine/demos/java/recorder/preferences/RecorderPreferenceFragment.java +++ b/Recorder3D/src/main/java/com/remmel/recorder3d/recorder/preferences/RecorderPreferenceFragment.java @@ -1,4 +1,4 @@ -package com.huawei.arengine.demos.java.recorder.preferences; +package com.remmel.recorder3d.recorder.preferences; import android.os.Bundle; import android.util.Size; @@ -6,7 +6,7 @@ import androidx.preference.ListPreference; import androidx.preference.PreferenceFragmentCompat; -import com.huawei.arengine.demos.R; +import com.remmel.recorder3d.R; import java.util.List; diff --git a/Recorder3D/src/main/res/layout/activity_choose.xml b/Recorder3D/src/main/res/layout/activity_choose.xml index f0a244f..3724178 100644 --- a/Recorder3D/src/main/res/layout/activity_choose.xml +++ b/Recorder3D/src/main/res/layout/activity_choose.xml @@ -20,11 +20,11 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:layout_marginBottom="20dp" - android:textAllCaps="false" android:background="@drawable/selector_reset" android:gravity="center" android:onClick="onClick" android:text="Recorder" + android:textAllCaps="false" android:textColor="@color/white" />