viewmodel variables renamed to model

app/src/main/java/net/pokeranalytics/android/ui/activity/GraphActivity.kt

@@ -17,7 +17,7 @@ import net.pokeranalytics.android.ui.viewmodel.ViewModelHolder
 
 class GraphActivity : BaseActivity(), ViewModelHolder {
 
-	override val viewModel: GraphViewModel by lazy {
+	override val model: GraphViewModel by lazy {
 		ViewModelProviders.of(this).get(GraphViewModel::class.java)
 	}
 
@@ -58,9 +58,9 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 	 */
 	private fun initUI() {
 
-		this.viewModel.title = activityTitle
+		this.model.title = activityTitle
 
-		this.viewModel.title?.let {
+		this.model.title?.let {
 			setSupportActionBar(toolbar)
 			supportActionBar?.setDisplayHomeAsUpEnabled(true)
 			title = activityTitle
@@ -69,14 +69,14 @@ class GraphActivity : BaseActivity(), ViewModelHolder {
 
 		barDataSets?.let {
 			if (it.size == 1) {
-				this.viewModel.setBarDataSet(it.first())
+				this.model.setBarDataSet(it.first())
 			} else {
 				throw PAIllegalStateException("Unexpected number of bar data sets")
 			}
 		}
 		lineDataSets?.let {
 			if (it.size == 1) {
-				this.viewModel.setLineDataSet(it.first())
+				this.model.setLineDataSet(it.first())
 			} else {
 				throw PAIllegalStateException("Unexpected number of line data sets")
 			}

app/src/main/java/net/pokeranalytics/android/ui/activity/components/ReportActivity.kt

@@ -14,16 +14,7 @@ class ReportParameters(var report: Report, var title: String, var stat: Stat? =
 
 abstract class ReportActivity : BaseActivity(), ViewModelHolder {
 
-//	private val viewModelFactory: ReportViewModelFactory by lazy {
-//		ReportViewModel.parameters?.let {
-//			val stat = it.stat ?: it.report.options.stats.first()
-//			ReportViewModelFactory(it.report, stat, it.title, it.showAggregationChoices)
-//		} ?: run {
-//			throw PAIllegalStateException("null report parameters")
-//		}
-//	}
-
-	override val viewModel: ReportViewModel by lazy {
+	override val model: ReportViewModel by lazy {
 		ViewModelProviders.of(this).get(ReportViewModel::class.java)
 	}
 
@@ -58,11 +49,11 @@ abstract class ReportActivity : BaseActivity(), ViewModelHolder {
 	private fun initViewModelWithParameters() {
 
 		ReportViewModel.parameters?.let {
-			this.viewModel.report = it.report
-			this.viewModel.title = it.title
+			this.model.report = it.report
+			this.model.title = it.title
 			val stat = it.stat ?: it.report.options.stats.first()
-			this.viewModel.stat = stat
-			this.viewModel.showAggregationChoices = it.showAggregationChoices
+			this.model.stat = stat
+			this.model.showAggregationChoices = it.showAggregationChoices
 
 //			Crashlytics.log("initViewModelWithParameters, stat = ${stat.uniqueIdentifier}")
 

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

@@ -83,7 +83,7 @@ class GraphFragment : RealmFragment(), OnChartValueSelectedListener {
 		val styleOrdinal = this.arguments?.getInt(BundleKey.STYLE.value) ?: throw PAIllegalStateException("Missing style key in bundle")
 		this.style = Style.values()[styleOrdinal]
 
-		this.graphDataProvider = (requireActivity() as ViewModelHolder).viewModel as GraphDataProvider
+		this.graphDataProvider = (requireActivity() as ViewModelHolder).model as GraphDataProvider
 	}
 
 	/**

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

@@ -23,7 +23,7 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 
 	override fun onStart() {
 		super.onStart()
-		if (this.viewModel.isEditingBlinds) {
+		if (this.model.isEditingBlinds) {
 			editText2.requestFocus()
 		} else {
 			editText.requestFocus()
@@ -61,14 +61,14 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 		data[1].hintResId?.let { editText2.hint = getString(it) }
 		editText2.inputType = data[1].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 
-		if (this.viewModel.valueAsPlaceholder) {
+		if (this.model.valueAsPlaceholder) {
 
-			this.viewModel.stringValue?.let {
+			this.model.stringValue?.let {
 				if (it.isNotBlank()) {
 					editText.hint = it
 				}
 			}
-			this.viewModel.secondStringValue?.let {
+			this.model.secondStringValue?.let {
 				if (it.isNotBlank()) {
 					editText2.hint = it
 				}
@@ -76,19 +76,19 @@ class BottomSheetDoubleEditTextFragment : BottomSheetFragment() {
 //            if (this.viewModel.stringValue?.isNotBlank()) { editText.hint = values[0] }
 //            if (values[1].isNotBlank()) { editText2.hint = values[1] }
 		} else {
-			editText.setText(this.viewModel.stringValue)
-			editText2.setText(this.viewModel.secondStringValue)
+			editText.setText(this.model.stringValue)
+			editText2.setText(this.model.secondStringValue)
 		}
 
 		editText.addTextChangedListener {
-			this.viewModel.stringValue = it?.toString()
+			this.model.stringValue = it?.toString()
 		}
 
 		editText2.addTextChangedListener {
-			this.viewModel.secondStringValue = it?.toString()
-			if (this.viewModel.isEditingBlinds) {
+			this.model.secondStringValue = it?.toString()
+			if (this.model.isEditingBlinds) {
 				try {
-					val bigBlind = this.viewModel.secondStringValue?.toDouble() ?: 0.0
+					val bigBlind = this.model.secondStringValue?.toDouble() ?: 0.0
 					editText.setText((bigBlind / 2.0).round())
 				} catch (e: Exception) {
 					editText.setText("")

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

@@ -39,11 +39,11 @@ class BottomSheetEditTextFragment : BottomSheetFragment() {
 		data[0].hintResId?.let { editText.hint = getString(it) }
 		editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 		editText.addTextChangedListener {
-			this.viewModel.stringValue = it?.toString()
+			this.model.stringValue = it?.toString()
 		}
 		data[0].defaultValue?.let {
-			if (this.viewModel.valueAsPlaceholder) {
-				this.viewModel.stringValue = it.toString()
+			if (this.model.valueAsPlaceholder) {
+				this.model.stringValue = it.toString()
 				editText.hint = it.toString()
 			} else {
 				editText.setText(it.toString())

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

@@ -35,7 +35,7 @@ class BottomSheetEditTextMultiLinesFragment : BottomSheetFragment() {
 
 		data[0].hintResId?.let { editText.hint = getString(it) }
 		editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
-		editText.addTextChangedListener { this.viewModel.stringValue = it?.toString() }
+		editText.addTextChangedListener { this.model.stringValue = it?.toString() }
 		data[0].defaultValue?.let {
 			editText.setText(it.toString())
 		}

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

@@ -43,7 +43,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	/**
 	 * A view model used to store potential bottom sheet values
 	 */
-	protected val viewModel: BottomSheetViewModel by lazy {
+	protected val model: BottomSheetViewModel by lazy {
 		ViewModelProviders.of(this).get(BottomSheetViewModel::class.java)
 	}
 
@@ -107,19 +107,19 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 			config = null
 		}
 
-		this.viewModel.load()
+		this.model.load()
 		initUI()
 	}
 
 	private fun configure(configuration: BottomSheetConfig) {
 
-		this.viewModel.row = configuration.row
-		this.viewModel.rowRepresentableEditDescriptors = configuration.rowRepresentableEditDescriptors
-		this.viewModel.isClearable = configuration.isClearable ?: true
-		this.viewModel.currentCurrency = configuration.currentCurrency
-		this.viewModel.isDeletable = configuration.isDeletable ?: false
-		this.viewModel.valueAsPlaceholder = configuration.valueHasPlaceholder ?: false
-		this.viewModel.alternativeLabels = configuration.alternativeLabels
+		this.model.row = configuration.row
+		this.model.rowRepresentableEditDescriptors = configuration.rowRepresentableEditDescriptors
+		this.model.isClearable = configuration.isClearable ?: true
+		this.model.currentCurrency = configuration.currentCurrency
+		this.model.isDeletable = configuration.isDeletable ?: false
+		this.model.valueAsPlaceholder = configuration.valueHasPlaceholder ?: false
+		this.model.alternativeLabels = configuration.alternativeLabels
 
 		this.delegate = configuration.delegate
 
@@ -135,7 +135,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 			val primaryKey = data.getStringExtra(EditableDataActivity.IntentKey.PRIMARY_KEY.keyName)
 			val pokerAnalyticsActivity = activity as BaseActivity
 			val liveDataType = LiveData.values()[dataType]
-			this.viewModel.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
+			this.model.addedData = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
 			this.onRowValueChanged()
 //			this.delegate.onRowValueChanged(proxyItem, this.row)
 			dismiss()
@@ -153,7 +153,7 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	 */
 	private fun initUI() {
 
-		val row = this.viewModel.row
+		val row = this.model.row
 		bottomSheetToolbar.title = row.localizedTitle(requireContext())
 		bottomSheetToolbar.inflateMenu(R.menu.toolbar_bottom_sheet)
 		bottomSheetToolbar.setOnMenuItemClickListener {
@@ -204,8 +204,8 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 			true
 		}
 
-		bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = this.viewModel.isClearable
-		bottomSheetToolbar.menu.findItem(R.id.actionDelete).isVisible = this.viewModel.isDeletable
+		bottomSheetToolbar.menu.findItem(R.id.actionClear).isVisible = this.model.isClearable
+		bottomSheetToolbar.menu.findItem(R.id.actionDelete).isVisible = this.model.isDeletable
 
 	}
 
@@ -213,43 +213,43 @@ open class BottomSheetFragment : BottomSheetDialogFragment() {
 	 * Return the data list
 	 */
 	fun getDescriptors(): List<RowRepresentableEditDescriptor>? {
-		return this.viewModel.rowRepresentableEditDescriptors
+		return this.model.rowRepresentableEditDescriptors
 	}
 
 	private fun getValue(): Any? {
-		return this.viewModel.getValue()
+		return this.model.getValue()
 	}
 
 	private fun onClear() {
-		this.delegate?.onRowValueChanged(null, this.viewModel.row)
+		this.delegate?.onRowValueChanged(null, this.model.row)
 	}
 
 	fun onRowValueChanged() {
 
-		val row = this.viewModel.row
+		val row = this.model.row
 
 		// if some data has been added
-		this.viewModel.addedData?.let {
+		this.model.addedData?.let {
 			this.delegate?.onRowValueChanged(it, row)
 			return
 		}
 
-		val value = this.viewModel.changedValue()
+		val value = this.model.changedValue()
 		this.delegate?.onRowValueChanged(value, row)
 	}
 
 	private fun onRowDeleted() {
-		this.delegate?.onRowDeleted(this.viewModel.row)
+		this.delegate?.onRowDeleted(this.model.row)
 	}
 
 	fun onRowSelected(row: RowRepresentable) {
-		this.viewModel.rowSelected(row)
+		this.model.rowSelected(row)
 		this.refreshRow(row)
 	}
 
 	fun onRowSelected(position: Int) {
-		val value = this.viewModel.rowSelected(position)
-		this.delegate?.onRowValueChanged(value, this.viewModel.row)
+		val value = this.model.rowSelected(position)
+		this.delegate?.onRowValueChanged(value, this.model.row)
 	}
 
 	fun notifyDataSetChanged() {

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

@@ -17,7 +17,7 @@ import net.pokeranalytics.android.ui.view.RowViewType
 open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentableDataSource, RowRepresentableDelegate {
 
 	override fun adapterRows(): List<RowRepresentable>? {
-		return this.viewModel.realmData
+		return this.model.realmData
 	}
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -32,14 +32,14 @@ open class BottomSheetListFragment : BottomSheetFragment(), LiveRowRepresentable
 	}
 
 	override fun rowRepresentableForPosition(position: Int): RowRepresentable? {
-		this.viewModel.realmData?.let {
+		this.model.realmData?.let {
 			return it[position] as RowRepresentable
 		}
 		throw PAIllegalStateException("Need to implement Data Source")
 	}
 
 	override fun numberOfRows(): Int {
-		this.viewModel.realmData?.let {
+		this.model.realmData?.let {
 			return it.size
 		}
 		throw PAIllegalStateException("Need to implement Data Source")

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

@@ -26,10 +26,10 @@ class BottomSheetListGameFragment : BottomSheetListFragment() {
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
-		this.viewModel.realmData?.let {
+		this.model.realmData?.let {
 			val selectedData = it[position]
 			selectedData?.let { data ->
-				this.viewModel.someValues[1] = data
+				this.model.someValues[1] = data
 				this.onRowValueChanged()
 //				this.delegate.onRowValueChanged(values, this.row)
 				dismiss()
@@ -43,10 +43,10 @@ class BottomSheetListGameFragment : BottomSheetListFragment() {
 	override fun initUI() {
 		LayoutInflater.from(requireContext()).inflate(R.layout.bottom_sheet_game_list, view?.bottomSheetContainer, true)
 
-		val limit = this.viewModel.limit
+		val limit = this.model.limit
 
-		this.viewModel.someValues.add(0, limit)
-		this.viewModel.someValues.add(1, null)
+		this.model.someValues.add(0, limit)
+		this.model.someValues.add(1, null)
 
 		chipGroup.removeAllViews()
 		Limit.values().forEach {
@@ -60,7 +60,7 @@ class BottomSheetListGameFragment : BottomSheetListFragment() {
 		}
 
 		chipGroup.setOnCheckedChangeListener { _, i ->
-			this.viewModel.someValues[0] = i
+			this.model.someValues[0] = i
 		}
 
 		if (limit == null) {

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

@@ -25,7 +25,7 @@ open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() {
 			val pokerAnalyticsActivity = activity as BaseActivity
 			val liveDataType = LiveData.values()[dataType]
 			val proxyItem: RealmModel? = liveDataType.getData(pokerAnalyticsActivity.getRealm(), primaryKey)
-			this.viewModel.selectedRows.add(proxyItem as RowRepresentable)
+			this.model.selectedRows.add(proxyItem as RowRepresentable)
 			this.refreshRow(proxyItem as RowRepresentable)
 //			dataAdapter.refreshRow(proxyItem as RowRepresentable)
 		}
@@ -40,7 +40,7 @@ open class BottomSheetMultiSelectionFragment : BottomSheetListFragment() {
 		row: RowRepresentable,
 		tag: Int
 	): Boolean {
-		return this.viewModel.isSelected(row)
+		return this.model.isSelected(row)
 //		return selectedRows.contains(row)
 	}
 

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

@@ -41,7 +41,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
 		editText.inputType = data[0].inputType ?: InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 		editText.addTextChangedListener {
 
-			this.viewModel.doubleValue = try {
+			this.model.doubleValue = try {
 				editText.text.toString().toDouble()
 			} catch (e: Exception) {
 				null
@@ -58,7 +58,7 @@ class BottomSheetNumericTextFragment : BottomSheetFragment() {
 				it.toString()
 			}
 
-			if (this.viewModel.valueAsPlaceholder) {
+			if (this.model.valueAsPlaceholder) {
 //				this.viewModel.doubleValue = it.toString().toDoubleOrNull()
 				editText.hint = valueString
 			} else {

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

@@ -30,11 +30,11 @@ class BottomSheetStaticListFragment : BottomSheetFragment(), StaticRowRepresenta
 	}
 
     override fun adapterRows(): List<RowRepresentable>? {
-        return this.viewModel.staticRows
+        return this.model.staticRows
     }
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
-		this.viewModel.selectedRows.add(row)
+		this.model.selectedRows.add(row)
 		this.onRowValueChanged()
 //        this.delegate.onRowValueChanged(row, this.row)
 		dismiss()

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

@@ -50,7 +50,7 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 			val formatter = NumberFormat.getNumberInstance()
 			formatter.maximumFractionDigits = 6
 			formatter.isGroupingUsed = false
-			currentValue.text = formatter.format(this.viewModel.currentDefaultValue)
+			currentValue.text = formatter.format(this.model.currentDefaultValue)
 
 			// First value
 			val defaultValue1 = try {
@@ -59,12 +59,12 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 				0.0
 			}
 
-			val formattedValue1 = "+ ${defaultValue1.toCurrency(this.viewModel.currentCurrency)}"
+			val formattedValue1 = "+ ${defaultValue1.toCurrency(this.model.currentCurrency)}"
 			button1.text = formattedValue1
 			button1.visibility = if (defaultValue1 > 0) View.VISIBLE else View.GONE
 			button1.setOnClickListener {
 //				val newValue = this.viewModel.currentDefaultValue + defaultValue1
-				this.viewModel.doubleValue = this.viewModel.currentDefaultValue + defaultValue1
+				this.model.doubleValue = this.model.currentDefaultValue + defaultValue1
 				this.onRowValueChanged()
 //				this.delegate.onRowValueChanged(currentDefaultValue + defaultValue1, row)
 				dismiss()
@@ -77,11 +77,11 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 				0.0
 			}
 
-			val formattedValue2 = "+ ${defaultValue2.toCurrency(this.viewModel.currentCurrency)}"
+			val formattedValue2 = "+ ${defaultValue2.toCurrency(this.model.currentCurrency)}"
 			button2.text = formattedValue2
 			button2.visibility = if (defaultValue2 > 0) View.VISIBLE else View.GONE
 			button2.setOnClickListener {
-				this.viewModel.doubleValue = this.viewModel.currentDefaultValue + defaultValue2
+				this.model.doubleValue = this.model.currentDefaultValue + defaultValue2
 				this.onRowValueChanged()
 //				this.delegate.onRowValueChanged(currentDefaultValue + defaultValue2, row)
 				dismiss()
@@ -96,7 +96,7 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 				} catch (e: Exception) {
 					0.0
 				}
-				editText2.setText((this.viewModel.currentDefaultValue + valueToAdd).round())
+				editText2.setText((this.model.currentDefaultValue + valueToAdd).round())
 
 			}
 
@@ -104,7 +104,7 @@ class BottomSheetSumFragment : BottomSheetFragment() {
 			data[4].hintResId?.let { editText2.hint = getString(it) }
 			editText2.inputType = data[4].inputType ?: InputType.TYPE_CLASS_TEXT
 			editText2.addTextChangedListener {
-				this.viewModel.doubleValue = try {
+				this.model.doubleValue = try {
 					it.toString().toDouble()
 				} catch (e: Exception) {
 					0.0

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

@@ -54,11 +54,11 @@ class BottomSheetTableSizeGridFragment : BottomSheetFragment(), StaticRowReprese
 	}
 
 	override fun adapterRows(): List<RowRepresentable>? {
-		return TableSize.all(this.viewModel.alternativeLabels)
+		return TableSize.all(this.model.alternativeLabels)
 	}
 
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
-		this.viewModel.defaultSize = (row as TableSize).numberOfPlayer
+		this.model.defaultSize = (row as TableSize).numberOfPlayer
 		this.onRowValueChanged()
 		dismiss()
 	}

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

@@ -22,7 +22,7 @@ import net.pokeranalytics.android.util.extensions.findById
 abstract class AbstractReportFragment : DataManagerFragment() {
 
 	protected val reportViewModel: ReportViewModel by lazy {
-		(requireActivity() as ViewModelHolder).viewModel as ReportViewModel
+		(requireActivity() as ViewModelHolder).model as ReportViewModel
 	}
 
 	val selectedReport: Report

app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsActivity.kt

@@ -12,7 +12,7 @@ import net.pokeranalytics.android.ui.activity.components.BaseActivity
 
 class CalendarDetailsActivity : BaseActivity() {
 
-	private val viewModel: CalendarDetailsViewModel by lazy {
+	private val model: CalendarDetailsViewModel by lazy {
 		ViewModelProviders.of(this).get(CalendarDetailsViewModel::class.java)
 	}
 
@@ -46,12 +46,9 @@ class CalendarDetailsActivity : BaseActivity() {
 	 */
 	private fun initData() {
 
-		this.viewModel.computedResults =
-			computedResults
-		this.viewModel.sessionTypeCondition =
-			sessionTypeCondition
-		this.viewModel.detailsTitle =
-			detailsTitle
+		this.model.computedResults = computedResults
+		this.model.sessionTypeCondition = sessionTypeCondition
+		this.model.detailsTitle = detailsTitle
 
 	}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/calendar/CalendarDetailsFragment.kt

@@ -39,7 +39,7 @@ import kotlin.collections.ArrayList
 
 class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource, RowRepresentableDelegate {
 
-	private val viewModel: CalendarDetailsViewModel by lazy {
+	private val model: CalendarDetailsViewModel by lazy {
 		ViewModelProviders.of(requireActivity()).get(CalendarDetailsViewModel::class.java)
 	}
 
@@ -83,12 +83,12 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
 	 */
 	private fun initUI() {
 
-		setToolbarTitle(this.viewModel.detailsTitle)
+		setToolbarTitle(this.model.detailsTitle)
 
 		setDisplayHomeAsUpEnabled(true)
 
 		var tabIndexToSelect = 0
-		this.viewModel.sessionTypeCondition?.let {
+		this.model.sessionTypeCondition?.let {
 			tabIndexToSelect = when (it) {
 				QueryCondition.IsCash -> 1
 				QueryCondition.IsTournament -> 2
@@ -101,9 +101,9 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
 		tabs.addOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
 			override fun onTabSelected(tab: TabLayout.Tab) {
 				when (tab.position) {
-					0 -> viewModel.sessionTypeCondition = null
-					1 -> viewModel.sessionTypeCondition = QueryCondition.IsCash
-					2 -> viewModel.sessionTypeCondition = QueryCondition.IsTournament
+					0 -> model.sessionTypeCondition = null
+					1 -> model.sessionTypeCondition = QueryCondition.IsCash
+					2 -> model.sessionTypeCondition = QueryCondition.IsTournament
 				}
 				launchStatComputation()
 			}
@@ -168,7 +168,7 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
 		progressBar.animate().alpha(1f).start()
 		recyclerView.animate().alpha(0f).start()
 
-		this.viewModel.computedResults?.let { computedResults ->
+		this.model.computedResults?.let { computedResults ->
 
 			GlobalScope.launch {
 
@@ -178,7 +178,7 @@ class CalendarDetailsFragment : BaseFragment(), StaticRowRepresentableDataSource
 				val query = Query().merge(computedResults.group.query)
 				query.remove(QueryCondition.IsCash)
 				query.remove(QueryCondition.IsTournament)
-				when (viewModel.sessionTypeCondition) {
+				when (model.sessionTypeCondition) {
 					QueryCondition.IsCash -> query.add(QueryCondition.IsCash)
 					QueryCondition.IsTournament -> query.add(QueryCondition.IsTournament)
 				}

app/src/main/java/net/pokeranalytics/android/ui/modules/session/SessionActivity.kt

@@ -13,7 +13,7 @@ class SessionActivity: BaseActivity() {
 
 	private lateinit var sessionFragment: SessionFragment
 
-	val viewModel: SessionViewModel by lazy {
+	val model: SessionViewModel by lazy {
 		ViewModelProviders.of(this).get(SessionViewModel::class.java)
 	}
 
@@ -75,9 +75,9 @@ class SessionActivity: BaseActivity() {
 	}
 
 	private fun initData() {
-		this.viewModel.isTournament = intent.getBooleanExtra(IntentKey.IS_TOURNAMENT.keyName, false)
-		this.viewModel.duplicate = intent.getBooleanExtra(IntentKey.DUPLICATE.keyName, false)
-		this.viewModel.sessionId = intent.getStringExtra(IntentKey.SESSION_ID.keyName)
+		this.model.isTournament = intent.getBooleanExtra(IntentKey.IS_TOURNAMENT.keyName, false)
+		this.model.duplicate = intent.getBooleanExtra(IntentKey.DUPLICATE.keyName, false)
+		this.model.sessionId = intent.getStringExtra(IntentKey.SESSION_ID.keyName)
 	}
 
 	/**

app/src/main/java/net/pokeranalytics/android/ui/viewmodel/ViewModelHolder.kt

@@ -3,5 +3,5 @@ package net.pokeranalytics.android.ui.viewmodel
 import androidx.lifecycle.ViewModel
 
 interface ViewModelHolder {
-	val viewModel: ViewModel
+	val model: ViewModel
 }