Changement du nom et mise en place de la vue amis

LauriFernandez · LauriFernandez · commit fe6bd26c25e5 · 2017-10-19T15:29:11.000-04:00
diff --git a/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueAmis.java b/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueAmis.java
@@ -16,6 +16,7 @@
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.SimpleAdapter;
+import android.widget.TextView;
 
 import java.util.HashMap;
 
@@ -25,19 +26,24 @@
 public class VueAmis extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
 
-    ListView vue_liste_amis = null;
+    protected ListView vue_liste_amis = null;
     UtilisateurDAO utilisateurDAO = null;
 
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.vue_amis);
+        utilisateurDAO = UtilisateurDAO.getInstance();
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        utilisateurDAO = UtilisateurDAO.getInstance();
+        getSupportActionBar().setTitle("Liste des amis");
+
+        vue_liste_amis = (ListView)findViewById(R.id.liste_amis);
         afficherAmis();
 
+
         vue_liste_amis.setOnItemClickListener(new AdapterView.OnItemClickListener(){
             @Override
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
@@ -59,15 +65,19 @@ public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
         toggle.syncState();
 
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        View vue = navigationView.getHeaderView(0);
+        TextView titre = (TextView)vue.findViewById(R.id.pseudoMenu);
+        titre.setText(utilisateurDAO.getUtilisateurCourant().getNom());
+
+        TextView mail = (TextView)vue.findViewById(R.id.mailMenu);
+        mail.setText(utilisateurDAO.getUtilisateurCourant().getMail());
         navigationView.setNavigationItemSelectedListener(this);
 
 
     }
 
     public void afficherAmis()
     {
-
-
         SimpleAdapter adapter = new SimpleAdapter(
                 this,
                 utilisateurDAO.getInstance().getUtilisateurCourant().getListeAmisToHashMap(),
@@ -130,6 +140,9 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if(id == R.id.imageView){
             Intent chargementVersQRCode = new Intent(VueAmis.this, VueQRCode.class);
             startActivity(chargementVersQRCode);
+        } else if(id == R.id.amis){
+            Intent changementVersAmis = new Intent(VueAmis.this,VueAmis.class);
+            startActivity(changementVersAmis);
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueMenu.java b/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueMenu.java
@@ -26,7 +26,9 @@
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.gms.maps.CameraUpdateFactory;
@@ -57,14 +59,19 @@ public class VueMenu extends AppCompatActivity
     private PointInfluenceDAO point_influence_dao = null;
 
     private LocationManager locationManager;
+    private UtilisateurDAO utilisateurDAO;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.vue_menu);
+        utilisateurDAO = UtilisateurDAO.getInstance();
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
+        getSupportActionBar().setTitle("NearUMix");
+
         SupportMapFragment mapFragment = (SupportMapFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.map);
         mapFragment.getMapAsync(this);
@@ -77,6 +84,12 @@ protected void onCreate(Bundle savedInstanceState) {
         toggle.syncState();
 
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        View vue = navigationView.getHeaderView(0);
+        TextView titre = (TextView)vue.findViewById(R.id.pseudoMenu);
+        titre.setText(utilisateurDAO.getUtilisateurCourant().getNom());
+
+        TextView mail = (TextView)vue.findViewById(R.id.mailMenu);
+        mail.setText(utilisateurDAO.getUtilisateurCourant().getMail());
         navigationView.setNavigationItemSelectedListener(this);
 
         locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
@@ -235,6 +248,9 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if(id == R.id.imageView){
             Intent chargementVersQRCode = new Intent(VueMenu.this, VueQRCode.class);
             startActivity(chargementVersQRCode);
+        } else if(id == R.id.amis){
+            Intent changementVersAmis = new Intent(VueMenu.this,VueAmis.class);
+            startActivity(changementVersAmis);
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VuePI.java b/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VuePI.java
@@ -17,6 +17,7 @@
 import android.widget.Toast;
 
 import squiddle.sheshire.apomalyn.qc.ca.nearumix.DAO.PointInfluenceDAO;
+import squiddle.sheshire.apomalyn.qc.ca.nearumix.DAO.UtilisateurDAO;
 import squiddle.sheshire.apomalyn.qc.ca.nearumix.modele.PointInfluence;
 import squiddle.sheshire.apomalyn.qc.ca.nearumix.parametre.VueProfil;
 
@@ -32,6 +33,7 @@ public class VuePI extends AppCompatActivity
     protected Button boutonVotePour;
     protected Button boutonVoteContre;
     protected Button bouton_retour_carte;
+    private UtilisateurDAO utilisateurDAO;
 
     private boolean aVote = false;
     private String aDejaVoter = "Vous avez deja vote";
@@ -42,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.vue_pi);
         Bundle parametres = this.getIntent().getExtras();
 
-
+        utilisateurDAO = UtilisateurDAO.getInstance();
         point_influence_dao = PointInfluenceDAO.getInstance();
         pi_courant = point_influence_dao.getPointInfluence(parametres.getInt("id_PI"));
 
@@ -68,6 +70,12 @@ protected void onCreate(Bundle savedInstanceState) {
         toggle.syncState();
 
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        View vue = navigationView.getHeaderView(0);
+        TextView titre = (TextView)vue.findViewById(R.id.pseudoMenu);
+        titre.setText(utilisateurDAO.getUtilisateurCourant().getNom());
+
+        TextView mail = (TextView)vue.findViewById(R.id.mailMenu);
+        mail.setText(utilisateurDAO.getUtilisateurCourant().getMail());
         navigationView.setNavigationItemSelectedListener(this);
     }
 
@@ -147,6 +155,9 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if (id == R.id.imageView) {
             Intent chargementVersQRCode = new Intent(VuePI.this, VueQRCode.class);
             startActivity(chargementVersQRCode);
+        } else if(id == R.id.amis){
+            Intent chargementVersAmis = new Intent(VuePI.this,VueAmis.class);
+            startActivity(chargementVersAmis);
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueQRCode.java b/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueQRCode.java
@@ -14,6 +14,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.google.zxing.WriterException;
 
@@ -23,6 +24,8 @@
 public class VueQRCode extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
 
+    private UtilisateurDAO utilisateurDAO;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -37,6 +40,12 @@ protected void onCreate(Bundle savedInstanceState) {
         toggle.syncState();
 
         NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+        View vue = navigationView.getHeaderView(0);
+        TextView titre = (TextView)vue.findViewById(R.id.pseudoMenu);
+        titre.setText(utilisateurDAO.getUtilisateurCourant().getNom());
+
+        TextView mail = (TextView)vue.findViewById(R.id.mailMenu);
+        mail.setText(utilisateurDAO.getUtilisateurCourant().getMail());
         navigationView.setNavigationItemSelectedListener(this);
         ImageView myImage = (ImageView) findViewById(R.id.imageView);
         try {
diff --git a/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueUtilisateur.java b/app/src/main/java/squiddle/sheshire/apomalyn/qc/ca/nearumix/VueUtilisateur.java
@@ -108,6 +108,9 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if(id == R.id.imageView){
             Intent chargementVersQRCode = new Intent(VueUtilisateur.this, VueQRCode.class);
             startActivity(chargementVersQRCode);
+        } else if(id == R.id.amis){
+            Intent changementVersAmis = new Intent(VueUtilisateur.this,VueAmis.class);
+            startActivity(changementVersAmis);
         }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
diff --git a/app/src/main/res/layout/nav_header_vue_amis.xml b/app/src/main/res/layout/nav_header_vue_amis.xml
@@ -20,14 +20,14 @@
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
+        android:id="@+id/pseudoMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/mailMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="android.studio@android.com" />
diff --git a/app/src/main/res/layout/nav_header_vue_menu.xml b/app/src/main/res/layout/nav_header_vue_menu.xml
@@ -20,14 +20,15 @@
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
+        android:id="@+id/pseudoMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/mailMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="android.studio@android.com" />
diff --git a/app/src/main/res/layout/nav_header_vue_pi.xml b/app/src/main/res/layout/nav_header_vue_pi.xml
@@ -20,14 +20,15 @@
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
+        android:id="@+id/pseudoMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/mailMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="android.studio@android.com" />
diff --git a/app/src/main/res/layout/nav_header_vue_qrcode.xml b/app/src/main/res/layout/nav_header_vue_qrcode.xml
@@ -20,14 +20,15 @@
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
+        android:id="@+id/pseudoMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/mailMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="android.studio@android.com" />
diff --git a/app/src/main/res/layout/nav_header_vue_utilisateur.xml b/app/src/main/res/layout/nav_header_vue_utilisateur.xml
@@ -20,14 +20,15 @@
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
+        android:id="@+id/pseudoMenu"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:text="Android Studio"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/mailMenu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="android.studio@android.com" />
diff --git a/app/src/main/res/menu/activity_vue_menu_drawer.xml b/app/src/main/res/menu/activity_vue_menu_drawer.xml
@@ -19,6 +19,12 @@
             android:icon="@drawable/ic_menu_manage"
             android:title="Mon QRCode"
             />
+
+        <item
+            android:id="@+id/amis"
+            android:icon="@drawable/ic_menu_manage"
+            android:title="Liste des amis"
+            />
     </group>
 
 
diff --git a/app/src/main/res/menu/vue_amis_drawer.xml b/app/src/main/res/menu/vue_amis_drawer.xml
@@ -19,5 +19,10 @@
             android:icon="@drawable/ic_menu_manage"
             android:title="Mon QRCode"
             />
+        <item
+            android:id="@+id/amis"
+            android:icon="@drawable/ic_menu_manage"
+            android:title="Liste des amis"
+            />
     </group>
 </menu>
diff --git a/app/src/main/res/menu/vue_pi_drawer.xml b/app/src/main/res/menu/vue_pi_drawer.xml
@@ -20,6 +20,12 @@
             android:icon="@drawable/ic_menu_manage"
             android:title="Mon QRCode"
             />
+
+        <item
+            android:id="@+id/amis"
+            android:icon="@drawable/ic_menu_manage"
+            android:title="Liste des amis"
+            />
     </group>
 
 </menu>
diff --git a/app/src/main/res/menu/vue_qrcode_drawer.xml b/app/src/main/res/menu/vue_qrcode_drawer.xml
@@ -19,6 +19,12 @@
             android:icon="@drawable/ic_menu_manage"
             android:title="Mon QRCode"
             />
+
+        <item
+            android:id="@+id/amis"
+            android:icon="@drawable/ic_menu_manage"
+            android:title="Liste des amis"
+            />
     </group>
 
 
diff --git a/app/src/main/res/menu/vue_utilisateur_drawer.xml b/app/src/main/res/menu/vue_utilisateur_drawer.xml
@@ -18,6 +18,12 @@
             android:icon="@drawable/ic_menu_manage"
             android:title="Mon QRCode"
             />
+
+        <item
+            android:id="@+id/amis"
+            android:icon="@drawable/ic_menu_manage"
+            android:title="Liste des amis"
+            />
     </group>
 
 </menu>

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,9 @@ public boolean onNavigationItemSelected(MenuItem item) {`
`108`	`108`	`} else if(id == R.id.imageView){`
`109`	`109`	`Intent chargementVersQRCode = new Intent(VueUtilisateur.this, VueQRCode.class);`
`110`	`110`	`startActivity(chargementVersQRCode);`
	`111`	`+ } else if(id == R.id.amis){`
	`112`	`+ Intent changementVersAmis = new Intent(VueUtilisateur.this,VueAmis.class);`
	`113`	`+ startActivity(changementVersAmis);`
`111`	`114`	`}`
`112`	`115`
`113`	`116`	`DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);`