caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #865 from swissalpine/white-number-patch

Browse source 
Fix for black number and labels on black background (aaps wear)
This commit is contained in:
AdrianLxM 2018-04-10 23:10:11 +02:00 committed by GitHub
parent e9ac979a1b 2414be85f2
commit ebfb950ce0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 85 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wear/src/main/res/layout/action_editplusminus_item.xml
View file

@ -26,27 +26,30 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"> android:layout_gravity="center">
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:cursorVisible="false"
android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="50dp" android:minWidth="50dp"
android:padding="10dp" android:padding="10dp"
android:text="112" android:text="112"
android:textSize="45sp" android:textColor="@color/white"
android:cursorVisible="false" android:textSize="45sp" />
android:gravity="center_horizontal" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:text="label" android:text="label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView

10
wear/src/main/res/layout/action_editplusminus_item_below.xml
View file

@ -16,21 +16,23 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:cursorVisible="false"
android:gravity="center"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="50dp" android:minWidth="50dp"
android:text="112" android:text="112"
android:textSize="45sp" android:textColor="@color/white"
android:cursorVisible="false" android:textSize="45sp" />
android:gravity="center" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:text="label" android:text="label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp" />
<LinearLayout <LinearLayout

11
wear/src/main/res/layout/action_editplusminus_item_quicklefty.xml
View file

@ -27,27 +27,30 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center">
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:cursorVisible="false"
android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="100dp" android:minWidth="100dp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="112" android:text="112"
android:textSize="45sp" android:textColor="@color/white"
android:cursorVisible="false" android:textSize="45sp" />
android:gravity="center_horizontal" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:text="label" android:text="label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp" />
<ImageView <ImageView

11
wear/src/main/res/layout/action_editplusminus_item_quickrighty.xml
View file

@ -17,27 +17,30 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center">
<EditText <EditText
android:id="@+id/amountfield" android:id="@+id/amountfield"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:cursorVisible="false"
android:gravity="center_horizontal"
android:inputType="numberDecimal" android:inputType="numberDecimal"
android:minWidth="100dp" android:minWidth="100dp"
android:paddingTop="10dp" android:paddingTop="10dp"
android:text="112" android:text="112"
android:textSize="45sp" android:textColor="@color/white"
android:cursorVisible="false" android:textSize="45sp" />
android:gravity="center_horizontal" />
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:text="label" android:text="label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center" android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp" />
<ImageView <ImageView

4
wear/src/main/res/layout/action_editplusminus_item_viktoria.xml
View file

@ -22,8 +22,9 @@
android:layout_gravity="left|center_vertical" android:layout_gravity="left|center_vertical"
android:gravity="center" android:gravity="center"
android:rotation="90" android:rotation="90"
android:text="label" android:text="labelx"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/white"
android:textSize="25sp" /> android:textSize="25sp" />
<LinearLayout <LinearLayout
@ -53,6 +54,7 @@
android:minWidth="50dp" android:minWidth="50dp"
android:padding="10dp" android:padding="10dp"
android:text="112" android:text="112"
android:textColor="@color/white"
android:textSize="45sp" /> android:textSize="45sp" />
<ImageView <ImageView

4
wear/src/main/res/layout/action_toggle_item.xml
View file

@ -10,14 +10,16 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:gravity="center">
<TextView <TextView
android:id="@+id/label" android:id="@+id/label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:text="label" android:text="label"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:gravity="center"/> android:textColor="@color/white" />
<ImageView <ImageView
android:id="@+id/togglebutton" android:id="@+id/togglebutton"
android:layout_width="wrap_content" android:layout_width="wrap_content"