From 76ccb864097d5e3831ba8101ffe2f796f3b68376 Mon Sep 17 00:00:00 2001
From: flauschtrud <jana@flauschcode.com>
Date: Thu, 12 Dec 2024 16:01:06 +0100
Subject: [PATCH 1/3] Use left-aligned text instead of centered text in cooking
 mode for accessability reasons #257

---
 .../fragment_cooking_assistant_page.xml       | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/layout/fragment_cooking_assistant_page.xml b/app/src/main/res/layout/fragment_cooking_assistant_page.xml
index a8b65b4e..5322a394 100644
--- a/app/src/main/res/layout/fragment_cooking_assistant_page.xml
+++ b/app/src/main/res/layout/fragment_cooking_assistant_page.xml
@@ -11,25 +11,16 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/text_margin">
-
-        <LinearLayout
-            android:id="@+id/cooking_assistant_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="0dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toTopOf="@id/cooking_assistant_controls"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+        android:padding="32dp">
 
             <TextView
                 android:id="@+id/cooking_assistant_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
                 android:gravity="center"
-                android:padding="32dp"
+                android:paddingTop="64dp"
+                android:paddingBottom="32dp"
                 android:text="@{viewModel.title}"
                 android:textAppearance="@style/TextAppearance.AppCompat.Headline"
                 android:textColor="?attr/colorPrimary" />
@@ -38,14 +29,13 @@
                 android:id="@+id/cooking_assistant_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:layout_constraintTop_toBottomOf="@id/cooking_assistant_title"
+                app:layout_constraintStart_toStartOf="parent"
                 android:minHeight="@dimen/min_height_for_accessibility"
-                android:gravity="center"
                 android:scrollbars="vertical"
                 android:text="@{viewModel.text}"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
-        </LinearLayout>
-
         <com.flauschcode.broccoli.recipe.cooking.CookingAssistantControls
             android:id="@+id/cooking_assistant_controls"
             android:layout_width="wrap_content"
@@ -56,7 +46,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cooking_assistant_layout"
             controls:maxSteps="@{viewModel.maxSteps}"
             controls:position="@{viewModel.position}" />
 

From 50e19a2281ed50ea4ef6f34092f43b819ba7a41c Mon Sep 17 00:00:00 2001
From: flauschtrud <jana@flauschcode.com>
Date: Fri, 13 Dec 2024 16:20:32 +0100
Subject: [PATCH 2/3] Only show the "not adjusted" message if the ingredient
 line contains any numbers at all #255

---
 .../broccoli/recipe/RecipeModule.java         |  8 ++++++
 .../ingredients/ScaledQuantityBuilder.java    | 21 +-------------
 app/src/main/res/values-b+sr+Latn/strings.xml |  1 -
 app/src/main/res/values-de/strings.xml        |  1 -
 app/src/main/res/values-el/strings.xml        |  1 -
 app/src/main/res/values-es/strings.xml        |  1 -
 app/src/main/res/values-fr/strings.xml        |  1 -
 app/src/main/res/values-hi/strings.xml        |  1 -
 app/src/main/res/values-it/strings.xml        |  1 -
 app/src/main/res/values-iw/strings.xml        |  1 -
 app/src/main/res/values-ja/strings.xml        |  1 -
 app/src/main/res/values-nb/strings.xml        |  1 -
 app/src/main/res/values-nl/strings.xml        |  1 -
 app/src/main/res/values-pl/strings.xml        |  1 -
 app/src/main/res/values-pt-rBR/strings.xml    |  1 -
 app/src/main/res/values-ru/strings.xml        |  1 -
 app/src/main/res/values-sv/strings.xml        |  1 -
 app/src/main/res/values-tr/strings.xml        |  1 -
 app/src/main/res/values-zh/strings.xml        |  1 -
 app/src/main/res/values/strings.xml           |  1 -
 .../ScaledQuantityBuilderTest.java            | 28 +++++--------------
 21 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/app/src/main/java/com/flauschcode/broccoli/recipe/RecipeModule.java b/app/src/main/java/com/flauschcode/broccoli/recipe/RecipeModule.java
index 47adea7a..70b3196a 100644
--- a/app/src/main/java/com/flauschcode/broccoli/recipe/RecipeModule.java
+++ b/app/src/main/java/com/flauschcode/broccoli/recipe/RecipeModule.java
@@ -2,6 +2,8 @@
 
 import android.app.Application;
 
