Skip to content

Commit 2fea5a7

Browse files
CTKnightCTKnight
committed
clean up dependencies
1 parent cf43c03 commit 2fea5a7

File tree

15 files changed

+34
-84
lines changed

15 files changed

+34
-84
lines changed

‎app/build.gradle

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ apply plugin: 'kotlin-kapt'
55
android {
66
compileSdkVersion 28
77
defaultConfig {
8-
applicationId "me.ctknight.myapplication"
8+
applicationId "me.ctknight.vrdemo"
99
minSdkVersion 24
1010
targetSdkVersion 28
1111
versionCode 1
1212
versionName "1.0"
13-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1413
}
1514
buildTypes {
1615
release {
@@ -25,14 +24,8 @@ dependencies {
2524
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.10'
2625

2726
implementation 'androidx.appcompat:appcompat:1.0.0-alpha1'
28-
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
29-
30-
implementation "org.permissionsdispatcher:permissionsdispatcher:4.3.0"
31-
kapt "org.permissionsdispatcher:permissionsdispatcher-processor:4.3.0"
3227

3328
implementation 'com.google.ar:core:1.6.0'
34-
// Adds Google VR spatial audio support
35-
implementation 'com.google.vr:sdk-audio:1.180.0'
3629
// Required for all Google VR apps
3730
implementation 'com.google.vr:sdk-base:1.180.0'
3831

‎app/src/androidTest/java/me/ctknight/myapplication/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="me.ctknight.myapplication">
3+
package="me.ctknight.vrdemo">
44

55
<uses-permission android:name="android.permission.CAMERA" />
66
<!-- Required for vibration feedback when the trigger action is performed. -->
@@ -43,7 +43,7 @@
4343
android:name="com.google.ar.core"
4444
android:value="required" />
4545
<activity
46-
android:name=".ui.MainActivity"
46+
android:name="me.ctknight.vrdemo.ui.MainActivity"
4747
android:configChanges="orientation|keyboardHidden|screenSize|uiMode|navigation|density"
4848
android:enableVrMode="@string/gvr_vr_mode_component"
4949
android:resizeableActivity="false"

‎app/src/main/java/me/ctknight/myapplication/ModelData.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/ModelData.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.ctknight.myapplication
1+
package me.ctknight.vrdemo
22

33
import android.content.Context
44
import android.graphics.Bitmap
@@ -9,7 +9,7 @@ import android.opengl.Matrix
99
import de.javagl.obj.Mtl
1010
import de.javagl.obj.Obj
1111
import de.javagl.obj.ObjData
12-
import me.ctknight.myapplication.utils.ShaderUtil
12+
import me.ctknight.vrdemo.utils.ShaderUtil
1313
import java.io.IOException
1414
import java.nio.FloatBuffer
1515
import java.nio.ShortBuffer

‎app/src/main/java/me/ctknight/myapplication/Scene.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/Scene.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.ctknight.myapplication
1+
package me.ctknight.vrdemo
22

33
import android.opengl.Matrix
44
import android.util.LongSparseArray

‎app/src/main/java/me/ctknight/myapplication/VRRenderer.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/VRRenderer.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.ctknight.myapplication
1+
package me.ctknight.vrdemo
22

33
import android.content.Context
44
import android.opengl.GLES20
@@ -10,12 +10,12 @@ import com.google.vr.sdk.base.Eye
1010
import com.google.vr.sdk.base.GvrView
1111
import com.google.vr.sdk.base.HeadTransform
1212
import com.google.vr.sdk.base.Viewport
13-
import me.ctknight.myapplication.drawer.BackgroundRenderer
14-
import me.ctknight.myapplication.drawer.IDrawer
15-
import me.ctknight.myapplication.drawer.SimpleDrawer
16-
import me.ctknight.myapplication.ui.MainActivity
17-
import me.ctknight.myapplication.utils.ShaderUtil
18-
import me.ctknight.myapplication.utils.toViewPoseTranslation
13+
import me.ctknight.vrdemo.drawer.BackgroundRenderer
14+
import me.ctknight.vrdemo.drawer.IDrawer
15+
import me.ctknight.vrdemo.drawer.SimpleDrawer
16+
import me.ctknight.vrdemo.ui.MainActivity
17+
import me.ctknight.vrdemo.utils.ShaderUtil
18+
import me.ctknight.vrdemo.utils.toViewPoseTranslation
1919
import javax.microedition.khronos.egl.EGLConfig
2020

2121
class VRRenderer(

‎app/src/main/java/me/ctknight/myapplication/drawer/BackgroundRenderer.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/drawer/BackgroundRenderer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package me.ctknight.myapplication.drawer
16+
package me.ctknight.vrdemo.drawer
1717

1818
import android.content.Context
1919
import android.opengl.GLES11Ext
2020
import android.opengl.GLES20
2121
import com.google.ar.core.Frame
2222
import com.google.ar.core.Session
23-
import me.ctknight.myapplication.utils.ShaderUtil
23+
import me.ctknight.vrdemo.utils.ShaderUtil
2424
import java.io.IOException
2525
import java.nio.ByteBuffer
2626
import java.nio.ByteOrder

‎app/src/main/java/me/ctknight/myapplication/drawer/IDrawer.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/drawer/IDrawer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package me.ctknight.myapplication.drawer
1+
package me.ctknight.vrdemo.drawer
22

33
import android.opengl.GLES20
44

5-
import me.ctknight.myapplication.ModelData
6-
import me.ctknight.myapplication.Scene
5+
import me.ctknight.vrdemo.ModelData
6+
import me.ctknight.vrdemo.Scene
77

88
abstract class IDrawer {
99
abstract fun prepareOnGLThread()

‎app/src/main/java/me/ctknight/myapplication/drawer/SimpleDrawer.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/drawer/SimpleDrawer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package me.ctknight.myapplication.drawer
1+
package me.ctknight.vrdemo.drawer
22

33
import android.content.Context
44
import android.opengl.GLES20
55
import android.util.Log
6-
import me.ctknight.myapplication.ModelData
7-
import me.ctknight.myapplication.Scene
8-
import me.ctknight.myapplication.utils.ShaderUtil
6+
import me.ctknight.vrdemo.ModelData
7+
import me.ctknight.vrdemo.Scene
8+
import me.ctknight.vrdemo.utils.ShaderUtil
99
import java.io.IOException
1010

1111
// must be created in GL render thread

‎app/src/main/java/me/ctknight/myapplication/ui/MainActivity.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/ui/MainActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.ctknight.myapplication.ui
1+
package me.ctknight.vrdemo.ui
22

33
import android.Manifest
44
import android.os.Bundle
@@ -12,10 +12,10 @@ import com.google.ar.core.Session
1212
import com.google.ar.core.exceptions.*
1313
import com.google.vr.sdk.base.GvrActivity
1414
import de.javagl.obj.*
15-
import me.ctknight.myapplication.ModelData
16-
import me.ctknight.myapplication.R
17-
import me.ctknight.myapplication.Scene
18-
import me.ctknight.myapplication.VRRenderer
15+
import me.ctknight.vrdemo.ModelData
16+
import me.ctknight.vrdemo.R
17+
import me.ctknight.vrdemo.Scene
18+
import me.ctknight.vrdemo.VRRenderer
1919
import permissions.dispatcher.*
2020
import java.io.IOException
2121

‎app/src/main/java/me/ctknight/myapplication/ui/VRView.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/ui/VRView.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package me.ctknight.myapplication.ui
1+
package me.ctknight.vrdemo.ui
22

33
import android.content.Context
44
import android.util.AttributeSet
55
import com.google.vr.sdk.base.GvrView
6-
import me.ctknight.myapplication.VRRenderer
6+
import me.ctknight.vrdemo.VRRenderer
77

88
class VRView : GvrView {
99

‎app/src/main/java/me/ctknight/myapplication/utils/ArExtension.kt renamed to ‎app/src/main/java/me/ctknight/vrdemo/utils/ArExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.ctknight.myapplication.utils
1+
package me.ctknight.vrdemo.utils
22

33
import com.google.ar.core.Pose
44

‎app/src/main/java/me/ctknight/myapplication/utils/ShaderUtil.java renamed to ‎app/src/main/java/me/ctknight/vrdemo/utils/ShaderUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* See the License for the specific language governing permissions and
1313
* limitations under the License.
1414
*/
15-
package me.ctknight.myapplication.utils;
15+
package me.ctknight.vrdemo.utils;
1616

1717
import android.content.Context;
1818
import android.opengl.GLES20;

‎app/src/main/res/layout/activity_main.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
66
tools:context=".ui.MainActivity">
77

8-
<me.ctknight.myapplication.ui.VRView
8+
<me.ctknight.vrdemo.ui.VRView
99
android:id="@+id/surface_view"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent" />
1212

13-
</androidx.constraintlayout.widget.ConstraintLayout>
13+
</FrameLayout>

‎app/src/test/java/me/ctknight/myapplication/ExampleUnitTest.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)