From 39db6f8f76cf519100e6638ddec5c1f4753ed10f Mon Sep 17 00:00:00 2001
From: Hamlix <nathanaelle@famille-viller.com>
Date: Tue, 14 Mar 2017 12:55:39 +0100
Subject: [PATCH 01/14] Create of association page

---
 app/src/main/AndroidManifest.xml              |  7 +-
 .../ui/activites/ShowAssociationActivity.java | 71 +++++++++++++++++++
 .../ui/fragment/AssociationMainFragment.java  | 14 ++++
 .../res/layout/activity_show_association.xml  | 49 +++++++++++++
 4 files changed, 138 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
 create mode 100644 app/src/main/res/layout/activity_show_association.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9602e12..ca7c6f3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,10 +19,11 @@
         <activity android:name=".ui.activites.LoginActivity" />
         <activity android:name=".ui.activites.AssociationDashboardActivity" />
         <activity android:name=".ui.activites.AgendaGeneratorActivity" />
-        <activity android:name=".ui.activites.AgendaActivity"></activity>
+        <activity android:name=".ui.activites.AgendaActivity" />
         <activity android:name=".ui.activites.ListEventsActivity" />
-        <activity android:name=".ui.activites.EventInfosActivity"></activity>
-        <activity android:name=".ui.activites.EventResearchActivity"></activity>
+        <activity android:name=".ui.activites.EventInfosActivity" />
+        <activity android:name=".ui.activites.EventResearchActivity" />
+        <activity android:name=".ui.activites.ShowAssociationActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
new file mode 100644
index 0000000..5b43950
--- /dev/null
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
@@ -0,0 +1,71 @@
+package fr.paris10.projet.assogenda.assogenda.ui.activites;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+
+
+import fr.paris10.projet.assogenda.assogenda.R;
+import fr.paris10.projet.assogenda.assogenda.model.Association;
+import fr.paris10.projet.assogenda.assogenda.model.User;
+
+public class ShowAssociationActivity extends AppCompatActivity {
+    private String associationID;
+    private Association association;
+    private User president;
+    private TextView nameAsso;
+    private TextView descAsso;
+    private TextView namePrez;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_show_association);
+        nameAsso = (TextView) findViewById(R.id.activity_show_association_name_asso);
+        descAsso = (TextView) findViewById(R.id.activity_show_association_description_asso);
+        namePrez = (TextView) findViewById(R.id.activity_show_association_name_president);
+        associationID = (String) getIntent().getExtras().get("associationID");
+        DatabaseReference reference = FirebaseDatabase.getInstance().getReference("association");
+        reference.child(associationID).addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                if (dataSnapshot.exists()) {
+                    association = dataSnapshot.getValue(Association.class);
+                    nameAsso.setText(association.name);
+                    descAsso.setText(association.description);
+                    namePrez.setText(" ");
+                    DatabaseReference references = FirebaseDatabase.getInstance().getReference("users");
+                    references.child(association.president).addListenerForSingleValueEvent(new ValueEventListener() {
+                        @Override
+                        public void onDataChange(DataSnapshot dataSnapshot) {
+                            if (dataSnapshot.exists()) {
+                                president = dataSnapshot.getValue(User.class);
+                                namePrez.setText(president.firstName+" "+president.lastName);
+                            }
+                        }
+
+                        @Override
+                        public void onCancelled(DatabaseError databaseError) {
+
+                        }
+                    });
+                }
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+
+
+
+
+    }
+}
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/fragment/AssociationMainFragment.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/fragment/AssociationMainFragment.java
index fa1561a..737b6ec 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/fragment/AssociationMainFragment.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/fragment/AssociationMainFragment.java
@@ -2,12 +2,14 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.ListView;
 
@@ -23,6 +25,8 @@
 
 import fr.paris10.projet.assogenda.assogenda.R;
 import fr.paris10.projet.assogenda.assogenda.model.Association;
+import fr.paris10.projet.assogenda.assogenda.ui.activites.EventInfosActivity;
+import fr.paris10.projet.assogenda.assogenda.ui.activites.ShowAssociationActivity;
 import fr.paris10.projet.assogenda.assogenda.ui.adapter.CustomAssociationAdapter;
 
 /**
@@ -64,6 +68,7 @@ public void onCreate(Bundle savedInstanceState) {
                 @Override
                 public void onChildAdded(DataSnapshot snapshot, String previousChild) {
                     Association association = snapshot.getValue(Association.class);
+                    association.id=snapshot.getKey();
                     items.add(association);
                     associationAdapter.notifyDataSetChanged();
                 }
@@ -97,6 +102,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View v = inflater.inflate(R.layout.fragment_association_main, container, false);
         listView = (ListView) v.findViewById(R.id.fragment_association_main_listView);
         listView.setAdapter(associationAdapter);
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                Intent intent = new Intent(view.getContext(), ShowAssociationActivity.class);
+                Association association = items.get(position);
+                intent.putExtra("associationID", association.id);
+                startActivity(intent);
+            }
+        });
         Button createAssociationButton =
                 (Button) v.findViewById(R.id.fragment_association_main_button_create_association);
         createAssociationButton.setOnClickListener(this);
diff --git a/app/src/main/res/layout/activity_show_association.xml b/app/src/main/res/layout/activity_show_association.xml
new file mode 100644
index 0000000..caf3266
--- /dev/null
+++ b/app/src/main/res/layout/activity_show_association.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_show_association"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="fr.paris10.projet.assogenda.assogenda.ui.activites.ShowAssociationActivity">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:text="TextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_show_association_name_asso" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srcCompat="@mipmap/ic_launcher"
+            android:id="@+id/activity_show_association_logo_asso" />
+
+        <TextView
+            android:text="TextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_show_association_name_president" />
+
+        <TextView
+            android:text="TextView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_show_association_description_asso" />
+
+        <Button
+            android:text="Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_show_association_create_event" />
+    </LinearLayout>
+</RelativeLayout>

From d00777278e0f16e085e5609267eb63936cbc1402 Mon Sep 17 00:00:00 2001
From: Hamlix <nathanaelle@famille-viller.com>
Date: Tue, 14 Mar 2017 16:08:13 +0100
Subject: [PATCH 02/14] Correct error event's association

---
 .../assogenda/assogenda/model/Event.java      |  4 ++--
 .../ui/activites/EventInfosActivity.java      | 20 +++++++++++++++++++
 .../ui/activites/ListEventsActivity.java      | 10 ++++++----
 .../ui/activites/ShowAssociationActivity.java | 15 ++++++++++++++
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/model/Event.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/model/Event.java
index 82f0f0c..387caba 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/model/Event.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/model/Event.java
@@ -20,7 +20,7 @@ public class Event {
     public int bail;
     public int seat_number;
     public int seat_free;
-    public Association association;
+    public String association;
     public int logo;
 
     public static DateFormat dateFormat =
@@ -31,7 +31,7 @@ public Event(){
     }
 
     public Event(String uid,String name, String start, String end, String type, String description, String location,
-                 float price, int bail, int seat_number, Association association, int logo){
+                 float price, int bail, int seat_number, String association, int logo){
         this.uid=uid;
         this.name=name;
         this.start=start;
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
index 8aa64e8..190e85a 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 
 import fr.paris10.projet.assogenda.assogenda.R;
+import fr.paris10.projet.assogenda.assogenda.model.Association;
 import fr.paris10.projet.assogenda.assogenda.model.Event;
 
 
@@ -29,6 +30,7 @@ public class EventInfosActivity extends AppCompatActivity {
     private String eventUID;
     private Event event;
     private TextView nameEvent;
+    private TextView nameAsso;
     private FirebaseAuth mFirebaseAuth;
     private FirebaseUser mFirebaseUser;
 
@@ -40,6 +42,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_event_infos);
         eventUID = (String) getIntent().getExtras().get("eventUID");
         nameEvent = (TextView) findViewById(R.id.activity_event_infos_name_event);
+        nameAsso = (TextView) findViewById(R.id.activity_event_infos_name_asso);
+
         loadEventInfoInBackground();
     }
 
@@ -53,6 +57,22 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                     event = dataSnapshot.getValue(Event.class);
                     event.uid=eventUID;
                     nameEvent.setText(event.name);
+                    nameAsso.setText(" ");
+                    DatabaseReference references = FirebaseDatabase.getInstance().getReference("association");
+                    references.child(event.association).addListenerForSingleValueEvent(new ValueEventListener() {
+                        @Override
+                        public void onDataChange(DataSnapshot dataS) {
+                            if (dataS.exists()) {
+                                Association a = dataS.getValue(Association.class);
+                                nameAsso.setText(a.name);
+                            }
+                        }
+
+                        @Override
+                        public void onCancelled(DatabaseError databaseError) {
+
+                        }
+                    });
                     HashMap<String,Object> hashMapValueDateBegin = new HashMap<>();
                     hashMapValueDateBegin.put("title_info","Date de début : ");
                     hashMapValueDateBegin.put("content_info",event.start);
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java
index 3cf8bf3..0b24729 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java
@@ -25,6 +25,7 @@
 import java.util.List;
 
 import fr.paris10.projet.assogenda.assogenda.R;
+import fr.paris10.projet.assogenda.assogenda.model.Association;
 import fr.paris10.projet.assogenda.assogenda.model.Event;
 
 public class ListEventsActivity extends AppCompatActivity {
@@ -33,7 +34,9 @@ public class ListEventsActivity extends AppCompatActivity {
     private SimpleAdapter adapter;
     private List<Event> listeEvenements = new ArrayList<>();
     private List<Event> listEventSort = new ArrayList<>();
+    private List<Association> listAssociation = new ArrayList<>();
 
+    private Association association;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -90,6 +93,7 @@ public Boolean compareDate(String event1, String event2) {
     }
 
     public void loadEventInBackground() {
+
         DatabaseReference reference = FirebaseDatabase.getInstance().getReference().child("events");
         reference.addListenerForSingleValueEvent(new ValueEventListener() {
             @Override
@@ -124,11 +128,9 @@ public void onDataChange(DataSnapshot dataSnapshot) {
 
                     for (Event event : listEventSort) {
                         HashMap<String, Object> hashMapValuesEvent = new HashMap<>();
+
                         hashMapValuesEvent.put("nameEvent", event.name);
-                        if (event.association == null)
-                            hashMapValuesEvent.put("association", "Nom asso");
-                        else
-                            hashMapValuesEvent.put("association", event.association);
+                        hashMapValuesEvent.put("association", " ");
                         hashMapValuesEvent.put("dateEventBegin", event.start);
                         hashMapValuesEvent.put("dateEventEnd", event.end);
                         hashMapValuesEvent.put("locationEvent", event.location);
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
index 5b43950..5b1a222 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
@@ -1,7 +1,10 @@
 package fr.paris10.projet.assogenda.assogenda.ui.activites;
 
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.google.firebase.database.DataSnapshot;
@@ -22,6 +25,7 @@ public class ShowAssociationActivity extends AppCompatActivity {
     private TextView nameAsso;
     private TextView descAsso;
     private TextView namePrez;
+    private Button createEvent;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -30,6 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
         nameAsso = (TextView) findViewById(R.id.activity_show_association_name_asso);
         descAsso = (TextView) findViewById(R.id.activity_show_association_description_asso);
         namePrez = (TextView) findViewById(R.id.activity_show_association_name_president);
+        createEvent = (Button) findViewById(R.id.activity_show_association_create_event);
         associationID = (String) getIntent().getExtras().get("associationID");
         DatabaseReference reference = FirebaseDatabase.getInstance().getReference("association");
         reference.child(associationID).addListenerForSingleValueEvent(new ValueEventListener() {
@@ -64,6 +69,16 @@ public void onCancelled(DatabaseError databaseError) {
             }
         });
 
+        createEvent.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+               /* Intent intent = new Intent(getApplicationContext(), CreateEventActivity.class);
+                intent.putExtra("assoID", associationID);
+                startActivity(intent);*/
+            }
+        });
+
+
 
 
 