+import com.flauschcode.broccoli.recipe.ingredients.ScaledQuantityBuilder;
+
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -17,4 +19,10 @@ Compressor compressor(Application application) {
         return new Compressor(application);
     }
 
+    @Provides
+    @Singleton
+    ScaledQuantityBuilder scaledQuantityBuilder() {
+        return new ScaledQuantityBuilder();
+    }
+
 }
diff --git a/app/src/main/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilder.java b/app/src/main/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilder.java
index 77264e7d..b5962b38 100644
--- a/app/src/main/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilder.java
+++ b/app/src/main/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilder.java
@@ -1,25 +1,10 @@
 package com.flauschcode.broccoli.recipe.ingredients;
 
-import android.app.Application;
-
-import com.flauschcode.broccoli.R;
-
 import java.text.DecimalFormat;
 import java.text.Normalizer;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-@Singleton
 public class ScaledQuantityBuilder {
 
-    private final Application application;
-
-    @Inject
-    public ScaledQuantityBuilder(Application application) {
-        this.application = application;
-    }
-
     private static final DecimalFormat decimalFormat = new DecimalFormat("0.##");
 
     public String from(String quantity, float scaleFactor) {
@@ -40,7 +25,7 @@ public String from(String quantity, float scaleFactor) {
 
             return scale(quantity, scaleFactor);
         } catch (NumberFormatException e) {
-            return "(" + getNotScaledString() + ") " + quantity;
+            return quantity;
         }
     }
 
@@ -108,8 +93,4 @@ private String prettyPrint(float f) {
         return f == i ? String.valueOf(i) : decimalFormat.format(f);
     }
 
-    private String getNotScaledString() {
-        return application.getString(R.string.unscaled);
-    }
-
 }
diff --git a/app/src/main/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
index a16340bf..ed2015c6 100644
--- a/app/src/main/res/values-b+sr+Latn/strings.xml
+++ b/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Za</string>
     <string name="recipe_amount">Količina u receptu</string>
     <string name="scaling_factor">Koeficijent skaliranja</string>
-    <string name="unscaled">nije prilagođeno</string>
     <string name="share_action">Podeli</string>
     <string name="shared_with">Podeli sa %1$s</string>
     <string name="recipe_could_not_be_imported_message">Žao nam je, ovo nije uspelo.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cbb8941d..1163d5cb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -46,7 +46,6 @@
     <string name="no_ingredients_and_directions_message">Dieses Rezept hat noch keine Zutaten oder Anleitung.</string>
     <string name="cook_action">Kochen</string>
     <string name="adjust_ingredients">Zutaten anpassen</string>
-    <string name="unscaled">nicht angepasst</string>
     <string name="share_action">Teilen</string>
     <string name="shared_with">Geteilt mit %1$s</string>
     <string name="recipe_could_not_be_imported_message">Das hat leider nicht funktioniert.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 149d98d0..6660daa0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Recipe amount</string>
     <string name="scaling_factor">Scaling factor</string>
-    <string name="unscaled">not adjusted</string>
     <string name="share_action">Share</string>
     <string name="shared_with">Shared with %1$s</string>
     <string name="recipe_could_not_be_imported_message">Sorry, this did not work.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bb9f01a0..ea5f8f6c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -56,7 +56,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Cantidad de la receta</string>
     <string name="scaling_factor">Factor de escala</string>
-    <string name="unscaled">no ajustado</string>
     <string name="share_action">Compartir</string>
     <string name="shared_with">Compartido con %1$s</string>
     <string name="recipe_could_not_be_imported_message">Lo sentimos, esto no ha funcionado.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 166dccaf..3b96c63c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Quantité de la recette</string>
     <string name="scaling_factor">Facteur d\'échelle</string>
-    <string name="unscaled">non ajusté</string>
     <string name="share_action">Partager</string>
     <string name="shared_with">Partagé avec %1$s</string>
     <string name="recipe_could_not_be_imported_message">Désolé, cela n\'a pas fonctionné.</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ae11d821..162b4d85 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Recipe amount</string>
     <string name="scaling_factor">Scaling factor</string>
-    <string name="unscaled">not adjusted</string>
     <string name="share_action">Share</string>
     <string name="shared_with">Shared with %1$s</string>
     <string name="recipe_could_not_be_imported_message">Sorry, this did not work.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bf85f10c..b3a7fa19 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Avanzato</string>
     <string name="recipe_amount">Quantità ricetta</string>
     <string name="scaling_factor">Fattore di scala</string>
