affichage capacité dans salle favorite

Author: Zahrun

Android/app/app.iml

@@ -90,8 +90,8 @@
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="jackson-annotations-2.3.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.3.2" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="spring-android-core-2.0.0.M3" level="project" />
     <orderEntry type="library" exported="" name="design-23.1.1" level="project" />

Android/app/src/main/java/gei/soprapp/FragmentFavorites.java

@@ -3,6 +3,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.view.ViewPager;
 import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
@@ -28,13 +29,13 @@ public static FragmentAbstract newInstance(int sectionNumber) {
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(view.getContext());
         Set<String> favoriteRoomsSet = sharedPreferences.getStringSet( Globals.PREF_FAVORITE_ROOMS, new TreeSet<String>());
         final String favoriteRoomsArray[] = new String[favoriteRoomsSet.size()];
         favoriteRoomsSet.toArray(favoriteRoomsArray);
 
         final ListView mListView = (ListView) view.findViewById(R.id.listFavorites);
-        final ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(),
+        final ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(),
                 android.R.layout.simple_list_item_1, favoriteRoomsArray);
         mListView.setAdapter(adapter);
 
@@ -43,7 +44,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 String selected = favoriteRoomsArray[position];
                 FragmentFavoritesReservations.setSelected(selected);
-                ((MainActivity) getContext()).getmSectionsPagerAdapter().switchFavoritesFragment();
+                ((MainActivity.SectionsPagerAdapter)((ViewPager) view.getRootView().findViewById(R.id.container)).getAdapter()).switchFavoritesFragment();
             }
         });
 

Android/app/src/main/java/gei/soprapp/FragmentFavoritesReservations.java

@@ -2,6 +2,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.v4.view.ViewPager;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -36,7 +37,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
 
         final TextView textView = (TextView) view.findViewById(R.id.favoritesReservationsText);
         CharSequence text = textView.getText();
-        textView.setText(text.subSequence(0,text.length()-1)+" "+selected+":");
+        textView.setText(text.subSequence(0, text.length() - 1) + " " + selected + ":");
 
 
         final ListView mListView = (ListView) view.findViewById(R.id.favoritesReservationsList);
