begin stop routes picker

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

@@ -1,14 +1,18 @@
 package com.rthoni.stssaguenay.ui.activities;
 
 import android.os.Bundle;
-import android.app.Activity;
 import android.support.v7.app.AppCompatActivity;
 
 import com.rthoni.stssaguenay.R;
+import com.rthoni.stssaguenay.dataaccess.LuPromise;
+import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.ui.fragments.StopPickerFragment;
+import com.rthoni.stssaguenay.ui.fragments.StopRoutesPickerFragment;
 
 public class StopPickerActivity extends AppCompatActivity {
 
+    private StopPickerFragment _stopPickerFragment;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -19,18 +23,38 @@ public class StopPickerActivity extends AppCompatActivity {
         goToStops();
     }
 
+    @Override
+    public boolean onSupportNavigateUp() {
+        if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
+            return super.onSupportNavigateUp();
+        }
+        getSupportFragmentManager().popBackStack();
+        return true;
+    }
+
     public void goToStops()
     {
         StopPickerFragment f = new StopPickerFragment();
+        f.setOnStopSelectedConsumer(new LuPromise.LuConsumer<StopsDbo>() {
+            @Override
+            public void execute(StopsDbo data) {
+                goToRoutes(data);
+            }
+        });
         getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.container, f)
                 .commit();
     }
 
-    public void goToRoutes()
+    public void goToRoutes(StopsDbo stopDbo)
     {
-
+        StopRoutesPickerFragment f = new StopRoutesPickerFragment();
+        f.setStopsDbo(stopDbo);
+        getSupportFragmentManager()
+                .beginTransaction()
+                .replace(R.id.container, f)
+                .addToBackStack("StopRoutesPickerFragment")
+                .commit();
     }
-
 }

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

@@ -26,6 +26,8 @@ import com.rthoni.stssaguenay.business.Utils;
 import com.rthoni.stssaguenay.dataaccess.LuPromise;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.TimerTask;
 import java.util.Vector;
@@ -46,6 +48,8 @@ public class StopPickerFragment extends Fragment {
 
     private StopsAdapter _stopsAdapter;
 
+    private LuPromise.LuConsumer<StopsDbo> _onStopSelectedConsumer;
+
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public TextView _textView;
         public ViewHolder(TextView v) {
@@ -90,6 +94,10 @@ public class StopPickerFragment extends Fragment {
             getFilter().filter(query);
         }
 
+        public List<StopsDbo> getStops() {
+            return _allStops;
+        }
+
         @Override
         public Filter getFilter() {
             return new Filter() {
@@ -190,6 +198,12 @@ public class StopPickerFragment extends Fragment {
 
     public void onStopSelected(StopsDbo stopsDbo)
     {
+        if (_onStopSelectedConsumer != null) {
+            _onStopSelectedConsumer.execute(stopsDbo);
+        }
+    }
 
+    public void setOnStopSelectedConsumer(LuPromise.LuConsumer<StopsDbo> onStopSelectedConsumer) {
+        _onStopSelectedConsumer = onStopSelectedConsumer;
     }
 }

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

@@ -1,20 +0,0 @@
-package com.rthoni.stssaguenay.ui.fragments;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-/**
- * Created by robin on 9/29/16.
- */
-public class StopRoutePickerFragment extends Fragment {
-
-    @Nullable
-    @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        return super.onCreateView(inflater, container, savedInstanceState);
-    }
-}

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

@@ -0,0 +1,49 @@
+package com.rthoni.stssaguenay.ui.fragments;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.rthoni.stssaguenay.R;
+import com.rthoni.stssaguenay.dbo.StopsDbo;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by robin on 9/29/16.
+ */
+public class StopRoutesPickerFragment extends Fragment {
+
+    @BindView(R.id.textView)
+    TextView _textView;
+
+    @BindView(R.id.listRoutes)
+    RecyclerView _listRoutes;
+
+    private StopsDbo _stopsDbo;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_stop_route_picker, container, false);
+        ButterKnife.bind(this, v);
+
+        _textView.setText(getResources().getString(R.string.pick_routes, _stopsDbo.getFullName()));
+
+        return v;
+    }
+
+    public StopsDbo getStopsDbo() {
+        return _stopsDbo;
+    }
+
+    public void setStopsDbo(StopsDbo stopsDbo) {
+        _stopsDbo = stopsDbo;
+    }
+}

app/src/main/res/layout/fragment_stop_route_picker.xml

@@ -3,29 +3,29 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-    <EditText
+    <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/textSearch"
-        android:hint="@string/search_stop"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/pick_routes"
+        android:id="@+id/textView"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:inputType="text"
-        android:imeOptions="actionSearch"/>
+        android:layout_alignParentEnd="true"/>
 
     <android.support.v7.widget.RecyclerView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/listStops"
+        android:id="@+id/listRoutes"
         android:scrollbars="vertical"
         android:fadeScrollbars="true"
-        android:layout_below="@id/textSearch"
+        android:layout_below="@id/textView"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"/>
+
 </RelativeLayout>

app/src/main/res/menu/menu_main.xml

@@ -1,10 +0,0 @@
-<menu 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"
-      tools:context=".ui.activities.MainActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:title="@string/action_settings"
-        app:showAsAction="never"/>
-</menu>

app/src/main/res/menu/menu_stop_picker.xml

@@ -1,9 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:tools="http://schemas.android.com/tools"
-      tools:context="com.rthoni.stssaguenay.ui.activities.StopPickerActivity">
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-</menu>

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <resources>
     <string name="app_name">STS Saguenay</string>
-    <string name="action_settings">Settings</string>
+    <string name="title_activity_stop_picker">Pick a stop - STS Saguenay</string>
     <string name="favourites_stops">Favourites stops:</string>
     <string name="search_stop">Search a stop</string>
-    <string name="title_activity_stop_picker">Pick a stop - STS Saguenay</string>
+    <string name="pick_routes">Pick your routes for stop %1$s:</string>
 </resources>