caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2959 from nightscout/revert-2954-bugfix/ui/buttons

Browse source 
Revert "Bugfix #2948 Dynamic height for action buttons"
This commit is contained in:
Milos Kozak 2023-10-21 11:13:48 +02:00 committed by GitHub
commit a1b0bf5247
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/main/src/main/res/layout/overview_fragment.xml
View file

@ -34,23 +34,22 @@
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/active_profile" android:id="@+id/active_profile"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginEnd="4dp" android:layout_marginEnd="5dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
android:hint="active profile" android:hint="active profile"
android:text="Profile" android:text="Profile"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
app:icon="@drawable/ic_ribbon_profile" app:icon="@drawable/ic_ribbon_profile"
android:singleLine="false"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/temp_target" android:id="@+id/temp_target"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal"
@ -58,7 +57,6 @@
android:text="@string/value_unavailable_short" android:text="@string/value_unavailable_short"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
app:icon="@drawable/ic_crosstarget" app:icon="@drawable/ic_crosstarget"
android:singleLine="false"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
@ -70,7 +68,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginTop="0dp" android:layout_marginTop="1dp"
app:cardCornerRadius="4dp" app:cardCornerRadius="4dp"
app:contentPadding="2dp" app:contentPadding="2dp"
app:cardElevation="2dp" app:cardElevation="2dp"