Mystere A reouvrance

app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/logo"

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

@@ -24,12 +24,12 @@ import java.util.ArrayList;
 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.game.Area;
+import app.mar.utils.game.Game;
+import app.mar.utils.game.LocatedResources;
+import app.mar.utils.game.Place;
+import app.mar.utils.game.Resource;
+import app.mar.utils.game.Stage;
 import app.mar.utils.geometry.GPSPoint;
 import min3d.core.Object3d;
 import min3d.core.Object3dContainer;

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 
 import app.mar.utils.AndroidResources;
 import app.mar.utils.FontChangeCrawler;
-import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.game.Resource;
 import app.mar.utils.files.FileManager;
 import uk.co.senab.photoview.PhotoViewAttacher;
 

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

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.widget.TextView;
 
 import app.mar.utils.FontChangeCrawler;
-import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.game.Resource;
 
 public class InfoActivity extends AppCompatActivity  implements IViewerActivity{
 

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

@@ -16,7 +16,7 @@ import android.widget.TextView;
 import app.mar.ui.MediaView;
 import app.mar.utils.AndroidResources;
 import app.mar.utils.FontChangeCrawler;
-import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.game.Resource;
 
 public class MediaViewerAcitvity extends AppCompatActivity implements MediaPlayer.OnSeekCompleteListener,
                                                                 MediaView.OnStartListener,

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

@@ -15,11 +15,10 @@ import android.widget.Toast;
 
 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;
+import app.mar.utils.game.Game;
+import app.mar.utils.game.Resource;
+import app.mar.utils.game.Stage;
 
 public abstract class  MenuActivity extends Activity implements View.OnClickListener, IViewerActivity{
 
@@ -69,7 +68,6 @@ public abstract class  MenuActivity extends Activity implements View.OnClickList
 
     protected void moveView(View v, int x, int y)
     {
-
         moveView(v, x, y, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
@@ -81,7 +79,7 @@ public abstract class  MenuActivity extends Activity implements View.OnClickList
         mRootLayout.addView(b);
         b.setBackgroundResource(R.drawable.uibutton);
         b.setTextColor(getResources().getColor(R.color.dull_4));
-        b.setTextSize(22);
+        b.setTextSize(18);
         b.setOnClickListener(this);
         return b;
     }
@@ -124,7 +122,6 @@ public abstract class  MenuActivity extends Activity implements View.OnClickList
         refreshMenuStyle();
 
         mCustomHandler.postDelayed(updateTimerThread, 10);
-        FontChangeCrawler.setFont(this);
     }
 
     public void onOptionsClick(View v)

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

@@ -11,7 +11,7 @@ import android.widget.TextView;
 
 import app.mar.utils.AndroidResources;
 import app.mar.utils.FontChangeCrawler;
-import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.game.Resource;
 import app.mar.utils.geometry.Point;
 import min3d.core.Object3d;
 import min3d.core.RendererActivity;

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

@@ -23,16 +23,16 @@ public class PermissionActivity extends AppCompatActivity {
     static final int PERM_COARSE_LOCATION=1339;
     protected TextView mText;
 
-    private static final String DISCLAMER="<h1>Attention :</h1> \n" +
-            "<h2>Ce jeu nécessite des déplacement en ville.</h2>\n" +
-            "Veillez à respecter les règles suivantes : <br>\n" +
+    private static final String DISCLAMER="<h1><font color=\"#00ccff\">Attention :</font></h1> \n" +
+            "<h2><font color=\"#0099cc\">Ce jeu nécessite des déplacement en ville.</font></h2>\n" +
+            "<font color=\"#0099cc\">Veillez à respecter les règles suivantes : <br>\n" +
             "Les enfants doivent être accompagnés d’un adulte. <br>\n" +
             "Faites attention à la circulation. <br>\n" +
             "Soyez vigilant sur l’environnement (altitude, marches, etc). <br>\n" +
-            "Ne jouer pas en conduisant. <br>\n" +
+            "Ne jouer pas en conduisant. <br></font>\n" +
             "\n" +
-            "<h3>Restez toujours conscient de votre environnement.</h3>\n" +
-            "<h3>En continuant, vous convenez que l’utilisation du jeu est à vos propres risques et responsabilités.</h3>";
+            "<h3><font color=\"#00ccff\">Restez toujours conscient de votre environnement.</font></h3>\n" +
+            "<h3><font color=\"#00ccff\">En continuant, vous convenez que l’utilisation du jeu est à vos propres risques et responsabilités.</font></h3>";
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -66,7 +66,7 @@ public class PermissionActivity extends AppCompatActivity {
             al.add(Manifest.permission.ACCESS_COARSE_LOCATION);
         } else m_nPerm--;
 
-        ActivityCompat.requestPermissions(this,al.toArray(new String[m_nPerm]), ALL_PERMISSIONS);
+        if(al.size()>0)ActivityCompat.requestPermissions(this,al.toArray(new String[m_nPerm]), ALL_PERMISSIONS);
 
 
     }
@@ -96,7 +96,7 @@ public class PermissionActivity extends AppCompatActivity {
     {
         if(m_nPerm==0)
         {
-            Intent intent = new Intent(this, SEMenuActivity.class);
+            Intent intent = new Intent(this, MARMenuActivity.class);
             startActivity(intent);
         }
     }

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

@@ -1,25 +1,37 @@
 package app.mar.activities;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.ListView;
-
+import android.widget.ScrollView;
+import android.widget.TextView;
 import java.util.ArrayList;
-
-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;
-
+import java.util.List;
+import app.mar.ui.*;
+import app.mar.utils.*;
+import app.mar.utils.game.*;
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.
  * status bar and navigation/system bar) with user interaction.
  */
 public class ResourceListActivity extends Activity {
-
     protected Game mGame;
     protected ListView mList;
-
     /*
     protected void addStage(ArrayList<Object> ar, int stage)
     {
@@ -32,12 +44,9 @@ public class ResourceListActivity extends Activity {
         b.setTextColor(Color.rgb(0x33, 0xb5, 0xe5));
         b.setTextSize(30);
         b.setTypeface(null, Typeface.BOLD);
-
         aa = new ResourceArrayAdapter(this, android.R.layout.simple_list_item_1, ar);
         lv.setOnItemClickListener(aa);
-
         lv.setAdapter(aa);
-
         nl.setOrientation(LinearLayout.VERTICAL);
         nl.addView(b);
         nl.addView(sv);
@@ -45,7 +54,6 @@ public class ResourceListActivity extends Activity {
         //lv.setLayoutParams(new LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT,  LinearLayout.LayoutParams.MATCH_PARENT));
         mLayout.addView(nl);
     }
-
     protected void fill()
     {
         if(mGame!=null)
@@ -55,8 +63,6 @@ public class ResourceListActivity extends Activity {
                 addStage(resources.get(i), i);
         }
     }*/
-
-
     protected void fill()
     {
         if(mGame!=null)
@@ -64,29 +70,23 @@ public class ResourceListActivity extends Activity {
             ArrayList< ArrayList<Resource> > resources = mGame.getResourceByStage();
             ArrayList<Object> obs = new ArrayList<Object>();
             for(int i = 0; i< resources.size(); i++) {
-                //obs.add("Étape "+i);
+                obs.add("Étape "+i);
                 for(int j=0; j<resources.get(i).size(); j++)
                     obs.add(resources.get(i).get(j));
             }
             ResourceArrayAdapter aa;
-            aa = new ResourceArrayAdapter(this, R.layout.array_layout, obs);
-
-            mList.setAdapter(aa);
+            aa = new ResourceArrayAdapter(this, android.R.layout.simple_list_item_1, obs);
             mList.setOnItemClickListener(aa);
+            mList.setAdapter(aa);
         }
     }
-
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_resource_list);
+        FontChangeCrawler.setFont(this);
         mGame = (Game)getIntent().getSerializableExtra("game");
-
         mList = (ListView) findViewById(R.id.list_layout);
         fill();
-        FontChangeCrawler.setFont(this);
     }
-
-
-}
+}

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

