From f04f395f36387f457f11b1a26404bf35bc038623 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 11 Mar 2019 11:07:49 +0100 Subject: [PATCH 1/3] Update SessionRow UI --- .../pokeranalytics/android/ui/view/SessionRowView.kt | 11 ++--------- app/src/main/res/layout/row_session_view.xml | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt index 320f66ee..31cfce79 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/SessionRowView.kt @@ -14,10 +14,7 @@ import net.pokeranalytics.android.model.TableSize import net.pokeranalytics.android.model.extensions.SessionState import net.pokeranalytics.android.model.extensions.getState import net.pokeranalytics.android.model.realm.Session -import net.pokeranalytics.android.util.getDayNumber -import net.pokeranalytics.android.util.getShortDayName -import net.pokeranalytics.android.util.shortTime -import net.pokeranalytics.android.util.toCurrency +import net.pokeranalytics.android.util.* /** * Display a row session @@ -47,11 +44,7 @@ class SessionRowView : FrameLayout { private fun init() { val layoutInflater = LayoutInflater.from(context) rowHistorySession = layoutInflater.inflate(R.layout.row_session_view, this, false) as ConstraintLayout - val layoutParams = FrameLayout.LayoutParams( - FrameLayout.LayoutParams.MATCH_PARENT, - FrameLayout.LayoutParams.WRAP_CONTENT - ) - + val layoutParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT) addView(rowHistorySession, layoutParams) } diff --git a/app/src/main/res/layout/row_session_view.xml b/app/src/main/res/layout/row_session_view.xml index 98316b32..9075bdf3 100644 --- a/app/src/main/res/layout/row_session_view.xml +++ b/app/src/main/res/layout/row_session_view.xml @@ -41,7 +41,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:layout_marginTop="8dp" + android:layout_marginTop="6dp" android:layout_marginEnd="8dp" app:layout_constraintBottom_toTopOf="@+id/sessionInfoLayout" app:layout_constraintEnd_toStartOf="@+id/linearLayout" From 61153ade7d279277b0fd3457e3086bfb74a82cc0 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 11 Mar 2019 11:54:18 +0100 Subject: [PATCH 2/3] Fix crash --- .../main/java/net/pokeranalytics/android/model/realm/Game.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt index 79097858..b74c2d50 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt @@ -68,7 +68,7 @@ open class Game : RealmObject(), Manageable, StaticRowRepresentableDataSource, R override fun updateValue(value: Any?, row: RowRepresentable) { when (row) { SimpleRow.NAME -> this.name = value as String? ?: "" - GameRow.SHORT_NAME -> this.shortName = value as String + GameRow.SHORT_NAME -> this.shortName = value as String? ?: "" } } From 552a3116b5d450eece43111c0a686be575e12bc6 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Mon, 11 Mar 2019 11:54:38 +0100 Subject: [PATCH 3/3] Add layout with check --- app/src/main/res/drawable/ic_check_state.xml | 6 +++ app/src/main/res/layout/row_title_check.xml | 49 ++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 app/src/main/res/drawable/ic_check_state.xml create mode 100644 app/src/main/res/layout/row_title_check.xml diff --git a/app/src/main/res/drawable/ic_check_state.xml b/app/src/main/res/drawable/ic_check_state.xml new file mode 100644 index 00000000..ef22c266 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_state.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/row_title_check.xml b/app/src/main/res/layout/row_title_check.xml new file mode 100644 index 00000000..1b70e44a --- /dev/null +++ b/app/src/main/res/layout/row_title_check.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + \ No newline at end of file