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 @@ - + + + android:orientation="vertical" + app:layout_constraintBottom_toTopOf="@id/llShoppingView" + app:layout_constraintTop_toBottomOf="@id/tb_main"> @@ -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" /> - + android:layout_marginBottom="12dp" + android:gravity="center" + android:orientation="horizontal" + app:layout_constraintBottom_toBottomOf="parent"> - - - - \ No newline at end of file + \ No newline at end of file