From b8d8c91433004af8271c27640739d5d04624d25f Mon Sep 17 00:00:00 2001
From: Ossama <Ossama1998@windowslive.com>
Date: Fri, 17 Apr 2020 01:12:06 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20l'interface=20graphiqu?=
 =?UTF-8?q?e=20#121?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../androidapp/vue/activity/MainActivity.java |   2 -
 .../vue/adapter/ExpandableListAdapter.java    |   3 +-
 .../src/main/res/drawable/custom_button4.xml  |   8 +++
 .../app/src/main/res/layout/activity_home.xml |   2 +-
 .../main/res/layout/activity_inscription.xml  |   3 +
 .../src/main/res/layout/activity_recap.xml    |  61 +++++++++---------
 .../{drawable => mipmap-mdpi}/uni_logo.png    | Bin
 7 files changed, 43 insertions(+), 36 deletions(-)
 create mode 100644 AndroidApp/app/src/main/res/drawable/custom_button4.xml
 rename AndroidApp/app/src/main/res/{drawable => mipmap-mdpi}/uni_logo.png (100%)

diff --git a/AndroidApp/app/src/main/java/com/androidapp/vue/activity/MainActivity.java b/AndroidApp/app/src/main/java/com/androidapp/vue/activity/MainActivity.java
index 1baeb5c..c4f817d 100644
--- a/AndroidApp/app/src/main/java/com/androidapp/vue/activity/MainActivity.java
+++ b/AndroidApp/app/src/main/java/com/androidapp/vue/activity/MainActivity.java
@@ -285,12 +285,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
         int id = item.getItemId();
-
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
             return true;
         }
-
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/AndroidApp/app/src/main/java/com/androidapp/vue/adapter/ExpandableListAdapter.java b/AndroidApp/app/src/main/java/com/androidapp/vue/adapter/ExpandableListAdapter.java
index 23d25ee..26f25ec 100644
--- a/AndroidApp/app/src/main/java/com/androidapp/vue/adapter/ExpandableListAdapter.java
+++ b/AndroidApp/app/src/main/java/com/androidapp/vue/adapter/ExpandableListAdapter.java
@@ -13,6 +13,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -118,8 +119,6 @@ public View getChildView(final int groupPosition, final int childPosition,
         mRecyclerView.setAdapter(mAdapter);
         mAdapter.notifyDataSetChanged();
         AdapterCollection.put(groupPosition, mAdapter);
-
-
         return mRecyclerView;
     }
 
diff --git a/AndroidApp/app/src/main/res/drawable/custom_button4.xml b/AndroidApp/app/src/main/res/drawable/custom_button4.xml
new file mode 100644
index 0000000..69b88c7
--- /dev/null
+++ b/AndroidApp/app/src/main/res/drawable/custom_button4.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+
+    <solid android:color="#FF0F00" > </solid>
+
+    <corners android:radius="100dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/AndroidApp/app/src/main/res/layout/activity_home.xml b/AndroidApp/app/src/main/res/layout/activity_home.xml
index f46e2d1..4c886c0 100644
--- a/AndroidApp/app/src/main/res/layout/activity_home.xml
+++ b/AndroidApp/app/src/main/res/layout/activity_home.xml
@@ -13,7 +13,7 @@
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="188dp"
-        app:srcCompat="@drawable/uni_logo"
+        app:srcCompat="@mipmap/uni_logo"
         tools:layout_editor_absoluteX="8dp"
         tools:layout_editor_absoluteY="29dp" />
 
diff --git a/AndroidApp/app/src/main/res/layout/activity_inscription.xml b/AndroidApp/app/src/main/res/layout/activity_inscription.xml
index 5935529..cc1783c 100644
--- a/AndroidApp/app/src/main/res/layout/activity_inscription.xml
+++ b/AndroidApp/app/src/main/res/layout/activity_inscription.xml
@@ -82,7 +82,10 @@
         android:id="@+id/buttonValiderInscription"
         android:layout_width="358dp"
         android:layout_height="70dp"
+        android:textSize="20sp"
+        android:textColor="#FFFFFF"
         android:layout_alignParentBottom="true"
         android:layout_centerHorizontal="true"
+        android:background="@drawable/custom_button4"
         android:text="Valider" />
     </LinearLayout>
\ No newline at end of file
diff --git a/AndroidApp/app/src/main/res/layout/activity_recap.xml b/AndroidApp/app/src/main/res/layout/activity_recap.xml
index b024387..4330a15 100644
--- a/AndroidApp/app/src/main/res/layout/activity_recap.xml
+++ b/AndroidApp/app/src/main/res/layout/activity_recap.xml
@@ -110,6 +110,7 @@
 
         </LinearLayout>
 
+
     <Button
         android:id="@+id/RetourArriereRecap"
         android:layout_width="358dp"
@@ -124,36 +125,34 @@
         android:background="@drawable/custom_button"
         android:text="Recommencer mon parcours" />
 
-    <Button
-        android:id="@+id/buttonConfirmation"
-        android:layout_width="358dp"
-        android:layout_height="70dp"
-        android:textSize="20sp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@drawable/custom_button"
-        android:onClick="onClickBtn"
-        android:text="Finaliser mon inscription" />
-
-    <Button
-        android:id="@+id/buttonPartager"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:textSize="20sp"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginTop="60dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_gravity="bottom|right"
-        android:background="@drawable/custom_button3"
-        android:onClick="onClickBtn"
-        android:textColor="#FFFFFF"
-        android:text="Partager"/>
+        <Button
+            android:id="@+id/buttonConfirmation"
+            android:layout_width="358dp"
+            android:layout_height="70dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/custom_button"
+            android:text="Finaliser mon inscription"
+            android:textSize="20sp" />
+
+        <Button
+            android:id="@+id/buttonPartager"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="bottom|right"
+            android:layout_marginStart="8dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginTop="60dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="@drawable/custom_button3"
+            android:text="Partager"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp" />
 
 </LinearLayout>
diff --git a/AndroidApp/app/src/main/res/drawable/uni_logo.png b/AndroidApp/app/src/main/res/mipmap-mdpi/uni_logo.png
similarity index 100%
rename from AndroidApp/app/src/main/res/drawable/uni_logo.png
rename to AndroidApp/app/src/main/res/mipmap-mdpi/uni_logo.png