@@ -17,7 +17,7 @@ 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;
+import app.mar.utils.game.Game;
 
 /**
  * A {@link PreferenceActivity} that presents a set of application settings. On

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

@@ -11,7 +11,7 @@ import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import app.mar.utils.FontChangeCrawler;
-import app.mar.utils.app.brest.game.Game;
+import app.mar.utils.game.Game;
 
 public class TransferActivity extends Activity {
 

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

@@ -1,5 +1,73 @@
 package app.mar.ui;
 
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Typeface;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+import app.mar.utils.AndroidResources;
+import app.mar.utils.game.Resource;
+
+
+/**
+ * Created by ptitcois on 22/08/16.
+ */
+public class ResourceArrayAdapter extends ArrayAdapter<Object> implements  AdapterView.OnItemClickListener{
+    protected Context mContext;
+    protected List<Object> mList;
+    public ResourceArrayAdapter(Context context, int resource, List<Object> objects) {
+        super(context, resource, objects);
+        mContext=context;
+        mList=objects;
+    }
+
+    @Override
+    public View getView(int position, View convertView,
+                        ViewGroup parent) {
+        View view =super.getView(position, convertView, parent);
+
+        TextView textView=(TextView) view.findViewById(android.R.id.text1);
+
+            /*YOUR CHOICE OF COLOR*/
+        textView.setTextColor(Color.rgb(0x33, 0xb5, 0xe5));
+
+        if(mList.get(position) instanceof String){
+            textView.setTextSize(30);
+            textView.setTypeface(null, Typeface.BOLD);
+        }else{
+            textView.setTextSize(15);
+            textView.setTypeface(null, Typeface.NORMAL);
+        }
+
+
+        return view;
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+        if (adapterView.getItemAtPosition(i) instanceof Resource) {
+            Resource item = (Resource) adapterView.getItemAtPosition(i);
+
+            Intent intent = AndroidResources.getViewerIntent(mContext, item);
+            mContext.startActivity(intent);
+
+        }else if(adapterView.getItemAtPosition(i) instanceof String)
+        {
+
+        }
+    }
+}
+
+
+/*package app.mar.ui;
+
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
@@ -16,11 +84,11 @@ import java.util.List;
 import app.mar.activities.R;
 import app.mar.utils.AndroidResources;
 import app.mar.utils.FontChangeCrawler;
-import app.mar.utils.app.brest.game.Resource;
+import app.mar.utils.game.Resource;
 
-/**
- * Created by ptitcois on 22/08/16.
- */
+//
+ // Created by ptitcois on 22/08/16.
+ //
 public class ResourceArrayAdapter extends ArrayAdapter<Object> implements  AdapterView.OnItemClickListener{
     protected Context mContext;
     protected List<Object> mList;
@@ -98,3 +166,4 @@ public class ResourceArrayAdapter extends ArrayAdapter<Object> implements  Adapt
         }
     }
 }
