caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

remove mdtp library

Browse source
This commit is contained in:
Milos Kozak 2020-05-10 21:07:58 +02:00
parent 05f73cd3ff
commit 9ac88f7def
31 changed files with 140 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -269,7 +269,6 @@ dependencies {
implementation "androidx.activity:activity-ktx:${activityVersion}"
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'com.google.android.material:material:1.1.0'
implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
implementation "io.reactivex.rxjava2:rxandroid:2.1.1"

8
app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
View file

@ -198,13 +198,7 @@ class ActionsFragment : DaggerFragment() {
val pump = activePlugin.activePump
actions_temptarget?.visibility = (profile != null).toVisibility()
actions_canceltempbasal.visibility = (profile == null).toVisibility()
actions_settempbasal.visibility = (profile == null).toVisibility()
actions_fill.visibility = (profile == null).toVisibility()
actions_extendedbolus.visibility = (profile == null).toVisibility()
actions_extendedbolus_cancel.visibility = (profile == null).toVisibility()
actions_historybrowser.visibility = (profile == null).toVisibility()
actions_tddstats.visibility = (profile == null).toVisibility()
actions_historybrowser.visibility = (profile != null).toVisibility()
val basalProfileEnabled = buildHelper.isEngineeringModeOrRelease() && pump.pumpDescription.isSetBasalProfileCapable

4
app/src/main/res/layout/actions_fragment.xml
View file

@ -280,7 +280,7 @@
app:layout_column="0"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="4" />
app:layout_row="6" />
<info.nightscout.androidaps.utils.SingleClickButton
android:id="@+id/actions_tddstats"
@ -295,7 +295,7 @@
app:layout_column="1"
app:layout_columnWeight="1"
app:layout_gravity="fill"
app:layout_row="4" />
app:layout_row="6" />
</androidx.gridlayout.widget.GridLayout>

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

@ -70,13 +70,6 @@
<color name="splashBackground">#2E2E2E</color>
<color name="toastBorder">#666666</color>
<color name="toastBase">#ffffff</color>
<color name="toastOk">#77dd77</color>
<color name="toastError">#ff0400</color>
<color name="toastWarn">#FF8C00</color>
<color name="toastInfo">#03A9F4</color>
<color name="metadataOk">#77dd77</color>
<color name="metadataTextWarning">#FF8C00</color>
<color name="metadataTextError">#FF5555</color>

6
app/src/main/res/values/dimens.xml
View file

@ -1,8 +1,2 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="compact_height">30dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="appbar_padding_top">8dp</dimen>
</resources>

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

@ -73,13 +73,6 @@
<string name="description_xdrip_status_line">Show information about your loop on your xDrip+ watchface.</string>
<string name="description_sms_communicator">Remote control AndroidAPS using SMS commands.</string>
<string name="nsprofileview_units_label">Units</string>
<string name="nsprofileview_dia_label">DIA</string>
<string name="nsprofileview_ic_label">IC</string>
<string name="nsprofileview_isf_label">ISF</string>
<string name="nsprofileview_basal_label">Basal</string>
<string name="nsprofileview_target_label">Target</string>
<string name="noprofileset">NO PROFILE SET</string>
<string name="treatments_insulin_label_string">Insulin:</string>
<string name="treatments_carbs_label_string">Carbs:</string>
<string name="treatments_iob_label_string">IOB:</string>
@ -165,7 +158,6 @@
<string name="sms_bolus">Bolus:</string>
<string name="basal">Basal</string>
<string name="sms_basal">Basal:</string>
<string name="carbs">Carbs</string>
<string name="changeyourinput">Change your input!</string>
<string name="configbuilder_bgsource">BG Source</string>
<string name="configbuilder_bgsource_description">Where should AndroidAPS gain it\'s data from?</string>
@ -311,7 +303,6 @@
<string name="danarprofile">DanaR profile settings</string>
<string name="danarprofile_dia">DIA [h]</string>
<string name="danarprofile_dia_summary">Duration of Insulin Activity</string>
<string name="danar_historyreload">Reload</string>
<string name="uploading">Uploading</string>
<string name="danar_ebolus">E bolus</string>
<string name="danar_dsbolus">DS bolus</string>
@ -328,8 +319,6 @@
<string name="danar_password_title">Pump password</string>
<string name="bolusstopped">Bolus stopped</string>
<string name="bolusstopping">Stopping bolus</string>
<string name="overview_bolusprogress_stop">Stop</string>
<string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
<string name="smscommunicator_loophasbeendisabled">Loop has been disabled</string>
<string name="smscommunicator_loophasbeenenabled">Loop has been enabled</string>
<string name="smscommunicator_loopisdisabled">Loop is disabled</string>
@ -591,7 +580,6 @@
<string name="careportal_sensorage_label">Sensor age</string>
<string name="careportal_canulaage_label">Canula age</string>
<string name="careportal_insulinage_label">Insulin age</string>
<string name="invalidprofile">Invalid profile !!!</string>
<string name="doprofileswitch">Do Profile Switch</string>
<string name="careportal_pbage_label">Pump battery age</string>
<string name="ns_alarmoptions">Alarm options</string>
@ -670,7 +658,6 @@
<string name="ultrarapid_oref">Ultra-Rapid Oref</string>
<string name="dia_too_short">DIA of %1$f too short - using %2$f instead!</string>
<string name="activate_profile">Activate profile</string>
<string name="date">Date</string>
<string name="invalid">INVALID</string>
<string name="pairing">Pairing</string>
<string name="selectedpump">Selected pump</string>

0
app/src/main/res/drawable-hdpi/background_darkgray.xml → core/src/main/res/drawable-hdpi/background_darkgray.xml
View file

0
app/src/main/res/drawable-hdpi/border_gray.xml → core/src/main/res/drawable-hdpi/border_gray.xml
View file

0
app/src/main/res/drawable-hdpi/icon_home_profile.png → core/src/main/res/drawable-hdpi/icon_home_profile.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

24
app/src/main/res/drawable/toast_border_ok.xml → core/src/main/res/drawable-hdpi/toast_border_ok.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:shape="rectangle"
tools:ignore="PrivateResource">
<corners android:radius="18dp" />
<solid android:color="@color/background_floating_material_dark" />
<stroke
android:width="3dp"
android:color="@color/toastBorder" />
</shape>
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:shape="rectangle"
tools:ignore="PrivateResource">
<corners android:radius="18dp" />
<solid android:color="@color/background_floating_material_dark" />
<stroke
android:width="3dp"
android:color="@color/toastBorder" />
</shape>

0
app/src/main/res/drawable-mdpi/icon_home_profile.png → core/src/main/res/drawable-mdpi/icon_home_profile.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

0
app/src/main/res/drawable-xhdpi/icon_home_profile.png → core/src/main/res/drawable-xhdpi/icon_home_profile.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
app/src/main/res/drawable-xxhdpi/icon_home_profile.png → core/src/main/res/drawable-xxhdpi/icon_home_profile.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4 KiB

After

Width:  |  Height:  |  Size: 4 KiB

0
app/src/main/res/drawable-xxxhdpi/icon_home_profile.png → core/src/main/res/drawable-xxxhdpi/icon_home_profile.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

30
app/src/main/res/drawable/alert_border_error.xml → core/src/main/res/drawable/alert_border_error.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="PrivateResource"
android:insetLeft="16dp"
android:insetTop="16dp"
android:insetRight="16dp"
android:insetBottom="16dp">
<shape
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@color/background_floating_material_dark" />
<stroke android:color="@color/errorAlertBackground" android:width="3dp" />
</shape></inset>
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="PrivateResource"
android:insetLeft="16dp"
android:insetTop="16dp"
android:insetRight="16dp"
android:insetBottom="16dp">
<shape
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@color/background_floating_material_dark" />
<stroke android:color="@color/errorAlertBackground" android:width="3dp" />
</shape></inset>

30
app/src/main/res/drawable/alert_border_warning.xml → core/src/main/res/drawable/alert_border_warning.xml
View file

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="PrivateResource"
android:insetLeft="16dp"
android:insetTop="16dp"
android:insetRight="16dp"
android:insetBottom="16dp">
<shape
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@color/background_floating_material_dark" />
<stroke android:color="@color/warningAlertBackground" android:width="3dp" />
</shape></inset>
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="PrivateResource"
android:insetLeft="16dp"
android:insetTop="16dp"
android:insetRight="16dp"
android:insetBottom="16dp">
<shape
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@color/background_floating_material_dark" />
<stroke android:color="@color/warningAlertBackground" android:width="3dp" />
</shape></inset>

0
app/src/main/res/drawable/ic_trending_flat_white_48dp.xml → core/src/main/res/drawable/ic_trending_flat_white_48dp.xml
View file

0
app/src/main/res/drawable/icon_home_profile.png → core/src/main/res/drawable/icon_home_profile.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

6
core/src/main/res/drawable/mdtp_material_button_background.xml Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
<item android:drawable="@drawable/mdtp_material_button_selected" android:state_focused="true" />
<item android:drawable="@drawable/mdtp_material_button_selected" android:state_pressed="true" />
<item android:drawable="@android:color/transparent" />
</selector>

13
core/src/main/res/drawable/mdtp_material_button_selected.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetBottom="6dp"
android:insetTop="6dp">
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="2dp" />
<solid android:color="@color/mdtp_button_selected" />
<padding
android:bottom="4dp"
android:top="4dp" />
</shape>
</inset>

0
app/src/main/res/drawable/pillborder.xml → core/src/main/res/drawable/pillborder.xml
View file

21
core/src/main/res/layout/danar_statsactivity.xml
View file

@ -5,17 +5,7 @@
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:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal">
</LinearLayout>
tools:context="info.nightscout.androidaps.activities.TDDStatsActivity">
<ScrollView
android:layout_width="match_parent"
@ -117,7 +107,7 @@
android:labelFor="@+id/danar_stats_editTotalBaseBasal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:layout_weight="1" />
<EditText
@ -142,7 +132,7 @@
android:labelFor="@+id/danar_stats_editTotalBaseBasal2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="left"
android:gravity="start"
android:layout_weight="1" />
<TextView
@ -165,7 +155,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
android:orientation="horizontal"
android:baselineAligned="false">
<LinearLayout
android:orientation="vertical"
@ -203,7 +194,7 @@
android:layout_height="wrap_content"
android:textColor="@color/mdtp_white"
android:background="@drawable/pillborder"
android:text="@string/danar_historyreload" />
android:text="@string/reload" />
</LinearLayout>
</LinearLayout>

4
core/src/main/res/layout/dialog_alert_custom.xml
View file

@ -28,8 +28,8 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginLeft="2dp"
android:layout_marginRight="50dp"
android:layout_marginStart="2dp"
android:layout_marginEnd="50dp"
android:layout_toEndOf="@id/alertdialog_icon"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceLarge"

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

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".dialogs.BolusProgressDialog"
tools:context="info.nightscout.androidaps.dialogs.BolusProgressDialog"
>
<RelativeLayout

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

@ -5,7 +5,7 @@
android:focusableInTouchMode="true"
android:minWidth="300dp"
android:orientation="vertical"
tools:context=".dialogs.ProfileViewerDialog">
tools:context="info.nightscout.androidaps.dialogs.ProfileViewerDialog">
<LinearLayout
android:layout_width="match_parent"

8
core/src/main/res/layout/okcancel.xml
View file

@ -19,7 +19,7 @@
android:layout_height="56dp"
android:orientation="horizontal"
android:background="@android:color/transparent"
android:gravity="end|right"
android:gravity="end"
android:layout_gravity="center_vertical"
android:paddingBottom="8dp">
@ -27,18 +27,16 @@
android:id="@+id/cancel"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp"
style="@style/mdtp_ActionButton.Text"
android:text="@string/mdtp_cancel" />
android:text="@string/cancel" />
<Button
android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
style="@style/mdtp_ActionButton.Text"
android:text="@string/mdtp_ok" />
android:text="@string/ok" />
</LinearLayout>
<!-- From: file:/Users/wdullaer/Documents/Programming%20Projects/MaterialDateTimePicker/library/src/main/res/layout/mdtp_done_button.xml -->

14
core/src/main/res/values/colors.xml
View file

@ -3,6 +3,11 @@
<color name="colorPrimary">#212121</color>
<color name="colorPrimaryDark">#000000</color>
<color name="colorAccent">#40bbaa</color>
<color name="mdtp_button_selected">#33969696</color>
<color name="mdtp_accent_color">#009688</color>
<color name="mdtp_button_color">@color/mdtp_accent_color</color>
<color name="mdtp_white">#ffffff</color>
<color name="mdtp_line_dark">#808080</color>
<!-- Fragments-->
<color name="colorInitializingBorder">#00695c</color>
@ -36,4 +41,13 @@
<!-- CareportalEvent-->
<color name="notificationAnnouncement">#FF8C00</color>
<!-- Toasts-->
<color name="toastBorder">#666666</color>
<color name="toastBase">#ffffff</color>
<color name="toastOk">#77dd77</color>
<color name="toastError">#ff0400</color>
<color name="toastWarn">#FF8C00</color>
<color name="toastInfo">#03A9F4</color>
</resources>

8
core/src/main/res/values/dimens.xml Normal file
View file

@ -0,0 +1,8 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="compact_height">30dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="appbar_padding_top">8dp</dimen>
</resources>

13
core/src/main/res/values/strings.xml
View file

@ -51,6 +51,19 @@
<string name="close">Close</string>
<string name="please_wait">Please wait…</string>
<string name="mute">Mute</string>
<string name="reload">Reload</string>
<string name="overview_bolusprogress_stoppressed">STOP PRESSED</string>
<string name="overview_bolusprogress_stop">Stop</string>
<string name="carbs">Carbs</string>
<string name="invalidprofile">Invalid profile !!!</string>
<string name="noprofileset">NO PROFILE SET</string>
<string name="date">Date</string>
<string name="nsprofileview_units_label">Units</string>
<string name="nsprofileview_dia_label">DIA</string>
<string name="nsprofileview_ic_label">IC</string>
<string name="nsprofileview_isf_label">ISF</string>
<string name="nsprofileview_basal_label">Basal</string>
<string name="nsprofileview_target_label">Target</string>
<!-- Constraints-->
<string name="limitingbasalratio">Limiting max basal rate to %1$.2f U/h because of %2$s</string>

28
core/src/main/res/values/styles.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:ns2="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
@ -34,5 +34,31 @@
<item name="colorAccent">@color/errorAlertBackground</item>
</style>
<!-- Buttons from MaterialDateTimePicker -->
<dimen name="mdtp_material_button_height">48dp</dimen>
<dimen name="mdtp_material_button_textsize">14sp</dimen>
<dimen name="mdtp_material_button_minwidth">64dp</dimen>
<dimen name="mdtp_material_button_textpadding_horizontal">8dp</dimen>
<style name="mdtp_ActionButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">@dimen/mdtp_material_button_height</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:focusable">true</item>
</style>
<style name="mdtp_ActionButton.Text" ns2:ignore="NewApi">
<item name="android:textSize">@dimen/mdtp_material_button_textsize</item>
<item name="android:singleLine">true</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:gravity">center</item>
<item name="android:stateListAnimator">@null</item>
<item name="android:background">@drawable/mdtp_material_button_background</item>
<item name="android:minWidth">@dimen/mdtp_material_button_minwidth</item>
<item name="android:paddingLeft">@dimen/mdtp_material_button_textpadding_horizontal</item>
<item name="android:paddingRight">@dimen/mdtp_material_button_textpadding_horizontal</item>
<item name="android:textColor">@color/mdtp_button_color</item>
<item name="android:textAllCaps">true</item>
</style>
</resources>

2
dana/src/main/res/layout/danar_historyactivity.xml
View file

@ -88,6 +88,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:drawableStart="@drawable/icon_actions_refill"
android:text="@string/danar_historyreload" />
android:text="@string/reload" />
</RelativeLayout>