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

Fixes #5 : close button bad layout

Browse Source
hh
Laurent 6 years ago
parent 881c8def65
commit 7aada36f8a
7 changed files with 50 additions and 33 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. 3
      app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
  2. 6
      app/src/main/res/drawable/ic_close.xml
  3. 7
      app/src/main/res/drawable/ic_close_green.xml
  4. 19
      app/src/main/res/layout/view_hand_keyboard_action.xml
  5. 23
      app/src/main/res/layout/view_hand_keyboard_amount.xml
  6. 20
      app/src/main/res/layout/view_hand_keyboard_card.xml
  7. 5
      app/src/main/res/values/styles.xml

3
app/src/main/java/net/pokeranalytics/android/ui/modules/handhistory/views/KeyboardCardView.kt
Unescape View File

@ -3,9 +3,6 @@ package net.pokeranalytics.android.ui.modules.handhistory.views
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import kotlinx.android.synthetic.main.view_hand_keyboard_action.view.closeButton
import kotlinx.android.synthetic.main.view_hand_keyboard_card.view.* import kotlinx.android.synthetic.main.view_hand_keyboard_card.view.*
import net.pokeranalytics.android.R import net.pokeranalytics.android.R
import net.pokeranalytics.android.exceptions.PAIllegalStateException import net.pokeranalytics.android.exceptions.PAIllegalStateException

6
app/src/main/res/drawable/ic_close.xml
Unescape View File

@ -1,5 +1,7 @@
<vector android:height="24dp" android:tint="#FFFFFF" <vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0" android:viewportHeight="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> android:viewportWidth="24.0"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/> <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector> </vector>

7
app/src/main/res/drawable/ic_close_green.xml
Unescape View File

@ -0,0 +1,7 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@color/green" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
</vector>

19
app/src/main/res/layout/view_hand_keyboard_action.xml
Unescape View File

@ -9,18 +9,25 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="44dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.button.MaterialButton <ImageButton
android:id="@+id/closeButton" android:id="@+id/closeButton"
app:icon="@drawable/ic_close" android:src="@drawable/ic_close_green"
style="@style/PokerAnalyticsTheme.Button" style="@style/PokerAnalyticsTheme.TransparentButton"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="44dp"/>
android:layout_marginStart="8dp"/>
<!-- <com.google.android.material.button.MaterialButton-->
<!-- android:id="@+id/closeButton"-->
<!-- app:icon="@drawable/ic_close"-->
<!-- style="@style/PokerAnalyticsTheme.Button"-->
<!-- android:layout_width="44dp"-->
<!-- android:layout_height="44dp"-->
<!-- android:layout_marginStart="8dp"/>-->
</LinearLayout> </LinearLayout>

23
app/src/main/res/layout/view_hand_keyboard_amount.xml
Unescape View File

@ -5,41 +5,41 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<LinearLayout <LinearLayout
android:id="@+id/toolbar"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="44dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/recyclerView"> app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.button.MaterialButton <ImageButton
android:id="@+id/closeButton" android:id="@+id/closeButton"
style="@style/PokerAnalyticsTheme.Button" android:src="@drawable/ic_close_green"
app:icon="@drawable/ic_close" style="@style/PokerAnalyticsTheme.TransparentButton"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="match_parent"/>
android:layout_marginStart="8dp"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/clearButton" android:id="@+id/clearButton"
android:text="@string/clear" android:text="@string/clear"
style="@style/PokerAnalyticsTheme.Button" style="@style/PokerAnalyticsTheme.Button"
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="44dp" android:layout_height="match_parent"
android:layout_marginStart="8dp"/> android:layout_marginStart="8dp"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/kiloButton" android:id="@+id/kiloButton"
style="@style/PokerAnalyticsTheme.Button" style="@style/PokerAnalyticsTheme.Button"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="match_parent"
android:layout_marginStart="8dp"/> android:layout_marginStart="8dp"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/millionButton" android:id="@+id/millionButton"
style="@style/PokerAnalyticsTheme.Button" style="@style/PokerAnalyticsTheme.Button"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="match_parent"
android:layout_marginStart="8dp"/> android:layout_marginStart="8dp"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -47,7 +47,7 @@
android:text="@string/next" android:text="@string/next"
style="@style/PokerAnalyticsTheme.Button" style="@style/PokerAnalyticsTheme.Button"
android:layout_width="64dp" android:layout_width="64dp"
android:layout_height="44dp" android:layout_height="match_parent"
android:layout_marginStart="8dp"/> android:layout_marginStart="8dp"/>
</LinearLayout> </LinearLayout>
@ -56,6 +56,7 @@
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/toolbar"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"

20
app/src/main/res/layout/view_hand_keyboard_card.xml
Unescape View File

@ -8,23 +8,21 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="44dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.button.MaterialButton <ImageButton
android:id="@+id/closeButton" android:id="@+id/closeButton"
style="@style/PokerAnalyticsTheme.Button" android:src="@drawable/ic_close_green"
app:icon="@drawable/ic_close" style="@style/PokerAnalyticsTheme.TransparentButton"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" /> android:layout_height="match_parent"/>
<Space <Space
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="2"/> android:layout_weight="2"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -33,12 +31,12 @@
android:text="@string/clear" android:text="@string/clear"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="match_parent"
android:layout_marginStart="8dp"/> android:layout_marginStart="8dp"/>
<Space <Space
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="2"/> android:layout_weight="2"/>
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
@ -47,7 +45,7 @@
android:text="@string/done" android:text="@string/done"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="match_parent"
android:layout_marginStart="8dp"/> android:layout_marginStart="8dp"/>
</LinearLayout> </LinearLayout>

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

@ -354,6 +354,11 @@
<!-- Button --> <!-- Button -->
<style name="PokerAnalyticsTheme.TransparentButton" parent="Widget.MaterialComponents.Button">
<item name="iconPadding">0dp</item>
<item name="backgroundTint">@color/transparent</item>
</style>
<style name="PokerAnalyticsTheme.Button" parent="Widget.MaterialComponents.Button"> <style name="PokerAnalyticsTheme.Button" parent="Widget.MaterialComponents.Button">
<item name="iconPadding">0dp</item> <item name="iconPadding">0dp</item>
<item name="android:height">48dp</item> <item name="android:height">48dp</item>

Write Preview
Loading…
Cancel
Save