Upgrade material to 1.1.0

app/build.gradle

@@ -104,7 +104,7 @@ dependencies {
     // Android
     implementation 'androidx.appcompat:appcompat:1.0.2'
     implementation 'androidx.core:core-ktx:1.3.0-alpha02'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.browser:browser:1.0.0'

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

@@ -122,6 +122,15 @@ open class Session : RealmObject(), Savable, Editable, StaticRowRepresentableDat
 		}
 	}
 
+	/***
+	 * Returns an automatic date for a new hand history
+	 */
+	val handHistoryAutomaticDate: Date
+		get() {
+			val hhCount = this.handHistories?.size ?: 0
+			return Date(this.date.time + hhCount * 1000 * 60) // one HH per minute
+		}
+
 	@PrimaryKey
 	override var id = UUID.randomUUID().toString()
 

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

@@ -158,6 +158,7 @@ open class HandHistory : RealmObject(), Deletable, RowRepresentable, Filterable,
 		handSetup.bigBlind?.let { this.bigBlind = it }
 
 		this.session = handSetup.session
+		this.date = this.session?.handHistoryAutomaticDate ?: Date()
 
 		this.createActions(handSetup.straddlePositions)
 	}

app/src/main/java/net/pokeranalytics/android/ui/adapter/HomePagerAdapter.kt

@@ -4,7 +4,10 @@ import android.util.SparseArray
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentStatePagerAdapter
-import net.pokeranalytics.android.ui.fragment.*
+import net.pokeranalytics.android.ui.fragment.CalendarFragment
+import net.pokeranalytics.android.ui.fragment.ReportsFragment
+import net.pokeranalytics.android.ui.fragment.SettingsFragment
+import net.pokeranalytics.android.ui.fragment.StatisticsFragment
 import net.pokeranalytics.android.ui.fragment.components.BaseFragment
 import net.pokeranalytics.android.ui.modules.feed.FeedFragment
 import java.lang.ref.WeakReference
@@ -12,7 +15,8 @@ import java.lang.ref.WeakReference
 /**
  * Home Adapter
  */
-class HomePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAdapter(fragmentManager) {
+class HomePagerAdapter(fragmentManager: FragmentManager) :
+	FragmentStatePagerAdapter(fragmentManager,	BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
 
 	private var weakReferences = SparseArray<WeakReference<BaseFragment>>()
 
@@ -53,14 +57,14 @@ class HomePagerAdapter(fragmentManager: FragmentManager) : FragmentStatePagerAda
 		}
 	}
 
-	/**
+//	/**
-	 * Return the fragment at the position key
+//	 * Return the fragment at the position key
-	 */
+//	 */
-	fun getFragment(key: Int): BaseFragment? {
+//	fun getFragment(key: Int): BaseFragment? {
-		if (this.weakReferences.get(key) != null) {
+//		if (this.weakReferences.get(key) != null) {
-			return this.weakReferences.get(key).get()
+//			return this.weakReferences.get(key).get()
-		}
+//		}
-		return null
+//		return null
-	}
+//	}
 
 }

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

@@ -72,9 +72,9 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		menu?.clear()
+		menu.clear()
-		inflater?.inflate(R.menu.toolbar_comparison_chart, menu) // TODO R.menu.toolbar_comparison_chart?
+		inflater.inflate(R.menu.toolbar_comparison_chart, menu) // TODO R.menu.toolbar_comparison_chart?
 		this.bankrollDetailsMenu = menu
 		updateMenuUI()
 		super.onCreateOptionsMenu(menu, inflater)
@@ -197,8 +197,8 @@ class BankrollDetailsFragment : RealmFragment(), StaticRowRepresentableDataSourc
 
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item?.itemId) {
+		when (item.itemId) {
 			R.id.settings -> editBankroll()
 		}
 		return true

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

@@ -52,15 +52,15 @@ class ComparisonChartFragment : BaseFragment(), StaticRowRepresentableDataSource
 	    initUI()
     }
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		menu?.clear()
+		menu.clear()
-		inflater?.inflate(R.menu.toolbar_comparison_chart, menu)
+		inflater.inflate(R.menu.toolbar_comparison_chart, menu)
 		this.comparisonChartMenu = menu
 		super.onCreateOptionsMenu(menu, inflater)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item!!.itemId) {
+		when (item.itemId) {
 			R.id.settings -> openChangeStatistics()
 		}
 		return true

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

@@ -32,7 +32,7 @@ import kotlin.collections.ArrayList
 
 open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
-	lateinit var rowRepresentableAdapter: RowRepresentableAdapter
+	private lateinit var rowRepresentableAdapter: RowRepresentableAdapter
 	private lateinit var primaryKey: String
 	private lateinit var filterCategoryRow: FilterCategoryRow
 
@@ -83,7 +83,7 @@ open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSo
 					minutes = if (it % 60 > 0) (it % 60).toString() else null
 				}
 				val data = row.editingDescriptors(mapOf("hours" to hours, "minutes" to minutes))
