From 89c57fd34d383e26e3b72fed850d9e9f0a7a8751 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 4 Dec 2019 11:29:09 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/ui/fragment/MainFragment.kt    |  7 ++-
 app/src/main/res/layout/fragment_main.xml     | 44 ++++++++++---------
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
index 1aae515b7c..a8b9b4ac02 100644
--- a/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
+++ b/app/src/main/java/com/tangem/ui/fragment/MainFragment.kt
@@ -88,7 +88,12 @@ class MainFragment : BaseFragment(), NavigationResultListener, NfcAdapter.Reader
             tvNFCHint.text = String.format(getString(R.string.main_screen_scan_card), getString(R.string.main_screen_phone))
 
         // set listeners
-        fab.setOnClickListener { showMenu(it) }
+//        ivMenu.setOnClickListener { showMenu(it) }
+
+        val toolbar = tb_main
+        (activity as? AppCompatActivity)?.setSupportActionBar(toolbar)
+        (activity as? AppCompatActivity)?.supportActionBar?.setDisplayShowTitleEnabled(false)
+
 
         setCardStoreLink()
     }
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index b048c74c40..b38da8388a 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -1,24 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/cl"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     tools:context="com.tangem.ui.activity.MainActivity"
     tools:ignore="contentDescription">
 
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/tb_main"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/white"
+        android:minHeight="?attr/actionBarSize"
+        app:layout_constraintTop_toTopOf="parent"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
     <LinearLayout
         android:id="@+id/llTapPrompt"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@color/actionbar_text"
         android:gravity="center_vertical|center_horizontal"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@id/llShoppingView"
+        app:layout_constraintTop_toBottomOf="@id/tb_main">
 
         <ImageView
+            android:id="@+id/ivTangemLogo"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="48dp"
+            app:layout_constraintTop_toBottomOf="@+id/tb_main"
             app:srcCompat="@drawable/tangem_logo_full_new" />
 
         <include layout="@layout/layout_touch_card" />
@@ -27,7 +41,6 @@
             android:id="@+id/tvNFCHint"
             android:layout_width="match_parent"
             android:layout_height="150dp"
-            android:layout_marginTop="12dp"
             android:fontFamily="@font/maax"
             android:gravity="center"
             android:lineSpacingExtra="8dp"
@@ -43,17 +56,17 @@
             android:textColor="@color/primary_dark"
             android:textSize="@dimen/text_size_medium" />
 
-
     </LinearLayout>
 
     <LinearLayout
         android:id="@+id/llShoppingView"
         android:layout_width="match_parent"
         android:layout_height="80dp"
-        android:layout_marginBottom="80dp"
-        android:gravity="center"
         android:layout_gravity="bottom"
-        android:orientation="horizontal">
+        android:layout_marginBottom="12dp"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <ImageView
             android:layout_width="32dp"
@@ -78,15 +91,4 @@
             android:textSize="14sp"
             tools:text="Don't have a card?\nVisit our store at tangemcards.com" />
     </LinearLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|start"
-        android:layout_margin="10dp"
-        android:src="@drawable/ic_show_menu"
-        app:backgroundTint="@color/colorPrimary"
-        app:fabSize="normal" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file