Working on Session UI

app/src/main/java/net/pokeranalytics/android/model/extensions/SessionExtensions.kt

@@ -0,0 +1,32 @@
+package net.pokeranalytics.android.model.extensions
+
+import net.pokeranalytics.android.model.realm.Session
+import java.util.*
+
+enum class SessionState {
+	PENDING,
+	STARTED,
+	PAUSED,
+	FINISHED,
+	INVALID;
+}
+
+/**
+ * Return the current state of a session
+ * For example: STARTED, PAUSED, FINISHED
+ */
+fun Session.getState(): SessionState {
+	val endDate = timeFrame?.endDate
+	timeFrame?.startDate?.let {startDate ->
+		if (startDate > Date()) {
+			return SessionState.PENDING
+		} else if (endDate != null) {
+			return SessionState.FINISHED
+		} else if (isPaused) {
+			return SessionState.PAUSED
+		} else {
+			return SessionState.STARTED
+		}
+	}
+	return SessionState.INVALID
+}

app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt

@@ -88,6 +88,8 @@ open class Session : RealmObject(), SessionInterface, RowRepresentableDataSource
 	// The features of the tournament, like Knockout, Shootout, Turbo...
 	var tournamentFeatures: RealmList<TournamentFeature> = RealmList()
 
+	var isPaused: Boolean = false
+
 	companion object {
 
 		fun newInstance(): Session {
@@ -159,7 +161,7 @@ open class Session : RealmObject(), SessionInterface, RowRepresentableDataSource
 	override fun actionIconForRow(row: RowRepresentable): Int? {
 		return when (row) {
 			SessionRow.START_DATE, SessionRow.END_DATE -> {
-				R.drawable.ic_close_white_24dp
+				R.drawable.ic_close
 			}
 			else -> null
 		}

app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt

@@ -1,13 +1,11 @@
 package net.pokeranalytics.android.ui.fragment
 
 import android.os.Bundle
-import android.view.LayoutInflater
+import android.view.*
-import android.view.View
-import android.view.ViewGroup
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.kotlin.where
-import kotlinx.android.synthetic.main.fragment_new_session.*
+import kotlinx.android.synthetic.main.fragment_session.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.LiveData
 import net.pokeranalytics.android.model.realm.Session
@@ -21,6 +19,7 @@ import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheet
 import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheetFragment
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.SessionRow
+import net.pokeranalytics.android.util.toast
 import java.util.*
 
 class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, BottomSheetDelegate {
@@ -29,7 +28,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 	private lateinit var sessionAdapter : RowRepresentableAdapter
 
 	override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-		return inflater.inflate(R.layout.fragment_new_session, container, false)
+		return inflater.inflate(R.layout.fragment_session, container, false)
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -37,6 +36,20 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 		initUI()
 	}
 
+	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+		inflater?.inflate(R.menu.session_toolbar, menu)
+		super.onCreateOptionsMenu(menu, inflater)
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+		when (item!!.itemId) {
+			R.id.restart -> toast("Restard is clicked!")
+			R.id.delete -> toast("Delete is clicked!")
+		}
+		return true
+	}
+
+
 	override fun onRowSelected(row: RowRepresentable) {
 		val data = currentSession.getBottomSheetData(row)
 		when (row) {
@@ -86,6 +99,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 		val activity = activity as PokerAnalyticsActivity
 		activity.setSupportActionBar(toolbar)
 		activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
+		setHasOptionsMenu(true)
 
 		val viewManager = LinearLayoutManager(requireContext())
 
@@ -94,6 +108,21 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
 			layoutManager = viewManager
 		}
 
+		bottomAppBar.inflateMenu(R.menu.session_bottom_app_bar)
+		bottomAppBar.menu.findItem(R.id.stop).isVisible = false
+
+		bottomAppBar.setOnMenuItemClickListener { item ->
+			when(item.itemId) {
+				R.id.stop -> toast("Stop is clicked!")
+			}
+			false
+		}
+
+		floatingActionButton.setOnClickListener {
+			floatingActionButton.setImageResource(R.drawable.ic_outline_pause)
+			bottomAppBar.menu.findItem(R.id.stop).isVisible = true
+		}
+
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/util/Extensions.kt

@@ -1,5 +1,8 @@
 package net.pokeranalytics.android.util
 
+import android.widget.Toast
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment
 import java.text.DateFormat
 import java.util.*
 
@@ -19,3 +22,14 @@ fun Date.medium(): String {
 fun Date.full(): String {
 	return DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(this)
 }
+
+
+// Toast
+
+fun PokerAnalyticsActivity.toast(message: String) {
+	Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+}
+
+fun PokerAnalyticsFragment.toast(message: String) {
+	Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT).show()
+}

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

@@ -1,9 +0,0 @@
-<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="#FF000000"
-            android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z"/>
-</vector>

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

@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
-</vector>

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

@@ -1,9 +0,0 @@
-<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="#FF000000"
-            android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>

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

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-            android:fillColor="#FF000000"
+            android:fillColor="#FFFFFFFF"
             android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M5,9.2h3L8,19L5,19L5,9.2zM10.6,5h2.8v14h-2.8L10.6,5zM16.2,13L19,13v6h-2.8v-6z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M3.5,18.49l6,-6.01 4,4L22,6.92l-1.41,-1.41 -7.09,7.97 -4,-4L2,16.99l1.5,1.5z"/>
 </vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z"/>
+</vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.25,2.52 0.77,-1.28 -3.52,-2.09L13.5,8z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M10,8.64L15.27,12 10,15.36V8.64M8,5v14l11,-7L8,5z"/>
 </vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z"/>
+</vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/>
 </vector>

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

@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M16,8v8H8V8h8m2,-2H6v12h12V6z"/>
 </vector>

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

@@ -33,7 +33,7 @@
 		android:layout_height="wrap_content"
 		android:layout_marginEnd="16dp"
 		android:layout_marginBottom="16dp"
-		android:src="@drawable/ic_add_white_24dp"
+		android:src="@drawable/ic_add"
 		app:fabSize="normal"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent" />

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

@@ -38,23 +38,38 @@
 			android:id="@+id/collapsingToolbar"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
+			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
 			app:contentScrim="?attr/colorPrimary"
 			app:expandedTitleGravity="bottom"
 			app:expandedTitleMarginStart="72dp"
 			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
-			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 
 			<androidx.appcompat.widget.Toolbar
 				android:id="@+id/toolbar"
 				android:layout_width="match_parent"
 				android:layout_height="?attr/actionBarSize"
-				app:title="Poker Analytics"
+				app:layout_collapseMode="pin"
 				app:titleTextColor="@color/white"
-				app:layout_collapseMode="pin" />
+				tools:title="Poker Analytics" />
 
 		</com.google.android.material.appbar.CollapsingToolbarLayout>
 
 	</com.google.android.material.appbar.AppBarLayout>
 
+
+	<com.google.android.material.bottomappbar.BottomAppBar
+		android:id="@+id/bottomAppBar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:theme="@style/PokerAnalyticsTheme.BottomAppBar"
+		android:layout_gravity="bottom" />
+
+	<com.google.android.material.floatingactionbutton.FloatingActionButton
+		android:id="@+id/floatingActionButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:src="@drawable/ic_outline_play"
+		app:layout_anchor="@id/bottomAppBar" />
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
-        xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
-        android:layout_width="match_parent"
+	android:layout_height="wrap_content"
-        android:layout_height="wrap_content"
+	android:background="?selectableItemBackground"
-        android:padding="16dp">
+	android:padding="16dp">
 
-    <androidx.appcompat.widget.AppCompatTextView
+	<androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/date"
+		android:id="@+id/date"
-            android:layout_width="0dp"
+		android:layout_width="0dp"
-            android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
+		android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
+		android:layout_marginTop="8dp"
-            android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
-            android:textSize="16sp"
+		android:layout_marginBottom="8dp"
-            tools:text="This date"
+		android:textSize="16sp"
-            app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
-            android:layout_marginStart="8dp"
+		app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginBottom="8dp"
+		app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"/>
+		tools:text="This date" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -49,6 +49,6 @@
 		app:layout_constraintEnd_toEndOf="parent"
 		app:layout_constraintTop_toTopOf="parent"
 		app:layout_constraintStart_toEndOf="@+id/value"
-		tools:src="@drawable/ic_close_white_24dp" />
+		tools:src="@drawable/ic_close" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,17 +6,17 @@
 		android:id="@+id/actionClear"
 		android:orderInCategory="100"
 		android:title="@string/clear"
-		android:icon="@drawable/ic_close_white_24dp"
+		android:icon="@drawable/ic_close"
 		app:showAsAction="always" />
 	<item
 		android:id="@+id/actionAdd"
-		android:icon="@drawable/ic_add_white_24dp"
+		android:icon="@drawable/ic_add"
 		android:orderInCategory="200"
 		android:title="@string/new_str"
 		app:showAsAction="ifRoom" />
 	<item
 		android:id="@+id/actionCheck"
-		android:icon="@drawable/ic_check_white_24dp"
+		android:icon="@drawable/ic_check"
 		android:orderInCategory="300"
 		android:title="@string/done"
 		app:showAsAction="ifRoom" />

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/stop"
+		android:title="@string/stop"
+		app:showAsAction="always" />
+
+</menu>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto">
+
+	<item
+		android:id="@+id/restart"
+		android:title="@string/restart_timer"
+		android:icon="@drawable/ic_outline_restart"
+		app:showAsAction="withText" />
+
+	<item
+		android:id="@+id/delete"
+		android:icon="@drawable/ic_outline_delete"
+		android:title="@string/delete"
+		app:showAsAction="withText" />
+
+</menu>

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

@@ -34,6 +34,7 @@
 		<item name="titleTextColor">@color/white</item>
 		<item name="titleTextAppearance">@style/PokerAnalyticsTheme.Toolbar.TitleAppearance</item>
 	</style>
+	+
 
 	<style name="PokerAnalyticsTheme.Toolbar.TitleAppearance">
 		<item name="android:textSize">20sp</item>
@@ -53,6 +54,10 @@
 	<!-- Bottom App Bar -->
 	<style name="PokerAnalyticsTheme.BottomAppBar" parent="Widget.MaterialComponents.BottomAppBar">
 		<item name="backgroundTint">@color/gray_darker</item>
+		<item name="android:colorPrimary">@color/white</item>
+		<item name="android:titleTextColor">@color/white</item>
+		<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
+		<item name="actionMenuTextColor">@color/white</item>
 	</style>
 
 	<!-- TextView -->