Commit 325fbf8f authored by Thomas's avatar Thomas
Browse files

Fix issue #1128 - Move QR code to header

parent 592be1f0

app/src/main/res/layouts/mastodon/layout/activity_profile.xml

+31 −24
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
                    android:layout_margin="6dp"

                    app:cardElevation="4dp"

                    app:layout_constraintTop_toTopOf="parent">

                    <RelativeLayout

                        android:layout_width="match_parent"

                        android:layout_height="match_parent">



                        <androidx.appcompat.widget.AppCompatImageView

                            android:id="@+id/banner_pp"
@@ -59,6 +62,25 @@ 
                            android:scaleType="centerCrop"

                            android:src="@drawable/default_banner"

                            tools:src="@tools:sample/backgrounds/scenic" />

                        <com.google.android.material.button.MaterialButton

                            android:id="@+id/qr_code_generator"

                            style="@style/Widget.Material3.Button.ElevatedButton"

                            android:layout_width="48dp"

                            android:layout_height="36dp"

                            app:iconGravity="textStart"

                            app:iconPadding="0dp"

                            android:contentDescription="@string/qr_code_generator"

                            android:scaleType="fitCenter"

                            android:visibility="gone"

                            android:layout_marginEnd="10dp"

                            android:layout_marginBottom="5dp"

                            app:icon="@drawable/baseline_qr_code_24"

                            android:layout_alignParentBottom="true"

                            android:layout_alignParentEnd="true"

                            tools:visibility="visible" />

                    </RelativeLayout>







                </com.google.android.material.card.MaterialCardView>
@@ -140,22 +162,7 @@ 
                    app:layout_constraintStart_toStartOf="@id/banner_container"

                    app:layout_constraintTop_toBottomOf="@id/avatar_container"

                    tools:text="@tools:sample/first_names" />

                <com.google.android.material.button.MaterialButton

                    android:id="@+id/qr_code_generator"

                    style="@style/Widget.Material3.Button.OutlinedButton"

                    android:layout_width="36dp"

                    android:layout_height="36dp"

                    android:layout_marginStart="10dp"

                    app:iconGravity="textStart"

                    app:iconPadding="0dp"

                    android:contentDescription="@string/qr_code_generator"

                    android:scaleType="fitCenter"

                    android:visibility="gone"

                    app:icon="@drawable/baseline_qr_code_24"

                    app:layout_constraintStart_toEndOf="@id/account_dn"

                    app:layout_constraintTop_toTopOf="@id/account_dn"

                    app:layout_constraintBottom_toBottomOf="@+id/account_dn"

                    tools:visibility="visible" />



                <androidx.appcompat.widget.LinearLayoutCompat

                    android:id="@+id/account_un_container"

                    android:layout_width="wrap_content"