Skip to content

Commit

Permalink
Merge pull request #3649 from TheNeskik/Fix_button_layout_all
Browse files Browse the repository at this point in the history 
Fix button layout
  • Loading branch information
@MilosKozak
MilosKozak authored Dec 24, 2024
2 parents a048e50 + ae32586 commit 3628e0d
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 34 deletions.
8 changes: 4 additions & 4 deletions pump/dana/src/main/res/layout/danar_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="1"
android:drawableTop="@drawable/ic_dana_profile"
android:ellipsize="end"
Expand All @@ -678,7 +678,7 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="1"
android:drawableTop="@drawable/ic_pump_history"
android:ellipsize="end"
Expand All @@ -692,7 +692,7 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="1"
android:drawableTop="@drawable/ic_stats"
android:ellipsize="end"
Expand All @@ -705,7 +705,7 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="1"
android:drawableTop="@drawable/ic_user_options"
android:ellipsize="end"
Expand Down
60 changes: 30 additions & 30 deletions ui/src/main/res/layout/dialog_loop.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_closed"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_closed"
android:text="@string/closedloop"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:visibility="gone" />
Expand All @@ -90,11 +90,11 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_lgs"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_lgs"
android:text="@string/lowglucosesuspend"
android:visibility="gone" />

Expand All @@ -104,11 +104,11 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_open"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_open"
android:text="@string/openloop"
android:visibility="gone" />

Expand All @@ -118,11 +118,11 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_resume"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_resume"
android:text="@string/enableloop"
android:textSize="11sp"
android:visibility="gone" />
Expand All @@ -133,11 +133,11 @@
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_disabled"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:drawableTop="@drawable/ic_loop_disabled"
android:text="@string/disableloop" />

</LinearLayout>
Expand Down Expand Up @@ -174,7 +174,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_resume"
android:paddingStart="10dp"
Expand All @@ -194,47 +194,47 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_paused"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration1h" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_suspend_2h"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_paused"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration2h" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_suspend_3h"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_paused"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration3h" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_suspend_10h"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_paused"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_paused"
android:text="@string/duration10h" />

</LinearLayout>
Expand Down Expand Up @@ -271,7 +271,7 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_reconnect"
android:paddingStart="10dp"
Expand All @@ -291,59 +291,59 @@
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_disconnected"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration15m" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_disconnect_30m"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_disconnected"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration30m" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_disconnect_1h"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_disconnected"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration1h" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_disconnect_2h"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_disconnected"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration2h" />

<app.aaps.core.ui.elements.SingleClickButton
android:id="@+id/overview_disconnect_3h"
style="@style/ButtonSmallFontStyle"
android:layout_width="0px"
android:layout_height="fill_parent"
android:layout_marginEnd="-2dp"
android:layout_marginEnd="@dimen/gray_material_button_margin_horizontal"
android:layout_weight="0.5"
android:drawableTop="@drawable/ic_loop_disconnected"
android:paddingStart="5dp"
android:paddingEnd="5dp"
android:drawableTop="@drawable/ic_loop_disconnected"
android:text="@string/duration3h" />

</LinearLayout>
Expand Down

0 comments on commit 3628e0d

Please sign in to comment.