From 331d995ed903f238ca9053f50d9bc5039da71aef Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Wed, 19 Feb 2025 10:33:09 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D0=B2=20=D0=B3=D0=BB=D0=B0=D0=BD=D0=B2=D0=BE=D0=BC=20=D1=8D?=
 =?UTF-8?q?=D0=BA=D1=80=D0=B0=D0=BD=D0=B5.=20=D0=A1=D1=82=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=84=D0=B0=D0=B1=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/fragment_profile.xml | 33 +++++++++++---------
 app/src/main/res/values/FAB_Style.xml        | 21 +++++++++++++
 app/src/main/res/values/TextStyle.xml        |  6 ++++
 3 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/values/FAB_Style.xml

diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 0abc630..a94de3a 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -35,10 +35,11 @@
 
     <ImageView
         android:id="@+id/photo"
-        android:layout_width="64dp"
-        android:layout_height="64dp"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:layout_marginBottom="16dp"
         android:contentDescription="@null"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/scan"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -46,12 +47,12 @@
 
     <TextView
         android:id="@+id/fullname"
+        style="@style/Theme.UiTemplate.TextH3"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
         android:layout_marginTop="16dp"
         android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/photo"
@@ -59,23 +60,25 @@
 
     <TextView
         android:id="@+id/position"
+        style="@style/Theme.UiTemplate.TextH4"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        app:layout_constraintEnd_toStartOf="@id/lastEntry"
-        app:layout_constraintStart_toEndOf="@id/photo"
-        app:layout_constraintTop_toBottomOf="@id/fullname"
+        android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toEndOf="@+id/fullname"
+        app:layout_constraintStart_toStartOf="@+id/fullname"
+        app:layout_constraintTop_toBottomOf="@+id/fullname"
         tools:text="@tools:sample/cities" />
 
     <TextView
         android:id="@+id/lastEntry"
+        style="@style/Theme.UiTemplate.TextH4_2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="16dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="16dp"
         app:layout_constraintEnd_toEndOf="@+id/fullname"
         app:layout_constraintStart_toStartOf="@+id/fullname"
-        app:layout_constraintTop_toBottomOf="@+id/fullname"
+        app:layout_constraintTop_toBottomOf="@+id/position"
         tools:text="@tools:sample/date/hhmm" />
 
     <TextView
@@ -100,12 +103,12 @@
         android:contentDescription="@string/profile_refresh_button"
         android:src="@drawable/ic_refresh"
         app:elevation="0dp"
-        tools:layout_editor_absoluteX="167dp"
-        tools:layout_editor_absoluteY="521dp" />
+        app:layout_constraintStart_toStartOf="@+id/position"
+        app:layout_constraintTop_toBottomOf="@+id/lastEntry" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/logout"
-        style="?attr/floatingActionButtonSmallStyle"
+        style="@style/Theme.UiTemplate.FAB.Gray"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/profile_refresh_button"
@@ -116,13 +119,13 @@
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/scan"
+        style="@style/Theme.UiTemplate.FAB.AccentColor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/profile_scan_button"
         android:src="@drawable/ic_qr_code"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:useCompatPadding="true" />
+        app:layout_constraintEnd_toEndOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/FAB_Style.xml b/app/src/main/res/values/FAB_Style.xml
new file mode 100644
index 0000000..ed21972
--- /dev/null
+++ b/app/src/main/res/values/FAB_Style.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.UiTemplate.FAB" parent="Theme.UiTemplate.Button">
+        <item name="tint">@color/TextBlack</item>
+        <item name="backgroundTint">@color/BackgroundGray</item>
+        <item name="elevation">0dp</item>
+        <item name="android:layout_width">52dp</item>
+        <item name="android:layout_height">52dp</item>
+        <item name="cornerRadius">50dp</item>
+
+    </style>
+
+    <style name="Theme.UiTemplate.FAB.AccentColor" parent="Theme.UiTemplate.FAB">
+        <item name="tint">@color/white</item>
+        <item name="backgroundTint">@color/AccentBlue</item>
+    </style>
+    <style name="Theme.UiTemplate.FAB.Gray" parent="Theme.UiTemplate.FAB">
+        <item name="tint">@color/Gray5</item>
+        <item name="backgroundTint">@color/BackgroundGray</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/TextStyle.xml b/app/src/main/res/values/TextStyle.xml
index 639155c..099f69a 100644
--- a/app/src/main/res/values/TextStyle.xml
+++ b/app/src/main/res/values/TextStyle.xml
@@ -2,32 +2,38 @@
 <resources>
         <style name="Theme.UiTemplate.TextH1">
             <item name="android:textSize">28sp</item>
+            <item name="android:textAlignment">center</item>
             <item name="android:fontFamily">@font/gilroyextrabold</item>
             <item name="android:textColor">@color/black</item>
         </style>
         <style name="Theme.UiTemplate.TextH2">
             <item name="android:textSize">28sp</item>
+            <item name="android:textAlignment">center</item>
             <item name="android:textColor">@color/TextBlack</item>
             <item name="android:fontFamily">@font/gilroybold</item>
         </style>
         <style name="Theme.UiTemplate.TextH3">
             <item name="android:textSize">20sp</item>
