From 3d496298fb0fb87420f6e21553c925e5ef84a6c3 Mon Sep 17 00:00:00 2001
From: loperret2 <louis.perret@etu.uca.fr>
Date: Fri, 14 Oct 2022 18:48:22 +0200
Subject: [PATCH] =?UTF-8?q?Detail=20finalis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                              |  7 ++
 .idea/vcs.xml                               |  1 -
 app/src/main/res/layout/fragment_detail.xml | 92 ++++++++++++++++-----
 3 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdd9278..3202732 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,4 +7,11 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.2289156626506024" />
+      </ProjectState>
+    </option>
+  </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 76a54c4..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/Ouaff" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 6584d7a..8260f35 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -5,39 +5,73 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <RatingBar
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:numStars="3"
+        app:layout_constraintBottom_toBottomOf="@id/agressiviteChien"
+        app:layout_constraintLeft_toRightOf="@id/barrier"
+        app:layout_constraintTop_toTopOf="@id/agressiviteChien"
+        tools:ignore="SpeakableTextPresentCheck" />
+
     <EditText
-        android:id="@+id/textFieldRaceChien"
+        android:id="@+id/textFieldMesureChien"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ems="10"
-        android:hint="Race"
+        android:hint="Nom"
         android:inputType="textPersonName"
-        android:text="Name"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/mesureChien"
         app:layout_constraintLeft_toRightOf="@+id/barrier"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+        app:layout_constraintTop_toTopOf="@id/mesureChien"
+        tools:ignore="TouchTargetSizeCheck" />
+
+
+    <Spinner
+        android:id="@+id/spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="Genre"
+        app:layout_constraintBottom_toBottomOf="@id/genreChien"
+        app:layout_constraintLeft_toRightOf="@id/barrier"
+        app:layout_constraintTop_toTopOf="@id/genreChien"
+        tools:ignore="TouchTargetSizeCheck" />
 
     <EditText
         android:id="@+id/textFieldNomChien"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:ems="10"
+        android:hint="Nom"
+        android:inputType="textPersonName"
+        app:layout_constraintBottom_toBottomOf="@id/nomChien"
+        app:layout_constraintLeft_toRightOf="@+id/barrier"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        tools:ignore="TouchTargetSizeCheck" />
+
+    <EditText
+        android:id="@+id/textFieldRaceChien"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:layout_marginEnd="52dp"
-        android:layout_marginRight="52dp"
         android:ems="10"
         android:hint="Nom"
         android:inputType="textPersonName"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/raceChien"
         app:layout_constraintLeft_toRightOf="@+id/barrier"
-        app:layout_constraintTop_toBottomOf="@+id/textFieldRaceChien" />
+        app:layout_constraintTop_toBottomOf="@+id/textFieldNomChien"
+        tools:ignore="TouchTargetSizeCheck" />
 
     <TextView
-        android:id="@+id/agressivite"
+        android:id="@+id/agressiviteChien"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="56dp"
         android:text="Aggressivité"
-        app:layout_constraintTop_toBottomOf="@+id/mesureChien" />
+        android:textColor="@color/colorPrimary"
+        app:layout_constraintTop_toBottomOf="@+id/mesureChien"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@id/barrier"/>
 
     <TextView
         android:id="@+id/mesureChien"
@@ -45,7 +79,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="56dp"
         android:text="Mesure"
-        app:layout_constraintTop_toBottomOf="@+id/genreChien" />
+        android:textColor="@color/colorPrimary"
+        app:layout_constraintTop_toBottomOf="@+id/genreChien"
+        app:layout_constraintRight_toLeftOf="@id/barrier"
+        app:layout_constraintLeft_toLeftOf="parent"/>
 
     <TextView
         android:id="@+id/genreChien"
@@ -53,32 +90,47 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="58dp"
         android:text="Genre"
-        app:layout_constraintTop_toTopOf="@+id/nomChien" />
+        android:textColor="@color/colorPrimary"
+        app:layout_constraintTop_toBottomOf="@+id/raceChien"
+        app:layout_constraintRight_toLeftOf="@id/barrier"
+        app:layout_constraintLeft_toLeftOf="parent"/>
+
+    <TextView
+        android:id="@+id/raceChien"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:textColor="@color/colorPrimary"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/nomChien"
+        app:layout_constraintRight_toLeftOf="@id/barrier"/>
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/colorPrimary"
+        android:background="@color/editorColorPrimary"
         android:minHeight="?attr/actionBarSize"
         android:theme="?attr/actionBarTheme"
         app:layout_constraintStart_toEndOf="@+id/nomChien"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        />
 
     <TextView
         android:id="@+id/nomChien"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
-        android:text="Nom"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar" />
+        android:text="Identité"
+        android:textColor="@color/colorPrimary"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar"
+        app:layout_constraintRight_toLeftOf="@id/barrier"/>
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/barrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:maxWidth="20px"
-        android:minWidth="20px"
         app:barrierDirection="right"
-        app:constraint_referenced_ids="nomChien,genreChien,mesureChien,agressivite" />
+        app:constraint_referenced_ids="nomChien,genreChien,mesureChien,agressiviteChien" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file