diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt index 9111abb2..47d57191 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt @@ -32,7 +32,7 @@ open class Comment : RealmObject(), Manageable, RowRepresentable { override val realmObjectClass: Class = Comment::class.java @Ignore - override val viewType: Int = RowViewType.TITLE.ordinal + override val viewType: Int = RowViewType.TITLE_MULTILINES.ordinal @Ignore override val inputFragmentType: InputFragmentType = InputFragmentType.EDIT_TEXT_MULTI_LINES diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt index 49d0625c..482f6181 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt @@ -106,7 +106,7 @@ open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresent if (!currentCommentCalendar.isSameDay(currentDateCalendar) || index == 0) { currentDateCalendar.time = currentCommentCalendar.time - rows.add(CustomizableRowRepresentable(RowViewType.HEADER_TITLE, title = currentDateCalendar.time.mediumDate())) + rows.add(CustomizableRowRepresentable(RowViewType.HEADER_SUBTITLE, title = currentDateCalendar.time.mediumDate())) } rows.add(comment) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt index 8cf37099..a3ce67b9 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt @@ -60,6 +60,7 @@ enum class RowViewType(private var layoutRes: Int) { HEADER_TITLE_VALUE(R.layout.row_header_title_value), HEADER_TITLE_AMOUNT(R.layout.row_header_title_amount), HEADER_TITLE_AMOUNT_BIG(R.layout.row_header_title_amount_big), + HEADER_SUBTITLE(R.layout.row_header_subtitle), LOCATION_TITLE(R.layout.row_title), INFO(R.layout.row_info), @@ -72,6 +73,7 @@ enum class RowViewType(private var layoutRes: Int) { TITLE_VALUE_ACTION(R.layout.row_title_value_action), TITLE_SWITCH(R.layout.row_title_switch), TITLE_GRID(R.layout.row_bottom_sheet_grid_title), + TITLE_MULTILINES(R.layout.row_title_multilines), DATA(R.layout.row_title), BOTTOM_SHEET_DATA(R.layout.row_bottom_sheet_title), TITLE_CHECK(R.layout.row_title_check), @@ -105,8 +107,8 @@ enum class RowViewType(private var layoutRes: Int) { return when (this) { // Row View Holder - HEADER_TITLE, HEADER_TITLE_VALUE, HEADER_TITLE_AMOUNT, HEADER_TITLE_AMOUNT_BIG, LOCATION_TITLE, - INFO, TITLE, TITLE_ARROW, TITLE_ICON_ARROW, TITLE_VALUE, TITLE_VALUE_ARROW, TITLE_VALUE_ACTION, TITLE_GRID, + HEADER_TITLE, HEADER_TITLE_VALUE, HEADER_TITLE_AMOUNT, HEADER_TITLE_AMOUNT_BIG, HEADER_SUBTITLE, LOCATION_TITLE, + INFO, TITLE, TITLE_ARROW, TITLE_ICON_ARROW, TITLE_VALUE, TITLE_VALUE_ARROW, TITLE_VALUE_ACTION, TITLE_GRID, TITLE_MULTILINES, TITLE_SWITCH, TITLE_CHECK, TITLE_VALUE_CHECK, DATA, BOTTOM_SHEET_DATA, LOADER -> RowViewHolder(layout) diff --git a/app/src/main/res/layout/row_header_subtitle.xml b/app/src/main/res/layout/row_header_subtitle.xml new file mode 100644 index 00000000..5811dc82 --- /dev/null +++ b/app/src/main/res/layout/row_header_subtitle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/row_header_title.xml b/app/src/main/res/layout/row_header_title.xml index 8ec368d4..20aaf136 100644 --- a/app/src/main/res/layout/row_header_title.xml +++ b/app/src/main/res/layout/row_header_title.xml @@ -7,7 +7,7 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5b48f8f1..e569f23d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -95,6 +95,7 @@ 8dp + + + + + + + +