From 6008ab841940300ef6c2282699944f889c61184c Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Mon, 24 Jul 2023 11:01:40 +0200
Subject: [PATCH] Rewrite layout,stillbuggy with head_icon

---
 .../custom_dialog_layout_two_button.xml       | 168 ++++++++----------
 1 file changed, 78 insertions(+), 90 deletions(-)

diff --git a/app/src/main/res/layout/custom_dialog_layout_two_button.xml b/app/src/main/res/layout/custom_dialog_layout_two_button.xml
index a9d4246..6a21cbc 100644
--- a/app/src/main/res/layout/custom_dialog_layout_two_button.xml
+++ b/app/src/main/res/layout/custom_dialog_layout_two_button.xml
@@ -1,117 +1,105 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/white">
+    tools:ignore="MissingDefaultResource">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cardView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="12dp"
+        android:layout_marginRight="12dp"
+        android:layout_marginBottom="120dp"
+        app:cardCornerRadius="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/background_dialog"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/head_icon"
+                android:layout_width="61dp"
+                android:layout_height="61dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="12dp"
+                android:src="@drawable/tickmark"
+                tools:ignore="ContentDescription,ImageContrastCheck" />
+
+            <TextView
+                android:id="@+id/msg"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="22dp"
+                android:layout_marginTop="18dp"
+                android:layout_marginRight="12dp"
+                android:fontFamily="@font/opensans_semibold"
+                android:text="@string/app_name"
+                android:textSize="16dp"
+                tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+
+            <TextView
+                android:id="@+id/cpl"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="22dp"
+                android:layout_marginTop="18dp"
+                android:layout_marginRight="12dp"
+                android:fontFamily="@font/opensans_regular"
+                android:text="@string/app_name"
+                android:textSize="16dp"
+                tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
+        </LinearLayout>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/Two_buttonDialog"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/background_dialog"
-        android:paddingLeft="@dimen/ten_dp"
-        android:paddingTop="@dimen/ten_dp"
-        android:paddingRight="@dimen/ten_dp"
-        android:paddingBottom="@dimen/thirty_dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/background_dialog"
-            android:orientation="vertical">
-        <ImageView
-            android:id="@+id/head_icon"
-            android:layout_width="61dp"
-            android:layout_height="61dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="12dp"
-            android:src="@drawable/tickmark"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription" />
-
-        <TextView
-            android:id="@+id/msg_two_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="22dp"
-            android:layout_marginTop="80dp"
-            android:layout_marginRight="12dp"
-            android:fontFamily="@font/opensans_semibold"
-            android:text="@string/app_name"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
-
-        <TextView
-            android:id="@+id/cpl_two_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="22dp"
-            android:layout_marginTop="115dp"
-            android:layout_marginRight="12dp"
-            android:fontFamily="@font/opensans_regular"
-            android:text="@string/app_name"
-            android:textSize="16sp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="HardcodedText,RtlHardcoded,SpUsage" />
-        </LinearLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="125dp"
-            android:gravity="center"
             android:orientation="horizontal">
+
             <Button
                 android:id="@+id/agreed"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="38dp"
+                android:layout_marginStart="30dp"
+                android:layout_marginTop="170dp"
                 android:layout_marginBottom="38dp"
-                android:autoSizeMaxTextSize="100sp"
-                android:autoSizeMinTextSize="12sp"
-                android:autoSizeStepGranularity="2sp"
-                android:autoSizeTextType="uniform"
                 android:background="@drawable/rounded_btn"
-                android:paddingLeft="25dp"
-                android:paddingRight="25dp"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="@string/button_cancel"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                tools:ignore="HardcodedText,RtlHardcoded,SpUsage"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:text="@string/button_ok"
+                android:textAlignment="center"
+                android:textColor="#212121"
+                android:textSize="16sp" />
 
             <Space
                 android:layout_width="155dp"
                 android:layout_height="wrap_content" />
+
             <Button
                 android:id="@+id/notagreed"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="38dp"
+                android:layout_marginTop="170dp"
+                android:layout_marginEnd="30dp"
                 android:layout_marginBottom="38dp"
-                android:autoSizeMaxTextSize="100sp"
-                android:autoSizeMinTextSize="12sp"
-                android:autoSizeStepGranularity="2sp"
-                android:autoSizeTextType="uniform"
                 android:background="@drawable/rounded_btn"
-                android:paddingLeft="25dp"
-                android:paddingRight="25dp"
-                android:gravity="center"
-                android:maxLines="1"
-                android:text="@string/button_ok"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                tools:ignore="HardcodedText,RtlHardcoded,SpUsage"
-                style="?android:attr/buttonBarButtonStyle" />
+                android:text="@string/button_cancel"
+                android:textAlignment="center"
+                android:textColor="#212121"
+                android:textSize="16sp" />
         </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            app:layout_constraintGuide_begin="20dp" />
+    </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file