save, load and display favourites

app/src/main/java/com/rthoni/stssaguenay/business/STSBusiness.java

@@ -1,6 +1,17 @@
 package com.rthoni.stssaguenay.business;
 
+import android.content.Context;
+
 import com.luticate.utils.dbo.LuDataAccessConfigDbo;
+import com.rthoni.stssaguenay.dataaccess.STSDataAccess;
+import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+import java.util.Vector;
 
 /**
  * Created by robin on 9/29/16.
@@ -17,4 +28,31 @@ public class STSBusiness {
         }
         return _config;
     }
+
+    public static List<FavouriteStopDbo> getFavouriteStops(Context ctx)
+    {
+        String str = STSDataAccess.getFavouriteStopsJson(ctx);
+        List<FavouriteStopDbo> dbos = new Vector<>();
+        JSONArray json;
+        try {
+            json = new JSONArray(str);
+            for (int i = 0; i < json.length(); ++i) {
+                FavouriteStopDbo dbo = new FavouriteStopDbo();
+                dbo.fromJson(json.getJSONObject(i));
+                dbos.add(dbo);
+            }
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        return dbos;
+    }
+
+    public static void setFavouriteStops(Context ctx, List<FavouriteStopDbo> favourites)
+    {
+        JSONArray json = new JSONArray();
+        for (FavouriteStopDbo favouriteStopDbo : favourites) {
+            json.put(new JSONObject(favouriteStopDbo.toArray()));
+        }
+        STSDataAccess.setFavouriteStopsJson(ctx, json.toString());
+    }
 }

app/src/main/java/com/rthoni/stssaguenay/dataaccess/STSDataAccess.java

@@ -0,0 +1,30 @@
+package com.rthoni.stssaguenay.dataaccess;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+/**
+ * Created by robin on 10/1/16.
+ */
+
+public class STSDataAccess {
+
+    public static String SHARED_PREF_NAME = "sts-saguenay";
+
+    public static String SHARED_PREF_FAVOURITE_STOPS = "favourites-stops";
+
+    public static SharedPreferences getSharedPref(Context ctx)
+    {
+        return ctx.getSharedPreferences(SHARED_PREF_NAME, Context.MODE_PRIVATE);
+    }
+
+    public static String getFavouriteStopsJson(Context ctx)
+    {
+        return getSharedPref(ctx).getString(SHARED_PREF_FAVOURITE_STOPS, "[]");
+    }
+
+    public static void setFavouriteStopsJson(Context ctx, String str)
+    {
+        getSharedPref(ctx).edit().putString(SHARED_PREF_FAVOURITE_STOPS, str).apply();
+    }
+}

app/src/main/java/com/rthoni/stssaguenay/dbo/FavouriteStopDbo.java

@@ -0,0 +1,63 @@
+package com.rthoni.stssaguenay.dbo;
+
+import com.luticate.utils.dbo.LuDbo;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by robin on 10/1/16.
+ */
+
+public class FavouriteStopDbo extends LuDbo {
+
+    protected StopsDbo _stop;
+
+    protected List<RoutesDbo> _routes;
+
+    @Override
+    public void fromJson(JSONObject json) throws JSONException {
+        _stop = new StopsDbo();
+        _stop.fromJson(json.getJSONObject("stop"));
+        _routes = new Vector<>();
+        JSONArray routes = json.getJSONArray("routes");
+        for (int i = 0; i < routes.length(); ++i) {
+            RoutesDbo route = new RoutesDbo();
+            route.fromJson(routes.getJSONObject(i));
+            _routes.add(route);
+        }
+    }
+
+    @Override
+    public HashMap<String, Object> toArray() {
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("stop", _stop.toArray());
+        List<Object> routes = new Vector<>();
+        for (RoutesDbo route : _routes) {
+            routes.add(route.toArray());
+        }
+        map.put("routes", routes);
+        return map;
+    }
+
+    public StopsDbo getStop() {
+        return _stop;
+    }
+
+    public void setStop(StopsDbo stop) {
+        _stop = stop;
+    }
+
+    public List<RoutesDbo> getRoutes() {
+        return _routes;
+    }
+
+    public void setRoutes(List<RoutesDbo> routes) {
+        _routes = routes;
+    }
+}

app/src/main/java/com/rthoni/stssaguenay/dbo/RoutesDbo.java

