Asset

app/src/main/res/layout/activity_main.xml → app/src/main/res/layout/activity_ar.xml

@@ -23,7 +23,7 @@
         android:longClickable="false"
         android:textColor="#33b5e5"
         android:textSize="25dp"
-        android:background="@drawable/uibutton" />
+        android:background="@color/colorPrimaryDark" />
 
     <FrameLayout
         android:layout_width="match_parent"
@@ -120,7 +120,7 @@
                 android:scaleType="fitCenter"
                 android:background="@drawable/ar_skin"
                 android:visibility="visible"
-                android:onClick="onStub" />
+                android:onClick="onClickScreen" />
 
             <TextView
                 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.brest.testmin3d.EndActivity"
+    tools:context="app.ara.activities.EndActivity"
     android:background="@drawable/background">
 
     <TextView

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="app.ara.activities.MediaAcitvity"
+    android:background="#000000">
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Informations"
+        android:id="@+id/info"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:onClick="onInfos" />
+
+    <ImageButton
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:id="@+id/play"
+        android:layout_alignTop="@+id/fullscreen"
+        android:layout_toLeftOf="@+id/fullscreen"
+        android:layout_toStartOf="@+id/fullscreen"
+        android:onClick="onPlayPause"
+        android:src="@android:drawable/ic_media_pause" />
+
+    <SeekBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/seekBar"
+        android:layout_below="@+id/title"
+        android:layout_alignBottom="@+id/play"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_toLeftOf="@+id/play"
+        android:layout_toStartOf="@+id/play"
+        android:background="#191919" />
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:id="@+id/title"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:textColor="@color/dull_5"
+        android:textAlignment="center"
+        android:textSize="25dp"
+        android:textStyle="bold" />
+
+    <ImageButton
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:id="@+id/fullscreen"
+        android:layout_below="@+id/title"
+        android:onClick="onFullscreen"
+        android:src="@android:drawable/ic_menu_crop"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/seekBar"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_above="@+id/info"
+        android:gravity="center">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentRight="true"
+            android:id="@+id/media_viewer"></FrameLayout>
+    </RelativeLayout>
+
+</RelativeLayout>

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

@@ -7,15 +7,14 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="app.brest.testmin3d.PermissionActivity"
-    android:background="#000000">
+    tools:context="app.ara.activities.PermissionActivity">
 
     <Button
         android:layout_width="wrap_content"
         android:layout_height="60dp"
         android:id="@+id/understood"
         android:textSize="25dp"
-        android:textColor="#33b5e5"
+        android:textColor="#000000"
         android:textStyle="bold"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
@@ -46,7 +45,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignRight="@+id/understood"
             android:layout_alignEnd="@+id/understood"
-            android:textColor="#33b5e5"
+            android:textColor="#000000"
             android:textSize="16dp" />
     </ScrollView>
 </RelativeLayout>

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.brest.testmin3d.PuzzleActivity">
+    tools:context="app.ara.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.brest.testmin3d.ResourceListActivity">
+    tools:context="app.ara.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_settings.xml

@@ -27,11 +27,10 @@
             android:layout_height="match_parent"
             android:id="@+id/scrollView"
             android:layout_below="@+id/button7"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true"
             android:layout_above="@+id/sbutok"
             android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true">
+            android:layout_alignParentEnd="true"
+            android:layout_marginLeft="30dp">
 
             <LinearLayout
                 android:orientation="vertical"

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.brest.testmin3d.TransferActivity"
+    tools:context="app.ara.activities.TransferActivity"
     android:background="@drawable/background">
 
     <ProgressBar

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

@@ -2,8 +2,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="app.brest.testmin3d.ViewerActivity"
-    android:background="#000000">
+    tools:context="app.ara.activities.ViewerActivity"
+    android:background="#000000"
+    android:id="@+id/rl_screen">
 
     <!-- The primary full-screen view. This can be replaced with whatever view
          is needed to present your content, e.g. VideoView, SurfaceView,
@@ -14,27 +15,11 @@
 
     <Button
         android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:text="Carte"
-        android:id="@+id/b_title"
-        android:layout_alignParentBottom="false"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentTop="true"
-        android:textColor="@color/dull_4"
-        android:textSize="30dp"
-        android:textStyle="bold"
-        android:background="@drawable/title" />
-
-    <Button
-        android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="wrap_content"
         android:text="Informations"
         android:id="@+id/button_info"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
