staxriver
/
poker-analytics
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve comments for Player

Browse Source
feature/players
Aurelien Hubert 6 years ago
parent 54b6457fc9
commit 9ad428152c
7 changed files with 90 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt
  2. 2
      app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt
  3. 6
      app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
  4. 17
      app/src/main/res/layout/row_header_subtitle.xml
  5. 2
      app/src/main/res/layout/row_header_title.xml
  6. 47
      app/src/main/res/layout/row_title_multilines.xml
  7. 19
      app/src/main/res/values/styles.xml

2
app/src/main/java/net/pokeranalytics/android/model/realm/Comment.kt
Unescape View File

@ -32,7 +32,7 @@ open class Comment : RealmObject(), Manageable, RowRepresentable {
override val realmObjectClass: Class<out Identifiable> = 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

2
app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt
Unescape View File

@ -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)

6
app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
Unescape View File

@ -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)

17
app/src/main/res/layout/row_header_subtitle.xml
Unescape View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title"
style="@style/PokerAnalyticsTheme.TextView.Header.Subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
tools:text="Header" />
</LinearLayout>

2
app/src/main/res/layout/row_header_title.xml
Unescape View File

@ -7,7 +7,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title"
style="@style/PokerAnalyticsTheme.TextView.Header"
style="@style/PokerAnalyticsTheme.TextView.Header.Title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"

47
app/src/main/res/layout/row_title_multilines.xml
Unescape View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/layout_swipe_to_delete" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/foreground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_dark"
android:foreground="?selectableItemBackground">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
style="@style/PokerAnalyticsTheme.TextView.RowTitleMultilines"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintStart_toStartOf="@+id/guidelineStart"
app:layout_constraintTop_toTopOf="parent"
tools:text="Data Type Title sqdo iqsjd \n isqojd ioqsjd oq" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineStart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="16dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineEnd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_end="16dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

19
app/src/main/res/values/styles.xml
Unescape View File

@ -95,6 +95,7 @@
<item name="android:paddingTop">8dp</item>
</style>
<style name="PokerAnalyticsTheme.TextView.Header">
<item name="android:textColor">@color/kaki_medium</item>
<item name="android:maxLines">1</item>
@ -103,6 +104,16 @@
<item name="android:textSize">18sp</item>
</style>
<style name="PokerAnalyticsTheme.TextView.Header.Title">
<item name="android:fontFamily">@font/roboto_bold</item>
<item name="android:textSize">18sp</item>
</style>
<style name="PokerAnalyticsTheme.TextView.Header.Subtitle">
<item name="android:fontFamily">@font/roboto_medium</item>
<item name="android:textSize">16sp</item>
</style>
<style name="PokerAnalyticsTheme.TextView.RowTitle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/white</item>
@ -111,6 +122,14 @@
<item name="android:ellipsize">end</item>
</style>
<style name="PokerAnalyticsTheme.TextView.RowTitleMultilines">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/white</item>
<item name="android:fontFamily">@font/roboto</item>
<item name="android:ellipsize">end</item>
</style>
<style name="PokerAnalyticsTheme.TextView.RowValue">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/kaki_lighter</item>

Write Preview
Loading…
Cancel
Save