From d2572eb14bfe6c1e569d34af30bd7a80e00f891f Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 15 Apr 2019 08:55:43 +0200 Subject: [PATCH 1/2] Start working on Calendar fragment --- .../android/ui/fragment/CalendarFragment.kt | 11 ++++- .../android/ui/view/CalendarTabs.kt | 21 +++++++++ app/src/main/res/layout/fragment_calendar.xml | 44 +++++++++++++------ .../res/layout/fragment_comparison_chart.xml | 24 ++-------- 4 files changed, 66 insertions(+), 34 deletions(-) create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt index b05d036f..26ac454b 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt @@ -5,9 +5,12 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager -import kotlinx.android.synthetic.main.fragment_stats.* +import kotlinx.android.synthetic.main.fragment_calendar.* +import kotlinx.android.synthetic.main.fragment_stats.recyclerView import net.pokeranalytics.android.R import net.pokeranalytics.android.ui.fragment.components.PokerAnalyticsFragment +import net.pokeranalytics.android.ui.view.CalendarTabs + class CalendarFragment : PokerAnalyticsFragment() { @@ -51,6 +54,12 @@ class CalendarFragment : PokerAnalyticsFragment() { */ private fun initUI() { + CalendarTabs.values().forEach { + val tab = tabs.newTab() + tab.text = getString(it.resId) + tabs.addTab(tab) + } + val viewManager = LinearLayoutManager(requireContext()) recyclerView.apply { diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt new file mode 100644 index 00000000..edf84717 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt @@ -0,0 +1,21 @@ +package net.pokeranalytics.android.ui.view + +import net.pokeranalytics.android.R + + +enum class CalendarTabs : Displayable { + NET_RESULTS, + NET_HOURLY_RATE, + NUMBER_OF_GAMES, + WIN_RATIO; + + override val resId: Int + get() { + return when (this) { + NET_RESULTS -> R.string.net_result + NET_HOURLY_RATE -> R.string.hour_rate_without_pauses + NUMBER_OF_GAMES -> R.string.number_of_records + WIN_RATIO -> R.string.win_ratio + } + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml index aaa1d704..50adf8b2 100644 --- a/app/src/main/res/layout/fragment_calendar.xml +++ b/app/src/main/res/layout/fragment_calendar.xml @@ -1,18 +1,36 @@ - + + + + + + + + + + android:id="@+id/recyclerView" + android:layout_width="0dp" + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/appBar" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_comparison_chart.xml b/app/src/main/res/layout/fragment_comparison_chart.xml index e24de7cb..290c62ac 100644 --- a/app/src/main/res/layout/fragment_comparison_chart.xml +++ b/app/src/main/res/layout/fragment_comparison_chart.xml @@ -7,11 +7,12 @@ + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - + android:layout_height="wrap_content" /> From 346cece99dcd9d0d80120b906a03d3de9c33123b Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 15 Apr 2019 09:43:06 +0200 Subject: [PATCH 2/2] Add calendar tabs --- .../android/ui/fragment/CalendarFragment.kt | 1 - .../net/pokeranalytics/android/ui/view/CalendarTabs.kt | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt index 26ac454b..58598f82 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt @@ -46,7 +46,6 @@ class CalendarFragment : PokerAnalyticsFragment() { * Init data */ private fun initData() { - } /** diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt index edf84717..677e3a0f 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/CalendarTabs.kt @@ -7,7 +7,11 @@ enum class CalendarTabs : Displayable { NET_RESULTS, NET_HOURLY_RATE, NUMBER_OF_GAMES, - WIN_RATIO; + WIN_RATIO, + STANDARD_DEVIATION_PER_HOUR, + AVERAGE_NET_RESULT, + AVERAGE_DURATION, + DURATION_OF_PLAY; override val resId: Int get() { @@ -16,6 +20,10 @@ enum class CalendarTabs : Displayable { NET_HOURLY_RATE -> R.string.hour_rate_without_pauses NUMBER_OF_GAMES -> R.string.number_of_records WIN_RATIO -> R.string.win_ratio + STANDARD_DEVIATION_PER_HOUR -> R.string.standard_deviation_per_hour + AVERAGE_NET_RESULT -> R.string.average_net_result + AVERAGE_DURATION -> R.string.average_hours_played + DURATION_OF_PLAY -> R.string.total_hours_played } } } \ No newline at end of file