caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DanaRHistoryActivity layout refactor

Browse source
This commit is contained in:
Milos Kozak 2019-12-21 15:26:41 +01:00
parent 6d46c39fba
commit 2e687fe687
18 changed files with 71 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
View file

@ -108,9 +108,9 @@ public class DanaRHistoryActivity extends NoSplashAppCompatActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.danar_historyactivity);
historyTypeSpinner = findViewById(R.id.danar_historytype);
statusView = findViewById(R.id.danar_historystatus);
reloadButton = findViewById(R.id.danar_historyreload);
historyTypeSpinner = findViewById(R.id.danar_history_spinner);
statusView = findViewById(R.id.danar_history_status);
reloadButton = findViewById(R.id.danar_history_reload);
recyclerView = findViewById(R.id.danar_history_recyclerview);
recyclerView.setHasFixedSize(true);

88
app/src/main/res/layout/danar_historyactivity.xml
View file

@ -3,50 +3,74 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context=".plugins.pump.danaR.activities.DanaRHistoryActivity">
<LinearLayout
android:id="@+id/danar_historytop"
<RelativeLayout
android:id="@+id/danar_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:background="@color/cardColorBackground"
android:orientation="horizontal"
android:padding="5dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/carbs"
android:src="@drawable/icon_danarhistory" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="@string/danar_history"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
<LinearLayout
android:id="@+id/spacer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/danar_header"
android:orientation="horizontal"
android:padding="5dp" />
<LinearLayout
android:id="@+id/danar_history_spinner_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/spacer"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="20dp"
android:text="Type:"
android:layout_marginStart="15dp"
android:layout_marginEnd="20dp"
android:text="@string/careportal_newnstreatment_eventtype"
android:textAppearance="?android:attr/textAppearanceSmall" />
<Spinner
android:id="@+id/danar_historytype"
android:id="@+id/danar_history_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_marginRight="5dp"
android:layout_weight="1"
android:background="@drawable/pillborder"
android:gravity="center_horizontal"
android:text="DanaR History" />
android:layout_marginEnd="20dp" />
</LinearLayout>
<TextView
android:id="@+id/danar_historystatus"
android:id="@+id/danar_history_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/danar_historytop"
android:layout_below="@id/danar_history_spinner_layout"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal" />
@ -54,23 +78,15 @@
android:id="@+id/danar_history_recyclerview"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_above="@+id/danar_historybuttons"
android:layout_below="@+id/danar_historystatus" />
android:layout_below="@+id/danar_history_status" />
<LinearLayout
android:id="@+id/danar_historybuttons"
<Button
android:id="@+id/danar_history_reload"
style="@style/Widget.AppCompat.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<Button
android:id="@+id/danar_historyreload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/danar_historyreload" />
</LinearLayout>
android:drawableStart="@drawable/icon_actions_refill"
android:text="@string/danar_historyreload" />
</RelativeLayout>

2
app/src/main/res/layout/dialog_bolusprogress.xml
View file

@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_calibration.xml
View file

@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_carbs.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_care.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_error.xml
View file

@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_extendedbolus.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_fill.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_insulin.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_profileswitch.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_profileviewer.xml
View file

@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_tempbasal.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_temptarget.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_treatment.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/layout/dialog_wizard.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/dialog_title_backround"
android:background="@color/dialog_title_background"
android:orientation="horizontal"
android:padding="5dp">

2
app/src/main/res/values/colors.xml
View file

@ -44,7 +44,7 @@
<color name="mdtp_accent_color">#40bbaa</color>
<color name="colorInitializingBorder">#00695c</color>
<color name="dialog_title_backround">#303030</color>
<color name="dialog_title_background">#303030</color>
<color name="cardColorBackground">#121212</color>
<color name="cardObjectiveText">#779ECB</color>

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

@ -877,7 +877,7 @@
<string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last two minutes. To prevent accidental double boluses and to guard against bugs this is disallowed.</string>
<string name="combo_pump_connected_now">Now</string>
<string name="combo_activity_reading_pump_history">Reading pump history</string>
<string name="danar_history">pump history</string>
<string name="danar_history">Pump history</string>
<string name="combo_activity_setting_basal_profile">Setting basal profile</string>
<string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
<string name="combo_pump_battery_low_warrning">Pump battery is low</string>