Merge branch 'dev' into 2.1.0

wjc

2026-03-26 d4a638c6d3ad6aacf3273c601ac9140d137ae54f

 app/src/main/res/layout/item_plant_details.xml

@@ -129,7 +129,7 @@

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="37.5dp"
                    android:layout_height="39dp"
                    android:orientation="horizontal">

                    <LinearLayout
@@ -254,7 +254,7 @@

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="37.5dp"
                    android:layout_height="39dp"
                    android:orientation="horizontal">

                    <LinearLayout