Skip to content

Commit

Permalink
Fix layout issues when using dynamic height #10
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidmigloz
davidmigloz committed Apr 23, 2018
1 parent 0b00563 commit b783b44
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 77 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Change Log

## Version 2.0.1 *(20/04/2018)*
## Version 2.0.1 *(23/04/2018)*

- Fix layout issues when using dynamic height #10
- Fix Proguard is obfuscating everything #9

## Version 2.0.0 *(20/04/2018)*
Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ android {
dependencies {
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
api "com.android.support:gridlayout-v7:27.1.1"
api 'com.android.support.constraint:constraint-layout:1.1.0'
}

/**
Expand Down
4 changes: 2 additions & 2 deletions lib/src/main/java/com/davidmiguel/numberkeyboard/NumberKeyboard.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import android.support.annotation.DrawableRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.constraint.ConstraintLayout;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatDelegate;
import android.support.v7.widget.GridLayout;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.View;
Expand All @@ -25,7 +25,7 @@
* Number keyboard (to enter pin or custom amount).
*/
@SuppressWarnings("unused")
public class NumberKeyboard extends GridLayout {
public class NumberKeyboard extends ConstraintLayout {

private static final int DEFAULT_KEY_WIDTH_DP = -1; // match_parent
private static final int DEFAULT_KEY_HEIGHT_DP = -1; // match_parent
Expand Down
157 changes: 85 additions & 72 deletions lib/src/main/res/layout/number_keyboard.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,16 @@
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:grid="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="1"
grid:layout_columnWeight="1"
grid:layout_row="3"
grid:layout_rowWeight="1">

<TextView
android:id="@+id/key0"
style="@style/key"
android:text="@string/zero"/>

</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="0"
grid:layout_columnWeight="1"
grid:layout_row="0"
grid:layout_rowWeight="1">
android:id="@+id/key1Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key4Container"
app:layout_constraintEnd_toStartOf="@+id/key2Container"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/key1"
Expand All @@ -36,11 +22,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="1"
grid:layout_columnWeight="1"
grid:layout_row="0"
grid:layout_rowWeight="1">
android:id="@+id/key2Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key5Container"
app:layout_constraintEnd_toStartOf="@+id/key3Container"
app:layout_constraintStart_toEndOf="@+id/key1Container"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/key2"
Expand All @@ -50,11 +37,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="2"
grid:layout_columnWeight="1"
grid:layout_row="0"
grid:layout_rowWeight="1">
android:id="@+id/key3Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key6Container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/key2Container"
app:layout_constraintTop_toTopOf="parent">

<TextView
android:id="@+id/key3"
Expand All @@ -64,11 +52,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="0"
grid:layout_columnWeight="1"
grid:layout_row="1"
grid:layout_rowWeight="1">
android:id="@+id/key4Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key7Container"
app:layout_constraintEnd_toStartOf="@+id/key5Container"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/key1Container">

<TextView
android:id="@+id/key4"
Expand All @@ -77,12 +66,14 @@

</com.davidmiguel.numberkeyboard.SquareFrameLayout>


<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="1"
grid:layout_columnWeight="1"
grid:layout_row="1"
grid:layout_rowWeight="1">
android:id="@+id/key5Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key8Container"
app:layout_constraintEnd_toStartOf="@+id/key6Container"
app:layout_constraintStart_toEndOf="@+id/key4Container"
app:layout_constraintTop_toBottomOf="@+id/key2Container">

<TextView
android:id="@+id/key5"
Expand All @@ -92,11 +83,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="2"
grid:layout_columnWeight="1"
grid:layout_row="1"
grid:layout_rowWeight="1">
android:id="@+id/key6Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key9Container"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/key5Container"
app:layout_constraintTop_toBottomOf="@+id/key3Container">

<TextView
android:id="@+id/key6"
Expand All @@ -106,11 +98,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="0"
grid:layout_columnWeight="1"
grid:layout_row="2"
grid:layout_rowWeight="1">
android:id="@+id/key7Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/leftAuxBtnContainer"
app:layout_constraintEnd_toStartOf="@+id/key8Container"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/key4Container">

<TextView
android:id="@+id/key7"
Expand All @@ -119,12 +112,14 @@

</com.davidmiguel.numberkeyboard.SquareFrameLayout>


<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="1"
grid:layout_columnWeight="1"
grid:layout_row="2"
grid:layout_rowWeight="1">
android:id="@+id/key8Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/key0Container"
app:layout_constraintEnd_toStartOf="@+id/key9Container"
app:layout_constraintStart_toEndOf="@+id/key7Container"
app:layout_constraintTop_toBottomOf="@+id/key5Container">

<TextView
android:id="@+id/key8"
Expand All @@ -134,11 +129,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="2"
grid:layout_columnWeight="1"
grid:layout_row="2"
grid:layout_rowWeight="1">
android:id="@+id/key9Container"
style="@style/keyContainer"
app:layout_constraintBottom_toTopOf="@+id/rightAuxBtnContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/key8Container"
app:layout_constraintTop_toBottomOf="@+id/key6Container">

<TextView
android:id="@+id/key9"
Expand All @@ -148,11 +144,12 @@
</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="0"
grid:layout_columnWeight="1"
grid:layout_row="3"
grid:layout_rowWeight="1">
android:id="@+id/leftAuxBtnContainer"
style="@style/keyContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/key0Container"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/key7Container">

<ImageView
android:id="@+id/leftAuxBtn"
Expand All @@ -162,19 +159,35 @@

</com.davidmiguel.numberkeyboard.SquareFrameLayout>


<com.davidmiguel.numberkeyboard.SquareFrameLayout
style="@style/key_container"
grid:layout_column="2"
grid:layout_columnWeight="1"
grid:layout_row="3"
grid:layout_rowWeight="1">
android:id="@+id/key0Container"
style="@style/keyContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/rightAuxBtnContainer"
app:layout_constraintStart_toEndOf="@+id/leftAuxBtnContainer"
app:layout_constraintTop_toBottomOf="@+id/key8Container">

<TextView
android:id="@+id/key0"
style="@style/key"
android:text="@string/zero"/>

</com.davidmiguel.numberkeyboard.SquareFrameLayout>

<com.davidmiguel.numberkeyboard.SquareFrameLayout
android:id="@+id/rightAuxBtnContainer"
style="@style/keyContainer"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/key0Container"
app:layout_constraintTop_toBottomOf="@+id/key9Container">

<ImageView
android:id="@+id/rightAuxBtn"
style="@style/key"
android:scaleType="center"
app:srcCompat="@drawable/ic_fingerprint"/>
app:srcCompat="@drawable/ic_backspace"/>

</com.davidmiguel.numberkeyboard.SquareFrameLayout>

</merge>
2 changes: 1 addition & 1 deletion lib/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<item name="autoSizeTextType">uniform</item>
</style>

<style name="key_container">
<style name="keyContainer">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">0dp</item>
</style>
Expand Down

0 comments on commit b783b44

Please sign in to comment.