virtual pump layout

This commit is contained in:
Milos Kozak 2017-04-29 17:48:45 +02:00
parent 66d011665d
commit f641d40722
8 changed files with 257 additions and 179 deletions

View file

@ -4,158 +4,235 @@
android:layout_height="match_parent"
tools:context=".plugins.PumpVirtual.VirtualPumpFragment">
<LinearLayout
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="@string/vitualpump_label"
android:textAppearance="?android:attr/textAppearanceLarge" />
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_basebasalrate_label"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" />
android:layout_gravity="center"
android:layout_marginTop="20dp"
android:text="@string/vitualpump_label"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:id="@+id/virtualpump_basabasalrate"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:layout_marginTop="20dp"
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_basebasalrate_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/virtualpump_basabasalrate"
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/virtualpump_tempbasal_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/virtualpump_tempbasal"
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/virtualpump_extendedbolus_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/virtualpump_extendedbolus"
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/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" />
<TextView
android:id="@+id/virtualpump_battery"
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/virtualpump_reservoir_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/virtualpump_reservoir"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="start"
android:paddingLeft="5dp"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_tempbasal_label"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" />
<TextView
android:id="@+id/virtualpump_tempbasal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_extendedbolus_label"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" />
<TextView
android:id="@+id/virtualpump_extendedbolus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_battery_label"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" />
<TextView
android:id="@+id/virtualpump_battery"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:singleLine="true"
android:text="@string/virtualpump_reservoir_label"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/colorPumpLabel"
android:textStyle="bold" />
<TextView
android:id="@+id/virtualpump_reservoir"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:paddingRight="5dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>

View file

@ -156,13 +156,13 @@
<string name="treatmentssafety_title">Tratments safety</string>
<string name="unsupportedclientver">Неподържана версия на NSClient</string>
<string name="virtualpump">Виртуална помпа</string>
<string name="virtualpump_basebasalrate_label">Базова базална стойност:</string>
<string name="virtualpump_battery_label">Батерия:</string>
<string name="virtualpump_extendedbolus_label">Удължен болус:</string>
<string name="virtualpump_reservoir_label">Резервоар:</string>
<string name="virtualpump_basebasalrate_label">Базова базална стойност</string>
<string name="virtualpump_battery_label">Батерия</string>
<string name="virtualpump_extendedbolus_label">Удължен болус</string>
<string name="virtualpump_reservoir_label">Резервоар</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">Грешка в базата данни</string>
<string name="virtualpump_tempbasal_label">Временен базал:</string>
<string name="virtualpump_tempbasal_label">Временен базал</string>
<string name="vitualpump_label">ВИРТУАЛНА ПОМПА</string>
<string name="xdrip">xDrip</string>
<string name="overview_extendedbolus_button">Удължен болус</string>
@ -214,7 +214,7 @@
<string name="bolusdelivered" formatted="false">Болус %.2fU беше подаден успешно</string>
<string name="smscommunicator_bolusfailed">Bolus failed</string>
<string name="canceltemp">Откажи временен базал</string>
<string name="virtualpump_lastconnection_label">Последно свързване:</string>
<string name="virtualpump_lastconnection_label">Последно свързване</string>
<string name="waitingforpumpresult">Изчаква резултат</string>
<string name="smscommunicator">SMS комуникатор</string>
<string name="smscommunicator_allowednumbers">Позволени телефонни номера</string>
@ -460,7 +460,6 @@
<string name="virtualpump_uploadstatus_title">Изпраща статус в NS</string>
<string name="virtualpump_settings">Настройки на виртуална помпа</string>
<string name="updatingbasalrates">Качва базални стойности</string>
<string name="virtualpump_firmware_label">Firmware:</string>
<string name="unlock_settings">Отключи настройки</string>
<string name="stoppingextendedbolus">Спиране на удължен болус</string>
<string name="stoppingtempbasal">Спиране на временен базал</string>
@ -512,4 +511,5 @@
<string name="smscommunicator_calibrationsent">Calibration sent. Receiving must be enabled in xDrip.</string>
<string name="smscommunicator_invalidphonennumber">Invalid SMS phone number</string>
<string name="queue">Опашка:</string>
<string name="virtualpump_firmware_label">Firmware</string>
</resources>

View file