-    <string name="unscaled">non personalizzato</string>
     <string name="share_action">Condividi</string>
     <string name="shared_with">Condividi con %1$s</string>
     <string name="recipe_could_not_be_imported_message">Siamo spiacenti, si è verificato un errore.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 2bf6b335..40b3cadf 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">פרו</string>
     <string name="recipe_amount">כמות במתכון</string>
     <string name="scaling_factor">מכפיל מידות</string>
-    <string name="unscaled">לא מותאם</string>
     <string name="share_action">שתף</string>
     <string name="shared_with">‏שתף באמצעות %1$s</string>
     <string name="recipe_could_not_be_imported_message">מצטער, הפעולה לא הצליחה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7a88f4fe..c7091209 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">プロ</string>
     <string name="recipe_amount">レシピの量</string>
     <string name="scaling_factor">倍率</string>
-    <string name="unscaled">調整していない</string>
     <string name="share_action">共有</string>
     <string name="shared_with">%1$sと共有</string>
     <string name="recipe_could_not_be_imported_message">もし訳ありませんが、動作はが失敗しました。</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 0dfccd77..b96f8408 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Oppskriftens mengde</string>
     <string name="scaling_factor">Skaleringsfaktor</string>
-    <string name="unscaled">ikke justert</string>
     <string name="share_action">Del</string>
     <string name="shared_with">Delt med %1$s</string>
     <string name="recipe_could_not_be_imported_message">Beklager, dette fungerte ikke.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bf224b73..b7121fe1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Geavanceerd</string>
     <string name="recipe_amount">Recipe amount</string>
     <string name="scaling_factor">Schalingsfactor</string>
-    <string name="unscaled">ongewijzigd</string>
     <string name="share_action">Delen</string>
     <string name="shared_with">Gedeeld met %1$s</string>
     <string name="recipe_could_not_be_imported_message">Sorry, dit is niet gelukt.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5c0e7cd3..59da9b24 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Recipe amount</string>
     <string name="scaling_factor">Współczynnik skalowania</string>
-    <string name="unscaled">niedostosowane</string>
     <string name="share_action">Udostępnij</string>
     <string name="shared_with">Udostępniono przez %1$s</string>
     <string name="recipe_could_not_be_imported_message">Przepraszamy, ale to nie zadziałało.</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4652d810..abd4c6d5 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Profissional</string>
     <string name="recipe_amount">Quantidade da receita</string>
     <string name="scaling_factor">Proporção</string>
-    <string name="unscaled">não ajustado</string>
     <string name="share_action">Compartilhar</string>
     <string name="shared_with">Compartilhado com %1$s</string>
     <string name="recipe_could_not_be_imported_message">Desculpe, isso não funcionou.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f57bc120..96497649 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Сложный</string>
     <string name="recipe_amount">Количество рецептов</string>
     <string name="scaling_factor">Коэффициент масштабирования</string>
-    <string name="unscaled">не отрегулировано</string>
     <string name="share_action">Поделиться</string>
     <string name="shared_with">Поделились с помощью %1$s</string>
     <string name="recipe_could_not_be_imported_message">К сожалению, это не работает.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 8cfc848d..e903e47e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Receptmängd</string>
     <string name="scaling_factor">Skalningsfaktor</string>
-    <string name="unscaled">ej justerad</string>
     <string name="share_action">Share</string>
     <string name="shared_with">Shared with %1$s</string>
     <string name="recipe_could_not_be_imported_message">Tyvärr fungerade inte detta.</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7ae8ba34..c5f29c3f 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">Profesyonel</string>
     <string name="recipe_amount">Tarif miktarı</string>
     <string name="scaling_factor">Ölçekleme faktörü</string>
-    <string name="unscaled">ölçeklenmemiş</string>
     <string name="share_action">Paylaş</string>
     <string name="shared_with">%1$s ile paylaşıldı</string>
     <string name="recipe_could_not_be_imported_message">Üzgünüz, bu işlem başarısız oldu.</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 01f8fe4a..36402c59 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -55,7 +55,6 @@
     <string name="scaling_pro">高级</string>
     <string name="recipe_amount">食谱分量</string>
     <string name="scaling_factor">比例倍数</string>
-    <string name="unscaled">未调整</string>
     <string name="share_action">分享</string>
     <string name="shared_with">已与 %1$s 分享</string>
     <string name="recipe_could_not_be_imported_message">抱歉，此操作不可用。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 460cbf34..2fcaf7ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,7 +64,6 @@
     <string name="scaling_pro">Pro</string>
     <string name="recipe_amount">Recipe amount</string>
     <string name="scaling_factor">Scaling factor</string>