From e0ecb78d054f8a7bd5cf2ac047921f4e25f623e3 Mon Sep 17 00:00:00 2001
From: repocque <remypoc@free.fr>
Date: Thu, 16 Mar 2017 09:46:47 +0100
Subject: [PATCH 03/14] fix(issue-25) : delete useless agenda activity

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../ui/activites/AgendaActivity.java          | 27 -------------------
 .../assogenda/ui/activites/MainActivity.java  |  2 +-
 app/src/main/res/layout/activity_agenda.xml   | 20 --------------
 4 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivity.java
 delete mode 100644 app/src/main/res/layout/activity_agenda.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c332c51..5c8cf94 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,6 @@
         <activity android:name=".ui.activites.LoginActivity" />
         <activity android:name=".ui.activites.AssociationDashboardActivity" />
         <activity android:name=".ui.activites.AgendaGeneratorActivity" />
-        <activity android:name=".ui.activites.AgendaActivity"/>
         <activity android:name=".ui.activites.ListEventsActivity" />
         <activity android:name=".ui.activites.EventInfosActivity"/>
         <activity android:name=".ui.activites.CreateEventActivity"/>
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivity.java
deleted file mode 100644
index 052a97e..0000000
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivity.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package fr.paris10.projet.assogenda.assogenda.ui.activites;
-
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-
-import fr.paris10.projet.assogenda.assogenda.R;
-
-public class AgendaActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_agenda);
-
-        Button agendaButton = (Button) findViewById(R.id.activity_agenda_generate_button);
-        agendaButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Intent intent = new Intent(view.getContext(), AgendaGeneratorActivity.class);
-                startActivity(intent);
-            }
-        });
-    }
-}
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java
index f6873e5..f355d37 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java
@@ -60,7 +60,7 @@ public void onClick(View view) {
             agendaButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    Intent intent = new Intent(view.getContext(), AgendaActivity.class);
+                    Intent intent = new Intent(view.getContext(), AgendaGeneratorActivity.class);
                     startActivity(intent);
                 }
             });
diff --git a/app/src/main/res/layout/activity_agenda.xml b/app/src/main/res/layout/activity_agenda.xml
deleted file mode 100644
index 3fdfa11..0000000
--- a/app/src/main/res/layout/activity_agenda.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_agenda"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="fr.paris10.projet.assogenda.assogenda.ui.activites.AgendaActivity">
-
-    <Button
-        android:text="Générer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:id="@+id/activity_agenda_generate_button" />
-</RelativeLayout>

From f7323decbaece40e98788511123d2e2dae2e1a13 Mon Sep 17 00:00:00 2001
From: repocque <remypoc@free.fr>
Date: Thu, 16 Mar 2017 10:45:03 +0100
Subject: [PATCH 04/14] fix(issue-25) : delete agenda activity tests

---
 .../ui/activites/AgendaActivityRoboTest.java  | 65 -------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 app/src/test/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivityRoboTest.java

diff --git a/app/src/test/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivityRoboTest.java b/app/src/test/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivityRoboTest.java
deleted file mode 100644
index 535ebb3..0000000
--- a/app/src/test/java/fr/paris10/projet/assogenda/assogenda/ui/activites/AgendaActivityRoboTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package fr.paris10.projet.assogenda.assogenda.ui.activites;
-
-import android.content.Intent;
-import android.widget.Button;
-
-import com.google.firebase.FirebaseApp;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-
-import fr.paris10.projet.assogenda.assogenda.BuildConfig;
-import fr.paris10.projet.assogenda.assogenda.R;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.*;
-import static org.robolectric.Shadows.shadowOf;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(constants = BuildConfig.class, sdk = 22)
-
-public class AgendaActivityRoboTest {
-
-    private AgendaActivity agendaActivity;
-
-    @Before
-    public void setUp() throws Exception {
-        FirebaseApp.initializeApp(RuntimeEnvironment.application.getApplicationContext());
-        agendaActivity = Robolectric.buildActivity(AgendaActivity.class).create().get();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        agendaActivity = null;
-    }
-
-    @Test
-    public void shouldNotBeNull() throws Exception {
-        assertNotNull(agendaActivity);
-    }
-
-    @Test
-    public void onAgendaGeneration() throws Exception {
-        Button button = (Button) agendaActivity.findViewById(R.id.activity_agenda_generate_button);
-        assertNotNull(button);
-        assertTrue(button.performClick());
-    }
-
-    @Test
-    public void onActivityChange() throws Exception {
-        Button button = (Button) agendaActivity.findViewById(R.id.activity_agenda_generate_button);
-        assertNotNull(button);
-        ShadowActivity shadowActivity = shadowOf(agendaActivity);
-        button.performClick();
-        Intent startedIntent = shadowActivity.getNextStartedActivity();
-        assertThat(startedIntent.getComponent().getClassName(),
-                equalTo(AgendaGeneratorActivity.class.getName()));
-    }
-}
\ No newline at end of file

From 12474db95323e7c29437f01ef3b22b9d5bce5955 Mon Sep 17 00:00:00 2001
From: repocque <remypoc@free.fr>
Date: Thu, 16 Mar 2017 11:25:49 +0100
Subject: [PATCH 05/14] fix(issue-27) : add hint to association search view

---
 .../assogenda/ui/activites/ListAssociationActivity.java        | 1 +
 app/src/main/res/layout/activity_list_association.xml          | 1 +
 app/src/main/res/values/strings.xml                            | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListAssociationActivity.java
index aca1674..ee925a8 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListAssociationActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListAssociationActivity.java
@@ -53,6 +53,7 @@ protected void onCreate(Bundle savedInstanceState) {
             loadAllAssociations();
 
         searchView = (SearchView) findViewById(R.id.list_association_activity_search);
+        searchView.setQueryHint(getString(R.string.list_association_activity_search_hint));
         loadSearchListener();
     }
 
diff --git a/app/src/main/res/layout/activity_list_association.xml b/app/src/main/res/layout/activity_list_association.xml
index 148cfb3..3962b5d 100644
--- a/app/src/main/res/layout/activity_list_association.xml
+++ b/app/src/main/res/layout/activity_list_association.xml
@@ -22,6 +22,7 @@
     <SearchView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:queryHint=""
         android:id="@+id/list_association_activity.search" />
 
     <ListView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a499154..a9ae3aa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,6 +45,9 @@
     <string name="activity_event_infos_nparticipate_toast">Vous ne participez plus à l\'événement </string>
     <string name="activity_event_infos_participate_date_passed_toast">L\'événement est terminé !</string>
 
+    <!-- Association research -->
+    <string name="list_association_activity_search_hint">association, university…</string>
+
     <string name="password_hint">Password</string>
     <string name="email_hint">Email</string>
     <string name="sign_up_button_label">Sign Up</string>