@ -157,13 +157,13 @@
<string name="treatmentssafety_title">Bezpečnost zadání ošetřeni</string>
<string name="unsupportedclientver">Nepodporovaná verze NSClient</string>
<string name="virtualpump">Virtualní pumpa</string>
<string name="virtualpump_basebasalrate_label">Základní hodnota bazálu:</string>
<string name="virtualpump_battery_label">Baterie:</string>
<string name="virtualpump_extendedbolus_label">Kombo bolus:</string>
<string name="virtualpump_reservoir_label">Zásobník:</string>
<string name="virtualpump_basebasalrate_label">Základní hodnota bazálu</string>
<string name="virtualpump_battery_label">Baterie</string>
<string name="virtualpump_extendedbolus_label">Kombo bolus</string>
<string name="virtualpump_reservoir_label">Zásobník</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">Chyba databáze</string>
<string name="virtualpump_tempbasal_label">Dočasný bazál:</string>
<string name="virtualpump_tempbasal_label">Dočasný bazál</string>
<string name="vitualpump_label">VIRTUÁLNÍ PUMPA</string>
<string name="xdrip">xDrip</string>
<string name="overview_extendedbolus_button">Kombo bolus</string>
@ -220,7 +220,7 @@
<string name="reloadprofile">Obnovit profil</string>
<string name="save">Uložit</string>
<string name="success">Úspěch</string>
<string name="virtualpump_lastconnection_label">Poslední spojení:</string>
<string name="virtualpump_lastconnection_label">Poslední spojení</string>
<string name="canceltemp">Zrušit dočasný bazál</string>
<string name="bolusdelivered" formatted="false">Bolus %.2fU aplikován úspěšně</string>
<string name="smscommunicator_bolusfailed">Chyba při aplikování bolusu</string>
@ -433,7 +433,7 @@
<string name="prefs_delta_title">Nastavení parametru delta BG</string>
<string name="profile">Profil</string>
<string name="short_tabtitles">Krátké názvy modulů</string>
<string name="virtualpump_firmware_label">Firmware:</string>
<string name="virtualpump_firmware_label">Firmware</string>
<string name="smscommunicator_invalidphonennumber">Špatné telefonní číslo</string>
<string name="tempbasaldeliveryerror">Chyba nastavování dočasného bazálu</string>
<string name="copied_to_clipboard">Nakopírováno do schránky</string>

View file

@ -23,7 +23,7 @@
<string name="tempbasals_netratio_label_string">Ratio:</string>
<string name="tempbasals_realduration_label_string">Dur:</string>
<string name="treatmentdeliveryerror">Bolus Abgabefehler</string>
<string name="virtualpump_battery_label">Batterie:</string>
<string name="virtualpump_battery_label">Batterie</string>
<string name="virtualpump_resultok">OK</string>
<string name="basal">Basal</string>
<string name="bolus">Bolus</string>
@ -94,14 +94,14 @@
<string name="treatments_wizard_unit_label">U</string>
<string name="up">Up</string>
<string name="virtualpump">Virtuelle Pumpe</string>
<string name="virtualpump_reservoir_label">Reservoir:</string>
<string name="virtualpump_reservoir_label">Reservoir</string>
<string name="xdrip">xDrip</string>
<string name="vitualpump_label">VIRTUELLE PUMPE</string>
<string name="virtualpump_sqlerror">SQL Error</string>
<string name="virtualpump_extendedbolus_label">Extended bolus:</string>
<string name="virtualpump_tempbasal_label">Temp basal:</string>
<string name="virtualpump_extendedbolus_label">Extended bolus</string>
<string name="virtualpump_tempbasal_label">Temp basal</string>
<string name="visible">Sichtbar</string>
<string name="virtualpump_basebasalrate_label">Basis Basalrate:</string>
<string name="virtualpump_basebasalrate_label">Basis Basalrate</string>
<string name="treatments_wizard_total_label">TOTAL</string>
<string name="unsupportedclientver">Nicht unterstützte Version von NSClient</string>
<string name="treatments_wizard_bg_label">BZ</string>
@ -215,7 +215,7 @@
<string name="reloadprofile">Profil neuladen</string>
<string name="save">Speichern</string>
<string name="success">Erfolgreich</string>
<string name="virtualpump_lastconnection_label">Letzte Verbindung:</string>
<string name="virtualpump_lastconnection_label">Letzte Verbindung</string>
<string name="danar_lastbolus">Letzter Bolus:</string>
<string name="danar_viewprofile">Profil anzeigen</string>
<string name="danarprofile">DanaR Profil Einstellungen</string>
@ -311,7 +311,7 @@
<string name="minago">vor %d min</string>
<string name="actions_shortname">"AKT"</string>
<string name="wear_shortname">"WEAR"</string>
<string name="virtualpump_shortname">"VP"</string>
<string name="virtualpump_shortname">VP</string>
<string name="treatments_shortname">"TREAT"</string>
<string name="temptargetrange_shortname">"TT"</string>
<string name="tempbasals_shortname">"TB"</string>

View file

