caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1679 from osodebailar/feature/improve-dana-buttons-and-local-profile

Browse source 
Feature improve dana buttons and local profile
This commit is contained in:
Milos Kozak 2022-04-29 10:16:42 +02:00 committed by GitHub
commit c3b9325f2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/res/layout/localprofile_fragment.xml
View file

@ -302,6 +302,7 @@
android:paddingStart="10dp" android:paddingStart="10dp"
android:paddingEnd="10dp" android:paddingEnd="10dp"
android:text="@string/activate_profile" android:text="@string/activate_profile"
android:visibility="gone"
app:icon="@drawable/ic_local_activate" app:icon="@drawable/ic_local_activate"
app:iconTint="@color/ic_local_activate" /> app:iconTint="@color/ic_local_activate" />
@ -323,6 +324,7 @@
android:paddingStart="1dp" android:paddingStart="1dp"
android:paddingEnd="1dp" android:paddingEnd="1dp"
android:text="@string/reset" android:text="@string/reset"
android:visibility="gone"
app:icon="@drawable/ic_local_reset" app:icon="@drawable/ic_local_reset"
app:iconTint="@color/ic_local_reset" /> app:iconTint="@color/ic_local_reset" />
@ -338,6 +340,7 @@
android:paddingStart="1dp" android:paddingStart="1dp"
android:paddingEnd="1dp" android:paddingEnd="1dp"
android:text="@string/save" android:text="@string/save"
android:visibility="gone"
app:icon="@drawable/ic_local_save" app:icon="@drawable/ic_local_save"
app:iconTint="@color/ic_local_save" /> app:iconTint="@color/ic_local_save" />
</LinearLayout> </LinearLayout>

8
core/src/main/res/drawable/ic_danarstats.xml
View file

@ -7,24 +7,24 @@
android:pathData="M5.719,19.125L5.719,11.828" android:pathData="M5.719,19.125L5.719,11.828"
android:strokeWidth="2.2677" android:strokeWidth="2.2677"
android:fillColor="#00000000" android:fillColor="#00000000"
android:strokeColor="#FEAF05" android:strokeColor="?attr/statsColor"
android:strokeLineCap="round"/> android:strokeLineCap="round"/>
<path <path
android:pathData="M9.792,19.125L9.792,8.01" android:pathData="M9.792,19.125L9.792,8.01"
android:strokeWidth="2.2677" android:strokeWidth="2.2677"
android:fillColor="#00000000" android:fillColor="#00000000"
android:strokeColor="#FEAF05" android:strokeColor="?attr/statsColor"
android:strokeLineCap="round"/> android:strokeLineCap="round"/>
<path <path
android:pathData="M13.865,19.125L13.865,9.51" android:pathData="M13.865,19.125L13.865,9.51"
android:strokeWidth="2.2677" android:strokeWidth="2.2677"
android:fillColor="#00000000" android:fillColor="#00000000"
android:strokeColor="#FEAF05" android:strokeColor="?attr/statsColor"
android:strokeLineCap="round"/> android:strokeLineCap="round"/>
<path <path
android:pathData="M17.938,19.125L17.938,4.594" android:pathData="M17.938,19.125L17.938,4.594"
android:strokeWidth="2.2677" android:strokeWidth="2.2677"
android:fillColor="#00000000" android:fillColor="#00000000"
android:strokeColor="#FEAF05" android:strokeColor="?attr/statsColor"
android:strokeLineCap="round"/> android:strokeLineCap="round"/>
</vector> </vector>

39
dana/src/main/res/layout/danar_fragment.xml
View file

@ -2,6 +2,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="info.nightscout.androidaps.dana.DanaFragment" tools:context="info.nightscout.androidaps.dana.DanaFragment"
android:orientation="vertical"> android:orientation="vertical">
@ -658,50 +659,58 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<com.google.android.material.button.MaterialButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/view_profile" android:id="@+id/view_profile"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginEnd="-2dp"
android:drawableTop="@drawable/ic_danarprofile" android:drawableTop="@drawable/ic_danarprofile"
android:paddingStart="0dp" android:text="@string/viewprofile"
android:paddingEnd="0dp" android:maxLines="2"
android:text="@string/viewprofile" /> android:ellipsize="end"
app:iconPadding="-4dp"/>
<com.google.android.material.button.MaterialButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/history" android:id="@+id/history"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginEnd="-2dp"
android:drawableTop="@drawable/ic_pump_history" android:drawableTop="@drawable/ic_pump_history"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:text="@string/pumphistory" android:text="@string/pumphistory"
android:maxLines="2"
android:ellipsize="end"
app:iconPadding="-4dp"
tools:ignore="TooManyViews" /> tools:ignore="TooManyViews" />
<com.google.android.material.button.MaterialButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/stats" android:id="@+id/stats"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginEnd="-2dp"
android:drawableTop="@drawable/ic_danarstats" android:drawableTop="@drawable/ic_danarstats"
android:paddingStart="0dp" android:text="@string/stats"
android:paddingEnd="0dp" android:maxLines="2"
android:text="@string/stats" /> android:ellipsize="end"
app:iconPadding="-4dp"/>
<com.google.android.material.button.MaterialButton <info.nightscout.androidaps.utils.ui.SingleClickButton
android:id="@+id/user_options" android:id="@+id/user_options"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:layout_marginEnd="-2dp"
android:drawableTop="@drawable/ic_danar_useropt" android:drawableTop="@drawable/ic_danar_useropt"
android:paddingStart="0dp" android:text="@string/danar_useroptions"
android:paddingEnd="0dp" android:maxLines="2"
android:text="@string/danar_useroptions" /> android:ellipsize="end"
app:iconPadding="-4dp"/>
</LinearLayout> </LinearLayout>