-				BottomSheetFragment.create(fragmentManager, row, this, data, true)
+				BottomSheetFragment.create(requireFragmentManager(), row, this, data, true)
 			}
 			is QueryCondition.ListOfValues<*> -> {
 				var valueAsString: String? = null
@@ -91,7 +91,7 @@ open class FilterDetailsFragment : RealmFragment(), StaticRowRepresentableDataSo
 					valueAsString = row.listOfValues.firstOrNull()?.toString()
 				}
 				val data = row.editingDescriptors(mapOf("valueAsString" to valueAsString))
-				BottomSheetFragment.create(fragmentManager, row, this, data, true)
+				BottomSheetFragment.create(requireFragmentManager(), row, this, data, true)
 			}
 		}
 	}

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

@@ -105,9 +105,9 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		menu?.clear()
+		menu.clear()
-		inflater?.inflate(R.menu.toolbar_editable_data, menu)
+		inflater.inflate(R.menu.toolbar_editable_data, menu)
 		this.filterMenu = menu
 		updateMenuUI()
 		super.onCreateOptionsMenu(menu, inflater)
@@ -121,8 +121,8 @@ open class FiltersFragment : RealmFragment(), StaticRowRepresentableDataSource,
 		}
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item!!.itemId) {
+		when (item.itemId) {
 			R.id.save -> validateUpdates()
 		}
 		return true

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

@@ -85,7 +85,7 @@ open class FiltersListFragment : DataListFragment() {
 			is Filter -> {
 				if (tag == 1) {
 					val data = row.editingDescriptors(mapOf("defaultValue" to row.name))
-					BottomSheetFragment.create(fragmentManager, row, this, data, false, isDeletable = true, valueHasPlaceholder = false)
+					BottomSheetFragment.create(requireFragmentManager(), row, this, data, false, isDeletable = true, valueHasPlaceholder = false)
 				} else {
 					val intent = Intent()
 					intent.putExtra(FiltersActivity.IntentKey.FILTER_ID.keyName, row.id)
@@ -104,7 +104,7 @@ open class FiltersListFragment : DataListFragment() {
 	/**
 	 * Update filter UI
 	 */
-	fun updateFilterUIIfNecessary(context: Context, filterId: String) {
+	private fun updateFilterUIIfNecessary(context: Context, filterId: String) {
 		if (filterId == Preferences.getActiveFilterId(context)) {
 			// Send broadcast
 			val intent = Intent()

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

@@ -60,16 +60,16 @@ class ReportCreationFragment : RealmFragment(), RowRepresentableDataSource, RowR
 		}
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		super.onCreateOptionsMenu(menu, inflater)
-		menu?.clear()
+		menu.clear()
-		inflater?.inflate(R.menu.toolbar_report_creation, menu)
+		inflater.inflate(R.menu.toolbar_report_creation, menu)
-		menu?.findItem(R.id.add)?.isVisible = false
+		menu.findItem(R.id.add)?.isVisible = false
 		reportCreationMenu = menu
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item?.itemId) {
+		when (item.itemId) {
 			R.id.add -> {
 				if (this.assistant.step == Assistant.Step.FILTER) {
 					FiltersActivity.newInstanceForResult(

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

@@ -134,16 +134,16 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
 		handler.removeCallbacksAndMessages(null)
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		menu?.clear()
+		menu.clear()
-		inflater?.inflate(R.menu.toolbar_session, menu)
+		inflater.inflate(R.menu.toolbar_session, menu)
 		this.sessionMenu = menu
 		updateMenuUI()
 		super.onCreateOptionsMenu(menu, inflater)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item!!.itemId) {
+		when (item.itemId) {
 			R.id.stop -> stopSession()
 			R.id.newHandHistory -> addHandHistory()
 			R.id.newCustomField -> addNewCustomField()
@@ -222,13 +222,13 @@ class SessionFragment : RealmFragment(), RowRepresentableDelegate {
 
 			}
 			SessionRow.BANKROLL -> {
-				BottomSheetFragment.create(fragmentManager, row, this, data, false, currentSession.currency)
+				BottomSheetFragment.create(requireFragmentManager(), row, this, data, false, currentSession.currency)
 			}
 			SessionRow.HANDS -> {
 				val hhIds = this.currentSession.handHistories?.map { it.id }?.toTypedArray()
 				DataListActivity.newDialogInstance(this, LiveData.HAND_HISTORY, false, hhIds)
 			}
-			else -> BottomSheetFragment.create(fragmentManager, row, this, data, currentCurrency = currentSession.currency)
+			else -> BottomSheetFragment.create(requireFragmentManager(), row, this, data, currentCurrency = currentSession.currency)
 		}
 	}
 

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

@@ -69,7 +69,7 @@ open class FilterableFragment : RealmFragment(), FilterHandler {
 		return super.onCreateView(inflater, container, savedInstanceState)
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		super.onCreateOptionsMenu(menu, inflater)
 		view?.findViewById<Toolbar>(R.id.toolbar)?.let { toolbar ->
 			toolbar.menu.removeItem(R.id.menu_item_filter)
@@ -79,8 +79,8 @@ open class FilterableFragment : RealmFragment(), FilterHandler {
 		}
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item?.itemId) {
+		when (item.itemId) {
 			R.id.menu_item_filter -> {
 				manageFilters(this)
 			}

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

@@ -46,8 +46,7 @@ class LoaderDialogFragment: DialogFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		val window = dialog.window
+		dialog?.window?.setBackgroundDrawableResource(android.R.color.transparent)
-		window?.setBackgroundDrawableResource(android.R.color.transparent)
 	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/fragment/components/bottomsheet/BottomSheetFragment.kt

@@ -55,7 +55,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 		const val REQUEST_CODE_ADD_NEW_OBJECT = 100
 
 		fun create(
-			fragmentManager: FragmentManager?,
+			fragmentManager: FragmentManager,
 			row: RowRepresentable,
 			delegate: RowRepresentableDelegate,
 			rowRepresentableEditDescriptors: List<RowRepresentableEditDescriptor>?,
@@ -139,9 +139,9 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	}
 
 	@SuppressLint("RestrictedApi")
-	override fun setupDialog(dialog: Dialog?, style: Int) {
+	override fun setupDialog(dialog: Dialog, style: Int) {
 		super.setupDialog(dialog, style)
-		dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+		dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
 	}
 
 	/**

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

@@ -159,7 +159,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa
 		when (row) {
 			is CustomFieldEntry -> {
 				val data = customField.editDescriptors(row)
-				BottomSheetFragment.create(fragmentManager, row, this, data, isClearable = false, isDeletable = true)
+				BottomSheetFragment.create(requireFragmentManager(), row, this, data, isClearable = false, isDeletable = true)
 			}
 			else -> super.onRowSelected(position, row, tag)
 		}

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

@@ -48,9 +48,9 @@ open class DataManagerFragment : RealmFragment() {
 		loadItem()
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		menu?.clear()
+		menu.clear()
-		inflater?.inflate(R.menu.toolbar_editable_data, menu)
+		inflater.inflate(R.menu.toolbar_editable_data, menu)
 		this.editableMenu = menu
 		updateMenuUI()
 		super.onCreateOptionsMenu(menu, inflater)
@@ -64,8 +64,8 @@ open class DataManagerFragment : RealmFragment() {
 		editableMenu?.findItem(R.id.save)?.isVisible = this.saveButtonShouldAppear
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item!!.itemId) {
+		when (item.itemId) {
 			R.id.save -> saveData()
 			R.id.delete -> deleteData()
 		}

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

@@ -69,7 +69,7 @@ open class EditableDataFragment : DataManagerFragment(), RowRepresentableDelegat
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
-		BottomSheetFragment.create(fragmentManager, row, this, getDataSource().editDescriptors(row))
+		BottomSheetFragment.create(requireFragmentManager(), row, this, getDataSource().editDescriptors(row))
 	}
 
 	override fun onRowValueChanged(value: Any?, row: RowRepresentable) {

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

@@ -134,7 +134,7 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou
 			PlayerRow.IMAGE -> openPictureDialog()
 			is Comment -> {
 				val data = arrayListOf(RowRepresentableEditDescriptor(row.content))
-				BottomSheetFragment.create(fragmentManager, row, this, data, isClearable = false, isDeletable = true)
+				BottomSheetFragment.create(requireFragmentManager(), row, this, data, isClearable = false, isDeletable = true)
 			}
 			else -> super.onRowSelected(position, row, tag)
 		}

app/src/main/java/net/pokeranalytics/android/ui/modules/feed/FeedFragment.kt

@@ -112,14 +112,9 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 		return inflater.inflate(R.layout.fragment_feed, container, false)
 	}
 
-	override fun onCreateContextMenu(
+	override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo?) {
-		menu: ContextMenu?,
-		v: View?,
-		menuInfo: ContextMenu.ContextMenuInfo?
-	) {
 		super.onCreateContextMenu(menu, v, menuInfo)
-
+		if (v.id == R.id.menuRecyclerView) {
-		if (v?.id == R.id.menuRecyclerView) {
 			activity?.menuInflater?.inflate(R.menu.menu_session, menu)
 		}
 
@@ -132,11 +127,10 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 		itemView.showContextMenu()
 	}
 
-	override fun onContextItemSelected(item: MenuItem?): Boolean {
+	override fun onContextItemSelected(item: MenuItem): Boolean {
 
-		when (item?.itemId) {
+		when (item.itemId) {
 			R.id.duplicate -> {
-
 				val session = this.sessionAdapter.sessionForPosition(menuPosition)
 				if (session != null) {
 					createNewSession(true, sessionId = session.id, duplicate = true)
@@ -144,8 +138,6 @@ class FeedFragment : FilterableFragment(), RowRepresentableDelegate {
 					throw PAIllegalStateException("Session not found for duplicate at position: $menuPosition")
 				}
 			}
-			else -> {
-			}
 		}
 
 		return true

app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/HandHistoryFragment.kt

@@ -188,10 +188,10 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 		this.keyboard.keyboardListener = this
 	}
 
-	override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-		menu?.clear()
+		menu.clear()
 		this.menu = menu
-		inflater?.inflate(R.menu.toolbar_hand_history, menu)
+		inflater.inflate(R.menu.toolbar_hand_history, menu)
 		updateMenuUI()
 		super.onCreateOptionsMenu(menu, inflater)
 	}
@@ -223,8 +223,8 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 		this.menu?.findItem(R.id.edit_save)?.setTitle(titleResId)
 	}
 
-	override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
-		when (item!!.itemId) {
+		when (item.itemId) {
 			R.id.edit_save -> saveOrEdit()
 			R.id.add -> addNewHand()
 			R.id.delete -> deleteHand()
@@ -318,7 +318,7 @@ class HandHistoryFragment : RealmFragment(), RowRepresentableDelegate, KeyboardL
 			BottomSheetType.NONE -> {}
 			else -> {
 				val editDescriptors = this.model.editDescriptors(row)
-				BottomSheetFragment.create(this.fragmentManager, row, this, editDescriptors, alternativeLabels = true)
+				BottomSheetFragment.create(requireFragmentManager(), row, this, editDescriptors, alternativeLabels = true)
 				return
 			}
 		}

app/src/main/res/color/chips_background_states.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:color="@color/colorAccent" android:state_checked="true" />
-	<item android:color="@android:color/transparent" />
+	<item android:color="@color/green_header" />
 	<!--
 	<item android:color="@color/colorAccent" android:state_checked="true" android:state_enabled="true" />
 	<item android:color="@color/green_transparent" android:state_checked="true" android:state_enabled="false" />

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

@@ -57,6 +57,7 @@
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/addButton"
+		style="@style/PokerAnalyticsTheme.FloatingButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|end"

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

@@ -84,6 +84,7 @@
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/addButton"
+		style="@style/PokerAnalyticsTheme.FloatingButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|end"

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

@@ -42,7 +42,6 @@
 			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
 			app:contentScrim="?attr/colorPrimary"
 			app:expandedTitleGravity="bottom"
-			app:expandedTitleMarginStart="72dp"
 			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
 			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
 

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

@@ -96,6 +96,7 @@
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/addButton"
+		style="@style/PokerAnalyticsTheme.FloatingButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|end"

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

@@ -36,6 +36,7 @@
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/addButton"
+		style="@style/PokerAnalyticsTheme.FloatingButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|end"

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

@@ -58,6 +58,7 @@
 
 	<com.google.android.material.floatingactionbutton.FloatingActionButton
 		android:id="@+id/floatingActionButton"
+		style="@style/PokerAnalyticsTheme.FloatingButton"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="bottom|center"

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

@@ -50,6 +50,10 @@
 
 	<!-- Toolbar -->
 
+	<style name="PokerAnalyticsTheme.FloatingButton" parent="Widget.MaterialComponents.FloatingActionButton">
+		<item name="android:backgroundTint">@color/green</item>
+	</style>
+
 	<style name="PokerAnalyticsTheme.Toolbar" parent="Widget.MaterialComponents.Toolbar">
 		<item name="android:background">@color/gray_darker</item>
 		<item name="titleTextColor">@color/white</item>