caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

allow decimal number in NumberPicker

Browse source
This commit is contained in:
Milos Kozak 2017-06-30 17:43:10 +02:00
parent 09e5fdc61b
commit 37055cd917
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle
View file

@ -173,6 +173,9 @@ dependencies {
androidTestCompile 'com.google.dexmaker:dexmaker:1.2'
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2'
compile(name: 'android-edittext-validator-v1.3.4-mod', ext: 'aar')
compile ('com.google.android:flexbox:0.3.0') {
exclude group: 'com.android.support'
}
compile('io.socket:socket.io-client:0.8.3') {
// excluding org.json which is provided by Android
exclude group: 'org.json', module: 'json'

3
app/src/main/res/layout/number_picker_layout.xml
View file

@ -23,7 +23,8 @@
android:layout_height="match_parent"
android:text="1"
android:textColor="@android:color/black"
android:inputType="number"
android:inputType="numberDecimal"
android:digits="0123456789.,"
android:gravity="center"
android:imeOptions="actionDone"
/>

23
app/src/main/res/layout/treatments_fragment.xml
View file

@ -10,11 +10,16 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
<com.google.android.flexbox.FlexboxLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal">
android:background="@color/defaultbackground"
app:alignContent="stretch"
app:alignItems="stretch"
app:flexDirection="row"
app:flexWrap="wrap"
app:justifyContent="space_between">
<TextView
android:id="@+id/treatments_treatments"
@ -22,6 +27,8 @@
android:layout_height="30dp"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/bolus" />
<TextView
@ -30,6 +37,8 @@
android:layout_height="30dp"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/extendedbolus" />
<TextView
@ -38,6 +47,8 @@
android:layout_height="30dp"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/tempbasal" />
<TextView
@ -46,6 +57,8 @@
android:layout_height="30dp"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/temptarget" />
<TextView
@ -54,9 +67,11 @@
android:layout_height="30dp"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="@string/profileswitch" />
</LinearLayout>
</com.google.android.flexbox.FlexboxLayout>
<FrameLayout
android:id="@+id/treatments_fragment_container"