@@ -36,7 +36,12 @@ public class RoutesDbo extends LuDbo {
 
     @Override
     public HashMap<String, Object> toArray() {
-        return null;
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("id", _id);
+        map.put("name", _name);
+        map.put("bgColor", _bgColor);
+        map.put("fgColor", _fgColor);
+        return map;
     }
 
     public String getId() {

app/src/main/java/com/rthoni/stssaguenay/dbo/StopsDbo.java

@@ -37,7 +37,13 @@ public class StopsDbo extends LuDbo {
 
     @Override
     public HashMap<String, Object> toArray() {
-        return null;
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("name", _name);
+        map.put("routes", _routes);
+        map.put("id", _id);
+        map.put("posX", _posX);
+        map.put("posY", _posY);
+        return map;
     }
 
     protected String _name;

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

@@ -9,13 +9,24 @@ import android.view.View;
 
 import com.luticate.utils.business.LuRequest;
 import com.rthoni.stssaguenay.R;
+import com.rthoni.stssaguenay.business.STSBusiness;
+import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
 import com.rthoni.stssaguenay.ui.fragments.HomeFragment;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.util.List;
+
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class MainActivity extends AppCompatActivity {
 
+    public static int ADD_FAVOURITE_STOP_REQUEST_CODE = 1;
+
+    private boolean _goToHome = false;
+
     @BindView(R.id.fab)
     FloatingActionButton _fab;
 
@@ -36,10 +47,19 @@ public class MainActivity extends AppCompatActivity {
                 goToAddStop();
             }
         });
-//        _fab.hide();
+
         goToHome();
     }
 
+    @Override
+    protected void onResume() {
+        if (_goToHome) {
+            _goToHome = false;
+            goToHome();
+        }
+        super.onResume();
+    }
+
     public void goToHome()
     {
         _fab.show();
@@ -56,10 +76,29 @@ public class MainActivity extends AppCompatActivity {
     public void goToAddStop()
     {
         Intent intent = new Intent(this, StopPickerActivity.class);
-        startActivity(intent);
+        startActivityForResult(intent, ADD_FAVOURITE_STOP_REQUEST_CODE);
     }
 
-//    @Override
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (requestCode == ADD_FAVOURITE_STOP_REQUEST_CODE && resultCode == RESULT_OK) {
+            FavouriteStopDbo favouriteStopDbo = new FavouriteStopDbo();
+            try {
+                JSONObject obj = new JSONObject(data.getStringExtra(StopPickerActivity.STOP_EXTRA_NAME));
+                favouriteStopDbo.fromJson(obj);
+            } catch (JSONException e) {
+                e.printStackTrace();
+                return;
+            }
+            List<FavouriteStopDbo> favouriteStopDbos = STSBusiness.getFavouriteStops(this);
+            favouriteStopDbos.add(favouriteStopDbo);
+            STSBusiness.setFavouriteStops(this, favouriteStopDbos);
+            _goToHome = true;
+        }
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    //    @Override
 //    public boolean onCreateOptionsMenu(Menu menu) {
 //        // Inflate the menu; this adds items to the action bar if it is present.
 //        getMenuInflater().inflate(R.menu.menu_main, menu);

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

@@ -1,16 +1,24 @@
 package com.rthoni.stssaguenay.ui.activities;
 
+import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
 import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
+import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+import com.rthoni.stssaguenay.dbo.RoutesDbo;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
 import com.rthoni.stssaguenay.ui.fragments.StopPickerFragment;
 import com.rthoni.stssaguenay.ui.fragments.StopRoutesPickerFragment;
 
+import java.util.List;
+
 public class StopPickerActivity extends AppCompatActivity {
 
+    public static String STOP_EXTRA_NAME = "STOP_EXTRA";
+
     private StopPickerFragment _stopPickerFragment;
 
     @Override
@@ -47,14 +55,28 @@ public class StopPickerActivity extends AppCompatActivity {
                 .commit();
     }
 
-    public void goToRoutes(StopsDbo stopDbo)
+    public void goToRoutes(final StopsDbo stopDbo)
     {
         StopRoutesPickerFragment f = new StopRoutesPickerFragment();
         f.setStopsDbo(stopDbo);
+        f.setOnRoutesSelected(new LuPromise.LuConsumer<FavouriteStopDbo>() {
+            @Override
+            public void execute(FavouriteStopDbo data) {
+                saveStop(data);
+            }
+        });
         getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.container, f)
                 .addToBackStack("StopRoutesPickerFragment")
                 .commit();
     }
+
+    public void saveStop(FavouriteStopDbo favouriteStopDbo)
+    {
+        Intent result = new Intent();
+        result.putExtra(STOP_EXTRA_NAME, favouriteStopDbo.toString());
+        setResult(Activity.RESULT_OK, result);
+        finish();
+    }
 }

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

@@ -3,12 +3,18 @@ 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.LinearLayoutManager;
 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.business.STSBusiness;
+import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
+
+import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -19,13 +25,78 @@ import butterknife.ButterKnife;
 public class HomeFragment extends Fragment {
 
     @BindView(R.id.listFavouritesStops)
-    RecyclerView _favouritesStops;
+    RecyclerView _favouritesStopsList;
+
+    FavouriteStopsAdapter _adapter;
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        public View _parentView;
+        public TextView _textView;
+        public ViewHolder(View v) {
+            super(v);
+            _parentView = v;
+        }
+    }
+
+    public class FavouriteStopsAdapter extends RecyclerView.Adapter<ViewHolder> {
+
+        private List<FavouriteStopDbo> _favourites;
+
+        @Override
+        public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+            View v = LayoutInflater.from(parent.getContext())
+                    .inflate(R.layout.favourite_stop_recycler_view_item, parent, false);
+            ViewHolder vh = new ViewHolder(v);
+            vh._textView = (TextView) v.findViewById(R.id.textView);
+            return vh;
+        }
+
+        @Override
+        public void onBindViewHolder(ViewHolder holder, int position) {
+            final FavouriteStopDbo favouriteStopDbo = _favourites.get(position);
+            holder._textView.setText(favouriteStopDbo.getStop().getFullName());
+            holder._parentView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    onFavouriteClicked(favouriteStopDbo);
+                }
+            });
+        }
+
+        @Override
+        public int getItemCount() {
+            return _favourites == null ? 0 : _favourites.size();
+        }
+
+        public void setFavourites(List<FavouriteStopDbo> favourites) {
+            _favourites = favourites;
+            notifyDataSetChanged();
+        }
+    }
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_home, container, false);
         ButterKnife.bind(this, v);
+
+        _adapter = new FavouriteStopsAdapter();
+        _favouritesStopsList.setAdapter(_adapter);
+        _favouritesStopsList.setLayoutManager(new LinearLayoutManager(getContext()));
+
+        loadFavourites();
+
         return v;
     }
+
+    public void loadFavourites()
+    {
+        List<FavouriteStopDbo> favourites = STSBusiness.getFavouriteStops(getContext());
+        _adapter.setFavourites(favourites);
+    }
+
+    public void onFavouriteClicked(FavouriteStopDbo favouriteStopDbo)
+    {
+
+    }
 }

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

@@ -173,6 +173,8 @@ public class StopPickerFragment extends Fragment {
         final ProgressDialog progressDialog = new ProgressDialog(getContext());
         progressDialog.setIndeterminate(true);
         progressDialog.show();
+        progressDialog.setTitle(R.string.loading);
+        progressDialog.setMessage(getString(R.string.loading_stops));
 
         StopsBusiness.getAll(STSBusiness.getConfig())
                 .then(new LuPromise.LuConsumer<List<StopsDbo>>() {

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

@@ -10,6 +10,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -19,6 +20,7 @@ import com.luticate.utils.business.LuPromise;
 import com.rthoni.stssaguenay.R;
 import com.rthoni.stssaguenay.business.RoutesBusiness;
 import com.rthoni.stssaguenay.business.STSBusiness;
+import com.rthoni.stssaguenay.dbo.FavouriteStopDbo;
 import com.rthoni.stssaguenay.dbo.RoutesDbo;
 import com.rthoni.stssaguenay.dbo.StopsDbo;
 
@@ -39,10 +41,15 @@ public class StopRoutesPickerFragment extends Fragment {
     @BindView(R.id.listRoutes)
     RecyclerView _listRoutes;
 
+    @BindView(R.id.btnSave)
+    Button _btnSave;
+
     private StopsDbo _stopsDbo;
 
     private RoutesAdapter _routesAdapter;
 
+    private LuPromise.LuConsumer<FavouriteStopDbo> _onRoutesSelected;
+
     public static class ViewHolder extends RecyclerView.ViewHolder {
         public ImageView _imageView;
         public TextView _textView;
@@ -57,6 +64,8 @@ public class StopRoutesPickerFragment extends Fragment {
 
         private List<RoutesDbo> _routes;
 
+        private List<RoutesDbo> _selectRoutes;
+
         @Override
         public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
             View v = LayoutInflater.from(parent.getContext())
@@ -80,7 +89,15 @@ public class StopRoutesPickerFragment extends Fragment {
             holder._view.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    v.setSelected(!v.isSelected());
+                    if (_selectRoutes.contains(routeDbo)) {
+                        _selectRoutes.remove(routeDbo);
+                        v.setSelected(false);
+                    }
+                    else {
+                        _selectRoutes.add(routeDbo);
+                        v.setSelected(true);
+                    }
+                    _btnSave.setEnabled(_selectRoutes.size() != 0);
                 }
             });
         }
@@ -92,8 +109,13 @@ public class StopRoutesPickerFragment extends Fragment {
 
         public void setRoutes(List<RoutesDbo> routes) {
             _routes = routes;
+            _selectRoutes = new Vector<>();
             notifyDataSetChanged();
         }
+
+        public List<RoutesDbo> getSelectRoutes() {
+            return _selectRoutes;
+        }
     }
 
     @Nullable
@@ -109,15 +131,18 @@ public class StopRoutesPickerFragment extends Fragment {
         _listRoutes.setLayoutManager(new LinearLayoutManager(getContext()));
         _listRoutes.setHasFixedSize(true);
 
+        _btnSave.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                save();
+            }
+        });
+
         loadRoutes();
 
         return v;
     }
 
-    public StopsDbo getStopsDbo() {
-        return _stopsDbo;
-    }
-
     public void setStopsDbo(StopsDbo stopsDbo) {
         _stopsDbo = stopsDbo;
     }
@@ -127,6 +152,8 @@ public class StopRoutesPickerFragment extends Fragment {
         final ProgressDialog progressDialog = new ProgressDialog(getContext());
         progressDialog.setIndeterminate(true);
         progressDialog.show();
+        progressDialog.setTitle(R.string.loading);
+        progressDialog.setMessage(getString(R.string.loading_routes));
 
         RoutesBusiness.getAll(STSBusiness.getConfig())
                 .then(new LuPromise.LuConsumer<List<RoutesDbo>>() {
@@ -145,4 +172,18 @@ public class StopRoutesPickerFragment extends Fragment {
                     }
                 });
     }
+
+    public void save()
+    {
+        if (_onRoutesSelected != null) {
+            FavouriteStopDbo favourite = new FavouriteStopDbo();
+            favourite.setStop(_stopsDbo);
+            favourite.setRoutes(_routesAdapter.getSelectRoutes());
+            _onRoutesSelected.execute(favourite);
+        }
+    }
+
+    public void setOnRoutesSelected(LuPromise.LuConsumer<FavouriteStopDbo> onRoutesSelected) {
+        _onRoutesSelected = onRoutesSelected;
+    }
 }

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:clickable="true"
+              android:foreground="?android:attr/selectableItemBackground"
+              android:minHeight="?android:attr/listPreferredItemHeightSmall"
+              android:weightSum="1">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceListItemSmall"
+        android:id="@+id/textView"
+        android:clickable="false"
+        android:focusable="false"
+        tools:text="Stop name"
+        android:gravity="center_vertical"
+        android:layout_weight="1.0"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/textView2"
+        android:clickable="false"
+        android:focusable="false"
+        tools:text="09h42 10h12"
+        android:gravity="center_vertical"
+        android:text="@string/loading_schedules"
+        android:layout_weight="1.0"/>
+</LinearLayout>

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

@@ -3,29 +3,42 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="@string/pick_routes"
-        android:id="@+id/textView"
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"/>
+        android:layout_above="@+id/btnSave">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/pick_routes"
+            android:id="@+id/textView"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/listRoutes"
+            android:scrollbars="vertical"
+            android:fadeScrollbars="true"/>
+
+    </LinearLayout>
+
 
-    <android.support.v7.widget.RecyclerView
+    <Button
+        android:text="@string/save"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/listRoutes"
-        android:scrollbars="vertical"
-        android:fadeScrollbars="true"
-        android:layout_below="@id/textView"
+        android:id="@+id/btnSave"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"/>
+        android:enabled="false"/>
 
 </RelativeLayout>

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

@@ -4,4 +4,9 @@
     <string name="favourites_stops">Favourites stops:</string>
     <string name="search_stop">Search a stop</string>
     <string name="pick_routes">Pick your routes for stop %1$s:</string>
+    <string name="save">Save</string>
+    <string name="loading">Loading&#8230;</string>
+    <string name="loading_schedules">Loading schedules&#8230;</string>
+    <string name="loading_routes">Loading schedules&#8230;</string>
+    <string name="loading_stops">Loading stops&#8230;</string>
 </resources>