Merge pull request #42 from ZafraniTechLLC/packagename

Removed all references of pubgapp
zafrani · May 20, 2017 · a83a1d6 · a83a1d6
2 parents dd65073 + 6c77806
commit a83a1d6
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 39 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
     defaultConfig {
-        applicationId "tech.zafrani.pubgapp"
+        applicationId "tech.zafrani.companionforpubg"
         minSdkVersion 18
         targetSdkVersion 25
         versionCode 2

diff --git a/...rani/pubgapp/ExampleInstrumentedTest.java → ...anionforpubg/ExampleInstrumentedTest.java b/...rani/pubgapp/ExampleInstrumentedTest.java → ...anionforpubg/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package tech.zafrani.pubgapp;
+package tech.zafrani.companionforpubg;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="tech.zafrani.pubgapp">
+          package="tech.zafrani.companionforpubg">
 
     <!--
          The ACCESS_COARSE/FINE_LOCATION permissions are not required to use

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/activities/DrawerActivity.java b/app/src/main/java/tech/zafrani/companionforpubg/activities/DrawerActivity.java
@@ -17,7 +17,7 @@
 import android.widget.FrameLayout;
 
 import tech.zafrani.companionforpubg.fragments.PUBGMapFragment;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.fragments.ItemFragment;
 import tech.zafrani.companionforpubg.utils.Constants;
 

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/activities/ItemDetailActivity.java b/app/src/main/java/tech/zafrani/companionforpubg/activities/ItemDetailActivity.java
@@ -8,7 +8,7 @@
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.fragments.ItemDetailsFragment;
 import tech.zafrani.companionforpubg.models.Item;
 

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/adapters/ItemListAdapter.java b/app/src/main/java/tech/zafrani/companionforpubg/adapters/ItemListAdapter.java
@@ -10,7 +10,7 @@
 
 import tech.zafrani.companionforpubg.adapters.viewholders.AmmunitionViewHolder;
 import tech.zafrani.companionforpubg.adapters.viewholders.VehicleViewHolder;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.adapters.viewholders.AttachmentsViewHolder;
 import tech.zafrani.companionforpubg.adapters.viewholders.ConsumablesViewHolder;
 import tech.zafrani.companionforpubg.adapters.viewholders.EquipmentViewHolder;

diff --git a/...rc/main/java/tech/zafrani/companionforpubg/adapters/viewholders/AmmunitionViewHolder.java b/...rc/main/java/tech/zafrani/companionforpubg/adapters/viewholders/AmmunitionViewHolder.java
@@ -9,7 +9,7 @@
 
 import com.squareup.picasso.Picasso;
 
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.models.Item;
 import tech.zafrani.companionforpubg.utils.Constants;
 

diff --git a/...c/main/java/tech/zafrani/companionforpubg/adapters/viewholders/AttachmentsViewHolder.java b/...c/main/java/tech/zafrani/companionforpubg/adapters/viewholders/AttachmentsViewHolder.java
@@ -12,7 +12,7 @@
 import tech.zafrani.companionforpubg.models.Damage;
 import tech.zafrani.companionforpubg.models.Item;
 import tech.zafrani.companionforpubg.utils.Constants;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 
 public class AttachmentsViewHolder extends ItemViewHolder {
     private final TextView nameTextView;

diff --git a/...c/main/java/tech/zafrani/companionforpubg/adapters/viewholders/ConsumablesViewHolder.java b/...c/main/java/tech/zafrani/companionforpubg/adapters/viewholders/ConsumablesViewHolder.java
@@ -11,7 +11,7 @@
 
 import tech.zafrani.companionforpubg.models.Item;
 import tech.zafrani.companionforpubg.utils.Constants;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 
 public class ConsumablesViewHolder extends ItemViewHolder{
 

diff --git a/...src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/EquipmentViewHolder.java b/...src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/EquipmentViewHolder.java
@@ -10,7 +10,7 @@
 import com.squareup.picasso.Picasso;
 
 import tech.zafrani.companionforpubg.models.Item;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.utils.Constants;
 
 public class EquipmentViewHolder extends ItemViewHolder {

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/VehicleViewHolder.java b/app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/VehicleViewHolder.java
@@ -9,7 +9,7 @@
 
 import com.squareup.picasso.Picasso;
 
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.models.Item;
 import tech.zafrani.companionforpubg.utils.Constants;
 

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/WeaponsViewHolder.java b/app/src/main/java/tech/zafrani/companionforpubg/adapters/viewholders/WeaponsViewHolder.java
@@ -11,7 +11,7 @@
 import tech.zafrani.companionforpubg.models.Damage;
 import tech.zafrani.companionforpubg.models.Item;
 import tech.zafrani.companionforpubg.utils.Constants;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 
 
 public class WeaponsViewHolder extends ItemViewHolder{

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/fragments/ItemFragment.java b/app/src/main/java/tech/zafrani/companionforpubg/fragments/ItemFragment.java
@@ -20,7 +20,7 @@
 
 import tech.zafrani.companionforpubg.models.Category;
 import tech.zafrani.companionforpubg.utils.FileUtil;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.adapters.ItemTabAdapter;
 import tech.zafrani.companionforpubg.models.Items;
 

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/fragments/ItemTabFragment.java b/app/src/main/java/tech/zafrani/companionforpubg/fragments/ItemTabFragment.java
@@ -14,7 +14,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.adapters.ItemListAdapter;
 import tech.zafrani.companionforpubg.models.Category;
 import tech.zafrani.companionforpubg.models.Item;

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/fragments/PUBGMapFragment.java b/app/src/main/java/tech/zafrani/companionforpubg/fragments/PUBGMapFragment.java
@@ -15,7 +15,7 @@
 import com.google.android.gms.maps.MapFragment;
 import com.google.android.gms.maps.OnMapReadyCallback;
 
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.maps.GoogleMapControllerImpl;
 
 

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/maps/actions/BoatAction.java b/app/src/main/java/tech/zafrani/companionforpubg/maps/actions/BoatAction.java
@@ -12,7 +12,7 @@
 
 import tech.zafrani.companionforpubg.maps.GoogleMapController;
 import tech.zafrani.companionforpubg.models.spawns.Spawns;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 
 public class BoatAction extends Action {
     @NonNull

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/maps/actions/DistanceAction.java b/app/src/main/java/tech/zafrani/companionforpubg/maps/actions/DistanceAction.java
@@ -13,7 +13,7 @@
 import com.google.android.gms.maps.model.PolylineOptions;
 
 import tech.zafrani.companionforpubg.maps.GoogleMapController;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 
 public class DistanceAction extends Action
         implements

diff --git a/app/src/main/java/tech/zafrani/companionforpubg/maps/actions/VehicleAction.java b/app/src/main/java/tech/zafrani/companionforpubg/maps/actions/VehicleAction.java
@@ -11,7 +11,7 @@
 import java.util.List;
 
 import tech.zafrani.companionforpubg.maps.GoogleMapController;
-import tech.zafrani.pubgapp.R;
+import tech.zafrani.companionforpubg.R;
 import tech.zafrani.companionforpubg.models.spawns.Spawns;
 
 public class VehicleAction extends Action {

diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
@@ -5,4 +5,4 @@
           android:name="com.google.android.gms.maps.SupportMapFragment"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
-          tools:context="tech.zafrani.pubgapp.MapsActivity"/>
+          tools:context="tech.zafrani.companionforpubg.MapsActivity"/>
diff --git a/app/src/main/res/values/google_maps_api.xml b/app/src/main/res/values/google_maps_api.xml
@@ -1,22 +1,3 @@
 <resources>
-    <!--
-    To get one, follow this link, follow the directions and press "Create" at the end:
-
-    https://console.developers.google.com/flows/enableapi?apiid=maps_android_backend&keyType=CLIENT_SIDE_ANDROID&r=A6:33:C5:64:79:16:12:85:A5:6B:3E:86:A7:EC:D2:96:85:F1:45:C4%3Btech.zafrani.pubgapp
-
-    You can also add your credentials to an existing key, using these values:
-
-    Package name:
-    A6:33:C5:64:79:16:12:85:A5:6B:3E:86:A7:EC:D2:96:85:F1:45:C4
-
-    SHA-1 certificate fingerprint:
-    A6:33:C5:64:79:16:12:85:A5:6B:3E:86:A7:EC:D2:96:85:F1:45:C4
-
-    Alternatively, follow the directions here:
-    https://developers.google.com/maps/documentation/android/start#get-key
-
-    Once you have your key (it starts with "AIza"), replace the "google_maps_key"
-    string in this file.
-    -->
     <string name="google_maps_key">@string/maps_api_key</string>
 </resources>
diff --git a/...tech/zafrani/pubgapp/ExampleUnitTest.java → ...ani/companionforpubg/ExampleUnitTest.java b/...tech/zafrani/pubgapp/ExampleUnitTest.java → ...ani/companionforpubg/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package tech.zafrani.pubgapp;
+package tech.zafrani.companionforpubg;
 
 import org.junit.Test;