Ajout des évenements permettant de donner une ressource

app/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
         tools:replace="android:icon">
         <activity
             android:name=".viewers.ImageViewerActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
             android:name=".viewers.ResourceListActivity"
@@ -28,6 +29,7 @@
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
             android:name=".PermissionActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -37,28 +39,37 @@
         </activity>
         <activity
             android:name=".viewers.MediaViewerAcitvity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
             android:name=".CreditsActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
             android:name=".HostActivity"
+            android:screenOrientation="portrait"
             android:label="@string/title_activity_host"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".BombActivity"
+            android:screenOrientation="portrait"
             android:label="@string/title_activity_bomb"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".ErrorActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
             android:name=".TutoActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
         <activity
             android:name=".EndActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
+
         <activity android:name=".CrashActivity"
+            android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar.Fullscreen" />
     </application>
 

app/src/main/java/macampcorp/macamp/utils/Const.java

@@ -1,7 +1,7 @@
 package macampcorp.macamp.utils;
 
 public class Const {
-    public static final float BOMB_PENALITY=1;
+    public static final float BOMB_PENALITY=120;
 
     public static final int POWER_OF_ANIM_DURATION=300;
 

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

@@ -40,7 +40,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="2dp"
                     android:text="@string/btn_code"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/label_size"
                     app:layout_constraintEnd_toStartOf="@+id/imageButton2"
                     app:layout_constraintStart_toEndOf="@+id/divider4"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -53,7 +53,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="2dp"
                     android:text="@string/lbl_time"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/label_size"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -80,7 +80,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text=" _ _  _ 2"
-                    android:textSize="18sp"
+                    android:textSize="@dimen/label_size"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/imageButton2"
                     app:layout_constraintStart_toEndOf="@+id/divider4"
@@ -99,7 +99,7 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="21:02"
-                    android:textSize="25sp"
+                    android:textSize="@dimen/big_label_size"
                     android:textStyle="bold"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toStartOf="@+id/divider4"
@@ -162,7 +162,7 @@
                 android:gravity="center"
                 android:onClick="onClickIndice"
                 android:text="@string/btn_indice"
-                android:textSize="12sp" />
+                android:textSize="@dimen/font_button_size" />
 
             <Button
                 android:id="@+id/btn_videos"
@@ -172,7 +172,7 @@
                 android:gravity="center"
                 android:onClick="onClickVideos"
                 android:text="@string/btn_journal"
-                android:textSize="12sp" />
+                android:textSize="@dimen/font_button_size" />
 
             <Button
                 android:id="@+id/btn_valid"
@@ -182,7 +182,7 @@
                 android:gravity="center"
                 android:onClick="onClickValid"
                 android:text="@string/btn_valid"
-                android:textSize="12sp" />
+                android:textSize="@dimen/font_button_size" />
         </LinearLayout>
 
     </LinearLayout>

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

@@ -20,6 +20,7 @@
         android:layout_alignParentStart="true"
         android:onClick="onOk"
         android:text="@string/btn_ok"
+        android:textSize="@dimen/font_button_size"
         android:textStyle="bold" />
 
     <ImageButton

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

@@ -12,7 +12,7 @@
     <Button
         android:id="@+id/understood"
         android:layout_width="wrap_content"
-        android:layout_height="60dp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentLeft="true"
@@ -21,7 +21,7 @@
         android:onClick="onUnderstood"
         android:text="@string/btn_understood"
         android:textColor="#000000"
-        android:textSize="25dp"
+        android:textSize="@dimen/font_button_size"
         android:textStyle="bold" />
 
     <ScrollView

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

@@ -12,14 +12,12 @@
     <!-- This FrameLayout insets its children based on system windows using
          android:fitsSystemWindows. -->
 
-    <Button
-        android:id="@+id/button5"
+    <TextView
+        android:id="@+id/textView"
         android:layout_width="match_parent"
-        android:layout_height="70dp"
-        android:layout_gravity="center_horizontal"
+        android:layout_height="wrap_content"
         android:text="@string/lbl_journal"
-        android:textSize="30dp"
-        android:textStyle="bold" />
+        android:textSize="@dimen/big_label_size" />
 
     <ListView
         android:id="@+id/list_layout"

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

@@ -4,16 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="#E6616161"
     tools:context=".TutoActivity">
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_marginBottom="8dp"
         android:src="@drawable/logo"
         android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/btn_prev"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -23,6 +25,7 @@
         android:layout_height="wrap_content"
         android:onClick="onNext"
         android:text="@string/btn_next"
+        android:textSize="@dimen/font_button_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
@@ -32,6 +35,7 @@
         android:layout_height="wrap_content"
         android:onClick="onPrev"
         android:text="@string/btn_prev"
+        android:textSize="@dimen/font_button_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -45,6 +49,7 @@
         android:layout_marginStart="8dp"
         android:onClick="onPass"
         android:text="@string/btn_pass"
+        android:textSize="@dimen/font_button_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btn_next"
         app:layout_constraintStart_toEndOf="@+id/btn_prev" />

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

@@ -91,7 +91,8 @@
                                 android:layout_gravity="bottom"
                                 android:layout_weight="5"
                                 android:hint="Désamorcer la bombe"
-                                android:text="@string/btn_defuse" />
+                                android:text="@string/btn_defuse"
+                                android:textSize="@dimen/font_button_size" />
                         </LinearLayout>
                     </ScrollView>
 

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

@@ -88,7 +88,8 @@
             android:id="@+id/btn_scan"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/btn_scan" />
+            android:text="@string/btn_scan"
+            android:textSize="@dimen/font_button_size" />
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/values-large/dimens.xml

@@ -2,4 +2,7 @@
 <resources>
     <dimen name="bomb_key_size">80dp</dimen>
     <dimen name="padding_afficheur" > 50dp</dimen>
+    <dimen name="font_button_size">35dp</dimen>
+    <dimen name="label_size">14dp</dimen>
+    <dimen name="big_label_size">25dp</dimen>
 </resources>

app/src/main/res/values-normal/dimens.xml

@@ -2,4 +2,7 @@
 <resources>
     <dimen name="bomb_key_size">60dp</dimen>
     <dimen name="padding_afficheur" > 10dp</dimen>
+    <dimen name="font_button_size">16dp</dimen>
+    <dimen name="label_size">14dp</dimen>
+    <dimen name="big_label_size">25dp</dimen>
 </resources>

app/src/main/res/values-small/dimens.xml

@@ -3,4 +3,8 @@
 
     <dimen name="bomb_key_size">40dp</dimen>
     <dimen name="padding_afficheur" > 0dp</dimen>
+    <dimen name="font_size" />
+    <dimen name="font_button_size">14dp</dimen>
+    <dimen name="label_size">12dp</dimen>
+    <dimen name="big_label_size">20dp</dimen>
 </resources>

app/src/main/res/values-xlarge/dimens.xml

@@ -2,4 +2,7 @@
 <resources>
     <dimen name="bomb_key_size">90dp</dimen>
     <dimen name="padding_afficheur" > 100dp</dimen>
+    <dimen name="font_button_size">40dp</dimen>
+    <dimen name="label_size">16dp</dimen>
+    <dimen name="big_label_size">30dp</dimen>
 </resources>

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

@@ -7,4 +7,7 @@
     <dimen name="title_text_size">30dp</dimen>
     <dimen name="bomb_key_size">60dp</dimen>
     <dimen name="padding_afficheur" />
+    <dimen name="font_button_size">14dp</dimen>
+    <dimen name="label_size">14dp</dimen>
+    <dimen name="big_label_size">25dp</dimen>
 </resources>