+*/

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

@@ -10,8 +10,8 @@ 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 app.mar.utils.game.Game;
+import app.mar.utils.game.Resource;
 import min3d.core.Object3d;
 import min3d.parser.IParser;
 import min3d.parser.Parser;

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

@@ -62,7 +62,7 @@ public class FontChangeCrawler
     public static void setFont(Activity app)
     {
         FontChangeCrawler fontChanger = new FontChangeCrawler(app.getAssets(), "font.ttf");
-        fontChanger.replaceFonts((ViewGroup)app.findViewById(android.R.id.content));
+        if(fontChanger!=null) fontChanger.replaceFonts((ViewGroup)app.findViewById(android.R.id.content));
     }
 
     public static void setFont(ViewGroup v, Context app)

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

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

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

@@ -1,4 +1,4 @@
-package app.mar.utils.app.brest.game;
+package app.mar.utils.game;
 
 import android.app.Activity;
 

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package app.mar.utils.app.brest.game;
+package app.mar.utils.game;
 
 import android.app.Activity;
 

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

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

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

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

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ImageViewerActivity"
-    android:background="#000000"
+    android:background="@drawable/background"
     android:id="@+id/rl_screen">
 
     <!-- The primary full-screen view. This can be replaced with whatever view

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

@@ -8,11 +8,11 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".MediaViewerAcitvity"
-    android:background="#000000">
+    android:background="@drawable/background">
 
     <Button
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="150px"
         android:text="@string/informations"
         android:id="@+id/info"
         android:layout_alignParentBottom="true"
