caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

pump fragment redesign

Browse source
This commit is contained in:
Milos Kozak 2017-04-29 18:11:15 +02:00
parent f641d40722
commit 974e5e0098
7 changed files with 525 additions and 302 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

482
app/src/main/res/layout/danar_fragment.xml
View file

@ -6,8 +6,8 @@
<ScrollView <ScrollView
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_width="match_parent"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -17,275 +17,495 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_weight="1"
android:layout_marginRight="15dp" android:gravity="end"
android:singleLine="true" android:paddingRight="5dp"
android:text="@string/virtualpump_lastconnection_label" android:text="@string/danar_bluetooth_status"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" />
<TextView <TextView
android:id="@+id/danar_lastconnection" android:layout_width="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:layout_weight="0"
android:gravity="center_horizontal"
<com.joanzapata.iconify.widget.IconTextView android:paddingEnd="2dp"
android:id="@+id/danar_battery" android:paddingStart="2dp"
android:layout_width="wrap_content" android:text=":"
android:layout_height="wrap_content" android:textSize="14sp" />
android:layout_gravity="center_vertical"
android:layout_weight="1.02"
android:gravity="center_vertical|right"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textSize="20dp" />
<com.joanzapata.iconify.widget.IconTextView <com.joanzapata.iconify.widget.IconTextView
android:id="@+id/danar_btconnection" android:id="@+id/danar_btconnection"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_weight="1"
android:layout_weight="1.02" android:gravity="start"
android:gravity="center_vertical|right"
android:paddingLeft="5dp" android:paddingLeft="5dp"
android:paddingRight="5dp"
android:text="{fa-bluetooth-b}" android:text="{fa-bluetooth-b}"
android:textSize="20dp" /> android:textSize="20dp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_weight="1"
android:layout_marginRight="15dp" android:gravity="end"
android:singleLine="true" android:paddingRight="5dp"
android:text="@string/virtualpump_battery_label"
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<com.joanzapata.iconify.widget.IconTextView
android:id="@+id/danar_battery"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textSize="20dp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/virtualpump_lastconnection_label"
android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView
android:id="@+id/danar_lastconnection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textSize="14sp" />
</LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:paddingRight="5dp"
android:text="@string/danar_lastbolus" android:text="@string/danar_lastbolus"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_lastbolus" android:id="@+id/danar_lastbolus"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:text="0 U" android:textSize="14sp" />
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_weight="1"
android:layout_marginRight="15dp" android:gravity="end"
android:singleLine="true" android:paddingRight="5dp"
android:text="@string/danar_dailyunits" android:text="@string/danar_dailyunits"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_dailyunits" android:id="@+id/danar_dailyunits"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:text="0 / 0 U" android:textSize="14sp" />
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_weight="1"
android:singleLine="true" android:gravity="end"
android:paddingRight="5dp"
android:text="@string/virtualpump_basebasalrate_label" android:text="@string/virtualpump_basebasalrate_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_basabasalrate" android:id="@+id/danar_basabasalrate"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_weight="1"
android:singleLine="true" android:gravity="end"
android:paddingRight="5dp"
android:text="@string/virtualpump_tempbasal_label" android:text="@string/virtualpump_tempbasal_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_tempbasal" android:id="@+id/danar_tempbasal"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_weight="1"
android:singleLine="true" android:gravity="end"
android:paddingRight="5dp"
android:text="@string/virtualpump_extendedbolus_label" android:text="@string/virtualpump_extendedbolus_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_extendedbolus" android:id="@+id/danar_extendedbolus"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_weight="1"
android:singleLine="true" android:gravity="end"
android:paddingRight="5dp"
android:text="@string/virtualpump_reservoir_label" android:text="@string/virtualpump_reservoir_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_reservoir" android:id="@+id/danar_reservoir"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_weight="1"
android:singleLine="true" android:gravity="end"
android:paddingRight="5dp"
android:text="@string/danar_iob_label" android:text="@string/danar_iob_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_iob" android:id="@+id/danar_iob"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_weight="1"
android:singleLine="true" android:gravity="end"
android:paddingRight="5dp"
android:text="@string/virtualpump_firmware_label" android:text="@string/virtualpump_firmware_label"
android:textAppearance="?android:attr/textAppearanceSmall" android:textSize="14sp" />
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" /> <TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<TextView <TextView
android:id="@+id/danar_firmware" android:id="@+id/danar_firmware"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:gravity="right" android:gravity="start"
android:paddingRight="5dp" android:paddingLeft="5dp"
android:textAppearance="?android:attr/textAppearanceSmall" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="horizontal">
<Button <Button
android:id="@+id/danar_viewprofile" android:id="@+id/danar_viewprofile"
@ -298,15 +518,17 @@
android:id="@+id/danar_history" android:id="@+id/danar_history"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/danar_history" android:layout_weight="1"
android:layout_weight="1" /> android:text="@string/danar_history" />
</LinearLayout>
<Button <Button
android:id="@+id/danar_stats"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/danar_stats" android:layout_weight="1"
android:id="@+id/danar_stats" android:text="@string/danar_stats" />
android:layout_weight="1" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
app/src/main/res/values-bg/strings.xml
View file