-    <string name="unscaled">not adjusted</string>
 
     <string name="share_action">Share</string>
     <string name="shared_with">Shared with %1$s</string>
diff --git a/app/src/test/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilderTest.java b/app/src/test/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilderTest.java
index e9dbe7dc..0245ec9b 100644
--- a/app/src/test/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilderTest.java
+++ b/app/src/test/java/com/flauschcode/broccoli/recipe/ingredients/ScaledQuantityBuilderTest.java
@@ -1,27 +1,16 @@
 package com.flauschcode.broccoli.recipe.ingredients;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.when;
-
-import android.app.Application;
 
-import com.flauschcode.broccoli.R;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ScaledQuantityBuilderTest {
 
-    @Mock
-    private Application application;
-
-    @InjectMocks
-    private ScaledQuantityBuilder scaledQuantityBuilder;
+    private final ScaledQuantityBuilder scaledQuantityBuilder = new ScaledQuantityBuilder();
 
     @Test
     public void scale_integer_quantity() {
@@ -61,23 +50,20 @@ public void scale_fraction_range_quantity() {
 
     @Test
     public void scale_non_scalable_quantity() {
-        when(application.getString(R.string.unscaled)).thenReturn("not scaled");
         String scaled = scaledQuantityBuilder.from("je 1", 2f);
-        assertThat(scaled,  is("(not scaled) je 1"));
+        assertThat(scaled,  is("je 1"));
     }
 
     @Test
     public void scale_missing_quantity() {
-        when(application.getString(R.string.unscaled)).thenReturn("not scaled");
         String scaled = scaledQuantityBuilder.from("", 2f);
-        assertThat(scaled,  is("(not scaled) "));
+        assertThat(scaled,  is(""));
     }
 
     @Test
     public void scale_incomplete_range() {
-        when(application.getString(R.string.unscaled)).thenReturn("not scaled");
         String scaled = scaledQuantityBuilder.from("1-", 2f);
-        assertThat(scaled,  is("(not scaled) 1-"));
+        assertThat(scaled,  is("1-"));
     }
 
 }
\ No newline at end of file

From 648d9a56f96ce5f3dd76cd9f6e6f9c752314e596 Mon Sep 17 00:00:00 2001
From: flauschtrud <jana@flauschcode.com>
Date: Fri, 13 Dec 2024 16:38:25 +0100
Subject: [PATCH 3/3] Use left-aligned text instead of centered text in cooking
 mode for accessability reasons #257 Reverted some changes that broke the
 ability to scroll the page's text.

---
 .../fragment_cooking_assistant_page.xml       | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_cooking_assistant_page.xml b/app/src/main/res/layout/fragment_cooking_assistant_page.xml
index 5322a394..f607f652 100644
--- a/app/src/main/res/layout/fragment_cooking_assistant_page.xml
+++ b/app/src/main/res/layout/fragment_cooking_assistant_page.xml
@@ -13,14 +13,23 @@
         android:layout_height="match_parent"
         android:padding="32dp">
 
+        <LinearLayout
+            android:id="@+id/cooking_assistant_layout"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toTopOf="@id/cooking_assistant_controls"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
             <TextView
                 android:id="@+id/cooking_assistant_title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toTopOf="parent"
                 android:gravity="center"
-                android:paddingTop="64dp"
-                android:paddingBottom="32dp"
+                android:padding="32dp"
                 android:text="@{viewModel.title}"
                 android:textAppearance="@style/TextAppearance.AppCompat.Headline"
                 android:textColor="?attr/colorPrimary" />
@@ -29,13 +38,13 @@
                 android:id="@+id/cooking_assistant_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:layout_constraintTop_toBottomOf="@id/cooking_assistant_title"
-                app:layout_constraintStart_toStartOf="parent"
                 android:minHeight="@dimen/min_height_for_accessibility"
                 android:scrollbars="vertical"
                 android:text="@{viewModel.text}"
                 android:textAppearance="@style/TextAppearance.AppCompat.Large" />
 
+        </LinearLayout>
+
         <com.flauschcode.broccoli.recipe.cooking.CookingAssistantControls
             android:id="@+id/cooking_assistant_controls"
             android:layout_width="wrap_content"
@@ -46,6 +55,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cooking_assistant_layout"
             controls:maxSteps="@{viewModel.maxSteps}"
             controls:position="@{viewModel.position}" />