From 7dbe03fca942b590db8e3e4f54d06e4ca09d5151 Mon Sep 17 00:00:00 2001 From: Jacob Wood <50378486+Jacusaurus@users.noreply.github.com> Date: Wed, 25 Nov 2020 16:56:32 -0500 Subject: [PATCH] Changed package name to be more generic. May change name from "borderlands3dpscalculator" at a later date. --- .../borderlands3dpscalculator/ExampleInstrumentedTest.java | 2 +- .../activities/MainActivityTest.java | 4 +--- app/src/main/AndroidManifest.xml | 6 +++--- .../activities/CameraActivity.java | 6 +++--- .../borderlands3dpscalculator/activities/MainActivity.java | 6 +++--- .../borderlands3dpscalculator/models/Weapon.java | 2 +- .../borderlands3dpscalculator/models/WeaponTest.java | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-) rename app/src/androidTest/java/com/{romaindeschenes => borderlandsdpscalculator}/borderlands3dpscalculator/ExampleInstrumentedTest.java (92%) rename app/src/androidTest/java/com/{romaindeschenes => borderlandsdpscalculator}/borderlands3dpscalculator/activities/MainActivityTest.java (83%) rename app/src/main/java/com/{romaindeschenes => borderlandsdpscalculator}/borderlands3dpscalculator/activities/CameraActivity.java (98%) rename app/src/main/java/com/{romaindeschenes => borderlandsdpscalculator}/borderlands3dpscalculator/activities/MainActivity.java (95%) rename app/src/main/java/com/{romaindeschenes => borderlandsdpscalculator}/borderlands3dpscalculator/models/Weapon.java (98%) rename app/src/test/java/com/{romaindeschenes => borderlandsdpscalculator}/borderlands3dpscalculator/models/WeaponTest.java (91%) diff --git a/app/src/androidTest/java/com/romaindeschenes/borderlands3dpscalculator/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/ExampleInstrumentedTest.java similarity index 92% rename from app/src/androidTest/java/com/romaindeschenes/borderlands3dpscalculator/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/ExampleInstrumentedTest.java index caa5db2..d3c4484 100644 --- a/app/src/androidTest/java/com/romaindeschenes/borderlands3dpscalculator/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.romaindeschenes.borderlands3dpscalculator; +package com.borderlandsdpscalculator.borderlands3dpscalculator; import android.content.Context; diff --git a/app/src/androidTest/java/com/romaindeschenes/borderlands3dpscalculator/activities/MainActivityTest.java b/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivityTest.java similarity index 83% rename from app/src/androidTest/java/com/romaindeschenes/borderlands3dpscalculator/activities/MainActivityTest.java rename to app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivityTest.java index 23aa14e..af92638 100644 --- a/app/src/androidTest/java/com/romaindeschenes/borderlands3dpscalculator/activities/MainActivityTest.java +++ b/app/src/androidTest/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivityTest.java @@ -1,4 +1,4 @@ -package com.romaindeschenes.borderlands3dpscalculator.activities; +package com.borderlandsdpscalculator.borderlands3dpscalculator.activities; import org.junit.Rule; import org.junit.Test; @@ -8,8 +8,6 @@ import androidx.test.filters.LargeTest; import androidx.test.rule.ActivityTestRule; -import static org.junit.Assert.*; - @RunWith(AndroidJUnit4.class) @LargeTest public class MainActivityTest { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7dd6d7a..d677089 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.borderlandsdpscalculator.borderlands3dpscalculator"> @@ -11,8 +11,8 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> - - + + diff --git a/app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/activities/CameraActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/CameraActivity.java similarity index 98% rename from app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/activities/CameraActivity.java rename to app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/CameraActivity.java index 89fec97..ee4daab 100644 --- a/app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/activities/CameraActivity.java +++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/CameraActivity.java @@ -1,4 +1,4 @@ -package com.romaindeschenes.borderlands3dpscalculator.activities; +package com.borderlandsdpscalculator.borderlands3dpscalculator.activities; import androidx.appcompat.app.AppCompatActivity; import androidx.core.app.ActivityCompat; @@ -20,8 +20,8 @@ import com.google.android.gms.vision.Detector; import com.google.android.gms.vision.text.TextBlock; import com.google.android.gms.vision.text.TextRecognizer; -import com.romaindeschenes.borderlands3dpscalculator.R; -import com.romaindeschenes.borderlands3dpscalculator.models.Weapon; +import com.borderlandsdpscalculator.borderlands3dpscalculator.R; +import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon; import java.io.IOException; import java.util.ArrayList; diff --git a/app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/activities/MainActivity.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java similarity index 95% rename from app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/activities/MainActivity.java rename to app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java index 1991047..0cf35ee 100644 --- a/app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/activities/MainActivity.java +++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/activities/MainActivity.java @@ -1,4 +1,4 @@ -package com.romaindeschenes.borderlands3dpscalculator.activities; +package com.borderlandsdpscalculator.borderlands3dpscalculator.activities; import androidx.appcompat.app.AppCompatActivity; @@ -12,8 +12,8 @@ import android.widget.EditText; import android.widget.TextView; -import com.romaindeschenes.borderlands3dpscalculator.R; -import com.romaindeschenes.borderlands3dpscalculator.models.Weapon; +import com.borderlandsdpscalculator.borderlands3dpscalculator.R; +import com.borderlandsdpscalculator.borderlands3dpscalculator.models.Weapon; public class MainActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/models/Weapon.java b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java similarity index 98% rename from app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/models/Weapon.java rename to app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java index 6597e66..6fb181a 100644 --- a/app/src/main/java/com/romaindeschenes/borderlands3dpscalculator/models/Weapon.java +++ b/app/src/main/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/Weapon.java @@ -1,4 +1,4 @@ -package com.romaindeschenes.borderlands3dpscalculator.models; +package com.borderlandsdpscalculator.borderlands3dpscalculator.models; import java.io.Serializable; diff --git a/app/src/test/java/com/romaindeschenes/borderlands3dpscalculator/models/WeaponTest.java b/app/src/test/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/WeaponTest.java similarity index 91% rename from app/src/test/java/com/romaindeschenes/borderlands3dpscalculator/models/WeaponTest.java rename to app/src/test/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/WeaponTest.java index 9ae3a6b..6a99888 100644 --- a/app/src/test/java/com/romaindeschenes/borderlands3dpscalculator/models/WeaponTest.java +++ b/app/src/test/java/com/borderlandsdpscalculator/borderlands3dpscalculator/models/WeaponTest.java @@ -1,4 +1,4 @@ -package com.romaindeschenes.borderlands3dpscalculator.models; +package com.borderlandsdpscalculator.borderlands3dpscalculator.models; import org.junit.Before; import org.junit.Test;