@ -232,7 +232,7 @@
<string name="danarprofile_dia">DIA (Време на действие на инсулина) ч.:</string> <string name="danarprofile_dia">DIA (Време на действие на инсулина) ч.:</string>
<string name="danar_lastbolus">Последен болус:</string> <string name="danar_lastbolus">Последен болус:</string>
<string name="danar_invalidinput">Неправилни входни данни</string> <string name="danar_invalidinput">Неправилни входни данни</string>
<string name="danar_dailyunits">Единици за деня:</string> <string name="danar_dailyunits">Единици за деня</string>
<string name="careportal_temporarytarget">Временна цел</string> <string name="careportal_temporarytarget">Временна цел</string>
<string name="careportal_temporarytargetcancel">Отакажи временна цел</string> <string name="careportal_temporarytargetcancel">Отакажи временна цел</string>
<string name="comment">Коментар</string> <string name="comment">Коментар</string>

4
app/src/main/res/values-cs/strings.xml
View file

@ -204,9 +204,9 @@
<string name="absolute">Absolutní</string> <string name="absolute">Absolutní</string>
<string name="comment">Komentář</string> <string name="comment">Komentář</string>
<string name="connectionerror">Chyba připojování pumpy</string> <string name="connectionerror">Chyba připojování pumpy</string>
<string name="danar_dailyunits">Jednotek za den:</string> <string name="danar_dailyunits">Jednotek za den</string>
<string name="danar_invalidinput">Chybná vstupní data</string> <string name="danar_invalidinput">Chybná vstupní data</string>
<string name="danar_iob_label">IOB z pumpy:</string> <string name="danar_iob_label">IOB z pumpy</string>
<string name="danar_lastbolus">Poslední bolus</string> <string name="danar_lastbolus">Poslední bolus</string>
<string name="danar_valuenotsetproperly">Hodnota nenastavena správně</string> <string name="danar_valuenotsetproperly">Hodnota nenastavena správně</string>
<string name="danar_viewprofile">Zobrazit profil</string> <string name="danar_viewprofile">Zobrazit profil</string>

2
app/src/main/res/values-de/strings.xml
View file

@ -204,7 +204,7 @@
<string name="connecting">Verbinden</string> <string name="connecting">Verbinden</string>
<string name="connectionerror">Pumpen Verbindungsfehler</string> <string name="connectionerror">Pumpen Verbindungsfehler</string>
<string name="danar_bt_name_title">DanaR Blueetooth Gerät</string> <string name="danar_bt_name_title">DanaR Blueetooth Gerät</string>
<string name="danar_iob_label">Pumpen IOB:</string> <string name="danar_iob_label">Pumpen IOB</string>
<string name="danar_pump_settings">DanaR Pumpen Einstellungen</string> <string name="danar_pump_settings">DanaR Pumpen Einstellungen</string>
<string name="danarpump">DanaR</string> <string name="danarpump">DanaR</string>
<string name="disconnected">Getrennt</string> <string name="disconnected">Getrennt</string>

