From cb5b20182cb4d38d8cfe8c85c2ad29fab34a5e8f Mon Sep 17 00:00:00 2001
From: Serafim_Pankin <serafimpankin@yandex.ru>
Date: Wed, 19 Feb 2025 14:49:06 +0300
Subject: [PATCH] Implementation of the design and the new button

---
 app/src/main/res/drawable/button_bg.xml      | 12 +++++
 app/src/main/res/layout/fragment_auth.xml    |  5 +++
 app/src/main/res/layout/fragment_profile.xml | 46 +++++++++++++++++++-
 app/src/main/res/values-en/strings-en.xml    |  4 +-
 app/src/main/res/values-night/themes.xml     |  1 +
 app/src/main/res/values-ru/strings-ru.xml    |  1 +
 app/src/main/res/values/strings.xml          |  5 ++-
 app/src/main/res/values/themes.xml           |  1 +
 8 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/button_bg.xml

diff --git a/app/src/main/res/drawable/button_bg.xml b/app/src/main/res/drawable/button_bg.xml
new file mode 100644
index 0000000..e2eb59e
--- /dev/null
+++ b/app/src/main/res/drawable/button_bg.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+
+    <gradient android:startColor="@color/startColor"
+
+        android:endColor="#03A9F4"
+        android:angle="270"
+        />
+<!--    <corners android:radius="8dp" />-->
+<!--    <stroke android:width="10dp"  android:color="#000000" />-->
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml
index e6c4e6b..b7e1c9a 100644
--- a/app/src/main/res/layout/fragment_auth.xml
+++ b/app/src/main/res/layout/fragment_auth.xml
@@ -40,6 +40,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
+            android:layout_marginTop="10dp"
             android:layout_width="280dp"
             android:layout_height="match_parent"
             android:orientation="vertical"
@@ -105,10 +106,14 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/next"
+                app:cardElevation="8dp"
+
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/continue_"
                 android:padding="12dp"
+                app:strokeColor="@color/black"
+                app:strokeWidth="1dp"
                 android:textSize="16sp"
                 android:textColor="@color/white"
                 app:backgroundTint="@color/primary"
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index bc942e2..aaeb3ac 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -96,6 +96,20 @@
                         android:background="?android:attr/colorBackground"
                         android:textColor="?attr/colorOnBackground"
                         android:text="Должность пользователя" />
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/rights_using_smartphone"
+                        android:padding="15dp"
+                        android:layout_margin="16dp"
+                        android:layout_marginTop="10dp"
+
+                        android:textAlignment="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:textSize="18sp"
+                        android:letterSpacing="0.05"
+                        android:background="?android:attr/colorBackground"
+                        android:textColor="?attr/colorOnBackground"
+                        android:text="Права  с помощью смартфона" />
 
 
 
@@ -103,7 +117,8 @@
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/scan"
                         android:layout_margin="16dp"
-
+                        app:strokeColor="@color/black"
+                        app:strokeWidth="1dp"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/scan"
@@ -111,7 +126,9 @@
                         app:iconGravity="textStart"
                         android:padding="12dp"
                         android:textSize="16sp"
+                        app:cardElevation="8dp"
                         android:layout_marginTop="10dp"
+                        android:maxHeight="200dp"
 
                         android:textColor="@color/white"
                         app:cornerRadius="8dp"
@@ -119,15 +136,20 @@
                         app:rippleColor="@color/white"/>
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/button_search"
+                        app:cardElevation="8dp"
+                        android:maxHeight="200dp"
 
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/administrator_searc_button_search"
+                        app:strokeColor="@color/black"
+                        app:strokeWidth="1dp"
                         android:padding="12dp"
                         android:textSize="16sp"
                         android:layout_marginTop="10dp"
                         android:layout_margin="16dp"
 
+
                         android:textColor="@color/white"
                         app:cornerRadius="8dp"
                         app:backgroundTint="@color/primary"
@@ -141,8 +163,30 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/logout"
+                        android:maxHeight="200dp"
+
+                        app:strokeColor="@color/black"
+                        app:strokeWidth="1dp"
+                        android:padding="12dp"
+
+                        android:textSize="16sp"
+                        android:textColor="@color/white"
+                        app:cornerRadius="8dp"
+                        app:backgroundTint="@color/primary"
+                        app:rippleColor="@color/white"/>
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/сhange_rights"
+                        android:layout_margin="16dp"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/сhange_rights"
+                        android:maxHeight="200dp"
 
                         android:padding="12dp"
+                        app:strokeColor="@color/black"
+                        app:strokeWidth="1dp"
+                        app:cardElevation="8dp"
+
 
                         android:textSize="16sp"
                         android:textColor="@color/white"
diff --git a/app/src/main/res/values-en/strings-en.xml b/app/src/main/res/values-en/strings-en.xml
index c581fa6..3632634 100644
--- a/app/src/main/res/values-en/strings-en.xml
+++ b/app/src/main/res/values-en/strings-en.xml
@@ -15,6 +15,8 @@
     <string name="ok">ОК</string>
     <string name="error">Error</string>
     <string name="administrator_search">Enter the username</string>
-    <string name="administrator_searc_button_search">🔍 Search 🔍</string>
+    <string name="administrator_searc_button_search"> Search </string>
     <string name="title_profile">Your profile</string>
+    <string name="сhange_rights">Change rights using smartphone</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 8466999..daa82a0 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -5,4 +5,5 @@
         <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
     </style>
     <color name="icon_color_pro">#FFFFFF</color>
+    <color name="startColor">#FFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings-ru.xml b/app/src/main/res/values-ru/strings-ru.xml
index 4d32e40..098400f 100644
--- a/app/src/main/res/values-ru/strings-ru.xml
+++ b/app/src/main/res/values-ru/strings-ru.xml
@@ -18,4 +18,5 @@
  <string name="administrator_search">Введите логин пользователя</string>
  <string name="administrator_searc_button_search">🔍 Поиск  🔍</string>
  <string name="title_profile">Профиль</string>
+ <string name="сhange_rights">Изменить права входа с помощью смартфона</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b84f4fc..f0c6f45 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,9 @@
     <string name="ok">ОК</string>
     <string name="error">Error</string>
     <string name="administrator_search">Enter the username</string>
-    <string name="administrator_searc_button_search">🔍 Search 🔍</string>
+    <string name="administrator_searc_button_search"> Search </string>
     <string name="title_profile">Your profile</string>
+    <string name="сhange_rights">Change rights using smartphone</string>
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 17639a5..9d76676 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,5 +5,6 @@
         <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
     </style>
     <color name="icon_color_pro">#000000</color>
+    <color name="startColor">#FFFFFF</color>
     <style name="Theme.ACSS" parent="Base.Theme.ACSS" />
 </resources>
\ No newline at end of file