From 0c4cf786f8e1f5ec03ddc264563b31dbb11dc65f Mon Sep 17 00:00:00 2001
From: Hamlix <nathanaelle@famille-viller.com>
Date: Thu, 16 Mar 2017 11:31:10 +0100
Subject: [PATCH 06/14] Correct bug show name asso

---
 .../ui/activites/EventInfosActivity.java      |  4 +--
 .../ui/activites/ListEventsActivity.java      | 28 ++++++++++++++++---
 .../ui/activites/ShowAssociationActivity.java |  4 +--
 .../res/layout/activity_show_association.xml  |  2 +-
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
index ea9e9a6..2763049 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
@@ -210,9 +210,7 @@ public void onCancelled(DatabaseError databaseError) {
                     adapter = new SimpleAdapter(EventInfosActivity.this,listValues,R.layout.content_infos_event,from,to);
                     listInfos.setAdapter(adapter);
                 }
-                listInfos = (ListView) findViewById(R.id.activity_event_infos_list);
-                adapter = new SimpleAdapter(EventInfosActivity.this, listValues, R.layout.content_infos_event, from, to);
-                listInfos.setAdapter(adapter);
+
 
                 updateParticipate();
             }
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java
index 228e68f..8611c01 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ListEventsActivity.java
@@ -34,9 +34,8 @@ public class ListEventsActivity extends AppCompatActivity {
     private SimpleAdapter adapter;
     private List<Event> listeEvenements = new ArrayList<>();
     private List<Event> listEventSort = new ArrayList<>();
-    private List<Association> listAssociation = new ArrayList<>();
+    private HashMap<String, String> listAssociation= new HashMap<>();
 
-    private Association association;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -95,6 +94,25 @@ public Boolean compareDate(String event1, String event2) {
     }
 
     public void loadEventInBackground() {
+        DatabaseReference references = FirebaseDatabase.getInstance().getReference("association");
+        references.addListenerForSingleValueEvent(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataS) {
+                if (dataS.exists()) {
+                    for (DataSnapshot e : dataS.getChildren()) {
+                        Association a = e.getValue(Association.class);
+                        a.id = e.getKey();
+                        if (listAssociation.get(a.id) == null)
+                            listAssociation.put(a.id, a.name);
+                    }
+                }
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
 
         DatabaseReference reference = FirebaseDatabase.getInstance().getReference().child("events");
         reference.addListenerForSingleValueEvent(new ValueEventListener() {
@@ -103,6 +121,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                 int tailleList;
                 int nbEvent;
                 int eventRestant;
+
                 if (dataSnapshot.exists()) {
                     for (DataSnapshot e : dataSnapshot.getChildren()) {
                         Event event = e.getValue(Event.class);
@@ -128,11 +147,12 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                         }
                     }
 
+
+
                     for (Event event : listEventSort) {
                         HashMap<String, Object> hashMapValuesEvent = new HashMap<>();
-
                         hashMapValuesEvent.put("nameEvent", event.name);
-                        hashMapValuesEvent.put("association", " ");
+                        hashMapValuesEvent.put("association", listAssociation.get(event.association));
                         hashMapValuesEvent.put("dateEventBegin", event.start);
                         hashMapValuesEvent.put("dateEventEnd", event.end);
                         hashMapValuesEvent.put("locationEvent", event.location);
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
index 5b1a222..4157d70 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
@@ -72,9 +72,9 @@ public void onCancelled(DatabaseError databaseError) {
         createEvent.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-               /* Intent intent = new Intent(getApplicationContext(), CreateEventActivity.class);
+                Intent intent = new Intent(getApplicationContext(), CreateEventActivity.class);
                 intent.putExtra("assoID", associationID);
-                startActivity(intent);*/
+                startActivity(intent);
             }
         });
 
diff --git a/app/src/main/res/layout/activity_show_association.xml b/app/src/main/res/layout/activity_show_association.xml
index caf3266..f641518 100644
--- a/app/src/main/res/layout/activity_show_association.xml
+++ b/app/src/main/res/layout/activity_show_association.xml
@@ -41,7 +41,7 @@
             android:id="@+id/activity_show_association_description_asso" />
 
         <Button
-            android:text="Button"
+            android:text="Create event"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/activity_show_association_create_event" />

From 69fda52d7d674504fd7796d9b4722418551581bc Mon Sep 17 00:00:00 2001
From: Hamlix <nathanaelle@famille-viller.com>
Date: Thu, 16 Mar 2017 11:59:02 +0100
Subject: [PATCH 07/14] =?UTF-8?q?Add=20symbol=20=E2=82=AC=20to=20price.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assogenda/assogenda/ui/activites/EventInfosActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
index 2763049..2f83cdc 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/EventInfosActivity.java
@@ -177,7 +177,7 @@ public void onCancelled(DatabaseError databaseError) {
                     hashMapValueDateEnd.put("content_info",event.end);
                     HashMap<String,Object> hashMapValuePrice = new HashMap<>();
                     hashMapValuePrice.put("title_info","Prix : ");
-                    hashMapValuePrice.put("content_info",event.price);
+                    hashMapValuePrice.put("content_info",event.price+" €");
                     HashMap<String,Object> hashMapValueSpace = new HashMap<>();
                     hashMapValueSpace.put("title_info","Places disponible : ");
                     hashMapValueSpace.put("content_info",event.seat_free);

From 0a18ae81eae2375bbc5cf212adec77667063d2e5 Mon Sep 17 00:00:00 2001
From: repocque <remypoc@free.fr>
Date: Thu, 16 Mar 2017 12:03:20 +0100
Subject: [PATCH 08/14] fix(issue-28) : display toast when a user successfully
 create his account

---
 .../assogenda/assogenda/ui/activites/SignUpActivity.java | 2 ++
 app/src/main/res/values/strings.xml                      | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/SignUpActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/SignUpActivity.java
index e8a8597..31124be 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/SignUpActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/SignUpActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.Toast;
 
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
@@ -82,6 +83,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
                             daoUser.createUser(task.getResult().getUser().getUid(), email, firstName, lastName);
                             startActivity(intent);
+                            Toast.makeText(getApplicationContext(), getString(R.string.signup_toast_connected), Toast.LENGTH_LONG).show();
                         } else {
                             showAlertDialogError(R.string.signup_error_title, task.getException().getMessage());
                         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a499154..631cde2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -45,16 +45,19 @@
     <string name="activity_event_infos_nparticipate_toast">Vous ne participez plus à l\'événement </string>
     <string name="activity_event_infos_participate_date_passed_toast">L\'événement est terminé !</string>
 
-    <string name="password_hint">Password</string>
-    <string name="email_hint">Email</string>
+    <!-- Signup -->
     <string name="sign_up_button_label">Sign Up</string>
     <string name="signup_error_message">Please make sure you enter an email address and password!</string>
     <string name="signup_error_title">Error!</string>
     <string name="signup_success">Account successfully created! You can now Login.</string>
+    <string name="sign_up_text">Sign Up!</string>
+    <string name="signup_toast_connected">successfully connected !</string>
+
+    <string name="password_hint">Password</string>
+    <string name="email_hint">Email</string>
     <string name="login_error_message">Please make sure you enter an email address and password!</string>
     <string name="login_error_title">Error!</string>
     <string name="login_button_label">Login</string>
-    <string name="sign_up_text">Sign Up!</string>
     <string name="title_activity_login">Sign in</string>
     <string name="add_item">Add New Item</string>
     <string name="action_logout">Logout</string>

From 5426ca6a96ef19712eb55546c099f06ed4b9cf82 Mon Sep 17 00:00:00 2001
From: repocque <remypoc@free.fr>
Date: Thu, 16 Mar 2017 12:20:52 +0100
Subject: [PATCH 09/14] fix(issue-28) : add string value

---
 app/src/main/res/values/strings.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 631cde2..825fbeb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,16 +53,7 @@
     <string name="sign_up_text">Sign Up!</string>
     <string name="signup_toast_connected">successfully connected !</string>
 
-    <string name="password_hint">Password</string>
-    <string name="email_hint">Email</string>
-    <string name="login_error_message">Please make sure you enter an email address and password!</string>
-    <string name="login_error_title">Error!</string>
-    <string name="login_button_label">Login</string>
-    <string name="title_activity_login">Sign in</string>
-    <string name="add_item">Add New Item</string>
-    <string name="action_logout">Logout</string>
-    <string name="first_name">First Name</string>
-    <string name="last_name">Last Name</string>
+    <!-- Event creation -->
     <string name="event_create_name">Name</string>
     <string name="event_create">Create event</string>
     <string name="event_create_submit_error_message">Please make sure to fill all fields</string>
@@ -78,6 +69,18 @@
     <string name="event_create_submit_date_error_message">The end date cannot be anterior to the start !</string>
     <string name="event_create_submit_seats_error_message">You need at least five seats available to your event !</string>
     <string name="event_create_submit_price_error_message">The price cannot be negative !</string>
+
+    <!-- Login -->
+    <string name="password_hint">Password</string>
+    <string name="email_hint">Email</string>
+    <string name="login_error_message">Please make sure you enter an email address and password!</string>
+    <string name="login_error_title">Error!</string>
+    <string name="login_button_label">Login</string>
+    <string name="title_activity_login">Sign in</string>
+    <string name="add_item">Add New Item</string>
+    <string name="action_logout">Logout</string>
+    <string name="first_name">First Name</string>
+    <string name="last_name">Last Name</string>
     <string name="event_list">Event list</string>
 
 

From cc68ef9e6b0a6fc8cad1446a1f50efc0cf267816 Mon Sep 17 00:00:00 2001
From: Valentin Bouquet <valentin-bouquet@hotmail.fr>
Date: Sun, 19 Mar 2017 17:26:28 +0100
Subject: [PATCH 10/14] Added advanced options in create event

---
 .../ui/activites/CreateEventActivity.java     | 78 +++++++++++++------
 .../main/res/layout/activity_create_event.xml |  6 ++
 app/src/main/res/layout/activity_login.xml    | 19 ++++-
 app/src/main/res/layout/activity_main.xml     |  4 +-
 app/src/main/res/values/strings.xml           | 24 +++---
 5 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/CreateEventActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/CreateEventActivity.java
index 263fac0..26574a0 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/CreateEventActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/CreateEventActivity.java
@@ -1,3 +1,4 @@
+
 package fr.paris10.projet.assogenda.assogenda.ui.activites;
 
 import android.app.AlertDialog;
@@ -38,6 +39,7 @@ public class CreateEventActivity extends AppCompatActivity {
     protected EditText eventLocationEditText;
     protected EditText eventSeatsAvailableEditText;
     protected EditText eventPriceEditText;
+    protected Button eventAdvancedButton;
 
     protected DatabaseReference database = FirebaseDatabase.getInstance().getReference("events");
 
@@ -45,6 +47,8 @@ public class CreateEventActivity extends AppCompatActivity {
     protected DatabaseReference dbAssoc = FirebaseDatabase.getInstance().getReference("associations");
     protected String eventAsso;
 
+    protected Calendar c;
+
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,7 +56,8 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_create_event);
         eventAsso = getIntent().getStringExtra("assoID");
 
-
+        //Initialization
+        c = Calendar.getInstance();
         eventNameEditText = (EditText) findViewById(R.id.activity_create_event_name);
         eventStartTimeEditText = (EditText) findViewById(R.id.activity_create_event_start_time);
         eventStartDateEditText = (EditText) findViewById(R.id.activity_create_event_start_date);
@@ -64,6 +69,20 @@ protected void onCreate(Bundle savedInstanceState) {
         eventLocationEditText = (EditText) findViewById(R.id.activity_create_event_location);
         eventSeatsAvailableEditText = (EditText) findViewById(R.id.activity_create_event_seats_available);
         eventPriceEditText = (EditText) findViewById(R.id.activity_create_event_price);
+        eventAdvancedButton = (Button) findViewById(R.id.activity_create_event_advanced_button);
+
+        //Hide advanced options
+        eventPriceEditText.setVisibility(View.GONE);
+        eventSeatsAvailableEditText.setVisibility(View.GONE);
+        eventDescriptionEditText.setVisibility(View.GONE);
+
+        //Default value (date and time)
+        eventStartDateEditText.setText(new SimpleDateFormat("dd/MM/yyyy").format(c.getTime()));
+        eventStartTimeEditText.setText(new SimpleDateFormat("kk:mm").format(c.getTime()));
+        eventEndDateEditText.setText(new SimpleDateFormat("dd/MM/yyyy").format(c.getTime()));
+        c.setTime(c.getTime());
+        c.add(Calendar.HOUR, 1);
+        eventEndTimeEditText.setText(new SimpleDateFormat("kk:mm").format(c.getTime()));
 
         //Sets the spinner's content
         ArrayAdapter<CharSequence> tmpAdapterEventTypes = ArrayAdapter.createFromResource(this,R.array.event_create_event_types, android.R.layout.simple_spinner_item);
@@ -98,6 +117,21 @@ public void onClick(View v) {
             }
         });
 
+        eventAdvancedButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (eventPriceEditText.getVisibility() == View.GONE){
+                    eventPriceEditText.setVisibility(View.VISIBLE);
+                    eventSeatsAvailableEditText.setVisibility(View.VISIBLE);
+                    eventDescriptionEditText.setVisibility(View.VISIBLE);
+                }
+                else{
+                    eventPriceEditText.setVisibility(View.GONE);
+                    eventSeatsAvailableEditText.setVisibility(View.GONE);
+                    eventDescriptionEditText.setVisibility(View.GONE);
+                }
+            }
+        });
 
 
 
@@ -108,32 +142,30 @@ public void onClick(View v) {
                 final String eventStart = eventDatesConverter(eventStartTimeEditText, eventStartDateEditText);
                 final String eventEnd = eventDatesConverter(eventEndTimeEditText, eventEndDateEditText);
                 final String eventType = eventTypeSpinner.getItemAtPosition(eventTypeSpinner.getSelectedItemPosition()).toString().trim();
-                final String eventDescription = eventDescriptionEditText.getText().toString().trim();
+                String eventDescription = eventDescriptionEditText.getText().toString().trim();
                 final String eventLocation = eventLocationEditText.getText().toString().trim();
-                final String eventSeatsAvailable = eventSeatsAvailableEditText.getText().toString().trim();
-                final String eventPrice = eventPriceEditText.getText().toString().trim();
+                String eventSeatsAvailable = eventSeatsAvailableEditText.getText().toString().trim();
+                String eventPrice = eventPriceEditText.getText().toString().trim();
                 final String eventAssociation = eventAsso;
 
-                if (eventName.isEmpty() || eventDescription.isEmpty() || eventStart == null || eventEnd == null
-                        || eventType.isEmpty() || eventLocation.isEmpty() || eventSeatsAvailable.isEmpty() || eventPrice.isEmpty()) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(CreateEventActivity.this);
-                    builder.setMessage(R.string.event_create_submit_error_message)
-                            .setTitle(R.string.event_create_submit_error_title)
-                            .setPositiveButton(android.R.string.ok, null);
-                    AlertDialog dialog = builder.create();
-                    dialog.show();
+                //Checking value of optional fields
+                if (eventDescription.isEmpty()){
+                    eventDescription = "";
                 }
-                else if (Integer.parseInt(eventSeatsAvailable) < 5){
-                    AlertDialog.Builder builder = new AlertDialog.Builder(CreateEventActivity.this);
-                    builder.setMessage(R.string.event_create_submit_seats_error_message)
-                            .setTitle(R.string.event_create_submit_error_title)
-                            .setPositiveButton(android.R.string.ok, null);
-                    AlertDialog dialog = builder.create();
-                    dialog.show();
+                //Value to -1 means there are no seats limit
+                if (eventSeatsAvailable.isEmpty()){
+                    eventSeatsAvailable = "-1";
+                }
+                //Value to -1 means there are no price, it's free
+                if (eventPrice.isEmpty()){
+                    eventPrice = "-1.0";
                 }
-                else if(Float.parseFloat(eventPrice) < 0.0){
+
+                // NOTE : SEATS / PRICE / DESCRIPTION  =>  OPTIONAL
+
+                if (eventName.isEmpty() || eventStart == null || eventEnd == null || eventType.isEmpty() || eventLocation.isEmpty() ) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(CreateEventActivity.this);
-                    builder.setMessage(R.string.event_create_submit_price_error_message)
+                    builder.setMessage(R.string.event_create_submit_error_message)
                             .setTitle(R.string.event_create_submit_error_title)
                             .setPositiveButton(android.R.string.ok, null);
                     AlertDialog dialog = builder.create();
@@ -151,7 +183,7 @@ else if (!firstDateAnteriorToSecond(eventStart, eventEnd)){
                     database.push()
                             .setValue(new Event( "", eventName, eventStart, eventEnd, eventType, eventAssociation, eventLocation,
                                     Float.parseFloat(eventPrice), Integer.parseInt(eventSeatsAvailable), eventDescription)
-                            .toMap());
+                                    .toMap());
                     loadMain();
                 }
             }
@@ -233,4 +265,4 @@ public void loadMain(){
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
         startActivity(intent);
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_event.xml b/app/src/main/res/layout/activity_create_event.xml
index 24bee86..ddfdf41 100644
--- a/app/src/main/res/layout/activity_create_event.xml
+++ b/app/src/main/res/layout/activity_create_event.xml
@@ -113,6 +113,12 @@
             android:id="@+id/activity_create_event_location"
             android:hint="@string/event_create_location" />
 
+        <Button
+                    android:text="@string/event_create_advanced_show"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/activity_create_event_advanced_button" />
+
         <EditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 188c775..885796f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_login"
     android:layout_width="match_parent"
@@ -10,6 +11,15 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="fr.paris10.projet.assogenda.assogenda.ui.activites.LoginActivity">
 
+    <TextView
+                android:text="@string/log_in_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+               android:id="@+id/activity_login_textview"
+                android:textSize="28sp"
+                android:layout_marginBottom="30dp"
+                android:textAlignment="center" />
+
     <EditText
         android:id="@+id/activity_login_email"
         android:layout_width="match_parent"
@@ -43,11 +53,12 @@
 
     <TextView
         android:id="@+id/activity_login_to_activity_sign_up"
-        android:layout_width="wrap_content"
+        android:layout_width="351dp"
         android:layout_height="wrap_content"
         android:layout_below="@+id/activity_login_validate"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="69dp"
-        android:text="@string/sign_up_text" />
+        android:text="@string/sign_up_text"
+        android:textAlignment="center" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 55a2401..5785c88 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -48,7 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
-            android:text="liste des associations" />
+            android:text="@string/association_list" />
 
         <Button
             android:id="@+id/main_activity_followed_asso_button"
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/main_activity.list_asso_button"
             android:layout_centerHorizontal="true"
-            android:text="Followed associations " />
+            android:text="@string/association_followed" />
 
         <Button
             android:text="@string/action_logout"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a1814ff..f7ae92c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,7 +3,7 @@
 
     <!-- Association -->
     <string name="fragment_association_main_title">Manage association</string>
-    <string name="activity_main_button_association">Association</string>
+    <string name="activity_main_button_association">Association management</string>
     <string name="fragment_association_main_button_create_association">Create association</string>
 
     <!-- Association form -->
@@ -39,11 +39,11 @@
     <string name="activity_event_research_start_time">HStart time</string>
 
     <!-- Event participation -->
-    <string name="activity_event_infos_participate_button">Participer</string>
-    <string name="activity_event_infos_nparticipate_button">Ne plus participer</string>
-    <string name="activity_event_infos_participate_toast">Vous participez à : </string>
-    <string name="activity_event_infos_nparticipate_toast">Vous ne participez plus à l\'événement </string>
-    <string name="activity_event_infos_participate_date_passed_toast">L\'événement est terminé !</string>
+    <string name="activity_event_infos_participate_button">Participate</string>
+    <string name="activity_event_infos_nparticipate_button">Disengagement</string>
+    <string name="activity_event_infos_participate_toast">You participate to : </string>
+    <string name="activity_event_infos_nparticipate_toast">You disengaged from the event </string>
+    <string name="activity_event_infos_participate_date_passed_toast">The event is over !</string>
 
     <!-- Association research -->
     <string name="list_association_activity_search_hint">association, university…</string>
@@ -59,7 +59,8 @@
     <!-- Event creation -->
     <string name="event_create_name">Name</string>
     <string name="event_create">Create event</string>
-    <string name="event_create_submit_error_message">Please make sure to fill all fields</string>
+    <string name="event_create_submit_error_message">Please make sure to fill all obligatory fields</string>
+    <string name="event_create_advanced_show">Advanced options</string>
     <string name="event_create_submit_error_title">Error !</string>
     <string name="event_create_start_time">Start time</string>
     <string name="event_create_start_date">Start date</string>
@@ -67,13 +68,14 @@
     <string name="event_create_end_date">End date</string>
     <string name="event_create_description">Description</string>
     <string name="event_create_location">Location</string>
-    <string name="event_create_price">Price</string>
+    <string name="event_create_price">Price (€)</string>
     <string name="event_create_seats_available">Seats available</string>
     <string name="event_create_submit_date_error_message">The end date cannot be anterior to the start !</string>
     <string name="event_create_submit_seats_error_message">You need at least five seats available to your event !</string>
     <string name="event_create_submit_price_error_message">The price cannot be negative !</string>
 
     <!-- Login -->
+    <string name="log_in_text">Log in to AssoGenda</string>
     <string name="password_hint">Password</string>
     <string name="email_hint">Email</string>
     <string name="login_error_message">Please make sure you enter an email address and password!</string>
@@ -84,13 +86,15 @@
     <string name="action_logout">Logout</string>
     <string name="first_name">First Name</string>
     <string name="last_name">Last Name</string>
-    <string name="event_list">Event list</string>
+    <string name="event_list">Events list</string>
+    <string name="association_followed">Followed associations </string>
+    <string name="association_list">Associations list</string>
 
 
     <string-array name="event_create_event_types">
         <item>Sport</item>
         <item>Party</item>
         <item>Training</item>
-        <item> </item>
+        <item>Other</item>
     </string-array>
 </resources>

From f77debb08f277f77c9020d1ecf916e78443ae384 Mon Sep 17 00:00:00 2001
From: Valentin Bouquet <valentin-bouquet@hotmail.fr>
Date: Sun, 19 Mar 2017 18:02:37 +0100
Subject: [PATCH 11/14] Add default image for association

---
 .../ui/activites/ShowAssociationActivity.java |   5 +++
 .../ui/adapter/CustomAssociationAdapter.java  |   2 +-
 .../ui/adapter/SearchAssociationAdapter.java  |   2 +-
 .../association_default_icon.png              | Bin 0 -> 642 bytes
 .../association_default_icon.png              | Bin 0 -> 410 bytes
 .../association_default_icon.png              | Bin 0 -> 897 bytes
 .../association_default_icon.png              | Bin 0 -> 728 bytes
 .../res/layout/activity_show_association.xml  |  30 ++++++++++++------
 .../res/layout/item_association_listview.xml  |   2 --
 9 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/association_default_icon.png
 create mode 100644 app/src/main/res/drawable-mdpi/association_default_icon.png
 create mode 100644 app/src/main/res/drawable-xhdpi/association_default_icon.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/association_default_icon.png

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
index 4157d70..2e979ed 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.google.firebase.database.DataSnapshot;
@@ -26,11 +27,15 @@ public class ShowAssociationActivity extends AppCompatActivity {
     private TextView descAsso;
     private TextView namePrez;
     private Button createEvent;
+    private ImageView image;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_show_association);
+
+        image = (ImageView) findViewById(R.id.activity_show_association_logo_asso);
+        image.setImageResource(R.drawable.association_default_icon);
         nameAsso = (TextView) findViewById(R.id.activity_show_association_name_asso);
         descAsso = (TextView) findViewById(R.id.activity_show_association_description_asso);
         namePrez = (TextView) findViewById(R.id.activity_show_association_name_president);
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/CustomAssociationAdapter.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/CustomAssociationAdapter.java
index a8e15f2..ca97652 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/CustomAssociationAdapter.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/CustomAssociationAdapter.java
@@ -66,7 +66,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         } else {
 
             //If association has no logo registered, set default android image
-            viewHolder.imageAssociationLogo.setImageResource(R.mipmap.ic_launcher);
+            viewHolder.imageAssociationLogo.setImageResource(R.drawable.association_default_icon);
         }
 
         return view;
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/SearchAssociationAdapter.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/SearchAssociationAdapter.java
index 3bf361f..afd4ba2 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/SearchAssociationAdapter.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/adapter/SearchAssociationAdapter.java
@@ -121,7 +121,7 @@ public void onClick(View v) {
         } else {
 
             //If association has no logo registered, set default android image
-            viewHolder.logo.setImageResource(R.mipmap.ic_launcher);
+            viewHolder.logo.setImageResource(R.drawable.association_default_icon);
         }
 
         return view;
diff --git a/app/src/main/res/drawable-hdpi/association_default_icon.png b/app/src/main/res/drawable-hdpi/association_default_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c35e782bb1c15605e2124b334ab1587e2b41ceea
GIT binary patch
literal 642
zcmV-|0)737P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006>Nkl<Zc-rk&
zOKTKC5RUH$C@6@6Al?FM(4Fovs0SAjL{JelBH{yofJcu?@DLw_5Wy(9iWm1_)a~xc
zLD+*a8qHM@auA*F9wYvTwZ1VUo3ImH#2JG1K{0f7^-O);UsX?67lXlIFc=I5gTY|@
z1rAKc>x7Pb0&P#=iSd$2zW3GaR-xSp*>sDIz~3&u+GwooH8UHJo0&D`XWwitliEF4
zkbG+JV?GP*t2I|h;|@vfhlI9Ih4zo6j?aj?UtgYd>OZ!(OFlEqXR$#PUnByPQrpKt
z<gQngdl+c<hR6(v(dkvC5ZFI%_bx^N^N8Cwmh7bQ1f5EMwefjvy12i&TpD|pd>=yP
zj+R28`^BdXNGylI1m+PZl<kABVv;TMUO*&BO3#H!?vy4YlEGC<VrqW!ehU69hID@^
z^|#TxFzyM(50^#&`b~=wJNb)1Jsr2`dalL3m&%=QT}vmji{jsslrEQ&JX)cQl4_un
zyQJlpAV7&4q5NQIlEb@eA6I7`2r?1My`~+%7OL5UMCt;ORy2OrqrPk^z5~_b&6UUw
zptI!Ez&o<rh=bMx<4(4VqXNEJcq>IGp^x5QtOK>)2UNsY(iUp`sEphxslM(B%(o+<
zvbWGmNpknH(<%g^w&(sN`QIdPO2*z;xYMW;Vf<;-N2SO*prpn+CXgo+x~)+&R14#U
zTxg;Gz73a8Cj?Th)4JSNto*T*Xym&8{qEQO4isLehIM)G#7&JDJo(?A!C){L3<iV2
cVEi}u3G6;8sNN@h)Bpeg07*qoM6N<$f*h1F;Q#;t

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/association_default_icon.png b/app/src/main/res/drawable-mdpi/association_default_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b832de74f3c04ad4bafd51e1f1f6360f653f8851
GIT binary patch
literal 410
zcmV;L0cHM)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004DNkl<Zc-rk$
zJxc>Y5RHO@Vq+zW2-*e%+1=nrEfxxjg`$Y|mKIv4v9%MF`~dZ^G1=XVhmb<BN}C@b
zx4UP^k2q%zJ<bztvWUVy7#L=Dd2im%U7_IM;Nal!pRgd+G?md22Ijv@{@9(MLI)7-
z_Xx0-G^_C-k!q3n`h-b!IL}|ktqUMB+|Q6FfwiP3)D9ET4drT^NqtJW@rtd^m{kEx
z=*_$UtYHuG2ih<*=~=GMh;O#63Rrp$M}Vl75m3WgB0!o})^>CO#O+xXfR-|@cd0O(
z`P#?)!)7MTF~m8!4@+gPH{b~bZT2Ruk(cVPvoNLiWe0@1tMKj|PD{CdB2r&NUZ+Cc
zmV@4u6>@sj9!eH0N1pBhxPindvI<`V?7}Fxae#M<UT3&(0Wjh6cjT#vMzr?nQXCIJ
z{i4G4O8*Yj^(qnO@~6Nv`FqJOG}XHMeLFZfIQ)6M0fagQGZcnZxBvhE07*qoM6N<$
Ef^+%1LjV8(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/association_default_icon.png b/app/src/main/res/drawable-xhdpi/association_default_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6a049f3ce4de61a531eeb4a85b6f9c047fba18
GIT binary patch
literal 897
zcmV-{1AhF8P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0009>Nkl<Zc-rlk
z+iMd+6o>1r6t8%}2NguD`Ve}_ZrT!W)CYa@MXfi)LJ`p?1;HoLf}(hNP#?sK3RP4L
z*plqd)KqCS-dgEvK@cfrXC@W>AL2Qaq^)VvjYP<x=YvDios-?3-=1^kOjQ*@5ClOG
z1VIo4K@bE%5ClQ|HCp)B#Z9rX02+S(ZvqcTyk$Wyj@nH2g2l7ei`Q`NpAO#c8lD$o
z-Zcn#5NtTl2K5^F%y<v}eSO1AuQ|xnT0dX2NT+96jyzy7@wq_o+Hehh(0A%j1Cf#H
z5R*G?SKbG|ew(WVep;@4U^{ASYhtv<`1os~&V#PJQ!MzLp-=6Uo}jbFl?N>*KWHDW
zA|WnsgCH?2CWry+9mWe#9~)n1Gx6L{0Q5oM2?5;H4*k}_nwZ$XDf(p*y!H8Y?$}a`
z%iUT4E<eIrqtOCviT+p>V&ajX0O*6hlLDw4Iy1QJC{*({Po31I!{h~{dqQg>F&Aq1
zyl)185Bg37$kc$o9{IMUU{hpX9r(B)+~ctGbG6Y~(Ae*7fMAj{2#`dd-vgANa19$_
zv3o-BFQ6Qr;m%-uFR)y-4c=Jy^x#!Du1)ucPLCzP)b@fI5R<zgYu-U$xD`l@EHqw#
zwn%!8ZitZTP`9t3o4<vB{vuw(wP^vmq8-E;0wM0{H=Nrd;S+wh0>pWux6nTCh~a^c
zRO8r-!Dgqw{0tb#^a!ZwDb1|8M=ZBk>S}gQ;I<=9VE2b?Ic;$f%``xDw^)goGXZAC
zU&p@*Du(-dP6W(~pd-S?hbQ$0#Msl>nVxNC@UUmwT%7UW|MLQK<XNm~+~zWqpBl2c
z?6LGHEzZIB>)`h^>kp06JB-gVP5`L!Lq46q*mjt-xVnTx4*dNd0z9UB2L=iCUmqV|
z(89$U5atwQ%xnD&SF{;-@+(~Le_(pj6Z?ui15;n06EH(Sw9WDHmF8@DaIh&Wc-;Q_
z#AV;Z4u}B0S9IyP>UjQPszQ_BXic_Ghs!f{vy{^wo(i#4LR@v>IicbLU@AiWJ}g%N
zyhkZ%-N3{~Y?AqhsfvMbA;i4B*u2UyyhkZ-H21tx{Rx5~2!bF8f*=TjAP9mW2x5|7
XenPj?8gh%*00000NkvXXu0mjfblj~J

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/association_default_icon.png b/app/src/main/res/drawable-xxhdpi/association_default_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..e57bbdfb311956e08a324738030bcc4e747de539
GIT binary patch
literal 728
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V4Cmg;uunK>+Q^ofwvt5+A<s1
zf*2~@4ps89PGE9k6k%X(0a8mC_OeHMsp$tWuzq+Y>0Rd`e36TL{gllm>L+dP)ZRaH
z&R|<jMp^#<+jp(4n1E(u1^a*e`24hDV!oaG=}%rh|E8V)aK_rg?o?NPVVKQqpMA;#
z?2m%C*;$_MYOg()?=x>=`o|k*tnVNDX~nT_roex_#cr1t<<u7bdj6i>X8+Qn7i-sk
z4i(5-tFpG}$34?epX{R6J$g{SfAweS*Qc4HJ*&5VE#0yE|Mh1zISfy>FEe$Gd$gzK
zjm><WC5u)WFWS?+>C?)uwfpvQ8ZmUsbxIihTx+;u>XtWJ%Rik|F}_{AT(#Em)WtiD
z9iJX`m;DPkx};g5(YZ;@YeLzJeLO$+f4^}uu;A*&JMA0nDsty)rXPyF79!~)X|<5&
z>iM3Dj<eT%H02IzXIS#vD?nF$+u2zm4q0zcC%6kvbM*MlcP%6GkAzk*Z{%c_SkA9g
z+hT7@-nzP}Id+v);f{5)W_Wj~oz{r*bv-)q)6BE^Paj-0QhEI)ZEoHTr`%)rPF+m>
zdH2G>ZELI2Jk(0WUND&5RPI}!?(+8kR5r_3V(G8WT|GEy-{u2LH*Lzi@uy_pt0;H#
z<j9Yu9=F-AuP}2c;ElL{cKYhfx$C{7CK_EY)w0~QcGiubX}jM{o6@^Y|5f*l&^sA5
zwE^Mp6DDcCw@wt#EZFw$-1Ze&+umR1nsxp8!4u5aW2ecKecC4M|7EKB<nx+li{`!e
zbKN^d$+pyH!P3X~*I%_)`Nx{D;^eH8%W@~(wThd%jNP_o_b>az1<Tqi<4#`K{c`_d
wkt-JMpT6cLoVxoyX8Ko0cC4udB={iV5A#Y>(}c~ov0Wg(r>mdKI;Vst0I1hfSpWb4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_show_association.xml b/app/src/main/res/layout/activity_show_association.xml
index f641518..627bfaf 100644
--- a/app/src/main/res/layout/activity_show_association.xml
+++ b/app/src/main/res/layout/activity_show_association.xml
@@ -14,36 +14,46 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:weightSum="1">
 
         <TextView
-            android:text="TextView"
+            android:id="@+id/activity_show_association_name_asso"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_show_association_name_asso" />
+            android:text="TextView"
+            android:textAlignment="center"
+            android:textSize="36sp" />
 
         <ImageView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:srcCompat="@mipmap/ic_launcher"
-            android:id="@+id/activity_show_association_logo_asso" />
+            android:id="@+id/activity_show_association_logo_asso"
+            android:layout_weight="0.15" />
 
         <TextView
-            android:text="TextView"
+            android:id="@+id/activity_show_association_name_president"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_show_association_name_president" />
+            android:text="TextView"
+            android:textSize="18sp" />
 
         <TextView
-            android:text="TextView"
+            android:id="@+id/activity_show_association_description_asso"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_show_association_description_asso" />
+            android:text="TextView"
+            android:textSize="18sp"
+            android:layout_weight="0.85" />
 
         <Button
-            android:text="Create event"
+            android:id="@+id/activity_show_association_create_event"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_show_association_create_event" />
+            android:background="@color/accent"
+            android:elevation="0dp"
+            android:text="Create event" />
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_association_listview.xml b/app/src/main/res/layout/item_association_listview.xml
index c3ddf5c..900159a 100644
--- a/app/src/main/res/layout/item_association_listview.xml
+++ b/app/src/main/res/layout/item_association_listview.xml
@@ -7,8 +7,6 @@
         android:id="@+id/item_association_listview_association_logo"
         android:layout_width="70dp"
         android:layout_height="70dp"
-        android:padding="5dp"
-        android:layout_marginEnd="10dp"
         android:src="@mipmap/ic_launcher" />
 
     <TextView android:id="@+id/item_association_listview_association_name"

From 03683505940ed8993d2d634cd13ca6c8dbdc95a6 Mon Sep 17 00:00:00 2001
From: Valentin Bouquet <valentin-bouquet@hotmail.fr>
Date: Sun, 19 Mar 2017 18:14:47 +0100
Subject: [PATCH 12/14] Update association dashbord view

---
 .../ui/activites/ShowAssociationActivity.java |  4 ---
 .../res/layout/activity_show_association.xml  |  7 -----
 .../res/layout/fragment_association_main.xml  | 28 +++++++++++--------
 app/src/main/res/values/strings.xml           |  2 +-
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
index 2e979ed..edc0da9 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/ShowAssociationActivity.java
@@ -25,7 +25,6 @@ public class ShowAssociationActivity extends AppCompatActivity {
     private User president;
     private TextView nameAsso;
     private TextView descAsso;
-    private TextView namePrez;
     private Button createEvent;
     private ImageView image;
 
@@ -38,7 +37,6 @@ protected void onCreate(Bundle savedInstanceState) {
         image.setImageResource(R.drawable.association_default_icon);
         nameAsso = (TextView) findViewById(R.id.activity_show_association_name_asso);
         descAsso = (TextView) findViewById(R.id.activity_show_association_description_asso);
-        namePrez = (TextView) findViewById(R.id.activity_show_association_name_president);
         createEvent = (Button) findViewById(R.id.activity_show_association_create_event);
         associationID = (String) getIntent().getExtras().get("associationID");
         DatabaseReference reference = FirebaseDatabase.getInstance().getReference("association");
@@ -49,14 +47,12 @@ public void onDataChange(DataSnapshot dataSnapshot) {
                     association = dataSnapshot.getValue(Association.class);
                     nameAsso.setText(association.name);
                     descAsso.setText(association.description);
-                    namePrez.setText(" ");
                     DatabaseReference references = FirebaseDatabase.getInstance().getReference("users");
                     references.child(association.president).addListenerForSingleValueEvent(new ValueEventListener() {
                         @Override
                         public void onDataChange(DataSnapshot dataSnapshot) {
                             if (dataSnapshot.exists()) {
                                 president = dataSnapshot.getValue(User.class);
-                                namePrez.setText(president.firstName+" "+president.lastName);
                             }
                         }
 
diff --git a/app/src/main/res/layout/activity_show_association.xml b/app/src/main/res/layout/activity_show_association.xml
index 627bfaf..4bde7b0 100644
--- a/app/src/main/res/layout/activity_show_association.xml
+++ b/app/src/main/res/layout/activity_show_association.xml
@@ -32,13 +32,6 @@
             android:id="@+id/activity_show_association_logo_asso"
             android:layout_weight="0.15" />
 
-        <TextView
-            android:id="@+id/activity_show_association_name_president"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="TextView"
-            android:textSize="18sp" />
-
         <TextView
             android:id="@+id/activity_show_association_description_asso"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_association_main.xml b/app/src/main/res/layout/fragment_association_main.xml
index acfaffd..9f34a4c 100644
--- a/app/src/main/res/layout/fragment_association_main.xml
+++ b/app/src/main/res/layout/fragment_association_main.xml
@@ -7,25 +7,31 @@
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:weightSum="1">
 
         <TextView
+            android:id="@+id/fragment_association_main_title"
             android:layout_width="match_parent"
-            android:layout_height="20dp"
+            android:layout_height="wrap_content"
             android:text="@string/fragment_association_main_title"
-            android:id="@+id/fragment_association_main_title" />
+            android:textAlignment="center"
+            android:textSize="30sp" />
 
-        <Button
-            android:text="@string/fragment_association_main_button_create_association"
+        <ListView
+            android:id="@+id/fragment_association_main_listView"
             android:layout_width="match_parent"
-            android:layout_height="81dp"
-            android:id="@+id/fragment_association_main_button_create_association" />
+            android:layout_height="351dp"
+            android:layout_marginTop="20dp"
+            android:layout_weight="1" />
 
-        <ListView
+        <Button
+            android:id="@+id/fragment_association_main_button_create_association"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:id="@+id/fragment_association_main_listView"
-            android:layout_marginTop="93dp" />
+            android:layout_height="wrap_content"
+            android:background="@color/accent"
+            android:text="@string/fragment_association_main_button_create_association" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7ae92c..868d416 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">AssoGenda</string>
 
     <!-- Association -->
-    <string name="fragment_association_main_title">Manage association</string>
+    <string name="fragment_association_main_title">Mes associations</string>
     <string name="activity_main_button_association">Association management</string>
     <string name="fragment_association_main_button_create_association">Create association</string>
 

From dc139b2334c2c74c9a08deac46c4e3a4ad83cf6a Mon Sep 17 00:00:00 2001
From: Valentin Bouquet <valentin-bouquet@hotmail.fr>
Date: Sun, 19 Mar 2017 21:52:54 +0100
Subject: [PATCH 13/14] Update main user interface

---
 app/src/main/AndroidManifest.xml              | 14 +--
 .../assogenda/ui/activites/MainActivity.java  | 53 ++++-------
 .../ui/activites/MainAssociationActivity.java | 95 +++++++++++++++++++
 .../ui/activites/MainEventActivity.java       | 45 +++++++++
 .../main/res/layout/activity_event_infos.xml  | 11 ++-
 .../res/layout/activity_event_research.xml    |  8 +-
 .../main/res/layout/activity_list_events.xml  |  6 +-
 app/src/main/res/layout/activity_main.xml     | 50 ++++------
 .../res/layout/activity_main_association.xml  | 40 ++++++++
 .../main/res/layout/activity_main_event.xml   | 35 +++++++
 .../res/layout/activity_show_association.xml  |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 12 files changed, 279 insertions(+), 82 deletions(-)
 create mode 100644 app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainAssociationActivity.java
 create mode 100644 app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainEventActivity.java
 create mode 100644 app/src/main/res/layout/activity_main_association.xml
 create mode 100644 app/src/main/res/layout/activity_main_event.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e42af9e..143d751 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,15 +20,17 @@
         <activity android:name=".ui.activites.AssociationDashboardActivity" />
         <activity android:name=".ui.activites.AgendaGeneratorActivity" />
         <activity android:name=".ui.activites.AgendaActivity" />
-        <activity android:name=".ui.activites.AgendaActivity"/>
+        <activity android:name=".ui.activites.AgendaActivity" />
         <activity android:name=".ui.activites.ListEventsActivity" />
         <activity android:name=".ui.activites.EventInfosActivity" />
         <activity android:name=".ui.activites.EventResearchActivity" />
-        <activity android:name=".ui.activites.ShowAssociationActivity"/>
-        <activity android:name=".ui.activites.EventInfosActivity"/>
-        <activity android:name=".ui.activites.CreateEventActivity"/>
-        <activity android:name=".ui.activites.EventResearchActivity"/>
-        <activity android:name=".ui.activites.ListAssociationActivity"/>
+        <activity android:name=".ui.activites.ShowAssociationActivity" />
+        <activity android:name=".ui.activites.EventInfosActivity" />
+        <activity android:name=".ui.activites.CreateEventActivity" />
+        <activity android:name=".ui.activites.EventResearchActivity" />
+        <activity android:name=".ui.activites.ListAssociationActivity" />
+        <activity android:name=".ui.activites.MainAssociationActivity" />
+        <activity android:name=".ui.activites.MainEventActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java
index f355d37..f8f1699 100644
--- a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainActivity.java
@@ -35,10 +35,28 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         else {
 
+            Button associationBtn = (Button) findViewById(R.id.activity_main_association_btn);
+            associationBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(view.getContext(),  MainAssociationActivity.class);
+                    startActivity(intent);
+                }
+            });
+            Button eventBtn = (Button) findViewById(R.id.activity_main_events_btn);
+            eventBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(view.getContext(),  MainEventActivity.class);
+                    startActivity(intent);
+                }
+            });
+
+
             //Sets isAssoMember to true or false
-            userIsAnAssociationMember();
+            //userIsAnAssociationMember();
 
-            Button logoutButton = (Button) findViewById(R.id.activity_main_logout_button);
+            /*Button logoutButton = (Button) findViewById(R.id.activity_main_logout_button);
             logoutButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -101,7 +119,7 @@ public void onClick(View v) {
                     intent.putExtra("followed", true);
                     startActivity(intent);
                 }
-            });
+            });*/
 
 
         }
@@ -114,9 +132,6 @@ protected void onStart() {
 
     @Override
     public void onResume(){
-        /*Intent intent = new Intent(this, MainActivity.class);
-        finish();
-        startActivity(intent);*/
         super.onResume();
     }
 
@@ -138,30 +153,4 @@ protected void loggedOut() {
         finish();
         startActivity(getIntent());
     }
-
-    protected void loadCreateEventView(){
-        Intent intent = new Intent(this, CreateEventActivity.class);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        startActivity(intent);
-    }
-
-    //Updates isAssoMember variable according to association appatenance of the current user
-    protected void userIsAnAssociationMember(){
-        isAssoMember = false;
-
-        database.child(daoUser.getCurrentUserId()).child("isAssoMember").addValueEventListener(new ValueEventListener() {
-            @Override
-            public void onDataChange(DataSnapshot dataSnapshot) {
-                if (dataSnapshot.exists()){
-                    isAssoMember = dataSnapshot.getValue(Boolean.class);
-                }
-            }
-
-            @Override
-            public void onCancelled(DatabaseError databaseError) {
-
-            }
-        });
-    }
 }
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainAssociationActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainAssociationActivity.java
new file mode 100644
index 0000000..8a88e42
--- /dev/null
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainAssociationActivity.java
@@ -0,0 +1,95 @@
+package fr.paris10.projet.assogenda.assogenda.ui.activites;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseError;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.FirebaseDatabase;
+import com.google.firebase.database.ValueEventListener;
+
+import fr.paris10.projet.assogenda.assogenda.R;
+import fr.paris10.projet.assogenda.assogenda.daos.DAOUser;
+
+public class MainAssociationActivity extends AppCompatActivity {
+    protected Boolean isAssoMember;
+    protected DatabaseReference database = FirebaseDatabase.getInstance().getReference("users");
+    private DAOUser daoUser;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main_association);
+
+        this.daoUser = DAOUser.getInstance();
+
+        if(!daoUser.isLoggedIn()){
+            redirectIfNotLoggedIn();
+        }
+        userIsAnAssociationMember();
+
+        Button associationButton = (Button) findViewById(R.id.activity_main_button_association);
+            associationButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Intent intent = new Intent(view.getContext(), AssociationDashboardActivity.class);
+                    startActivity(intent);
+                }
+            });
+
+            Button listAssociationsButton = (Button) findViewById(R.id.main_activity_list_asso_button);
+            listAssociationsButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(v.getContext(), ListAssociationActivity.class);
+                    intent.putExtra("followed", false);
+                    startActivity(intent);
+                }
+            });
+
+            Button followedAssoButton = (Button) findViewById(R.id.main_activity_followed_asso_button);
+            followedAssoButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(v.getContext(), ListAssociationActivity.class);
+                    intent.putExtra("followed", true);
+                    startActivity(intent);
+                }
+            });
+    }
+
+    //Updates isAssoMember variable according to association appatenance of the current user
+    protected void userIsAnAssociationMember(){
+        isAssoMember = false;
+
+        database.child(daoUser.getCurrentUserId()).child("isAssoMember").addValueEventListener(new ValueEventListener() {
+            @Override
+            public void onDataChange(DataSnapshot dataSnapshot) {
+                if (dataSnapshot.exists()){
+                    isAssoMember = dataSnapshot.getValue(Boolean.class);
+                }
+            }
+
+            @Override
+            public void onCancelled(DatabaseError databaseError) {
+
+            }
+        });
+    }
+
+    protected void loadLogInView() {
+        Intent intent = new Intent(this, LoginActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        startActivity(intent);
+    }
+
+    protected void redirectIfNotLoggedIn() {
+        if (!daoUser.isLoggedIn())
+            loadLogInView();
+    }
+}
diff --git a/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainEventActivity.java b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainEventActivity.java
new file mode 100644
index 0000000..8c7ed16
--- /dev/null
+++ b/app/src/main/java/fr/paris10/projet/assogenda/assogenda/ui/activites/MainEventActivity.java
@@ -0,0 +1,45 @@
+package fr.paris10.projet.assogenda.assogenda.ui.activites;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import fr.paris10.projet.assogenda.assogenda.R;
+
+public class MainEventActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main_event);
+
+        Button agendaButton = (Button) findViewById(R.id.activity_main_calendar_button);
+        agendaButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(view.getContext(), AgendaGeneratorActivity.class);
+                startActivity(intent);
+            }
+        });
+
+        Button listEventButton = (Button) findViewById(R.id.main_list_events_button);
+        listEventButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(v.getContext(), ListEventsActivity.class);
+                startActivity(intent);
+            }
+        });
+
+        Button searchEventButton = (Button) findViewById(R.id.activity_main_event_research_button);
+        searchEventButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(view.getContext(), EventResearchActivity.class);
+                startActivity(intent);
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/layout/activity_event_infos.xml b/app/src/main/res/layout/activity_event_infos.xml
index 60ef89c..1b3c781 100644
--- a/app/src/main/res/layout/activity_event_infos.xml
+++ b/app/src/main/res/layout/activity_event_infos.xml
@@ -18,10 +18,12 @@
         android:weightSum="1">
 
         <TextView
-            android:text="Nom Event"
+            android:id="@+id/activity_event_infos_name_event"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_event_infos_name_event" />
+            android:text="Nom Event"
+            android:textAlignment="center"
+            android:textSize="30sp" />
 
 
         <ImageView
@@ -58,9 +60,12 @@
             android:layout_weight="1.15" />
 
         <Button
+            android:id="@+id/activity_event_infos_participate_button"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="61dp"
-            android:id="@+id/activity_event_infos_participate_button" />
+            android:background="@color/event_color_03"
+            android:text="Participate" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_event_research.xml b/app/src/main/res/layout/activity_event_research.xml
index 031c3a2..baa9581 100644
--- a/app/src/main/res/layout/activity_event_research.xml
+++ b/app/src/main/res/layout/activity_event_research.xml
@@ -18,10 +18,12 @@
         android:weightSum="1">
 
         <TextView
-            android:text="@string/activity_event_research_title_info"
+            android:id="@+id/activity_event_research_title_info"
             android:layout_width="match_parent"
-            android:layout_height="21dp"
-            android:id="@+id/activity_event_research_title_info" />
+            android:layout_height="51dp"
+            android:text="@string/activity_event_research_title_info"
+            android:textAlignment="center"
+            android:textSize="30sp" />
 
         <LinearLayout
             android:orientation="horizontal"
diff --git a/app/src/main/res/layout/activity_list_events.xml b/app/src/main/res/layout/activity_list_events.xml
index e31b149..1a1397a 100644
--- a/app/src/main/res/layout/activity_list_events.xml
+++ b/app/src/main/res/layout/activity_list_events.xml
@@ -17,10 +17,12 @@
         android:layout_height="match_parent">
 
         <TextView
-            android:text="Listes des événements"
+            android:id="@+id/activity_list_events_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_list_events_title" />
+            android:text="Events"
+            android:textAlignment="center"
+            android:textSize="30sp" />
 
         <ListView
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5785c88..1c16ea7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,53 +16,35 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true">
+        android:layout_alignParentStart="true"
+        android:weightSum="1">
 
         <Button
-            android:text="@string/activity_main_button_association"
+            android:id="@+id/activity_main.association_btn"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/activity_main_button_association" />
+            android:layout_weight="0.46"
+            android:background="@color/accent"
+            android:text="Associations"
+            android:textSize="30sp" />
 
         <Button
-            android:text="@string/event_list"
+            android:id="@+id/activity_main.events_btn"
+            style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/main_list_events_button"/>
-
-        <Button
-            android:text="@string/activity_main_calendar_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/activity_main_calendar_button" />
-
-        <Button
-            android:text="@string/activity_main_event_research_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/activity_main_event_research_button"/>
-
-        <Button
-            android:id="@+id/main_activity.list_asso_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:text="@string/association_list" />
-
-        <Button
-            android:id="@+id/main_activity_followed_asso_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/main_activity.list_asso_button"
-            android:layout_centerHorizontal="true"
-            android:text="@string/association_followed" />
+            android:layout_marginTop="10dp"
+            android:layout_weight="0.44"
+            android:background="@color/event_color_03"
+            android:text="Events"
+            android:textSize="30sp" />
 
         <Button
             android:text="@string/action_logout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="50dp"
+            android:layout_marginTop="70dp"
             android:id="@+id/activity_main_logout_button" />
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_main_association.xml b/app/src/main/res/layout/activity_main_association.xml
new file mode 100644
index 0000000..c5e5dd0
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_association.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="fr.paris10.projet.assogenda.assogenda.ui.activites.MainAssociationActivity">
+
+    <LinearLayout
+        android:layout_width="368dp"
+        android:layout_height="495dp"
+        android:orientation="vertical"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="8dp"
+        tools:ignore="MissingConstraints">
+
+        <Button
+            android:text="@string/activity_main_button_association"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_main_button_association" />
+
+        <Button
+            android:id="@+id/main_activity.list_asso_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:text="@string/association_list" />
+
+        <Button
+            android:id="@+id/main_activity_followed_asso_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/main_activity.list_asso_button"
+            android:layout_centerHorizontal="true"
+            android:text="@string/association_followed" />
+
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main_event.xml b/app/src/main/res/layout/activity_main_event.xml
new file mode 100644
index 0000000..a2a9b5c
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_event.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="fr.paris10.projet.assogenda.assogenda.ui.activites.MainEventActivity">
+
+    <LinearLayout
+        android:layout_width="368dp"
+        android:layout_height="495dp"
+        android:orientation="vertical"
+        tools:layout_editor_absoluteX="8dp"
+        tools:layout_editor_absoluteY="8dp"
+        tools:ignore="MissingConstraints">
+
+        <Button
+            android:text="@string/event_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/main_list_events_button"/>
+
+        <Button
+            android:text="@string/activity_main_calendar_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_main_calendar_button" />
+
+        <Button
+            android:text="@string/activity_main_event_research_button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/activity_main_event_research_button"/>
+    </LinearLayout>
+</android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_show_association.xml b/app/src/main/res/layout/activity_show_association.xml
index 4bde7b0..4141dd8 100644
--- a/app/src/main/res/layout/activity_show_association.xml
+++ b/app/src/main/res/layout/activity_show_association.xml
@@ -45,7 +45,7 @@
             style="@style/Widget.AppCompat.Button.Colored"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/accent"
+            android:background="@color/event_color_03"
             android:elevation="0dp"
             android:text="Create event" />
     </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 868d416..1645e30 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,7 +32,7 @@
     <string name="activity_main_calendar_button">Agenda</string>
 
     <!-- Event research -->
-    <string name="activity_event_research_title_info">Event search</string>
+    <string name="activity_event_research_title_info">Search events</string>
     <string name="activity_main_event_research_button">Event search</string>
     <string name="activity_event_research_button">Search</string>
     <string name="activity_event_research_start_date">Start date</string>

From d9d95b8180fd2ec1ab7c55fcf7dd0b8433010276 Mon Sep 17 00:00:00 2001
From: Valentin Bouquet <valentin-bouquet@hotmail.fr>
Date: Sun, 19 Mar 2017 21:56:28 +0100
Subject: [PATCH 14/14] Update gradle release version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6524494..e67b3e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-version '1.0.0-alpha.1'
+version '1.0.0-beta.1'
 
 buildscript {
     repositories {