using fragment onAttach instead of consumer setters

app/src/main/java/com/rthoni/stssaguenay/ui/activities/MainActivity.java

@@ -49,6 +49,7 @@ import com.rthoni.stssaguenay.dbo.UserDbo;
 import com.rthoni.stssaguenay.dbo.UsersSettingsDbo;
 import com.rthoni.stssaguenay.ui.fragments.HomeFragment;
 import com.rthoni.stssaguenay.ui.fragments.StopViewerFragment;
+import com.rthoni.stssaguenay.ui.interfaces.OnFavouriteStopClicked;
 
 import org.json.JSONObject;
 
@@ -57,7 +58,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, OnFavouriteStopClicked {
 
     public static int ADD_FAVOURITE_STOP_REQUEST_CODE = 1;
     public static int SEARCH_STOP_REQUEST_CODE = 2;
@@ -216,12 +217,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     {
         _fab.setVisibility(View.VISIBLE);
         HomeFragment f = new HomeFragment();
-        f.setOnFavouriteStopClicked(new LuConsumer<UserFavouriteStopsDbo>() {
-            @Override
-            public void execute(UserFavouriteStopsDbo data) {
-                goToStop(data.getStop());
-            }
-        });
         getSupportFragmentManager().beginTransaction().replace(R.id.container, f).commit();
     }
 
@@ -463,4 +458,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             }
         });
     }
