From 6ed8b23dff546cce0b3d514b46eebf4f5800452b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 14 Apr 2020 14:21:52 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../personalize/ui/PersonalizationFragment.kt | 3 ++- .../variants/responses/ui/ResponseFragment.kt | 15 +++++++++++++-- .../ucase/variants/scan/ui/ScanActionFragment.kt | 3 ++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt index 196828c168..d05c81f2d0 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/ui/PersonalizationFragment.kt @@ -33,6 +33,7 @@ import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.Personalizati import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.PersonalizationPresetView import com.tangem.tangemtest.ucase.variants.personalize.ui.presets.RvPresetNamesAdapter import com.tangem.tangemtest.ucase.variants.personalize.ui.widgets.PersonalizationItemBuilder +import com.tangem.tangemtest.ucase.variants.responses.ui.ResponseFragment import ru.dev.gbixahue.eu4d.lib.android._android.views.inflate import ru.dev.gbixahue.eu4d.lib.android.global.log.Log import ru.dev.gbixahue.eu4d.lib.android.global.threading.postUI @@ -117,7 +118,7 @@ class PersonalizationFragment : BaseCardActionFragment(), PersonalizationPresetV override fun handleResponseCardData(card: Card) { super.handleResponseCardData(card) - navigateTo(R.id.action_nav_card_action_to_response_screen) + navigateTo(R.id.action_nav_card_action_to_response_screen, ResponseFragment.setTittle(R.string.fg_name_response_personalization)) } override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt index 51616a2a4c..07676a18f2 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/responses/ui/ResponseFragment.kt @@ -3,6 +3,8 @@ package com.tangem.tangemtest.ucase.variants.responses.ui import android.os.Bundle import android.view.* import android.widget.LinearLayout +import androidx.annotation.StringRes +import androidx.core.os.bundleOf import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.lifecycle.Observer @@ -29,12 +31,13 @@ open class ResponseFragment : BaseFragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setTittle() + setHasOptionsMenu(true) + setTittle() } private fun setTittle() { - val titleId = selfVM.determineTitleId(mainActivityVM.commandResponse) + val titleId = getTittleId(arguments) ?: selfVM.determineTitleId(mainActivityVM.commandResponse) activity?.setTitle(titleId) } @@ -70,4 +73,12 @@ open class ResponseFragment : BaseFragment() { } return super.onOptionsItemSelected(item) } + + companion object { + private val argTittle = "tittle" + + fun setTittle(@StringRes id: Int): Bundle = bundleOf(Pair(argTittle, id)) + + private fun getTittleId(args: Bundle?): Int? = args?.getInt(argTittle) + } } \ No newline at end of file diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt index 07de8bf618..b3b8c89d33 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/scan/ui/ScanActionFragment.kt @@ -11,6 +11,7 @@ import com.tangem.tangemtest.R import com.tangem.tangemtest.ucase.domain.paramsManager.ItemsManager import com.tangem.tangemtest.ucase.domain.paramsManager.managers.ScanItemsManager import com.tangem.tangemtest.ucase.ui.BaseCardActionFragment +import com.tangem.tangemtest.ucase.variants.responses.ui.ResponseFragment import ru.dev.gbixahue.eu4d.lib.android._android.views.dpToPx /** @@ -49,6 +50,6 @@ class ScanActionFragment : BaseCardActionFragment() { override fun handleResponseCardData(card: Card) { super.handleResponseCardData(card) - navigateTo(R.id.action_nav_card_action_to_response_screen) + navigateTo(R.id.action_nav_card_action_to_response_screen, ResponseFragment.setTittle(R.string.fg_name_response_scan)) } } \ No newline at end of file