Update toolbar

Author: MarkNjunge

app/src/main/java/com/marknkamau/justjava/ui/BaseActivity.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu
 import android.view.MenuItem
+import android.widget.Toast
 import com.marknkamau.justjava.JustJavaApp
 import com.marknkamau.justjava.R
 import com.marknkamau.justjava.ui.about.AboutActivity
@@ -35,11 +36,11 @@ abstract class BaseActivity : AppCompatActivity() {
 
         if (authService.isSignedIn()) {
             menu?.findItem(R.id.menu_login)?.isVisible = false
-            menu?.findItem(R.id.menu_profile)?.isVisible = true
+//            menu?.findItem(R.id.menu_profile)?.isVisible = true
             menu?.findItem(R.id.menu_logout)?.isVisible = true
         } else {
             menu?.findItem(R.id.menu_login)?.isVisible = true
-            menu?.findItem(R.id.menu_profile)?.isVisible = false
+//            menu?.findItem(R.id.menu_profile)?.isVisible = false
             menu?.findItem(R.id.menu_logout)?.isVisible = false
         }
         return true
@@ -56,7 +57,11 @@ abstract class BaseActivity : AppCompatActivity() {
                 return true
             }
             R.id.menu_profile -> {
-                startActivity(Intent(this, ProfileActivity::class.java))
+                if (authService.isSignedIn()) {
+                    startActivity(Intent(this, ProfileActivity::class.java))
+                } else {
+                    startActivity(Intent(this, LogInActivity::class.java))
+                }
                 return true
             }
             R.id.menu_logout -> {
@@ -65,6 +70,7 @@ abstract class BaseActivity : AppCompatActivity() {
                 authService.logOut()
                 // If this is ProfileActivity
                 (this as? ProfileActivity)?.finish()
+                Toast.makeText(this, "Logged out", Toast.LENGTH_SHORT).show()
                 return true
             }
             R.id.menu_about -> {

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

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_cart"
         android:icon="@drawable/ic_cart"
         android:title="@string/cart"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/menu_login"
-        android:title="@string/login" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_profile"
         android:icon="@drawable/ic_profile"
         android:title="@string/profile"
-        app:showAsAction="never" />
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/menu_login"
+        android:title="@string/login" />
     <item
         android:id="@+id/menu_logout"
         android:title="@string/logout"