From 7dc300ef195ead446e79691c22af13d26f26c079 Mon Sep 17 00:00:00 2001
From: Alexis Drai <drai.alexis@gmail.com>
Date: Thu, 6 Oct 2022 09:50:45 +0200
Subject: [PATCH] :art: Add cheat button

---
 .../main/res/layout-land/activity_quiz.xml    | 23 ++++++++++++++-----
 .../main/res/layout-land/cheat_activity.xml   |  6 -----
 app/src/main/res/layout/activity_quiz.xml     | 15 ++++++++++--
 app/src/main/res/layout/cheat_activity.xml    |  2 +-
 app/src/main/res/values-fr-rFR/strings.xml    |  7 +++---
 app/src/main/res/values/strings.xml           |  7 +++---
 6 files changed, 39 insertions(+), 21 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/cheat_activity.xml

diff --git a/app/src/main/res/layout-land/activity_quiz.xml b/app/src/main/res/layout-land/activity_quiz.xml
index 2ec98d7..83cab06 100644
--- a/app/src/main/res/layout-land/activity_quiz.xml
+++ b/app/src/main/res/layout-land/activity_quiz.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="400dp"
+        android:layout_height="250dp"
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="vertical"
@@ -37,7 +37,7 @@
                 android:id="@+id/btnTrue"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="100dp"
-                android:layout_height="match_parent"
+                android:layout_height="100dp"
                 android:layout_margin="10dp"
                 android:backgroundTint="#888"
                 android:text="@string/true_btn"
@@ -47,7 +47,7 @@
                 android:id="@+id/btnFalse"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="100dp"
-                android:layout_height="match_parent"
+                android:layout_height="100dp"
                 android:layout_margin="10dp"
                 android:backgroundTint="#888"
                 android:text="@string/false_btn"
@@ -61,14 +61,25 @@
             android:layout_height="0dp"
             android:layout_margin="10dp"
             android:layout_weight="1"
-            android:layout_gravity="end"
             android:src="@drawable/ic_next_btn"
+            android:layout_gravity="end"
             android:backgroundTint="#848"
             android:contentDescription="@string/next_question_btn"
             android:textColor="@color/black" />
-        <!--            android:text="@string/next_question_btn"-->
-        <!--            android:background="@drawable/ic_next_btn"-->
 
     </LinearLayout>
 
+    <Button
+        android:id="@+id/btnCheat"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_margin="10dp"
+        android:backgroundTint="#888"
+        android:text="@string/cheat"
+        android:textColor="@color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/cheat_activity.xml b/app/src/main/res/layout-land/cheat_activity.xml
deleted file mode 100644
index cdc89f2..0000000
--- a/app/src/main/res/layout-land/cheat_activity.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_quiz.xml b/app/src/main/res/layout/activity_quiz.xml
index 371a860..8bab670 100644
--- a/app/src/main/res/layout/activity_quiz.xml
+++ b/app/src/main/res/layout/activity_quiz.xml
@@ -65,9 +65,20 @@
             android:backgroundTint="#848"
             android:contentDescription="@string/next_question_btn"
             android:textColor="@color/black" />
-        <!--            android:text="@string/next_question_btn"-->
-        <!--            android:background="@drawable/ic_next_btn"-->
 
     </LinearLayout>
 
+    <Button
+        android:id="@+id/btnCheat"
+        style="?android:attr/buttonBarButtonStyle"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_margin="10dp"
+        android:backgroundTint="#888"
+        android:text="@string/cheat"
+        android:textColor="@color/black"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/cheat_activity.xml b/app/src/main/res/layout/cheat_activity.xml
index ee185e9..7f1d139 100644
--- a/app/src/main/res/layout/cheat_activity.xml
+++ b/app/src/main/res/layout/cheat_activity.xml
@@ -6,7 +6,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="250dp"
+        android:layout_height="200dp"
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="vertical"
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index ba6c26a..374eedd 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -2,15 +2,16 @@
 <resources>
     <string name="app_name">Quiz</string>
     <string name="in_the_middle">En plein milieu</string>
-    <string name="false_btn">FAUX</string>
-    <string name="true_btn">VRAI</string>
+    <string name="false_btn">Faux</string>
+    <string name="true_btn">Vrai</string>
+    <string name="next_question_btn">(Suivant)</string>
     <string name="lorem_ipsum">Lorem ipsum dolor sit amet</string>
     <string name="correct_answer">Oui!</string>
     <string name="wrong_answer">Kwô?</string>
-    <string name="next_question_btn">(SUIVANTE)</string>
     <string name="question1">Question 1</string>
     <string name="question2">Question 2</string>
     <string name="question3">Question 3</string>
     <string name="are_you_sure">Êtes-vous sûr?</string>
     <string name="show_answer">Voir réponse</string>
+    <string name="cheat">Tricher</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c898097..d8ffd01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,15 +1,16 @@
 <resources>
     <string name="app_name">Quiz</string>
     <string name="in_the_middle">Right in the middle</string>
-    <string name="false_btn">FALSE</string>
-    <string name="true_btn">TRUE</string>
+    <string name="false_btn">False</string>
+    <string name="true_btn">True</string>
+    <string name="next_question_btn">(Next)</string>
     <string name="lorem_ipsum">Lorem ipsum dolor sit amet</string>
     <string name="correct_answer">That\'s right!</string>
     <string name="wrong_answer">U wot m8?</string>
-    <string name="next_question_btn">(NEXT)</string>
     <string name="question1">Yo mama…</string>
     <string name="question2">My mama…</string>
     <string name="question3">Their mama…</string>
     <string name="are_you_sure">Are you sure about that?</string>
     <string name="show_answer">Show answer</string>
+    <string name="cheat">Cheat</string>
 </resources>
\ No newline at end of file