diff --git a/ShakeAndCraft/app/src/main/res/layout/activity_main.xml b/ShakeAndCraft/app/src/main/res/layout/activity_main.xml index 76dd3d8..86e0c84 100644 --- a/ShakeAndCraft/app/src/main/res/layout/activity_main.xml +++ b/ShakeAndCraft/app/src/main/res/layout/activity_main.xml @@ -27,7 +27,8 @@ android:id="@+id/fragment" android:name="androidx.navigation.fragment.NavHostFragment" android:layout_width="match_parent" - android:layout_height="725dp" + android:layout_height="match_parent" + android:layout_marginBottom="63dp" app:defaultNavHost="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/ShakeAndCraft/app/src/main/res/layout/fragment_forge.xml b/ShakeAndCraft/app/src/main/res/layout/fragment_forge.xml index 3185d63..3230d29 100644 --- a/ShakeAndCraft/app/src/main/res/layout/fragment_forge.xml +++ b/ShakeAndCraft/app/src/main/res/layout/fragment_forge.xml @@ -14,20 +14,20 @@ android:layout_height="wrap_content" android:gravity="center" android:paddingTop="50dp" - android:paddingBottom="20dp" + android:paddingBottom="30dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - android:layout_marginBottom="20dp"> + app:layout_constraintBottom_toTopOf="@id/RecipeScroll"> - + app:layout_constraintBottom_toBottomOf="parent" + > + + - + + - + android:textSize="17sp" + android:textStyle="bold" /> + + + + - + + android:textSize="17sp" + android:textStyle="bold" /> + + android:layout_marginHorizontal="20dp" + android:overScrollMode="never" + tools:itemCount="3" + tools:listitem="@layout/list_recipe" /> + + + android:textSize="17sp" + android:textStyle="bold" /> + + android:layout_marginHorizontal="20dp" + android:overScrollMode="never" + tools:itemCount="3" + tools:listitem="@layout/list_recipe"/> @@ -149,7 +161,6 @@ - - + \ No newline at end of file