Mystere A reouvrance

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="app.ara.activities">
+    package="app.mar.activities">
 
     <uses-permission android:name="android.permission.CAMERA" />
 
@@ -20,38 +20,38 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".ARActivity" />
+        <activity android:name="app.mar.activities.ARActivity" />
         <activity
-            android:name=".ImageViewerActivity"
+            android:name="app.mar.activities.ImageViewerActivity"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
-            android:name=".ResourceListActivity"
+            android:name="app.mar.activities.ResourceListActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_resource_list"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".SettingsActivity"
+            android:name="app.mar.activities.SettingsActivity"
             android:configChanges="orientation|keyboardHidden"
             android:label="@string/title_activity_settings"
             android:screenOrientation="portrait" />
-        <activity android:name=".TransferActivity" />
-        <activity android:name=".EndActivity" />
+        <activity android:name="app.mar.activities.TransferActivity" />
+        <activity android:name="app.mar.activities.EndActivity" />
         <activity
-            android:name=".MARMenuActivity"
+            android:name="app.mar.activities.MARMenuActivity"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".SEMenuActivity"
+            android:name="app.mar.activities.SEMenuActivity"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait">
             >
         </activity>
         <activity
-            android:name=".PuzzleActivity"
+            android:name="app.mar.activities.PuzzleActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/title_activity_puzzle"
             android:theme="@style/FullscreenTheme" />
-        <activity android:name=".PermissionActivity">
+        <activity android:name="app.mar.activities.PermissionActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -59,15 +59,15 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MediaViewerAcitvity"
+            android:name="app.mar.activities.MediaViewerAcitvity"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
-            android:name=".ModelViewerActivity"
+            android:name="app.mar.activities.ModelViewerActivity"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
-            android:name=".InfoActivity"
+            android:name="app.mar.activities.InfoActivity"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
-        <activity android:name=".CreditsActivity"
+        <activity android:name="app.mar.activities.CreditsActivity"
                   android:theme="@style/AppTheme.NoActionBar.Fullscreen" ></activity>
     </application>
 </manifest>

app/src/main/java/app/ara/activities/ARActivity.java → app/src/main/java/app/mar/activities/ARActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
@@ -21,16 +21,16 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 
-import app.ara.ui.CameraPreview;
-import app.ara.utils.AndroidResources;
-import app.ara.utils.Settings;
-import app.ara.utils.app.brest.game.Area;
-import app.ara.utils.app.brest.game.Game;
-import app.ara.utils.app.brest.game.LocatedResources;
-import app.ara.utils.app.brest.game.Place;
-import app.ara.utils.app.brest.game.Resource;
-import app.ara.utils.app.brest.game.Stage;
-import app.ara.utils.geometry.GPSPoint;
+import app.mar.ui.CameraPreview;
+import app.mar.utils.AndroidResources;
+import app.mar.utils.Settings;
+import app.mar.utils.app.brest.game.Area;
+import app.mar.utils.app.brest.game.Game;
+import app.mar.utils.app.brest.game.LocatedResources;
+import app.mar.utils.app.brest.game.Place;
+import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.app.brest.game.Stage;
+import app.mar.utils.geometry.GPSPoint;
 import min3d.core.Object3d;
 import min3d.core.Object3dContainer;
 import min3d.core.RendererActivity;

app/src/main/java/app/ara/activities/CreditsActivity.java → app/src/main/java/app/mar/activities/CreditsActivity.java

@@ -1,11 +1,11 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Html;
 import android.widget.TextView;
 