-        android:textColor="#33b5e5"
-        android:textStyle="bold"
-        android:textSize="25dp"
         android:onClick="onClickInfo" />
 
     <FrameLayout
@@ -55,12 +40,6 @@
             android:focusable="true"
             android:visibility="visible" />
 
-        <VideoView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/vv_media"
-            android:layout_gravity="center" />
-
         <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -71,7 +50,23 @@
             android:textColor="#33b5e5"
             android:textSize="20dp"
             android:visibility="invisible" />
-
     </FrameLayout>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="Large Text"
+        android:id="@+id/b_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" />
+
 </RelativeLayout>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#001111</color>
+    <color name="colorPrimaryDark">#005566</color>
+    <color name="colorAccent">#1199cc</color>
 
     <color name="black_overlay">#66000000</color>
 

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

@@ -1,7 +1,7 @@
 <resources>
-    <string name="app_name">Mystère à Recouvrance</string>
+    <string name="app_name">Une Terreur dans la Ville</string>
     <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
+    <string name="action_settings">Options</string>
     <string name="capture_button">Capture Image From Camera</string>
     <string name="desc">capture image place holder</string>
 
@@ -9,9 +9,9 @@
     <string name="dummy_button">Dummy Button</string>
     <string name="dummy_content">DUMMY\nCONTENT</string>
 
-    <string name="title_activity_resource_list">ResourceListActivity</string>
-    <string name="title_activity_menu">MenuActivity</string>
-    <string name="title_activity_settings">Settings</string>
+    <string name="title_activity_resource_list">Inventaire</string>
+    <string name="title_activity_menu">Menu</string>
+    <string name="title_activity_settings">Options</string>
 
     <!-- Strings related to Settings -->
 
@@ -74,7 +74,7 @@
     <string name="gps_stub__">-1.67609 48.10663;-1.67918 48.10971;-1.67929 48.11128;-1.68026 48.11461;</string>
     <string name="gps_stub_brest">-4.4931557 48.3852982;-4.4907396 48.3822208;-4.4913189 48.3821055;-4.5009306 48.3812175;-4.4994088 48.3816246;-4.5001176 48.3829454;-4.4998877 48.3861891;-4.4993333 48.3843879;-4.4981522 48.3837466;-4.4940766 48.3855502;-4.4934548 48.3850800;-4.4920585 48.3832195;-4.4925920 48.3818895;-4.4974687 48.3831305;-4.4977893 48.3839475;-4.4936559 48.3832834;-4.4947957 48.3844682;-4.4944665 48.3851339;-4.4940462 48.3842496;-4.4926676 48.3835729;-4.4927382 48.3826774;-4.4972925 48.3835206;-4.4956640 48.3843096;-4.4980210 48.3844962;      </string>
     <string name="gps_stub_">-1.6636940 48.0955401 ;-1.6648474 48.0958025;-1.6649627 48.0958487;-1.6652739 48.0958718;-1.6658446 48.0954599;-1.6658503 48.0947939;-1.6649685 48.0953636;-1.6635852 48.0952597;-1.6637062 48.0954137;-1.6637927 48.0955215;-1.6639079 48.0956793;-1.6641270 48.0957178;-1.6642653 48.0956139;-1.6644785 48.0957216;</string>
-    <string name="gps_stub_se">-1.6552946 48.0210506;-1.6518083 48.0207201;-1.6584931 48.0200556;-1.6624308 48.0181617;-1.6538682 48.0224585;-1.6512439 48.0208696;-1.6510127 48.0213842;-1.6462995 48.0187739;-1.6507205 48.0179446;</string>
-    <string name="gps_stub">-1.6552002 48.0214484;-1.6556532 48.0204598;-1.6552002 48.0214484;</string>
+    <string name="gps_stub">-1.6552946 48.0210506;-1.6518083 48.0207201;-1.6584931 48.0200556;-1.6624308 48.0181617;-1.6538682 48.0224585;-1.6512439 48.0208696;-1.6510127 48.0213842;-1.6462995 48.0187739;-1.6507205 48.0179446;</string>
+    <string name="gps_stub_se">-1.6552002 48.0214484;-1.6556532 48.0204598;-1.6552002 48.0214484;</string>
     <string name="title_activity_puzzle">PuzzleActivity</string>
 </resources>

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

@@ -25,6 +25,11 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="AppTheme.NoActionBar.Fullscreen">
+        <item name="android:actionBarStyle">@style/FullscreenActionBarStyle</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />