main fab

app/build.gradle

@@ -53,6 +53,7 @@ dependencies {
     compile 'com.google.android.gms:play-services:9.6.1'
     compile 'com.android.support:multidex:1.0.1'
     compile 'com.google.maps.android:android-maps-utils:0.4+'
+    compile 'com.github.clans:fab:1.6.4'
 }
 
 apply plugin: 'com.google.gms.google-services'

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

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.NavigationView;
 import android.support.multidex.MultiDex;
 import android.support.v4.app.FragmentManager;
@@ -32,6 +31,8 @@ import com.facebook.GraphResponse;
 import com.facebook.login.LoginManager;
 import com.facebook.login.LoginResult;
 import com.facebook.login.widget.LoginButton;
+import com.github.clans.fab.FloatingActionButton;
+import com.github.clans.fab.FloatingActionMenu;
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdView;
 import com.google.android.gms.ads.MobileAds;
@@ -63,7 +64,13 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private boolean _goToHome = false;
 
     @BindView(R.id.fab)
-    FloatingActionButton _fab;
+    FloatingActionMenu _fab;
+
+    @BindView(R.id.fab_item_add_map)
+    FloatingActionButton _fabMap;
+
+    @BindView(R.id.fab_item_add_list)
+    FloatingActionButton _fabList;
 
     @BindView(R.id.nav_view)
     NavigationView _navigationView;
@@ -114,10 +121,17 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         _textUserEmail = ButterKnife.findById(headerView, R.id.textUserEmail);
         _textHelpMessage = ButterKnife.findById(headerView, R.id.text_help_message);
 
