caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Improve UserEntryitem Layout

Browse source
This commit is contained in:
Philoul 2021-03-09 23:02:31 +01:00
parent 441f419bfa
commit dc010adf8c
2 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
View file

@ -433,7 +433,7 @@ public class NSClientPlugin extends PluginBase {
// room Therapy Event // room Therapy Event
TherapyEvent therapyEvent = therapyEventFromNsIdForInvalidating(_id); TherapyEvent therapyEvent = therapyEventFromNsIdForInvalidating(_id);
disposable.add(repository.runTransactionForResult(new SyncTherapyEventTransaction(therapyEvent)).subscribe( disposable.add(repository.runTransactionForResult(new SyncTherapyEventTransaction(therapyEvent)).subscribe(
result -> result.getInvalidated().forEach(record -> uel.log(Action.CAREPORTAL_DELETED_FROM_NS, record.getNote() , new ValueWithUnit(record.getTimestamp(), Units.Timestamp), new ValueWithUnit(record.getType().getText(), Units.CPEvent), new ValueWithUnit(record.getGlucose(), Units.Mg_Dl), new ValueWithUnit((int) record.getDuration()/60000, Units.M))), result -> result.getInvalidated().forEach(record -> uel.log(Action.CAREPORTAL_DELETED_FROM_NS, record.getNote() , new ValueWithUnit(record.getTimestamp(), Units.Timestamp), new ValueWithUnit(record.getType().getText(), Units.CPEvent))),
error -> aapsLogger.error(LTag.DATABASE, "Error while removing therapy event", error))); error -> aapsLogger.error(LTag.DATABASE, "Error while removing therapy event", error)));
// new DB model // new DB model
EventNsTreatment evtTreatment = new EventNsTreatment(EventNsTreatment.Companion.getREMOVE(), json); EventNsTreatment evtTreatment = new EventNsTreatment(EventNsTreatment.Companion.getREMOVE(), json);

44
app/src/main/res/layout/treatments_user_entry_item.xml
View file

@ -38,34 +38,24 @@
</LinearLayout> </LinearLayout>
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/values"
android:layout_height="match_parent" android:layout_width="wrap_content"
android:baselineAligned="true" android:layout_height="wrap_content"
android:orientation="horizontal"> android:layout_gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="10dp"
android:textStyle="bold"
android:visibility="gone"
android:text="Values with units" />
<TextView <TextView
android:id="@+id/values" android:id="@+id/s"
android:layout_width="0px" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:paddingStart="20dp"
android:layout_weight="1" android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingStart="20dp" tools:ignore="HardcodedText,RtlSymmetry" />
android:paddingEnd="10dp"
android:textStyle="bold"
android:visibility="gone"
android:text="Values with units" />
<TextView
android:id="@+id/s"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:paddingStart="20dp"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="HardcodedText,RtlSymmetry" />
</LinearLayout>
<View <View
android:layout_width="fill_parent" android:layout_width="fill_parent"