From 377b0e4c3376ed150a381838ccb27fe6c4877b22 Mon Sep 17 00:00:00 2001
From: Ivan Baheux <ivan.baheux@murena.io>
Date: Mon, 16 Jun 2025 11:49:00 +0200
Subject: [PATCH 1/3] fix: let horizontal calculator overlap toolbar

---
 res/layout/display_one_line.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/res/layout/display_one_line.xml b/res/layout/display_one_line.xml
index aa0a2343..9f489beb 100644
--- a/res/layout/display_one_line.xml
+++ b/res/layout/display_one_line.xml
@@ -9,20 +9,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/rounded_bottom"
-    android:clipChildren="false"
     android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
-
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent">
+
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
         <com.android.calculator2.CalculatorScrollView
             android:id="@+id/formula_scroll_view"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:overScrollMode="never"
             android:scrollbars="none">
 
@@ -30,7 +33,8 @@
                 android:id="@+id/formula"
                 style="@style/DisplayTextStyle.Formula"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
                 android:ellipsize="none"
                 android:longClickable="true"
                 android:singleLine="true"
@@ -43,7 +47,8 @@
             android:id="@+id/result"
             style="@style/DisplayTextStyle.Result"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
             android:bufferType="spannable"
             android:singleLine="true"
             android:textColor="@color/display_result_text_color"
-- 
GitLab


From 187ae8e2dfb176a6e7c9fed0f869f6bf2007aabe Mon Sep 17 00:00:00 2001
From: Ivan Baheux <ivan.baheux@murena.io>
Date: Mon, 16 Jun 2025 12:07:39 +0200
Subject: [PATCH 2/3] fix: re-added drag handle

---
 res/layout/display_one_line.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/res/layout/display_one_line.xml b/res/layout/display_one_line.xml
index 9f489beb..fcaa0091 100644
--- a/res/layout/display_one_line.xml
+++ b/res/layout/display_one_line.xml
@@ -13,7 +13,8 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp"
+        android:layout_weight="1">
 
         <include
             android:id="@+id/toolbar"
-- 
GitLab


From ea07bc547c0911f4985d5fcb9d76df052e51d598 Mon Sep 17 00:00:00 2001
From: Ivan Baheux <ivan.baheux@murena.io>
Date: Mon, 16 Jun 2025 12:27:46 +0200
Subject: [PATCH 3/3] fix: toolbar menu on top of text

---
 res/layout/display_one_line.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/layout/display_one_line.xml b/res/layout/display_one_line.xml
index fcaa0091..9e2a61df 100644
--- a/res/layout/display_one_line.xml
+++ b/res/layout/display_one_line.xml
@@ -16,12 +16,6 @@
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
         <com.android.calculator2.CalculatorScrollView
             android:id="@+id/formula_scroll_view"
             android:layout_width="match_parent"
@@ -54,6 +48,13 @@
             android:singleLine="true"
             android:textColor="@color/display_result_text_color"
             android:visibility="invisible" />
+        
+        <include
+            android:id="@+id/toolbar"
+            layout="@layout/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
     </FrameLayout>
 
     <include layout="@layout/drag_handle" />
-- 
GitLab