From a523e65ae5193bbfd0acbdc250485e6234812bbc Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 15 Feb 2019 14:01:50 +0100 Subject: [PATCH 01/11] Improve style (work in progress) --- .../android/ui/fragment/NewSessionFragment.kt | 6 +++- .../android/util/PokerAnalyticsActivity.kt | 10 ++++++ .../main/res/color/bottom_navigation_item.xml | 8 +++++ app/src/main/res/layout/activity_home.xml | 1 - .../main/res/layout/fragment_bottom_sheet.xml | 1 - .../main/res/layout/fragment_new_session.xml | 16 +-------- app/src/main/res/values/colors.xml | 10 ++++-- app/src/main/res/values/styles.xml | 33 +++++++++++++++---- 8 files changed, 58 insertions(+), 27 deletions(-) create mode 100644 app/src/main/res/color/bottom_navigation_item.xml diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt index 845b1835..006050b3 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt @@ -15,6 +15,7 @@ import net.pokeranalytics.android.ui.adapter.components.DynamicRowInterface import net.pokeranalytics.android.ui.adapter.components.EditableDataDelegate import net.pokeranalytics.android.ui.fragment.components.BottomSheetFragment import net.pokeranalytics.android.ui.fragment.components.BottomSheetType +import net.pokeranalytics.android.util.PokerAnalyticsActivity import net.pokeranalytics.android.util.PokerAnalyticsFragment class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, EditableDataDelegate { @@ -56,6 +57,9 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl */ private fun initUI() { + val activity = activity as PokerAnalyticsActivity + activity.setSupportActionBar(toolbar) + val viewManager = LinearLayoutManager(requireContext()) val newSessionAdapter = DynamicListAdapter(newSession, this) @@ -71,7 +75,7 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl * Set fragment data */ fun setData(isTournament: Boolean) { - title.text = if (isTournament) "New tournament" else "New cash game" + toolbar.title = if (isTournament) "Tournament" else "Cash game" } } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt index f9bdfe8f..49dee4a6 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/PokerAnalyticsActivity.kt @@ -2,6 +2,7 @@ package net.pokeranalytics.android.util import android.os.Bundle import android.os.PersistableBundle +import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import io.realm.Realm @@ -13,6 +14,15 @@ open class PokerAnalyticsActivity : AppCompatActivity() { super.onCreate(savedInstanceState, persistentState) } + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + item?.let { + if (it.itemId == android.R.id.home) { + finish() + } + } + return super.onOptionsItemSelected(item) + } + override fun onDestroy() { super.onDestroy() realm.close() diff --git a/app/src/main/res/color/bottom_navigation_item.xml b/app/src/main/res/color/bottom_navigation_item.xml new file mode 100644 index 00000000..da961584 --- /dev/null +++ b/app/src/main/res/color/bottom_navigation_item.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 9c60a84a..af3a6fe8 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -21,7 +21,6 @@ android:layout_height="wrap_content" android:layout_marginStart="0dp" android:layout_marginEnd="0dp" - android:background="?android:attr/windowBackground" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/fragment_bottom_sheet.xml b/app/src/main/res/layout/fragment_bottom_sheet.xml index 76eabc63..5db274df 100644 --- a/app/src/main/res/layout/fragment_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_bottom_sheet.xml @@ -8,7 +8,6 @@ - - + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 438fd332..5ae430fa 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,12 +1,16 @@ - #008577 - #00574B - #D81B60 + #141414 + #000000 + #58C473 #000000 #FFFFFF + #58C473 + #8A58C473 + #3658C473 + #141414 #1B1F1B diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f6d293ed..72b0e3de 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,36 +1,57 @@ - + + + + + - + + - - - @@ -46,14 +46,14 @@ From 38ee2d7b6078f9618ef392bca54ffb4b45549105 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 15 Feb 2019 15:52:24 +0100 Subject: [PATCH 07/11] Update layout --- app/src/main/res/layout/fragment_history.xml | 38 ++++++++++++-------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 79607455..fabab07b 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -7,12 +7,22 @@ android:layout_height="match_parent" tools:context=".ui.activity.HomeActivity"> + + + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> Date: Fri, 15 Feb 2019 18:06:23 +0100 Subject: [PATCH 08/11] Fix style --- app/src/main/res/layout/fragment_editable_data.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_editable_data.xml b/app/src/main/res/layout/fragment_editable_data.xml index 7d50fb8c..76e12a6b 100644 --- a/app/src/main/res/layout/fragment_editable_data.xml +++ b/app/src/main/res/layout/fragment_editable_data.xml @@ -17,7 +17,7 @@ Date: Fri, 15 Feb 2019 18:26:30 +0100 Subject: [PATCH 09/11] Update style, layout & UI --- .../android/ui/activity/HomeActivity.kt | 8 ++++ .../android/ui/fragment/NewSessionFragment.kt | 1 + app/src/main/res/layout/activity_home.xml | 12 +++++- app/src/main/res/layout/fragment_history.xml | 21 ++-------- .../main/res/layout/fragment_new_session.xml | 1 + app/src/main/res/layout/fragment_settings.xml | 40 ++++++------------- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 8 files changed, 40 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt index 968d04ca..2b9e910a 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt @@ -6,6 +6,7 @@ import android.os.Bundle import com.google.android.material.bottomnavigation.BottomNavigationView import io.realm.Realm import kotlinx.android.synthetic.main.activity_home.* +import net.pokeranalytics.android.R import net.pokeranalytics.android.model.realm.Session import net.pokeranalytics.android.ui.fragment.HistoryFragment import net.pokeranalytics.android.ui.fragment.SettingsFragment @@ -85,6 +86,13 @@ class HomeActivity : PokerAnalyticsActivity() { */ private fun displayFragment(index: Int) { + toolbar.title = when (index) { + 0 -> getString(R.string.title_history) + 1 -> getString(R.string.title_stats) + 2 -> getString(R.string.title_settings) + else -> "" + } + val fragment = when(index) { 0 -> HistoryFragment() 1 -> StatsFragment() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt index 006050b3..9cf088a5 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/NewSessionFragment.kt @@ -59,6 +59,7 @@ class NewSessionFragment : PokerAnalyticsFragment(), DynamicRowCallback, Editabl val activity = activity as PokerAnalyticsActivity activity.setSupportActionBar(toolbar) + activity.supportActionBar?.setDisplayHomeAsUpEnabled(true) val viewManager = LinearLayoutManager(requireContext()) val newSessionAdapter = DynamicListAdapter(newSession, this) diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index af3a6fe8..121f90c3 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -6,6 +6,16 @@ android:layout_height="match_parent" tools:context=".ui.activity.HomeActivity"> + + + app:layout_constraintTop_toBottomOf="@+id/toolbar" /> - - + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/newSession" /> + app:layout_constraintTop_toTopOf="@+id/newSession" /> + app:layout_constraintTop_toTopOf="@+id/newSession" /> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 6202c2e5..0d9b6d37 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -1,31 +1,17 @@ - + - - - + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d8974ddd..81e23bbd 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ #141414 - #000000 + #0A0A0A #58C473 #000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 08e7524a..49bc95e1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -27,7 +27,7 @@