Skip to content

Commit

Permalink
Remove GridLayout.
Browse files Browse the repository at this point in the history
  • Loading branch information
@StephaneBg
StephaneBg committed Oct 28, 2018
1 parent f0cae02 commit 71cfead
Show file tree
Hide file tree
Showing 7 changed files with 371 additions and 347 deletions.
14 changes: 6 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ Add the JitPack repository in your build.gradle at the end of repositories:
And add the dependencies
```
dependencies {
implementation 'com.github.StephaneBg:SimpleNumberPicker:{latest-version}'
implementation "com.android.support:gridlayout-v7:$supportVersion"
implementation "com.android.support.constraint:constraint-layout:$constraintVersion"
implementation 'com.github.StephaneBg:SimpleNumberPicker:{latest-version}'
}
```

Expand All @@ -31,26 +29,26 @@ And add the dependencies

To display a decimal picker `DialogFragment`:
``` java
new DecimalPickerDialog.Builder()
DecimalPickerDialog.Builder()
.setReference(REF_DEC_DIALOG) // Optional
.setNatural(false) // Optional - false is default
.setRelative(true) // Optional - true is default
.setTheme(R.style.DecimalPickerTheme) // Optional
.create()
.show(getSupportFragmentManager(), TAG_DEC_DIALOG);
.show(getSupportFragmentManager(), TAG_DEC_DIALOG)
```

### HexaPickerDialog

To display a hexadecimal picker `DialogFragment`:
``` java
new HexaPickerDialog.Builder()
HexaPickerDialog.Builder()
.setReference(REF_HEX_DIALOG) // Optional
.setMinLength(2) // Optional - Default is none
.setMaxLength(8) // Optional - Default is none
.setTheme(R.style.HexaPickerTheme) // Optional
.create()
.show(getSupportFragmentManager(), TAG_HEX_DIALOG);
.show(getSupportFragmentManager(), TAG_HEX_DIALOG)
```

## Handler
Expand Down Expand Up @@ -92,7 +90,7 @@ If you've fixed a bug or have a feature you've added, just create a pull request
Please send a pull request if you would like to be added here.

## License
Copyright 2017 Stéphane Baiget
Copyright 2018 Stéphane Baiget

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/java/Config.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ object Versions {
const val appcompat = "1.0.0"
const val vectorDrawable = "1.0.0"
const val constraintLayout = "1.1.3"
const val gridlayout = "1.0.0"
const val material = "1.0.0"
const val rangeView = "0.1.1"
}
Expand All @@ -48,7 +47,6 @@ object Libs {
val appcompat = "androidx.appcompat:appcompat:${Versions.appcompat}"
val vectorDrawable = "androidx.vectordrawable:vectordrawable:${Versions.vectorDrawable}"
val material = "com.google.android.material:material:${Versions.material}"
val gridlayout = "androidx.gridlayout:gridlayout:${Versions.gridlayout}"
val constraintLayout = "androidx.constraintlayout:constraintlayout:${Versions.constraintLayout}"
val rangeView = "me.bendik.simplerangeview:simplerangeview:${Versions.rangeView}"
}
4 changes: 2 additions & 2 deletions library/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ android {
}

dependencies {
api Libs.kotlinStd
implementation Libs.kotlinStd

api Libs.appcompat
api Libs.gridlayout
api Libs.constraintLayout
api Libs.material
}
302 changes: 157 additions & 145 deletions library/src/main/res/layout/snp_dialog_decimal_picker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,161 +44,173 @@
<ImageButton
android:id="@+id/key_backspace"
style="@style/Base.Widget.AppCompat.Button.Borderless"
android:layout_width="88dp"
android:layout_width="48dp"
android:layout_height="wrap_content"
android:layout_marginTop="0dp"
android:importantForAccessibility="no"
app:layout_constraintBottom_toBottomOf="@+id/tv_number"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_number"
tools:layout_editor_absoluteY="15dp"
tools:src="@drawable/snp_ic_backspace_black_24dp"
/>

<androidx.gridlayout.widget.GridLayout
android:id="@+id/keyboard"
<TextView
android:id="@+id/key_1"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
app:columnCount="4"
app:layout_constraintDimensionRatio="1:1"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="1"
app:layout_constraintEnd_toStartOf="@id/key_2"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_number"
/>

<TextView
android:id="@+id/key_2"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="2"
app:layout_constraintEnd_toStartOf="@id/key_3"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@+id/key_1"
app:layout_constraintTop_toBottomOf="@id/tv_number"
/>


<TextView
android:id="@+id/key_3"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@+id/key_2"
app:layout_constraintTop_toBottomOf="@id/tv_number"
/>

<TextView
android:id="@+id/key_4"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="4"
app:layout_constraintEnd_toStartOf="@id/key_5"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_number"
app:orientation="vertical"
app:rowCount="4"
>

<TextView
android:id="@+id/key_1"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="1"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_4"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="4"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>


<TextView
android:id="@+id/key_7"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="7"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_sign"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="±"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_2"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="2"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_5"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="5"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_8"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="8"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_0"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_3"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="3"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_6"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="6"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_9"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
android:text="9"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
/>

<TextView
android:id="@+id/key_point"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_rowWeight="1"
tools:text="."
/>
</androidx.gridlayout.widget.GridLayout>
app:layout_constraintTop_toBottomOf="@id/key_1"
/>

<TextView
android:id="@+id/key_5"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="5"
app:layout_constraintEnd_toStartOf="@id/key_6"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/key_4"
app:layout_constraintTop_toBottomOf="@id/key_2"
/>

<TextView
android:id="@+id/key_6"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="6"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/key_5"
app:layout_constraintTop_toBottomOf="@id/key_3"
/>

<TextView
android:id="@+id/key_7"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="7"
app:layout_constraintEnd_toStartOf="@id/key_8"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/key_4"
/>

<TextView
android:id="@+id/key_8"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="8"
app:layout_constraintEnd_toStartOf="@id/key_9"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/key_7"
app:layout_constraintTop_toBottomOf="@id/key_5"
/>

<TextView
android:id="@+id/key_9"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="9"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/key_8"
app:layout_constraintTop_toBottomOf="@id/key_6"
/>

<TextView
android:id="@+id/key_sign"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="±"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/key_0"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/key_7"
/>

<TextView
android:id="@+id/key_0"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
android:text="0"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/key_point"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/key_sign"
app:layout_constraintTop_toBottomOf="@id/key_8"
/>

<TextView
android:id="@+id/key_point"
style="@style/SnpKey"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:padding="@dimen/snp_margin_padding_size_small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/key_0"
app:layout_constraintTop_toBottomOf="@id/key_9"
tools:text="."
/>
</androidx.constraintlayout.widget.ConstraintLayout>
Loading

0 comments on commit 71cfead

Please sign in to comment.