+
+    @Override
+    public void onFavouriteStopClicked(UserFavouriteStopsDbo favouriteStopsDbo) {
+        goToStop(favouriteStopsDbo.getStop());
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/activities/StopPickerActivity.java

@@ -16,8 +16,10 @@ import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.ui.fragments.StopListPickerFragment;
 import com.rthoni.stssaguenay.ui.fragments.StopMapPickerFragment;
 import com.rthoni.stssaguenay.ui.fragments.StopRoutesPickerFragment;
+import com.rthoni.stssaguenay.ui.interfaces.OnRoutesSelected;
+import com.rthoni.stssaguenay.ui.interfaces.OnStopClicked;
 
-public class StopPickerActivity extends AppCompatActivity {
+public class StopPickerActivity extends AppCompatActivity implements OnStopClicked, OnRoutesSelected {
 
     public static String MAP_EXTRA_NAME = "MAP_EXTRA";
 
@@ -61,20 +63,8 @@ public class StopPickerActivity extends AppCompatActivity {
 
     public void goToStops()
     {
-        LuConsumer<StopsDbo> consumer = new LuConsumer<StopsDbo>() {
-            @Override
-            public void execute(StopsDbo data) {
-                if (_selectRoutes) {
-                    goToRoutes(data);
-                }
-                else {
-                    saveStop(data);
-                }
-            }
-        };
         if (_map) {
             StopMapPickerFragment f = new StopMapPickerFragment();
-            f.setOnStopSelectedConsumer(consumer);
             getSupportFragmentManager()
                     .beginTransaction()
                     .replace(R.id.container, f)
@@ -82,7 +72,6 @@ public class StopPickerActivity extends AppCompatActivity {
         }
         else {
             StopListPickerFragment f = new StopListPickerFragment();
-            f.setOnStopSelectedConsumer(consumer);
             getSupportFragmentManager()
                     .beginTransaction()
                     .replace(R.id.container, f)
@@ -94,12 +83,6 @@ public class StopPickerActivity extends AppCompatActivity {
     {
         StopRoutesPickerFragment f = new StopRoutesPickerFragment();
         f.setStopsDbo(stopDbo);
-        f.setOnRoutesSelected(new LuConsumer<UserFavouriteStopsDbo>() {
-            @Override
-            public void execute(UserFavouriteStopsDbo data) {
-                saveFavouriteStop(data);
-            }
-        });
         getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.container, f)
@@ -122,4 +105,19 @@ public class StopPickerActivity extends AppCompatActivity {
         setResult(Activity.RESULT_OK, result);
         finish();
     }
+
+    @Override
+    public void onStopSlicker(StopsDbo stopsDbo) {
+        if (_selectRoutes) {
+            goToRoutes(stopsDbo);
+        }
+        else {
+            saveStop(stopsDbo);
+        }
+    }
+
+    @Override
+    public void onRoutesSelected(UserFavouriteStopsDbo favouriteStopsDbo) {
+        saveFavouriteStop(favouriteStopsDbo);
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/HomeFragment.java

@@ -1,5 +1,7 @@
 package com.rthoni.stssaguenay.ui.fragments;
 
+import android.app.Activity;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -23,6 +25,7 @@ import com.rthoni.stssaguenay.business.SchedulesBusiness;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.SchedulesDbo;
+import com.rthoni.stssaguenay.ui.interfaces.OnFavouriteStopClicked;
 
 import org.joda.time.DateTimeZone;
 import org.joda.time.LocalDateTime;
@@ -52,7 +55,7 @@ public class HomeFragment extends Fragment {
 
     private FavouriteStopsAdapter _adapter;
 
-    private LuConsumer<UserFavouriteStopsDbo> _onFavouriteStopClicked;
+    private OnFavouriteStopClicked _onFavouriteStopClicked;
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public View _parentView;
@@ -172,6 +175,14 @@ public class HomeFragment extends Fragment {
         return v;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnFavouriteStopClicked) {
+            _onFavouriteStopClicked = (OnFavouriteStopClicked) context;
+        }
+    }
+
     public void setRefreshing(final boolean refreshing)
     {
         _swipeRefreshLayout.post(new Runnable() {
@@ -193,7 +204,7 @@ public class HomeFragment extends Fragment {
     public void onFavouriteClicked(UserFavouriteStopsDbo favouriteStopDbo)
     {
         if (_onFavouriteStopClicked != null) {
-            _onFavouriteStopClicked.execute(favouriteStopDbo);
+            _onFavouriteStopClicked.onFavouriteStopClicked(favouriteStopDbo);
         }
     }
 
@@ -250,7 +261,4 @@ public class HomeFragment extends Fragment {
                 });
     }
 
-    public void setOnFavouriteStopClicked(LuConsumer<UserFavouriteStopsDbo> onFavouriteStopClicked) {
-        _onFavouriteStopClicked = onFavouriteStopClicked;
-    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopListPickerFragment.java

@@ -1,6 +1,7 @@
 package com.rthoni.stssaguenay.ui.fragments;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -27,6 +28,8 @@ import com.rthoni.stssaguenay.business.STSBusiness;
 import com.rthoni.stssaguenay.business.StopsBusiness;
 import com.rthoni.stssaguenay.business.Utils;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
+import com.rthoni.stssaguenay.ui.activities.StopPickerActivity;
+import com.rthoni.stssaguenay.ui.interfaces.OnStopClicked;
 
 import java.util.List;
 import java.util.TimerTask;
@@ -48,7 +51,7 @@ public class StopListPickerFragment extends Fragment {
 
     private StopsAdapter _stopsAdapter;
 
-    private LuConsumer<StopsDbo> _onStopSelectedConsumer;
+    private OnStopClicked _onStopSelectedConsumer;
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public TextView _textView;
@@ -170,6 +173,14 @@ public class StopListPickerFragment extends Fragment {
         return v;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnStopClicked) {
+            _onStopSelectedConsumer = (OnStopClicked) context;
+        }
+    }
+
     public void loadStops()
     {
         final ProgressDialog progressDialog = new ProgressDialog(getContext());
@@ -199,11 +210,7 @@ public class StopListPickerFragment extends Fragment {
     public void onStopSelected(StopsDbo stopsDbo)
     {
         if (_onStopSelectedConsumer != null) {
-            _onStopSelectedConsumer.execute(stopsDbo);
+            _onStopSelectedConsumer.onStopSlicker(stopsDbo);
         }
     }
-
-    public void setOnStopSelectedConsumer(LuConsumer<StopsDbo> onStopSelectedConsumer) {
-        _onStopSelectedConsumer = onStopSelectedConsumer;
-    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopMapPickerFragment.java

@@ -31,6 +31,8 @@ import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.STSBusiness;
 import com.rthoni.stssaguenay.business.StopsBusiness;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
+import com.rthoni.stssaguenay.ui.activities.StopPickerActivity;
+import com.rthoni.stssaguenay.ui.interfaces.OnStopClicked;
 
 import java.util.HashMap;
 import java.util.List;
@@ -92,7 +94,7 @@ public class StopMapPickerFragment extends Fragment {
     @BindView(R.id.mapView)
     MapView _mapView;
 
-    private LuConsumer<StopsDbo> _onStopSelectedConsumer;
+    private OnStopClicked _onStopSelectedConsumer;
 
     private GoogleMap _map;
 
@@ -162,6 +164,14 @@ public class StopMapPickerFragment extends Fragment {
         return v;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnStopClicked) {
+            _onStopSelectedConsumer = (OnStopClicked) context;
+        }
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if (ActivityCompat.checkSelfPermission(getContext(), Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
@@ -245,11 +255,7 @@ public class StopMapPickerFragment extends Fragment {
     public void onStopSelected(StopsDbo stopsDbo)
     {
         if (_onStopSelectedConsumer != null) {
-            _onStopSelectedConsumer.execute(stopsDbo);
+            _onStopSelectedConsumer.onStopSlicker(stopsDbo);
         }
     }
-
-    public void setOnStopSelectedConsumer(LuConsumer<StopsDbo> onStopSelectedConsumer) {
-        _onStopSelectedConsumer = onStopSelectedConsumer;
-    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/fragments/StopRoutesPickerFragment.java

@@ -1,6 +1,7 @@
 package com.rthoni.stssaguenay.ui.fragments;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -25,6 +26,7 @@ import com.rthoni.stssaguenay.business.STSBusiness;
 import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
 import com.rthoni.stssaguenay.dbo.RoutesDbo;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
+import com.rthoni.stssaguenay.ui.interfaces.OnRoutesSelected;
 
 import java.util.List;
 import java.util.Vector;
@@ -50,7 +52,7 @@ public class StopRoutesPickerFragment extends Fragment {
 
     private RoutesAdapter _routesAdapter;
 
-    private LuConsumer<UserFavouriteStopsDbo> _onRoutesSelected;
+    private OnRoutesSelected _onRoutesSelected;
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public ImageView _imageView;
@@ -145,6 +147,14 @@ public class StopRoutesPickerFragment extends Fragment {
         return v;
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        if (context instanceof OnRoutesSelected) {
+            _onRoutesSelected = (OnRoutesSelected) context;
+        }
+    }
+
     public void setStopsDbo(StopsDbo stopsDbo) {
         _stopsDbo = stopsDbo;
     }
@@ -182,11 +192,7 @@ public class StopRoutesPickerFragment extends Fragment {
             UserFavouriteStopsDbo favourite = new UserFavouriteStopsDbo();
             favourite.setStop(_stopsDbo);
             favourite.setRoutes(_routesAdapter.getSelectRoutes());
-            _onRoutesSelected.execute(favourite);
+            _onRoutesSelected.onRoutesSelected(favourite);
         }
     }
-
-    public void setOnRoutesSelected(LuConsumer<UserFavouriteStopsDbo> onRoutesSelected) {
-        _onRoutesSelected = onRoutesSelected;
-    }
 }

app/src/main/java/com/rthoni/stssaguenay/ui/interfaces/OnFavouriteStopClicked.java

@@ -0,0 +1,11 @@
+package com.rthoni.stssaguenay.ui.interfaces;
+
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
+
+/**
+ * Created by robin on 12/10/16.
+ */
+
+public interface OnFavouriteStopClicked {
+    void onFavouriteStopClicked(UserFavouriteStopsDbo favouriteStopsDbo);
+}

app/src/main/java/com/rthoni/stssaguenay/ui/interfaces/OnRoutesSelected.java

@@ -0,0 +1,11 @@
+package com.rthoni.stssaguenay.ui.interfaces;
+
+import com.rthoni.stssaguenay.dbo.UserFavouriteStopsDbo;
+
+/**
+ * Created by robin on 12/10/16.
+ */
+
+public interface OnRoutesSelected {
+    void onRoutesSelected(UserFavouriteStopsDbo favouriteStopsDbo);
+}

app/src/main/java/com/rthoni/stssaguenay/ui/interfaces/OnStopClicked.java

@@ -0,0 +1,11 @@
+package com.rthoni.stssaguenay.ui.interfaces;
+
+import com.rthoni.stssaguenay.dbo.StopsDbo;
+
+/**
+ * Created by robin on 12/10/16.
+ */
+
+public interface OnStopClicked {
+    void onStopSlicker(StopsDbo stopsDbo);
+}