From 2d4f2e831f35ca528dc36ef1a374c821610d998f Mon Sep 17 00:00:00 2001
From: Alexis Drai <drai.alexis@gmail.com>
Date: Mon, 3 Oct 2022 11:21:31 +0200
Subject: [PATCH] :poop: Add icon button...

---
 .idea/deploymentTargetDropDown.xml          | 12 -----------
 .idea/gradle.xml                            |  2 +-
 app/src/main/java/fr/iut/pm/QuizActivity.kt |  9 ++++----
 app/src/main/res/drawable/ic_next_btn.xml   |  5 +++++
 app/src/main/res/layout/activity_quiz.xml   | 23 ++++++++++++---------
 app/src/main/res/values-fr-rFR/strings.xml  |  2 +-
 app/src/main/res/values/strings.xml         |  2 +-
 7 files changed, 26 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_next_btn.xml

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 93bb7d7..cc74c73 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,18 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="R52MA0DTKCR" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-10-03T08:49:19.257046Z" />
     <runningDeviceTargetsSelectedWithDialog>
       <Target>
         <type value="RUNNING_DEVICE_TARGET" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6995054..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="18" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/fr/iut/pm/QuizActivity.kt b/app/src/main/java/fr/iut/pm/QuizActivity.kt
index a321ef5..8655b05 100644
--- a/app/src/main/java/fr/iut/pm/QuizActivity.kt
+++ b/app/src/main/java/fr/iut/pm/QuizActivity.kt
@@ -2,6 +2,7 @@ package fr.iut.pm
 
 import android.os.Bundle
 import android.widget.Button
+import android.widget.ImageButton
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -14,20 +15,20 @@ class QuizActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_quiz)
 
+//        val TAG = this.localClassName
+
         val questions = Stub().loadQuestions(resources)
 
         val textViewQuestion = findViewById<TextView>(R.id.textViewQuestion)
-        val btnNext = findViewById<Button>(R.id.btnNext)
-        val btnRestart = findViewById<Button>(R.id.btnRestart)
 
         var iterator = questions.iterator()
         nextQuestion(textViewQuestion, iterator)
 
-        btnNext.setOnClickListener {
+        findViewById<ImageButton>(R.id.btnNext).setOnClickListener {
             nextQuestion(textViewQuestion, iterator)
         }
 
-        btnRestart.setOnClickListener {
+        findViewById<Button>(R.id.btnRestart).setOnClickListener {
             iterator = questions.iterator()
             nextQuestion(textViewQuestion, iterator)
         }
diff --git a/app/src/main/res/drawable/ic_next_btn.xml b/app/src/main/res/drawable/ic_next_btn.xml
new file mode 100644
index 0000000..fe51230
--- /dev/null
+++ b/app/src/main/res/drawable/ic_next_btn.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_quiz.xml b/app/src/main/res/layout/activity_quiz.xml
index 6871c46..93f07d7 100644
--- a/app/src/main/res/layout/activity_quiz.xml
+++ b/app/src/main/res/layout/activity_quiz.xml
@@ -19,8 +19,8 @@
             android:id="@+id/textViewQuestion"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1"
             android:layout_marginBottom="20dp"
+            android:layout_weight="1"
             android:gravity="center"
             android:text="@string/lorem_ipsum" />
 
@@ -35,42 +35,45 @@
 
             <Button
                 android:id="@+id/btnTrue"
+                style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="100dp"
                 android:layout_height="match_parent"
                 android:layout_margin="10dp"
                 android:backgroundTint="#888"
                 android:text="@string/true_btn"
-                android:textColor="@color/black"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:textColor="@color/black" />
 
             <Button
                 android:id="@+id/btnFalse"
+                style="?android:attr/buttonBarButtonStyle"
                 android:layout_width="100dp"
                 android:layout_height="match_parent"
                 android:layout_margin="10dp"
                 android:backgroundTint="#888"
                 android:text="@string/false_btn"
-                android:textColor="@color/black"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:textColor="@color/black" />
 
         </LinearLayout>
 
-        <Button
+        <ImageButton
             android:id="@+id/btnNext"
-            android:layout_width="220dp"
+            android:layout_width="108dp"
             android:layout_height="0dp"
-            android:layout_weight="1"
             android:layout_margin="10dp"
+            android:layout_weight="1"
+            android:src="@drawable/ic_next_btn"
             android:backgroundTint="#848"
-            android:text="@string/next_question_btn"
+            android:contentDescription="@string/next_question_btn"
             android:textColor="@color/black" />
+        <!--            android:text="@string/next_question_btn"-->
+        <!--            android:background="@drawable/ic_next_btn"-->
 
         <Button
             android:id="@+id/btnRestart"
             android:layout_width="220dp"
             android:layout_height="0dp"
-            android:layout_weight="1"
             android:layout_margin="10dp"
+            android:layout_weight="1"
             android:backgroundTint="#f88"
             android:text="@string/restart_btn"
             android:textColor="@color/black" />
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index e0bd54e..214a7d0 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -7,6 +7,6 @@
     <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="next_question_btn">(SUIVANTE)</string>
     <string name="restart_btn">RECOMMENCER</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 ce2a9bc..5fcd4ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,7 @@
     <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="next_question_btn">(NEXT)</string>
     <string name="question1" translatable="false">Yo mama... something something</string>
     <string name="question2" translatable="false">My mama... yada yada yada</string>
     <string name="question3" translatable="false">Their mama... blah blah</string>