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

Improve separator UI

Browse Source
feature/top10
Aurelien Hubert 7 years ago
parent 3d45e9e10c
commit 822142976f
3 changed files with 106 additions and 89 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/ui/view/RowRepresentable.kt
  2. 101
      app/src/main/res/layout/row_header_title_value.xml
  3. 92
      app/src/main/res/layout/row_title_value.xml

2
app/src/main/java/net/pokeranalytics/android/ui/view/RowRepresentable.kt
Unescape View File

@ -118,7 +118,7 @@ enum class SessionRow : RowRepresentable {
override val needSeparator: Boolean override val needSeparator: Boolean
get() { get() {
return when (this) { return when (this) {
TIPS -> true TIPS, BANKROLL_VARIATION -> true
else -> false else -> false
} }
} }

101
app/src/main/res/layout/row_header_title_value.xml
Unescape View File

@ -1,61 +1,72 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rowHeaderTitleValue.container" android:id="@+id/rowHeaderTitleValue.container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/green_header"> android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rowHeaderTitleValue.title" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:background="@color/green_header">
android:layout_marginBottom="16dp"
style="@style/PokerAnalyticsTheme.TextView.RowTitle" <androidx.appcompat.widget.AppCompatTextView
app:layout_constraintBottom_toTopOf="@+id/rowHeaderTitleValue.separator" android:id="@+id/rowHeaderTitleValue.title"
app:layout_constraintHorizontal_bias="0.0" style="@style/PokerAnalyticsTheme.TextView.RowTitle"
app:layout_constraintStart_toStartOf="@+id/guidelineStart" android:layout_width="wrap_content"
app:layout_constraintTop_toTopOf="parent" android:layout_height="wrap_content"
tools:text="Title" /> android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
<androidx.appcompat.widget.AppCompatTextView app:layout_constraintBottom_toBottomOf="parent"
android:id="@+id/rowHeaderTitleValue.value" app:layout_constraintStart_toStartOf="@+id/guidelineStart"
android:layout_width="0dp" app:layout_constraintTop_toTopOf="parent"
android:layout_height="wrap_content" tools:text="Title" />
android:layout_marginStart="16dp"
android:ellipsize="end" <androidx.appcompat.widget.AppCompatTextView
android:gravity="end" android:id="@+id/rowHeaderTitleValue.value"
android:maxLines="1" style="@style/PokerAnalyticsTheme.TextView.RowValue"
style="@style/PokerAnalyticsTheme.TextView.RowValue" android:layout_width="0dp"
app:layout_constraintBottom_toTopOf="@+id/rowHeaderTitleValue.separator" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" android:layout_marginStart="16dp"
app:layout_constraintStart_toEndOf="@+id/rowHeaderTitleValue.title" android:layout_marginTop="16dp"
app:layout_constraintTop_toTopOf="parent" android:layout_marginBottom="16dp"
tools:text="Value" /> android:ellipsize="end"
android:gravity="end"
<androidx.constraintlayout.widget.Guideline android:maxLines="1"
android:id="@+id/guidelineStart" app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="wrap_content" app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
android:layout_height="wrap_content" app:layout_constraintStart_toEndOf="@+id/rowHeaderTitleValue.title"
android:orientation="vertical" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintGuide_begin="16dp" /> tools:text="Value" />
<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>
<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" />
<View <FrameLayout
android:id="@+id/rowHeaderTitleValue.separator" android:id="@+id/rowHeaderTitleValue.separator"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="16dp" android:layout_height="16dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.appcompat.widget.LinearLayoutCompat>

92
app/src/main/res/layout/row_title_value.xml
Unescape View File

@ -1,57 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rowTitleValue.container" android:id="@+id/rowTitleValue.container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?selectableItemBackground"> android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rowTitleValue.title" android:layout_width="match_parent"
style="@style/PokerAnalyticsTheme.TextView.RowTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" android:background="?selectableItemBackground">
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/rowTitleValue.separator"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="@+id/guidelineStart"
app:layout_constraintTop_toTopOf="parent"
tools:text="Title" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/rowTitleValue.value" android:id="@+id/rowTitleValue.title"
style="@style/PokerAnalyticsTheme.TextView.RowValue" style="@style/PokerAnalyticsTheme.TextView.RowTitle"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginTop="16dp"
android:ellipsize="end" android:layout_marginBottom="16dp"
android:gravity="end" app:layout_constraintBottom_toBottomOf="parent"
android:maxLines="1" app:layout_constraintStart_toStartOf="@+id/guidelineStart"
app:layout_constraintBottom_toTopOf="@+id/rowTitleValue.separator" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd" tools:text="Title" />
app:layout_constraintStart_toEndOf="@+id/rowTitleValue.title"
app:layout_constraintTop_toTopOf="parent"
tools:text="Value" />
<androidx.constraintlayout.widget.Guideline <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/guidelineStart" android:id="@+id/rowTitleValue.value"
android:layout_width="wrap_content" style="@style/PokerAnalyticsTheme.TextView.RowValue"
android:layout_height="wrap_content" android:layout_width="0dp"
android:orientation="vertical" android:layout_height="wrap_content"
app:layout_constraintGuide_begin="16dp" /> android:layout_marginStart="16dp"
android:ellipsize="end"
android:gravity="end"
android:maxLines="1"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
app:layout_constraintStart_toEndOf="@+id/rowTitleValue.title"
app:layout_constraintTop_toTopOf="parent"
tools:text="Value" />
<androidx.constraintlayout.widget.Guideline <androidx.constraintlayout.widget.Guideline
android:id="@+id/guidelineEnd" android:id="@+id/guidelineStart"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintGuide_end="16dp" /> 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 <FrameLayout
android:id="@+id/rowTitleValue.separator" android:id="@+id/rowTitleValue.separator"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="16dp" android:layout_height="16dp"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -61,12 +67,12 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1dp"
android:layout_gravity="center"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_gravity="center"
android:background="@color/kaki" /> android:background="@color/kaki" />
</FrameLayout> </FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.appcompat.widget.LinearLayoutCompat>
Write Preview
Loading…
Cancel
Save