Make profile app bar icons part of the scrollable content (#3138)

Author: MiSikora

CHANGELOG.md

@@ -16,6 +16,8 @@
 *   Bug Fixes
     *   Keep the playing service in the foreground when casting
         ([#3094](https://github.com/Automattic/pocket-casts-android/pull/3094))
+    *   Scroll profile tab app bar icons with the content in the landscape orientation
+        ([#3138](https://github.com/Automattic/pocket-casts-android/pull/3138))
 *   Updates
     *   Move Up Next clear queue button to app bar
         ([#3068](https://github.com/Automattic/pocket-casts-android/pull/3068))

modules/features/profile/src/main/res/layout-land/fragment_profile.xml

@@ -171,39 +171,32 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/btnRefresh"
                 app:layout_constraintBottom_toBottomOf="parent"/>
+
+            <androidx.compose.ui.platform.ComposeView
+                android:id="@+id/btnGift"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:layout_gravity="end"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                app:layout_constraintEnd_toStartOf="@id/btnSettings"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <ImageButton
+                android:id="@+id/btnSettings"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:background="?android:attr/actionBarItemBackground"
+                android:contentDescription="@string/settings"
+                android:src="@drawable/ic_profile_settings"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:tint="?attr/primary_icon_01" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end"
-        android:layout_marginTop="7dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginBottom="10dp">
-
-        <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/btnGift"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="8dp"
-            app:layout_constraintEnd_toStartOf="@id/btnSettings"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-        <ImageButton
-            android:id="@+id/btnSettings"
-            android:layout_width="44dp"
-            android:layout_height="44dp"
-            android:layout_marginBottom="10dp"
-            android:background="?android:attr/actionBarItemBackground"
-            android:contentDescription="@string/settings"
-            android:src="@drawable/ic_profile_settings"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="?attr/primary_icon_01" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
 </FrameLayout>

modules/features/profile/src/main/res/layout/fragment_profile.xml

@@ -172,19 +172,19 @@
 
             <androidx.compose.ui.platform.ComposeView
                 android:id="@+id/btnGift"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="7dp"
-                android:layout_marginStart="7dp"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"/>
+                app:layout_constraintTop_toTopOf="parent" />
 
             <ImageButton
                 android:id="@+id/btnSettings"
                 android:layout_width="44dp"
                 android:layout_height="44dp"
-                android:layout_marginTop="7dp"
-                android:layout_marginEnd="7dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
                 android:background="?android:attr/actionBarItemBackground"
                 android:contentDescription="@string/settings"
                 android:src="@drawable/ic_profile_settings"