@@ -45,11 +46,12 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
             @Override
             public void run() {
                 final Reservations[] reservations = Requests.getReservationsOfRoom(mListView, FragmentFavoritesReservations.selected);
-                if (reservations==null) return;
+                if (reservations==null || reservations.length==0) return;
                 if (mListView==null) return;
                 mListView.post(new Runnable() {
                     @Override
                     public void run() {
+                        textView.append("\n\t\t\t(capacité: " + reservations[0].getRoomRef().getCapacity()+")");
                         //2- affichage
                         ArrayAdapter<String> adapter = new ArrayAdapter<String>(getActivity(),
                                 android.R.layout.simple_list_item_1, Globals.formatReservations(reservations, getContext(),false));
@@ -66,7 +68,7 @@ public void run() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
-                    ((MainActivity) v.getContext()).getmSectionsPagerAdapter().switchFavoritesFragment();
+                    ((MainActivity.SectionsPagerAdapter)((ViewPager) v.getRootView().findViewById(R.id.container)).getAdapter()).switchFavoritesFragment();
                     return true;
                 }
                 return false;

Android/app/src/main/java/gei/soprapp/FragmentReservations.java

@@ -53,7 +53,7 @@ public void onItemClick(AdapterView<?> parent, final View view, final int positi
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
-                        final Reservations[] reservations = Requests.getReservationsCurrentUser(mListView);
+                        final Reservations[] reservations = Requests.getReservationsCurrentUser(view);
                         view.post(new Runnable() {
                             @Override
                             public void run() {

Android/app/src/main/java/gei/soprapp/FragmentSearch.java

@@ -5,6 +5,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.design.widget.FloatingActionButton;
+import android.support.v4.view.ViewPager;
 import android.text.format.DateFormat;
 import android.view.View;
 import android.widget.ArrayAdapter;
@@ -140,7 +141,7 @@ public void onClick(final View v) {
                 int duree = Integer.valueOf(((EditText) view.findViewById(R.id.editTextDuree)).getText().toString());
                 int nbPersonnes = Integer.valueOf(((EditText) view.findViewById(R.id.editTextNbPerssonnes)).getText().toString());
                 FragmentSearchResults.setRequest(site,duree,nbPersonnes);
-                ((MainActivity) getContext()).getmSectionsPagerAdapter().switchSearchFragment();
+                ((MainActivity.SectionsPagerAdapter)((ViewPager) view.getRootView().findViewById(R.id.container)).getAdapter()).switchSearchFragment();
             }
         });
     }

Android/app/src/main/java/gei/soprapp/FragmentSearchResults.java

@@ -3,6 +3,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v4.view.ViewPager;
 import android.text.Html;
 import android.view.KeyEvent;
 import android.view.View;
@@ -77,10 +78,11 @@ public void onViewCreated(final View view, Bundle savedInstanceState) {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                final Rooms[] rooms = Requests.getRoomsSearched(mListView,siteRequest,dateRequest+timeRequest,dureeRequest,nbPersonnesRequest,equipmentsRequest);
+                final Rooms[] rooms = Requests.getRoomsSearched(view,siteRequest,dateRequest+timeRequest,dureeRequest,nbPersonnesRequest,equipmentsRequest);
 
                 if (rooms==null)
                     return;
+                if (mListView!=null)
                 mListView.post(new Runnable() {
                     @Override
                     public void run() {
@@ -121,7 +123,7 @@ public void run() {
             @Override
             public boolean onKey(View v, int keyCode, KeyEvent event) {
                 if (keyCode == KeyEvent.KEYCODE_BACK) {
-                    ((MainActivity) getContext()).getmSectionsPagerAdapter().switchSearchFragment();
+                    ((MainActivity.SectionsPagerAdapter)((ViewPager) view.getRootView().findViewById(R.id.container)).getAdapter()).switchSearchFragment();
                     return true;
                 }
                 return false;

Android/app/src/main/java/gei/soprapp/MainActivity.java

@@ -27,13 +27,8 @@ public class MainActivity extends AppCompatActivity {
      * may be best to switch to a
      * {@link android.support.v4.app.FragmentStatePagerAdapter}.
      */
-    private SectionsPagerAdapter mSectionsPagerAdapter;
     private Thread miseAJourThread;
 
-    public SectionsPagerAdapter getmSectionsPagerAdapter() {
-        return mSectionsPagerAdapter;
-    }
-
     /**
      * The {@link ViewPager} that will host the section contents.
      */
@@ -52,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         // Create the adapter that will return a fragment for each of the three
         // primary sections of the activity.
-        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+        SectionsPagerAdapter mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
 
         ActionBar ab = getSupportActionBar();
         ab.setDisplayShowHomeEnabled(true);
@@ -149,13 +144,8 @@ public void switchFavoritesFragment(){
             mFragmentManager.beginTransaction().remove(fragmentFavorites).commit();
             if (reservations) {
                 fragmentFavorites = FragmentFavoritesReservations.newInstance(position);
-                Log.e("Nouveau", "FragmentFavoritesReservations");
             } else {
                 fragmentFavorites = FragmentFavorites.newInstance(position);
-                Log.e("Nouveau", "FragmentFavorites");
-            }
-            if (fragmentFavorites==null) {
-                Log.e("ERREUR ICI", "");
             }
             notifyDataSetChanged();
         }

Android/app/src/main/res/layout/fragment_favorites.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent" android:layout_height="match_parent"
+    android:id="@+id/fragmentFavorites"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"

Android/app/src/main/res/layout/fragment_favorites_reservations.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent" android:layout_height="match_parent"
+    android:id="@+id/fragmentFavoritesReservations"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"