@ -46,10 +46,10 @@
<string name="treatments_wizard_total_label">TOTAL</string>
<string name="openapsma_run">Ejecutar ahora</string>
<string name="vitualpump_label">BOMBA VIRTUAL</string>
<string name="virtualpump_basebasalrate_label">Dosis Basal Base:</string>
<string name="virtualpump_tempbasal_label">Basal Temporal:</string>
<string name="virtualpump_extendedbolus_label">Bolo extendido:</string>
<string name="virtualpump_battery_label">Batería:</string>
<string name="virtualpump_basebasalrate_label">Dosis Basal Base</string>
<string name="virtualpump_tempbasal_label">Basal Temporal</string>
<string name="virtualpump_extendedbolus_label">Bolo extendido</string>
<string name="virtualpump_battery_label">Batería</string>
<string name="virtualpump_reservoir_label">Depósito:</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">Error de SQL</string>
@ -218,7 +218,7 @@
<string name="nobtadapter">No se encuentra adaptador Bluetooth</string>
<string name="devicenotfound">El dispositivo seleccionado no se encuentra</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_dailyunits">Unidades diarias:</string>
<string name="danar_lastbolus">Último bolo:</string>

View file

@ -48,11 +48,11 @@
<string name="treatments_wizard_total_label"></string>
<string name="openapsma_run">지금 실행</string>
<string name="vitualpump_label">가상 펌프</string>
<string name="virtualpump_basebasalrate_label">기본 기초주입량:</string>
<string name="virtualpump_tempbasal_label">임시기초주입:</string>
<string name="virtualpump_extendedbolus_label">확장 식사주입:</string>
<string name="virtualpump_battery_label">배터리:</string>
<string name="virtualpump_reservoir_label">인슐린 잔량:</string>
<string name="virtualpump_basebasalrate_label">기본 기초주입량</string>
<string name="virtualpump_tempbasal_label">임시기초주입</string>
<string name="virtualpump_extendedbolus_label">확장 식사주입</string>
<string name="virtualpump_battery_label">배터리</string>
<string name="virtualpump_reservoir_label">인슐린 잔량</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">SQL 에러</string>
<string name="openapsma_lastrun_label">최근 실행</string>
@ -223,7 +223,7 @@
<string name="nobtadapter">블루투스 어댑터를 찾지 못했습니다</string>
<string name="devicenotfound">선택된 기기를 찾지 못했습니다</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_dailyunits">Daily units:</string>
<string name="danar_lastbolus">최근 식사주입:</string>

View file

@ -7,6 +7,7 @@
<color name="inrange">#00FF00</color>
<color name="low">#FF0000</color>
<color name="high">#FFFF00</color>
<color name="listdelimiter">#505050</color>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>

View file

@ -49,11 +49,11 @@
<string name="treatments_wizard_total_label">TOTAL</string>
<string name="openapsma_run">Run now</string>
<string name="vitualpump_label">VIRTUAL PUMP</string>
<string name="virtualpump_basebasalrate_label">Base basal rate:</string>
<string name="virtualpump_tempbasal_label">Temp basal:</string>
<string name="virtualpump_extendedbolus_label">Extended bolus:</string>
<string name="virtualpump_battery_label">Battery:</string>
<string name="virtualpump_reservoir_label">Reservoir:</string>
<string name="virtualpump_basebasalrate_label">Base basal rate</string>
<string name="virtualpump_tempbasal_label">Temp basal</string>
<string name="virtualpump_extendedbolus_label">Extended bolus</string>
<string name="virtualpump_battery_label">Battery</string>
<string name="virtualpump_reservoir_label">Reservoir</string>
<string name="virtualpump_resultok">OK</string>
<string name="virtualpump_sqlerror">SQL Error</string>
<string name="openapsma_lastrun_label">Last run</string>
@ -234,7 +234,6 @@
<string name="nobtadapter">No bluetooth adapter found</string>
<string name="devicenotfound">Selected device not found</string>
<string name="connectionerror">Pump connection error</string>
<string name="virtualpump_lastconnection_label">Last connection:</string>
<string name="danar_iob_label">Pump IOB:</string>
<string name="danar_dailyunits">Daily units:</string>
<string name="danar_lastbolus">Last bolus:</string>
@ -458,7 +457,6 @@
<string name="always_use_shortavg">Always use short average delta instead of simple delta</string>
<string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
<string name="advancedsettings_title">Advanced Settings</string>
<string name="virtualpump_firmware_label">Firmware:</string>
<string name="danar_model" formatted="false">Model: %02X Protocol: %02X Code: %02X</string>
<string name="profile">Profile</string>
<string name="openapsama_max_daily_safety_multiplier" translatable="false">max_daily_safety_multiplier</string>
@ -596,4 +594,6 @@
<string name="cob">COB</string>
<string name="predictionshortlabel">PRE</string>
<string name="basalshortlabel">BAS</string>
<string name="virtualpump_firmware_label">Firmware</string>
<string name="virtualpump_lastconnection_label">Last connection</string>
</resources>