diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt index 0fbe03a7..b9a2a85c 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt @@ -7,6 +7,8 @@ import android.view.ViewGroup import android.widget.Toast import androidx.recyclerview.widget.LinearLayoutManager import io.realm.RealmResults +import io.realm.Sort +import io.realm.kotlin.where import kotlinx.android.synthetic.main.fragment_history.* import net.pokeranalytics.android.R import net.pokeranalytics.android.model.ObjectSavable @@ -18,7 +20,6 @@ import net.pokeranalytics.android.ui.adapter.components.RowRepresentableDelegate import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowViewType -import net.pokeranalytics.android.util.data.sessionDao class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate { @@ -80,7 +81,7 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, Ro * Init data */ private fun initData() { - realmSessions = getRealm().sessionDao().findAllSessions() + realmSessions = getRealm().where().findAll().sort("timeFrame.startDate", Sort.DESCENDING) val viewManager = LinearLayoutManager(requireContext()) historyAdapter = RowRepresentableAdapter(this, this) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt index 71576060..f06fca4b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt @@ -36,7 +36,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott private lateinit var currentSession: Session private lateinit var sessionAdapter: RowRepresentableAdapter private var sessionMenu: Menu? = null - + private val oldRows: ArrayList = ArrayList() override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return inflater.inflate(R.layout.fragment_session, container, false) @@ -235,8 +235,6 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott } } - val oldRows: ArrayList = ArrayList() - /** * Update the state of the session (start / pause) */ diff --git a/app/src/main/res/font/roboto_medium.xml b/app/src/main/res/font/roboto_medium.xml new file mode 100644 index 00000000..59df90bc --- /dev/null +++ b/app/src/main/res/font/roboto_medium.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/font/roboto_mono_medium.xml b/app/src/main/res/font/roboto_mono_medium.xml new file mode 100644 index 00000000..485dd2d9 --- /dev/null +++ b/app/src/main/res/font/roboto_mono_medium.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/layout/row_session_view.xml b/app/src/main/res/layout/row_session_view.xml index 9216e55c..ff4b18a8 100644 --- a/app/src/main/res/layout/row_session_view.xml +++ b/app/src/main/res/layout/row_session_view.xml @@ -14,6 +14,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:textAllCaps="true" + app:fontFamily="@font/roboto_mono_medium" app:layout_constraintBottom_toTopOf="@+id/dateNumber" app:layout_constraintStart_toStartOf="@+id/guidelineStart" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml index 212d1794..5030a3b4 100644 --- a/app/src/main/res/values/preloaded_fonts.xml +++ b/app/src/main/res/values/preloaded_fonts.xml @@ -5,5 +5,7 @@ @font/roboto_black @font/roboto_bold @font/roboto_light + @font/roboto_medium + @font/roboto_mono_medium diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d124ef6f..c0eb1bdd 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -108,7 +108,7 @@