+            <item name="android:textAlignment">center</item>
             <item name="android:textColor">@color/TextBlack</item>
             <item name="android:fontFamily">@font/montbold</item>
         </style>
         <style name="Theme.UiTemplate.TextH4">
             <item name="android:textSize">16sp</item>
+            <item name="android:textAlignment">center</item>
             <item name="android:textColor">@color/Gray6</item>
             <item name="android:fontFamily">@font/gilroysemibold</item>
         </style>
         <style name="Theme.UiTemplate.TextH4_2">
             <item name="android:textSize">16sp</item>
             <item name="android:textColor">@color/Gray5</item>
+            <item name="android:textAlignment">center</item>
             <item name="android:fontFamily">@font/gilroysemibold</item>
         </style>
         <style name="Theme.UiTemplate.TextH5">
             <item name="android:textSize">14sp</item>
             <item name="android:textColor">@color/Gray5</item>
+            <item name="android:textAlignment">center</item>
             <item name="android:fontFamily">@font/montsemibold</item>
         </style>
 </resources>

From 5762c2e6110d4b4a198a2dd1ead474df97184f09 Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Wed, 19 Feb 2025 10:37:07 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=B4=D1=83?=
 =?UTF-8?q?=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D0=B2=20=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/text_style.xml | 35 --------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 app/src/main/res/values/text_style.xml

diff --git a/app/src/main/res/values/text_style.xml b/app/src/main/res/values/text_style.xml
deleted file mode 100644
index 8fd2640..0000000
--- a/app/src/main/res/values/text_style.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Theme.UiTemplate.TextH1">
-        <item name="android:textSize">28sp</item>
-        <item name="android:fontFamily">@font/gilroyextrabold</item>
-        <item name="android:textColor">@color/black</item>
-    </style>
-
-    <style name="Theme.UiTemplate.TextH2">
-        <item name="android:textSize">28sp</item>
-        <item name="android:textColor">@color/TextBlack</item>
-        <item name="android:fontFamily">@font/gilroybold</item>
-    </style>
-    <style name="Theme.UiTemplate.TextH3">
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">@color/TextBlack</item>
-        <item name="android:fontFamily">@font/montbold</item>
-    </style>
-    <style name="Theme.UiTemplate.TextH4">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/Gray6</item>
-        <item name="android:fontFamily">@font/gilroysemibold</item>
-    </style>
-    <style name="Theme.UiTemplate.TextH4_2">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/Gray5</item>
-        <item name="android:fontFamily">@font/gilroysemibold</item>
-    </style>
-    <style name="Theme.UiTemplate.TextH5">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/Gray5</item>
-        <item name="android:fontFamily">@font/montsemibold</item>
-
-    </style>
-</resources>
\ No newline at end of file

From 9cf6d4c4dc46f7acb56d2c7f47bc16fafe4f494b Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Wed, 19 Feb 2025 11:06:45 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=D0=B8?=
 =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=BE=D0=B1=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F.=20=D1=84=D0=B8?=
 =?UTF-8?q?=D0=BA=D1=81=20=D1=84=D0=B0=D0=B1=D0=B0=20=D0=B2=20=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ru/myitschool/work/ui/profile/ProfileFragment.kt  |  1 -
 .../ru/myitschool/work/ui/profile/ProfileViewModel.kt |  4 +---
 app/src/main/res/layout/fragment_profile.xml          | 11 -----------
 app/src/main/res/layout/fragment_qr_scan.xml          |  1 +
 4 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
index d1d6ba1..ea901a4 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
@@ -71,7 +71,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
     }
 
     private fun initCallback() {
-        binding.refresh.setOnClickListener { viewModel.clickRefresh() }
         binding.logout.setOnClickListener { viewModel.clickLogout() }
         binding.scan.setOnClickListener { viewModel.clickScan() }
     }
diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
index 2c51899..b4210fb 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
@@ -37,9 +37,7 @@ class ProfileViewModel @Inject constructor(
         updateUserInfo()
     }
 
-    fun clickRefresh() {
-        updateUserInfo()
-    }
+
 
     fun clickLogout() {
         viewModelScope.launch {
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index a94de3a..e92178b 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -95,17 +95,6 @@
         tools:text="Something wrong. Try later" />
 
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/refresh"
-        style="?attr/floatingActionButtonSmallStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/profile_refresh_button"
-        android:src="@drawable/ic_refresh"
-        app:elevation="0dp"
-        app:layout_constraintStart_toStartOf="@+id/position"
-        app:layout_constraintTop_toBottomOf="@+id/lastEntry" />
-
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/logout"
         style="@style/Theme.UiTemplate.FAB.Gray"
diff --git a/app/src/main/res/layout/fragment_qr_scan.xml b/app/src/main/res/layout/fragment_qr_scan.xml
index a52eb71..4690065 100644
--- a/app/src/main/res/layout/fragment_qr_scan.xml
+++ b/app/src/main/res/layout/fragment_qr_scan.xml
@@ -29,6 +29,7 @@
         android:layout_margin="16dp"
         android:contentDescription="@string/close_button"
         android:src="@drawable/ic_close"
+        style="@style/Theme.UiTemplate.FAB.AccentColor"
         app:elevation="0dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />