add serach stop

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

@@ -9,7 +9,6 @@ import android.support.design.widget.NavigationView;
 import android.support.multidex.MultiDex;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
@@ -60,8 +59,7 @@ import butterknife.ButterKnife;
 public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
 
     public static int ADD_FAVOURITE_STOP_REQUEST_CODE = 1;
-
-    private boolean _goToHome = false;
+    public static int SEARCH_STOP_REQUEST_CODE = 2;
 
     @BindView(R.id.fab)
     FloatingActionMenu _fab;
@@ -85,10 +83,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     private CallbackManager _callbackManager;
 
-    private ActionBar _actionBar;
-
     private FragmentManager _fragmentManager;
 
+    private DrawerLayout _drawer;
+
+    private Runnable _onResumeAction;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -108,10 +108,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 
-        DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+        _drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        drawer.setDrawerListener(toggle);
+                this, _drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+        _drawer.addDrawerListener(toggle);
         toggle.syncState();
 
         _navigationView.setNavigationItemSelectedListener(this);
@@ -184,8 +184,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             }
         });
 
-        _actionBar = getSupportActionBar();
-
         updateLoginState();
         goToHome();
     }
@@ -207,9 +205,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     @Override
     protected void onResume() {
-        if (_goToHome) {
-            _goToHome = false;
-            goToHome();
+        if (_onResumeAction != null) {
+            _onResumeAction.run();
         }
         super.onResume();
     }
@@ -241,17 +238,48 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     public void goToAddStop(boolean map)
     {
+        _fab.close(true);
         Intent intent = new Intent(this, StopPickerActivity.class);
         intent.putExtra(StopPickerActivity.MAP_EXTRA_NAME, map);
         startActivityForResult(intent, ADD_FAVOURITE_STOP_REQUEST_CODE);
     }
 
+    public void goToSearchStop(boolean map)
+    {
+        _fab.close(true);
+        Intent intent = new Intent(this, StopPickerActivity.class);
+        intent.putExtra(StopPickerActivity.MAP_EXTRA_NAME, map);
+        intent.putExtra(StopPickerActivity.SELECT_ROUTES_EXTRA_NAME, false);
+        startActivityForResult(intent, SEARCH_STOP_REQUEST_CODE);
+    }
+
+    public void goToSearchStop()
+    {
+        final int item[] = new int[1];
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        String[] array = new String[]{getString(R.string.stop_add_map), getString(R.string.stop_add_list)};
+        builder.setSingleChoiceItems(array, 0, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                item[0] = which;
+            }
+        });
+        builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dialog.dismiss();
+                goToSearchStop(item[0] == 0);
+            }
+        });
+        builder.show();
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == ADD_FAVOURITE_STOP_REQUEST_CODE && resultCode == RESULT_OK) {
             UserFavouriteStopsDbo favouriteStopDbo = new UserFavouriteStopsDbo();
             try {
-                JSONObject obj = new JSONObject(data.getStringExtra(StopPickerActivity.STOP_EXTRA_NAME));
+                JSONObject obj = new JSONObject(data.getStringExtra(StopPickerActivity.FAVOURITE_STOP_EXTRA_NAME));
                 favouriteStopDbo.fromJson(obj);
             } catch (JSONException e) {
                 e.printStackTrace();
@@ -260,7 +288,28 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             List<UserFavouriteStopsDbo> favouriteStopDbos = STSBusiness.getFavouriteStops(this);
             favouriteStopDbos.add(favouriteStopDbo);
             STSBusiness.setFavouriteStops(this, favouriteStopDbos);
-            _goToHome = true;
+            _onResumeAction = new Runnable() {
+                @Override
+                public void run() {
+                    goToHome();
+                }
+            };
+        }
+        else if (requestCode == SEARCH_STOP_REQUEST_CODE && resultCode == RESULT_OK) {
+            final StopsDbo stopDbo = new StopsDbo();
+            try {
+                JSONObject obj = new JSONObject(data.getStringExtra(StopPickerActivity.STOP_EXTRA_NAME));
+                stopDbo.fromJson(obj);
+            } catch (JSONException e) {
+                e.printStackTrace();
+                return;
+            }
+            _onResumeAction = new Runnable() {
+                @Override
+                public void run() {
+                    goToStop(stopDbo);
+                }
+            };
         }
         else {
             _callbackManager.onActivityResult(requestCode, resultCode, data);
@@ -270,7 +319,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
-        if (item.getItemId() == R.id.nav_restore) {
+        if (item.getItemId() == R.id.nav_search_stop) {
+            goToSearchStop();
+        }
+        else if (item.getItemId() == R.id.nav_restore) {
             restoreSettings();
         }
         else if (item.getItemId() == R.id.nav_backup) {
@@ -284,6 +336,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         else {
             return false;
         }
+        _drawer.closeDrawers();
         return true;
     }
 
@@ -292,9 +345,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         UserDbo user = STSBusiness.getLoggedUser(this);
         _btnLogin.setVisibility(user == null ? View.VISIBLE : View.GONE);
         Menu menu = _navigationView.getMenu();
-        for (int i = 0; i < menu.size(); i++) {
-            menu.getItem(i).setVisible(user != null);
-        }
+        menu.findItem(R.id.nav_restore).setVisible(user != null);
+        menu.findItem(R.id.nav_backup).setVisible(user != null);
+        menu.findItem(R.id.nav_logout).setVisible(user != null);
         _textUserName.setText(user == null ? "" : user.getName());
         _textUserName.setVisibility(user == null ? View.GONE : View.VISIBLE);
         _textUserEmail.setText(user == null ? "" : user.getEmail());

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

@@ -20,16 +20,23 @@ public class StopPickerActivity extends AppCompatActivity {
 
     public static String MAP_EXTRA_NAME = "MAP_EXTRA";
 
+    public static String SELECT_ROUTES_EXTRA_NAME = "SELECT_ROUTES_EXTRA";
+
+    public static String FAVOURITE_STOP_EXTRA_NAME = "FAVOURITE_STOP_EXTRA";
+
     public static String STOP_EXTRA_NAME = "STOP_EXTRA";
 
     private boolean _map;
 
+    private boolean _selectRoutes;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_stop_picker);
 
         _map = getIntent().getBooleanExtra(MAP_EXTRA_NAME, false);
+        _selectRoutes = getIntent().getBooleanExtra(SELECT_ROUTES_EXTRA_NAME, true);
 
         MobileAds.initialize(getApplicationContext(), getString(R.string.ad_init));
         AdView mAdView = (AdView) findViewById(R.id.adView);
@@ -53,14 +60,20 @@ public class StopPickerActivity extends AppCompatActivity {
 
     public void goToStops()
     {
-        if (_map) {
-            StopMapPickerFragment f = new StopMapPickerFragment();
-            f.setOnStopSelectedConsumer(new LuPromise.LuConsumer<StopsDbo>() {
-                @Override
-                public void execute(StopsDbo data) {
+        LuPromise.LuConsumer<StopsDbo> consumer = new LuPromise.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)
@@ -68,12 +81,7 @@ public class StopPickerActivity extends AppCompatActivity {
         }
         else {
             StopListPickerFragment f = new StopListPickerFragment();
-            f.setOnStopSelectedConsumer(new LuPromise.LuConsumer<StopsDbo>() {
-                @Override
-                public void execute(StopsDbo data) {
-                    goToRoutes(data);
-                }
-            });
+            f.setOnStopSelectedConsumer(consumer);
             getSupportFragmentManager()
                     .beginTransaction()
                     .replace(R.id.container, f)
@@ -88,7 +96,7 @@ public class StopPickerActivity extends AppCompatActivity {
         f.setOnRoutesSelected(new LuPromise.LuConsumer<UserFavouriteStopsDbo>() {
             @Override
             public void execute(UserFavouriteStopsDbo data) {
-                saveStop(data);
+                saveFavouriteStop(data);
             }
         });
         getSupportFragmentManager()
@@ -98,10 +106,18 @@ public class StopPickerActivity extends AppCompatActivity {
                 .commit();
     }
 
-    public void saveStop(UserFavouriteStopsDbo favouriteStopDbo)
+    public void saveStop(StopsDbo stopDbo)
+    {
+        Intent result = new Intent();
+        result.putExtra(STOP_EXTRA_NAME, stopDbo.toString());
+        setResult(Activity.RESULT_OK, result);
+        finish();
+    }
+
+    public void saveFavouriteStop(UserFavouriteStopsDbo favouriteStopDbo)
     {
         Intent result = new Intent();
-        result.putExtra(STOP_EXTRA_NAME, favouriteStopDbo.toString());
+        result.putExtra(FAVOURITE_STOP_EXTRA_NAME, favouriteStopDbo.toString());
         setResult(Activity.RESULT_OK, result);
         finish();
     }

app/src/main/res/drawable/ic_directions_bus_white_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#e9e9e9"
+        android:pathData="M4,16c0,0.88 0.39,1.67 1,2.22L5,20c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h8v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1.78c0.61,-0.55 1,-1.34 1,-2.22L20,6c0,-3.5 -3.58,-4 -8,-4s-8,0.5 -8,4v10zM7.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5S6.67,14 7.5,14s1.5,0.67 1.5,1.5S8.33,17 7.5,17zM16.5,17c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM18,11L6,11L6,6h12v5z"/>
+</vector>

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

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+        <item
+            android:id="@+id/nav_search_stop"
+            android:icon="@drawable/ic_directions_bus_white_24dp"
+            android:title="@string/search_stop" />
+
         <item
             android:id="@+id/nav_restore"
             android:icon="@drawable/ic_archive_white_24dp"
-            android:title="@string/restore" />
+            android:title="@string/restore_settings" />
         <item
             android:id="@+id/nav_backup"
             android:icon="@drawable/ic_unarchive_white_24dp"
-            android:title="@string/backup" />
+            android:title="@string/backup_settings" />
         <item
             android:id="@+id/nav_logout"
             android:icon="@drawable/ic_open_in_new_white_24dp"

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

@@ -20,8 +20,8 @@
     <string name="error_try_again">Error. Please try again.</string>
 
     <string name="stop_add">Add a favourite stop</string>
-    <string name="stop_add_map">Add from map</string>
-    <string name="stop_add_list">Add from list</string>
+    <string name="stop_add_map">Select from map</string>
+    <string name="stop_add_list">Select from list</string>
 
     <string name="loading">Loading&#8230;</string>
     <string name="loading_schedules">Loading schedules&#8230;</string>
@@ -34,9 +34,9 @@
 
     <string name="drawer_help_message">Log in to access more features</string>
 
+    <string name="restore_settings">Restore settings</string>
+    <string name="backup_settings">Backup settings</string>
     <string name="logout">Logout</string>
-    <string name="restore">Restore settings</string>
-    <string name="backup">Backup settings</string>
 
     <string name="encryption_password">Encryption password</string>
     <string name="encryption_password_encrypt">Please enter an encryption password (you do not need to enter the same as a previous backup):</string>

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.0.0'