@@ -20,7 +20,11 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:onClick="onInfos" />
+        android:onClick="onInfos"
+        android:background="@drawable/uibutton"
+        android:textColor="@color/dull_4"
+        android:textStyle="bold"
+        android:textSize="25px" />
 
     <ImageButton
         android:layout_width="40dp"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ImageViewerActivity"
-    android:background="#000000"
+    android:background="@drawable/background"
     android:id="@+id/rl_screen">
 
     <!-- The primary full-screen view. This can be replaced with whatever view
@@ -15,12 +15,16 @@
 
     <Button
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150px"
         android:text="@string/informations"
         android:id="@+id/info"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:onClick="onClickInfo" />
+        android:onClick="onClickInfo"
+        android:background="@drawable/uibutton"
+        android:textColor="@color/dull_4"
+        android:textStyle="bold"
+        android:textSize="25px" />
 
     <FrameLayout
         android:layout_width="match_parent"

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

@@ -9,7 +9,7 @@
     android:paddingTop="0dp"
     tools:context=".MenuActivity"
     android:id="@+id/menu_root"
-    android:background="#000000">
+    android:background="@drawable/background">
 
     <Button
         android:layout_width="wrap_content"

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

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

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

@@ -6,7 +6,7 @@
     tools:context=".SplashActivity"
     android:baselineAligned="false"
     android:weightSum="1"
-    android:background="#000000">
+    android:background="@drawable/background">
 
     <Button
         android:layout_width="wrap_content"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".ImageViewerActivity"
-    android:background="#000000"
+    android:background="@drawable/background"
     android:id="@+id/rl_screen">
 
     <!-- The primary full-screen view. This can be replaced with whatever view
@@ -15,12 +15,16 @@
 
     <Button
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="100px"
         android:text="@string/informations"
         android:id="@+id/info"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:onClick="onClickInfo" />
+        android:onClick="onClickInfo"
+        android:background="@drawable/uibutton"
+        android:textStyle="bold"
+        android:textColor="@color/dull_4"
+        android:textSize="25px" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -49,14 +53,26 @@
         android:text="Large Text"
         android:id="@+id/title"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:textColor="@color/dull_5"
         android:textStyle="bold"
         android:textSize="25dp"
         android:textAlignment="center"
-        android:onClick="onClick" />
+        android:onClick="onClick"
+        android:layout_toLeftOf="@+id/imageButton"
+        android:layout_toStartOf="@+id/imageButton" />
+
+    <ImageButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/imageButton"
+        android:layout_above="@+id/frame_viewer"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:src="@android:drawable/ic_menu_crop"
+        android:onClick="onClick"
+        android:background="#00000000" />
 
 </RelativeLayout>

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

@@ -4,11 +4,11 @@
     android:layout_height="match_parent"
     android:weightSum="1">
 
-    <ImageButton
+    <!--><ImageButton
         android:layout_width="60dp"
         android:layout_height="match_parent"
         android:id="@+id/imageButton"
-        android:background="@drawable/fleche" />
+        android:background="@drawable/fleche" /><-->
 
     <TextView
         android:layout_width="wrap_content"

app/src/main/res/values/strings.xml

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Une Terreur dans la Ville</string>
+    <string name="app_name">Mystère à Recouvrance</string>
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Options</string>
     <string name="capture_button">Capture Image From Camera</string>