feature/top10
Aurelien Hubert 7 years ago
parent 1a56cfb419
commit 53fcd28c78
  1. 5
      app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
  2. 4
      app/src/main/java/net/pokeranalytics/android/ui/fragment/SessionFragment.kt
  3. 7
      app/src/main/res/font/roboto_medium.xml
  4. 7
      app/src/main/res/font/roboto_mono_medium.xml
  5. 1
      app/src/main/res/layout/row_session_view.xml
  6. 2
      app/src/main/res/values/preloaded_fonts.xml
  7. 2
      app/src/main/res/values/styles.xml

@ -7,6 +7,8 @@ import android.view.ViewGroup
import android.widget.Toast import android.widget.Toast
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import io.realm.RealmResults import io.realm.RealmResults
import io.realm.Sort
import io.realm.kotlin.where
import kotlinx.android.synthetic.main.fragment_history.* import kotlinx.android.synthetic.main.fragment_history.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.model.ObjectSavable 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.fragment.components.PokerAnalyticsFragment
import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.RowRepresentable
import net.pokeranalytics.android.ui.view.RowViewType import net.pokeranalytics.android.ui.view.RowViewType
import net.pokeranalytics.android.util.data.sessionDao
class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate { class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, RowRepresentableDelegate {
@ -80,7 +81,7 @@ class HistoryFragment : PokerAnalyticsFragment(), RowRepresentableDataSource, Ro
* Init data * Init data
*/ */
private fun initData() { private fun initData() {
realmSessions = getRealm().sessionDao().findAllSessions() realmSessions = getRealm().where<Session>().findAll().sort("timeFrame.startDate", Sort.DESCENDING)
val viewManager = LinearLayoutManager(requireContext()) val viewManager = LinearLayoutManager(requireContext())
historyAdapter = RowRepresentableAdapter(this, this) historyAdapter = RowRepresentableAdapter(this, this)

@ -36,7 +36,7 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
private lateinit var currentSession: Session private lateinit var currentSession: Session
private lateinit var sessionAdapter: RowRepresentableAdapter private lateinit var sessionAdapter: RowRepresentableAdapter
private var sessionMenu: Menu? = null private var sessionMenu: Menu? = null
private val oldRows: ArrayList<RowRepresentable> = ArrayList()
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_session, container, false) return inflater.inflate(R.layout.fragment_session, container, false)
@ -235,8 +235,6 @@ class SessionFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Bott
} }
} }
val oldRows: ArrayList<RowRepresentable> = ArrayList()
/** /**
* Update the state of the session (start / pause) * Update the state of the session (start / pause)
*/ */

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="name=Roboto&amp;weight=500"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="name=Roboto Mono&amp;weight=500"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>

@ -14,6 +14,7 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:gravity="center" android:gravity="center"
android:textAllCaps="true" android:textAllCaps="true"
app:fontFamily="@font/roboto_mono_medium"
app:layout_constraintBottom_toTopOf="@+id/dateNumber" app:layout_constraintBottom_toTopOf="@+id/dateNumber"
app:layout_constraintStart_toStartOf="@+id/guidelineStart" app:layout_constraintStart_toStartOf="@+id/guidelineStart"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"

@ -5,5 +5,7 @@
<item>@font/roboto_black</item> <item>@font/roboto_black</item>
<item>@font/roboto_bold</item> <item>@font/roboto_bold</item>
<item>@font/roboto_light</item> <item>@font/roboto_light</item>
<item>@font/roboto_medium</item>
<item>@font/roboto_mono_medium</item>
</array> </array>
</resources> </resources>

@ -108,7 +108,7 @@
<style name="PokerAnalyticsTheme.TextView.SessionRow.Date"> <style name="PokerAnalyticsTheme.TextView.SessionRow.Date">
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
<item name="android:fontFamily">@font/roboto</item>r <item name="android:fontFamily">@font/roboto</item>
</style> </style>
<style name="PokerAnalyticsTheme.TextView.SessionRow.DateNumber"> <style name="PokerAnalyticsTheme.TextView.SessionRow.DateNumber">

Loading…
Cancel
Save