From ae325866061524a4b5f349a660caac8fc0a27fd9 Mon Sep 17 00:00:00 2001 From: Neskik Date: Sun, 22 Dec 2024 21:22:13 +0100 Subject: [PATCH] Fix button layout --- .../src/main/res/layout/danar_fragment.xml | 8 +-- ui/src/main/res/layout/dialog_loop.xml | 60 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/pump/dana/src/main/res/layout/danar_fragment.xml b/pump/dana/src/main/res/layout/danar_fragment.xml index 81c2ef84f7e..8216ecd6ed4 100644 --- a/pump/dana/src/main/res/layout/danar_fragment.xml +++ b/pump/dana/src/main/res/layout/danar_fragment.xml @@ -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" @@ -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" @@ -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" @@ -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" diff --git a/ui/src/main/res/layout/dialog_loop.xml b/ui/src/main/res/layout/dialog_loop.xml index 8c7083d5821..d286d6a8782 100644 --- a/ui/src/main/res/layout/dialog_loop.xml +++ b/ui/src/main/res/layout/dialog_loop.xml @@ -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" /> @@ -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" /> @@ -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" /> @@ -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" /> @@ -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" /> @@ -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" @@ -194,11 +194,11 @@ 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" /> @@ -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" @@ -291,11 +291,11 @@ 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" />