-import app.ara.utils.FontChangeCrawler;
+import app.mar.utils.FontChangeCrawler;
 
 public class CreditsActivity extends AppCompatActivity {
 

app/src/main/java/app/ara/activities/EndActivity.java → app/src/main/java/app/mar/activities/EndActivity.java

@@ -1,9 +1,9 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import app.ara.utils.FontChangeCrawler;
+import app.mar.utils.FontChangeCrawler;
 
 public class EndActivity extends Activity {
 

app/src/main/java/app/ara/activities/IViewerActivity.java → app/src/main/java/app/mar/activities/IViewerActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 /**
  * Created by ptitcois on 04/07/17.

app/src/main/java/app/ara/activities/ImageViewerActivity.java → app/src/main/java/app/mar/activities/ImageViewerActivity.java

@@ -1,28 +1,19 @@
-package app.ara.activities;
+package app.mar.activities;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
-import android.support.v4.view.MotionEventCompat;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import app.ara.utils.AndroidResources;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Resource;
-import app.ara.utils.files.FileManager;
-import app.ara.utils.geometry.Point;
-import min3d.core.Object3d;
-import min3d.core.RendererActivity;
-import min3d.vos.CameraVo;
-import min3d.vos.Light;
+import app.mar.utils.AndroidResources;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.files.FileManager;
 import uk.co.senab.photoview.PhotoViewAttacher;
 
 /**

app/src/main/java/app/ara/activities/InfoActivity.java → app/src/main/java/app/mar/activities/InfoActivity.java

@@ -1,13 +1,11 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Resource;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Resource;
 
 public class InfoActivity extends AppCompatActivity  implements IViewerActivity{
 

app/src/main/java/app/ara/activities/MARMenuActivity.java → app/src/main/java/app/mar/activities/MARMenuActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.content.res.Resources;
 import android.util.TypedValue;

app/src/main/java/app/ara/activities/MediaViewerAcitvity.java → app/src/main/java/app/mar/activities/MediaViewerAcitvity.java

@@ -1,14 +1,11 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.Button;
 import android.widget.ImageButton;
@@ -16,12 +13,10 @@ import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import java.util.Timer;
-
-import app.ara.ui.MediaView;
-import app.ara.utils.AndroidResources;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Resource;
+import app.mar.ui.MediaView;
+import app.mar.utils.AndroidResources;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Resource;
 
 public class MediaViewerAcitvity extends AppCompatActivity implements MediaPlayer.OnSeekCompleteListener,
                                                                 MediaView.OnStartListener,

app/src/main/java/app/ara/activities/MenuActivity.java → app/src/main/java/app/mar/activities/MenuActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -13,13 +13,13 @@ import android.widget.Button;
 import android.widget.RelativeLayout;
 import android.widget.Toast;
 
-import app.ara.ui.RotateButton;
-import app.ara.utils.AndroidResources;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.Settings;
-import app.ara.utils.app.brest.game.Game;
-import app.ara.utils.app.brest.game.Resource;
-import app.ara.utils.app.brest.game.Stage;
+import app.mar.ui.RotateButton;
+import app.mar.utils.AndroidResources;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.Settings;
+import app.mar.utils.app.brest.game.Game;
+import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.app.brest.game.Stage;
 
 public abstract class  MenuActivity extends Activity implements View.OnClickListener, IViewerActivity{
 

app/src/main/java/app/ara/activities/ModelViewerActivity.java → app/src/main/java/app/mar/activities/ModelViewerActivity.java

@@ -1,8 +1,7 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.content.Intent;
 import android.support.v4.view.MotionEventCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
@@ -10,10 +9,10 @@ import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.TextView;
 
-import app.ara.utils.AndroidResources;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Resource;
-import app.ara.utils.geometry.Point;
+import app.mar.utils.AndroidResources;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.geometry.Point;
 import min3d.core.Object3d;
 import min3d.core.RendererActivity;
 import min3d.vos.CameraVo;

app/src/main/java/app/ara/activities/PermissionActivity.java → app/src/main/java/app/mar/activities/PermissionActivity.java

@@ -1,7 +1,6 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.Manifest;
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.support.v4.app.ActivityCompat;
@@ -9,14 +8,12 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.text.Html;
-import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
 import java.util.ArrayList;
-import java.util.List;
 
-import app.ara.utils.files.FileManager;
+import app.mar.utils.files.FileManager;
 
 public class PermissionActivity extends AppCompatActivity {
     private int m_nPerm=3;

app/src/main/java/app/ara/activities/PuzzleActivity.java → app/src/main/java/app/mar/activities/PuzzleActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.annotation.SuppressLint;
 import android.support.v7.app.ActionBar;

app/src/main/java/app/ara/activities/ResourceListActivity.java → app/src/main/java/app/mar/activities/ResourceListActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -6,10 +6,10 @@ import android.widget.ListView;
 
 import java.util.ArrayList;
 
-import app.ara.ui.ResourceArrayAdapter;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Game;
-import app.ara.utils.app.brest.game.Resource;
+import app.mar.ui.ResourceArrayAdapter;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Game;
+import app.mar.utils.app.brest.game.Resource;
 
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.

app/src/main/java/app/ara/activities/SEMenuActivity.java → app/src/main/java/app/mar/activities/SEMenuActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.content.res.Resources;
 import android.util.TypedValue;

app/src/main/java/app/ara/activities/SettingsActivity.java → app/src/main/java/app/mar/activities/SettingsActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 
 import android.app.Activity;
@@ -12,12 +12,12 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import app.ara.ui.CustomToggleButton;
-import app.ara.ui.SelectButton;
-import app.ara.ui.OnToggleListener;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.Settings;
-import app.ara.utils.app.brest.game.Game;
+import app.mar.ui.CustomToggleButton;
+import app.mar.ui.SelectButton;
+import app.mar.ui.OnToggleListener;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.Settings;
+import app.mar.utils.app.brest.game.Game;
 
 /**
  * A {@link PreferenceActivity} that presents a set of application settings. On

app/src/main/java/app/ara/activities/TransferActivity.java → app/src/main/java/app/mar/activities/TransferActivity.java

@@ -1,4 +1,4 @@
-package app.ara.activities;
+package app.mar.activities;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -10,8 +10,8 @@ import android.widget.ImageButton;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Game;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Game;
 
 public class TransferActivity extends Activity {
 

app/src/main/java/app/ara/ui/CameraPreview.java → app/src/main/java/app/mar/ui/CameraPreview.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 /**
  * Created by ptitcois on 17/08/16.

app/src/main/java/app/ara/ui/CustomListView.java → app/src/main/java/app/mar/ui/CustomListView.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;

app/src/main/java/app/ara/ui/CustomToggleButton.java → app/src/main/java/app/mar/ui/CustomToggleButton.java

@@ -1,11 +1,11 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
 
-import app.ara.activities.R;
+import app.mar.activities.R;
 
 /**
  * Created by ptitcois on 31/10/16.

app/src/main/java/app/ara/ui/MediaView.java → app/src/main/java/app/mar/ui/MediaView.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.app.Activity;
 import android.content.Context;
@@ -11,7 +11,7 @@ import android.view.View;
 
 import java.io.IOException;
 
-import app.ara.utils.files.FileManager;
+import app.mar.utils.files.FileManager;
 
 /**
  * Created by ptitcois on 27/03/17.

app/src/main/java/app/ara/ui/OnToggleListener.java → app/src/main/java/app/mar/ui/OnToggleListener.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.view.View;
 

app/src/main/java/app/ara/ui/ResourceArrayAdapter.java → app/src/main/java/app/mar/ui/ResourceArrayAdapter.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,10 +13,10 @@ import android.widget.TextView;
 
 import java.util.List;
 
-import app.ara.activities.R;
-import app.ara.utils.AndroidResources;
-import app.ara.utils.FontChangeCrawler;
-import app.ara.utils.app.brest.game.Resource;
+import app.mar.activities.R;
+import app.mar.utils.AndroidResources;
+import app.mar.utils.FontChangeCrawler;
+import app.mar.utils.app.brest.game.Resource;
 
 /**
  * Created by ptitcois on 22/08/16.

app/src/main/java/app/ara/ui/RotateButton.java → app/src/main/java/app/mar/ui/RotateButton.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.content.Context;
 import android.graphics.Canvas;

app/src/main/java/app/ara/ui/SelectButton.java → app/src/main/java/app/mar/ui/SelectButton.java

@@ -1,4 +1,4 @@
-package app.ara.ui;
+package app.mar.ui;
 
 import android.content.Context;
 import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import app.ara.activities.R;
+import app.mar.activities.R;
 
 /**
  * Created by ptitcois on 31/10/16.

app/src/main/java/app/ara/utils/AndroidResources.java → app/src/main/java/app/mar/utils/AndroidResources.java

@@ -1,4 +1,4 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import android.app.Activity;
 import android.content.Context;
@@ -6,12 +6,12 @@ import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 
-import app.ara.activities.ImageViewerActivity;
-import app.ara.activities.InfoActivity;
-import app.ara.activities.MediaViewerAcitvity;
-import app.ara.activities.ModelViewerActivity;
-import app.ara.utils.app.brest.game.Game;
-import app.ara.utils.app.brest.game.Resource;
+import app.mar.activities.ImageViewerActivity;
+import app.mar.activities.InfoActivity;
+import app.mar.activities.MediaViewerAcitvity;
+import app.mar.activities.ModelViewerActivity;
+import app.mar.utils.app.brest.game.Game;
+import app.mar.utils.app.brest.game.Resource;
 import min3d.core.Object3d;
 import min3d.parser.IParser;
 import min3d.parser.Parser;

app/src/main/java/app/ara/utils/FontChangeCrawler.java → app/src/main/java/app/mar/utils/FontChangeCrawler.java

@@ -1,4 +1,4 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/app/ara/utils/GpsStub.java → app/src/main/java/app/mar/utils/GpsStub.java

@@ -1,10 +1,10 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import android.util.Log;
 
 import java.util.ArrayList;
 
-import app.ara.utils.geometry.GPSPoint;
+import app.mar.utils.geometry.GPSPoint;
 
 /**
  * Created by ptitcois on 24/10/16.

app/src/main/java/app/ara/utils/JSONLoader.java → app/src/main/java/app/mar/utils/JSONLoader.java

@@ -1,4 +1,4 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import android.app.Activity;
 import android.util.Log;

app/src/main/java/app/ara/utils/ResourceManager.java → app/src/main/java/app/mar/utils/ResourceManager.java

@@ -1,9 +1,9 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 
-import app.ara.utils.app.brest.game.Resource;
+import app.mar.utils.app.brest.game.Resource;
 
 /**
  * Created by ptitcois on 18/08/16.

app/src/main/java/app/ara/utils/SensorsManager.java → app/src/main/java/app/mar/utils/SensorsManager.java

@@ -1,4 +1,4 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import android.Manifest;
 import android.app.Activity;
@@ -14,13 +14,10 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
-import android.widget.Toast;
 
-import app.ara.activities.ARActivity;
-import app.ara.activities.R;
-import app.ara.utils.geometry.GPSPoint;
+import app.mar.activities.ARActivity;
+import app.mar.activities.R;
+import app.mar.utils.geometry.GPSPoint;
 
 /**
  * Created by ptitcois on 18/08/16.
@@ -74,7 +71,7 @@ public class SensorsManager implements SensorEventListener, LocationListener {
 
     public boolean useGpsStub()
     {
-        return app.ara.utils.Settings.getSettings().isGPSDebug();
+        return app.mar.utils.Settings.getSettings().isGPSDebug();
     }
 
     public GPSPoint getPosition()
@@ -90,9 +87,9 @@ public class SensorsManager implements SensorEventListener, LocationListener {
         mSensorManager = (SensorManager) parent.getSystemService(parent.SENSOR_SERVICE);
         mAccelerometer = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
         mMagnetometer = mSensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD);
-        mBufferX = new SlideBuffer(app.ara.utils.Settings.getSettings().getSensorLatency());
-        mBufferY = new SlideBuffer(app.ara.utils.Settings.getSettings().getSensorLatency());
-        mBufferZ = new SlideBuffer(app.ara.utils.Settings.getSettings().getSensorLatency());
+        mBufferX = new SlideBuffer(app.mar.utils.Settings.getSettings().getSensorLatency());
+        mBufferY = new SlideBuffer(app.mar.utils.Settings.getSettings().getSensorLatency());
+        mBufferZ = new SlideBuffer(app.mar.utils.Settings.getSettings().getSensorLatency());
 
         //debug du GPS "GPS Préprogrammé"
         if(useGpsStub()) {

app/src/main/java/app/ara/utils/Settings.java → app/src/main/java/app/mar/utils/Settings.java

@@ -1,4 +1,4 @@
-package app.ara.utils;
+package app.mar.utils;
 
 import java.io.Serializable;
 

app/src/main/java/app/ara/utils/SlideBuffer.java → app/src/main/java/app/mar/utils/SlideBuffer.java

@@ -1,4 +1,4 @@
-package app.ara.utils;
+package app.mar.utils;
 
 /*
 public class SlideBuffer {

app/src/main/java/app/ara/utils/app/brest/game/Area.java → app/src/main/java/app/mar/utils/app/brest/game/Area.java

@@ -1,4 +1,4 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import android.app.Activity;
 
@@ -9,8 +9,8 @@ import org.json.JSONObject;
 import java.io.Serializable;
 import java.util.ArrayList;
 
-import app.ara.utils.geometry.GPSPoint;
-import app.ara.utils.geometry.Shape;
+import app.mar.utils.geometry.GPSPoint;
+import app.mar.utils.geometry.Shape;
 
 /**
  * Created by ptitcois on 19/08/16.

app/src/main/java/app/ara/utils/app/brest/game/Game.java → app/src/main/java/app/mar/utils/app/brest/game/Game.java

@@ -1,4 +1,4 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import android.app.Activity;
 import android.content.Context;
@@ -18,11 +18,11 @@ import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 
-import app.ara.activities.ARActivity;
-import app.ara.utils.ResourceManager;
-import app.ara.utils.SensorsManager;
-import app.ara.utils.Settings;
-import app.ara.utils.files.JSONAssetsManager;
+import app.mar.activities.ARActivity;
+import app.mar.utils.ResourceManager;
+import app.mar.utils.SensorsManager;
+import app.mar.utils.Settings;
+import app.mar.utils.files.JSONAssetsManager;
 
 /**
  * Created by ptitcois on 19/08/16.

app/src/main/java/app/ara/utils/app/brest/game/LocatedResources.java → app/src/main/java/app/mar/utils/app/brest/game/LocatedResources.java

@@ -1,4 +1,4 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import java.util.ArrayList;
 

app/src/main/java/app/ara/utils/app/brest/game/Place.java → app/src/main/java/app/mar/utils/app/brest/game/Place.java

@@ -1,4 +1,4 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -6,7 +6,7 @@ import org.json.JSONObject;
 
 import java.io.Serializable;
 
-import app.ara.utils.geometry.GPSPoint;
+import app.mar.utils.geometry.GPSPoint;
 
 /**
  * Created by ptitcois on 19/08/16.

app/src/main/java/app/ara/utils/app/brest/game/Player.java → app/src/main/java/app/mar/utils/app/brest/game/Player.java

@@ -1,12 +1,12 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import android.app.Activity;
 
 import java.io.Serializable;
 
-import app.ara.activities.ARActivity;
-import app.ara.utils.SensorsManager;
-import app.ara.utils.geometry.GPSPoint;
+import app.mar.activities.ARActivity;
+import app.mar.utils.SensorsManager;
+import app.mar.utils.geometry.GPSPoint;
 
 /**
  * Created by ptitcois on 20/08/16.

app/src/main/java/app/ara/utils/app/brest/game/Resource.java → app/src/main/java/app/mar/utils/app/brest/game/Resource.java

@@ -1,4 +1,4 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import android.app.Activity;
 import android.util.Log;
@@ -8,7 +8,7 @@ import org.json.JSONObject;
 
 import java.io.Serializable;
 
-import app.ara.utils.files.JSONAssetsManager;
+import app.mar.utils.files.JSONAssetsManager;
 import min3d.core.Object3d;
 import min3d.parser.IParser;
 import min3d.parser.Parser;

app/src/main/java/app/ara/utils/app/brest/game/Stage.java → app/src/main/java/app/mar/utils/app/brest/game/Stage.java

@@ -1,4 +1,4 @@
-package app.ara.utils.app.brest.game;
+package app.mar.utils.app.brest.game;
 
 import org.json.JSONException;
 import org.json.JSONObject;

app/src/main/java/app/ara/utils/files/FileManager.java → app/src/main/java/app/mar/utils/files/FileManager.java

@@ -1,4 +1,4 @@
-package app.ara.utils.files;
+package app.mar.utils.files;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/app/ara/utils/files/JSONAssetsManager.java → app/src/main/java/app/mar/utils/files/JSONAssetsManager.java

@@ -1,4 +1,4 @@
-package app.ara.utils.files;
+package app.mar.utils.files;
 
 import android.app.Activity;
 import android.util.Log;

app/src/main/java/app/ara/utils/geometry/GPSPoint.java → app/src/main/java/app/mar/utils/geometry/GPSPoint.java

@@ -1,11 +1,11 @@
-package app.ara.utils.geometry;
+package app.mar.utils.geometry;
 
 import java.io.Serializable;
 
 /**
  * Created by ptitcois on 16/08/16.
  */
-public class GPSPoint extends app.ara.utils.geometry.Point  implements Serializable {
+public class GPSPoint extends app.mar.utils.geometry.Point  implements Serializable {
     protected float mAccuracy;
 
 

app/src/main/java/app/ara/utils/geometry/Point.java → app/src/main/java/app/mar/utils/geometry/Point.java

@@ -1,4 +1,4 @@
-package app.ara.utils.geometry;
+package app.mar.utils.geometry;
 
 import java.io.Serializable;
 

app/src/main/java/app/ara/utils/geometry/Shape.java → app/src/main/java/app/mar/utils/geometry/Shape.java

@@ -1,4 +1,4 @@
-package app.ara.utils.geometry;
+package app.mar.utils.geometry;
 /**
  * Created by François Gautrais on 16/08/16.
  * Support also GPS Shape (By using GPSPoint)

app/src/main/java/min3d/parser/AParser.java

@@ -7,7 +7,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 
-import app.ara.utils.files.FileManager;
+import app.mar.utils.files.FileManager;
 import min3d.Min3d;
 import min3d.Shared;
 import min3d.Utils;

app/src/main/java/min3d/parser/ObjParser.java

@@ -7,7 +7,7 @@ import java.io.InputStreamReader;
 import java.util.Calendar;
 import java.util.StringTokenizer;
 
-import app.ara.utils.files.FileManager;
+import app.mar.utils.files.FileManager;
 import min3d.Min3d;
 import min3d.Shared;
 import min3d.core.Object3dContainer;

app/src/main/res/layout/activity_credits.xml

@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="app.ara.activities.CreditsActivity">
+    tools:context="app.mar.activities.CreditsActivity">
 
     <ScrollView
         android:layout_width="wrap_content"

app/src/main/res/layout/activity_end.xml

@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="app.ara.activities.EndActivity"
+    tools:context="app.mar.activities.EndActivity"
     android:background="@drawable/background">
 
     <TextView

app/src/main/res/layout/activity_permission.xml

@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="app.ara.activities.PermissionActivity">
+    tools:context="app.mar.activities.PermissionActivity">
 
     <Button
         android:layout_width="wrap_content"

app/src/main/res/layout/activity_puzzle.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#0099cc"
-    tools:context="app.ara.activities.PuzzleActivity">
+    tools:context="app.mar.activities.PuzzleActivity">
 
     <!-- The primary full-screen view. This can be replaced with whatever view
          is needed to present your content, e.g. VideoView, SurfaceView,

app/src/main/res/layout/activity_resource_list.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/background"
     android:orientation="vertical"
-    tools:context="app.ara.activities.ResourceListActivity">
+    tools:context="app.mar.activities.ResourceListActivity">
 
     <!-- The primary full-screen view. This can be replaced with whatever view
          is needed to present your content, e.g. VideoView, SurfaceView,

app/src/main/res/layout/activity_transfer.xml

@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="app.ara.activities.TransferActivity"
+    tools:context="app.mar.activities.TransferActivity"
     android:background="@drawable/background">
 
     <ProgressBar