Merge branch 'project_1' into project_2

18034727885

2026-06-18 10c9a6e8e76feca89a701e09016679be1e014efa

 app/src/main/res/layout/activity_cert_upload.xml

@@ -180,7 +180,7 @@
                android:gravity="center"
                android:orientation="vertical"
                android:visibility="gone"
                tools:visibility="visible">
                >

                <ImageView
                    android:layout_width="@dimen/dp_120"
@@ -204,13 +204,14 @@
                android:layout_height="0dp"
                android:layout_weight="1"
                android:visibility="gone"
                tools:visibility="gone">
                tools:visibility="visible">

                <androidx.constraintlayout.widget.ConstraintLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content">

                    <androidx.appcompat.widget.AppCompatTextView
                        android:id="@+id/tv_label"
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginStart="@dimen/dp_20"
@@ -228,9 +229,11 @@
                        android:layout_width="@dimen/dp_160"
                        android:layout_height="@dimen/dp_100"
                        android:layout_marginTop="@dimen/dp_52"
                        android:layout_marginStart="@dimen/dp_8"
                        android:src="@mipmap/img_card_front"
                        app:layout_constraintEnd_toStartOf="@+id/idBack"
                        app:layout_constraintStart_toStartOf="parent"
                        app:layout_constraintHorizontal_chainStyle="spread_inside"
                        app:layout_constraintStart_toStartOf="@id/tv_label"
                        app:layout_constraintTop_toTopOf="parent" />

                    <com.makeramen.roundedimageview.RoundedImageView
@@ -253,8 +256,8 @@
                        android:layout_width="@dimen/dp_160"
                        android:layout_height="@dimen/dp_100"
                        android:layout_marginTop="@dimen/dp_52"
                        android:layout_marginStart="@dimen/dp_15"
                        android:src="@mipmap/img_card_back"
                        app:layout_constraintEnd_toEndOf="parent"
                        app:layout_constraintStart_toEndOf="@+id/idFront"
                        app:layout_constraintTop_toTopOf="parent" />