4
app/src/main/res/values-es/strings.xml
View file

@ -219,8 +219,8 @@
<string name="devicenotfound">El dispositivo seleccionado no se encuentra</string> <string name="devicenotfound">El dispositivo seleccionado no se encuentra</string>
<string name="connectionerror">Error de conexión de la bomba</string> <string name="connectionerror">Error de conexión de la bomba</string>
<string name="virtualpump_lastconnection_label">Última conexión</string> <string name="virtualpump_lastconnection_label">Última conexión</string>
<string name="danar_iob_label">Bomba IOB:</string> <string name="danar_iob_label">Bomba IOB</string>
<string name="danar_dailyunits">Unidades diarias:</string> <string name="danar_dailyunits">Unidades diarias</string>
<string name="danar_lastbolus">Último bolo:</string> <string name="danar_lastbolus">Último bolo:</string>
<string name="hoursago">h antes</string> <string name="hoursago">h antes</string>
<string name="danar_invalidinput">Datos invalidos</string> <string name="danar_invalidinput">Datos invalidos</string>

4
app/src/main/res/values-ko/strings.xml
View file

@ -224,8 +224,8 @@
<string name="devicenotfound">선택된 기기를 찾지 못했습니다</string> <string name="devicenotfound">선택된 기기를 찾지 못했습니다</string>
<string name="connectionerror">펌프 연결 에러</string> <string name="connectionerror">펌프 연결 에러</string>
<string name="virtualpump_lastconnection_label">최근 연결</string> <string name="virtualpump_lastconnection_label">최근 연결</string>
<string name="danar_iob_label">펌프 IOB:</string> <string name="danar_iob_label">펌프 IOB</string>
<string name="danar_dailyunits">Daily units:</string> <string name="danar_dailyunits">Daily units</string>
<string name="danar_lastbolus">최근 식사주입:</string> <string name="danar_lastbolus">최근 식사주입:</string>
<string name="hoursago">시간 전</string> <string name="hoursago">시간 전</string>
<string name="danar_invalidinput">사용할수 없는 입력 데이터</string> <string name="danar_invalidinput">사용할수 없는 입력 데이터</string>

5
app/src/main/res/values/strings.xml
View file

@ -234,8 +234,8 @@
<string name="nobtadapter">No bluetooth adapter found</string> <string name="nobtadapter">No bluetooth adapter found</string>
<string name="devicenotfound">Selected device not found</string> <string name="devicenotfound">Selected device not found</string>
<string name="connectionerror">Pump connection error</string> <string name="connectionerror">Pump connection error</string>
<string name="danar_iob_label">Pump IOB:</string> <string name="danar_iob_label">Pump IOB</string>
<string name="danar_dailyunits">Daily units:</string> <string name="danar_dailyunits">Daily units</string>
<string name="danar_lastbolus">Last bolus:</string> <string name="danar_lastbolus">Last bolus:</string>
<string name="hoursago">h ago</string> <string name="hoursago">h ago</string>
<string name="danar_invalidinput">Invalid input data</string> <string name="danar_invalidinput">Invalid input data</string>
@ -596,4 +596,5 @@
<string name="basalshortlabel">BAS</string> <string name="basalshortlabel">BAS</string>
<string name="virtualpump_firmware_label">Firmware</string> <string name="virtualpump_firmware_label">Firmware</string>
<string name="virtualpump_lastconnection_label">Last connection</string> <string name="virtualpump_lastconnection_label">Last connection</string>
<string name="danar_bluetooth_status">Bluetooh status</string>
</resources> </resources>