-        _fab.setOnClickListener(new View.OnClickListener() {
+        _fabMap.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                goToAddStop(true);
+            }
+        });
+
+        _fabList.setOnClickListener(new View.OnClickListener() {
             @Override
-            public void onClick(View view) {
-                goToAddStop();
+            public void onClick(View v) {
+                goToAddStop(false);
             }
         });
 
@@ -202,7 +216,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     public void goToHome()
     {
-        _fab.show();
+        _fab.setVisibility(View.VISIBLE);
         HomeFragment f = new HomeFragment();
         f.setOnFavouriteStopClicked(new LuPromise.LuConsumer<UserFavouriteStopsDbo>() {
             @Override
@@ -215,7 +229,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
 
     public void goToStop(StopsDbo stopsDbo)
     {
-        _fab.hide();
+        _fab.setVisibility(View.GONE);
         StopViewerFragment f = new StopViewerFragment();
         f.setStopsDbo(stopsDbo);
         getSupportFragmentManager()
@@ -225,9 +239,10 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                 .commit();
     }
 
-    public void goToAddStop()
+    public void goToAddStop(boolean map)
     {
         Intent intent = new Intent(this, StopPickerActivity.class);
+        intent.putExtra(StopPickerActivity.MAP_EXTRA_NAME, map);
         startActivityForResult(intent, ADD_FAVOURITE_STOP_REQUEST_CODE);
     }
 

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

@@ -18,13 +18,19 @@ import com.rthoni.stssaguenay.ui.fragments.StopRoutesPickerFragment;
 
 public class StopPickerActivity extends AppCompatActivity {
 
+    public static String MAP_EXTRA_NAME = "MAP_EXTRA";
+
     public static String STOP_EXTRA_NAME = "STOP_EXTRA";
 
+    private boolean _map;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_stop_picker);
 
+        _map = getIntent().getBooleanExtra(MAP_EXTRA_NAME, false);
+
         MobileAds.initialize(getApplicationContext(), getString(R.string.ad_init));
         AdView mAdView = (AdView) findViewById(R.id.adView);
         AdRequest adRequest = new AdRequest.Builder().build();
@@ -47,18 +53,32 @@ public class StopPickerActivity extends AppCompatActivity {
 
     public void goToStops()
     {
-//        StopListPickerFragment f = new StopListPickerFragment();
-        StopMapPickerFragment f = new StopMapPickerFragment();
-        f.setOnStopSelectedConsumer(new LuPromise.LuConsumer<StopsDbo>() {
-            @Override
-            public void execute(StopsDbo data) {
-                goToRoutes(data);
-            }
-        });
-        getSupportFragmentManager()
-                .beginTransaction()
-                .replace(R.id.container, f)
-                .commit();
+        if (_map) {
+            StopMapPickerFragment f = new StopMapPickerFragment();
+            f.setOnStopSelectedConsumer(new LuPromise.LuConsumer<StopsDbo>() {
+                @Override
+                public void execute(StopsDbo data) {
+                    goToRoutes(data);
+                }
+            });
+            getSupportFragmentManager()
+                    .beginTransaction()
+                    .replace(R.id.container, f)
+                    .commit();
+        }
+        else {
+            StopListPickerFragment f = new StopListPickerFragment();
+            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(final StopsDbo stopDbo)

app/src/main/res/drawable/ic_archive_black_24dp.xml → app/src/main/res/drawable/ic_archive_white_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#e9e9e9"
         android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
 </vector>

app/src/main/res/drawable/ic_dehaze_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="M2,15.5v2h20v-2L2,15.5zM2,10.5v2h20v-2L2,10.5zM2,5.5v2h20v-2L2,5.5z"/>
+</vector>

app/src/main/res/drawable/ic_map_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="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>

app/src/main/res/drawable/ic_open_in_new_black_24dp.xml → app/src/main/res/drawable/ic_open_in_new_white_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#e9e9e9"
         android:pathData="M19,19H5V5h7V3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2v7zM14,3v2h3.59l-9.83,9.83 1.41,1.41L19,6.41V10h2V3h-7z"/>
 </vector>

app/src/main/res/drawable/ic_unarchive_black_24dp.xml → app/src/main/res/drawable/ic_unarchive_white_24dp.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#e9e9e9"
         android:pathData="M20.55,5.22l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.15,0.55L3.46,5.22C3.17,5.57 3,6.01 3,6.5V19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.49 -0.17,-0.93 -0.45,-1.28zM12,9.5l5.5,5.5H14v2h-4v-2H6.5L12,9.5zM5.12,5l0.82,-1h12l0.93,1H5.12z"/>
 </vector>

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

@@ -4,6 +4,7 @@
                                                  xmlns:tools="http://schemas.android.com/tools"
                                                  android:layout_width="match_parent"
                                                  android:layout_height="match_parent"
+                                                 xmlns:fab="http://schemas.android.com/apk/res-auto"
                                                  android:fitsSystemWindows="true"
                                                  tools:context=".ui.activities.MainActivity">
 
@@ -23,12 +24,60 @@
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.github.clans.fab.FloatingActionMenu
         android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@drawable/ic_add_black_24dp"/>
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="true"
+        fab:menu_fab_size="normal"
+        fab:menu_showShadow="true"
+        fab:menu_shadowColor="#66000000"
+        fab:menu_shadowRadius="4dp"
+        fab:menu_shadowXOffset="1dp"
+        fab:menu_shadowYOffset="3dp"
+        fab:menu_colorNormal="#DA4336"
+        fab:menu_colorPressed="#E75043"
+        fab:menu_colorRipple="#99FFFFFF"
+        fab:menu_animationDelayPerItem="50"
+        fab:menu_buttonSpacing="0dp"
+        fab:menu_labels_margin="0dp"
+        fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
+        fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
+        fab:menu_labels_paddingRight="8dp"
+        fab:menu_labels_paddingBottom="4dp"
+        fab:menu_labels_padding="8dp"
+        fab:menu_labels_textColor="#FFFFFF"
+        fab:menu_labels_textSize="14sp"
+        fab:menu_labels_cornerRadius="3dp"
+        fab:menu_labels_colorNormal="#333333"
+        fab:menu_labels_colorPressed="#444444"
+        fab:menu_labels_colorRipple="#66FFFFFF"
+        fab:menu_labels_showShadow="true"
+        fab:menu_labels_singleLine="false"
+        fab:menu_labels_ellipsize="none"
+        fab:menu_labels_maxLines="-1"
+        fab:menu_labels_position="left"
+        fab:menu_openDirection="up"
+        fab:menu_backgroundColor="@android:color/transparent"
+        fab:menu_fab_label="@string/stop_add"
+        app:menu_icon="@drawable/ic_add_white_24dp">
+
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/fab_item_add_map"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_map_white_24dp"
+            fab:fab_size="mini"
+            fab:fab_label="@string/stop_add_map" />
+
+        <com.github.clans.fab.FloatingActionButton
+            android:id="@+id/fab_item_add_list"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_dehaze_white_24dp"
+            fab:fab_size="mini"
+            fab:fab_label="@string/stop_add_list" />
+
+    </com.github.clans.fab.FloatingActionMenu>
 
 </android.support.design.widget.CoordinatorLayout>

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

@@ -12,7 +12,7 @@
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:src="@drawable/ic_add_black_24dp"
+        android:src="@drawable/ic_add_white_24dp"
         android:id="@+id/imageView"
         android:paddingBottom="2.5dp"
         android:paddingRight="5dp"

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

@@ -13,7 +13,7 @@
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:src="@drawable/ic_add_black_24dp"
+        android:src="@drawable/ic_add_white_24dp"
         android:id="@+id/imageView"
         android:paddingBottom="2.5dp"
         android:paddingRight="5dp"

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

@@ -3,14 +3,14 @@
 
         <item
             android:id="@+id/nav_restore"
-            android:icon="@drawable/ic_archive_black_24dp"
+            android:icon="@drawable/ic_archive_white_24dp"
             android:title="@string/restore" />
         <item
             android:id="@+id/nav_backup"
-            android:icon="@drawable/ic_unarchive_black_24dp"
+            android:icon="@drawable/ic_unarchive_white_24dp"
             android:title="@string/backup" />
         <item
             android:id="@+id/nav_logout"
-            android:icon="@drawable/ic_open_in_new_black_24dp"
+            android:icon="@drawable/ic_open_in_new_white_24dp"
             android:title="@string/logout" />
 </menu>

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

@@ -19,6 +19,10 @@
     <string name="save">Save</string>
     <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="loading">Loading&#8230;</string>
     <string name="loading_schedules">Loading schedules&#8230;</string>
     <string name="loading_routes">Loading routes&#8230;</string>