diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultSessionViewDelegate.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultSessionViewDelegate.kt index 662f286147..6367586908 100644 --- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultSessionViewDelegate.kt +++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/DefaultSessionViewDelegate.kt @@ -1,6 +1,6 @@ package com.tangem.tangem_sdk_new -import androidx.fragment.app.FragmentActivity +import android.app.Activity import com.tangem.* import com.tangem.tangem_sdk_new.nfc.NfcReader import com.tangem.tangem_sdk_new.ui.NfcSessionDialog @@ -12,7 +12,7 @@ import com.tangem.tasks.PinType */ class DefaultSessionViewDelegate(private val reader: NfcReader) : SessionViewDelegate { - lateinit var activity: FragmentActivity + lateinit var activity: Activity private var readingDialog: NfcSessionDialog? = null init { @@ -26,7 +26,7 @@ class DefaultSessionViewDelegate(private val reader: NfcReader) : SessionViewDel } } - private fun createReadingDialog(activity: FragmentActivity) { + private fun createReadingDialog(activity: Activity) { val dialogView = activity.layoutInflater.inflate(R.layout.nfc_bottom_sheet, null) readingDialog = NfcSessionDialog(activity) readingDialog?.setContentView(dialogView) diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/TangemSdk.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/TangemSdk.kt index 50ec4ce46c..7c11dc06c2 100644 --- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/TangemSdk.kt +++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/TangemSdk.kt @@ -1,6 +1,6 @@ package com.tangem.tangem_sdk_new.extensions -import androidx.fragment.app.FragmentActivity +import androidx.activity.ComponentActivity import com.squareup.sqldelight.android.AndroidSqliteDriver import com.tangem.Config import com.tangem.Database @@ -12,7 +12,7 @@ import com.tangem.tangem_sdk_new.NfcLifecycleObserver import com.tangem.tangem_sdk_new.TerminalKeysStorage import com.tangem.tangem_sdk_new.nfc.NfcManager -fun TangemSdk.Companion.init(activity: FragmentActivity, config: Config = Config()): TangemSdk { +fun TangemSdk.Companion.init(activity: ComponentActivity, config: Config = Config()): TangemSdk { val nfcManager = TangemSdk.initNfcManager(activity) val viewDelegate = DefaultSessionViewDelegate(nfcManager.reader) @@ -26,7 +26,7 @@ fun TangemSdk.Companion.init(activity: FragmentActivity, config: Config = Config } fun TangemSdk.Companion.customInit( - activity: FragmentActivity, + activity: ComponentActivity, viewDelegate: SessionViewDelegate? = null, config: Config = Config() ): TangemSdk { @@ -42,7 +42,7 @@ fun TangemSdk.Companion.customInit( ) } -fun TangemSdk.Companion.initNfcManager(activity: FragmentActivity): NfcManager { +fun TangemSdk.Companion.initNfcManager(activity: ComponentActivity): NfcManager { val nfcManager = NfcManager() nfcManager.setCurrentActivity(activity) activity.lifecycle.addObserver(NfcLifecycleObserver(nfcManager)) diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcSessionDialog.kt b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcSessionDialog.kt index 5b32b7e0a2..a0ad3666c8 100644 --- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcSessionDialog.kt +++ b/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/ui/NfcSessionDialog.kt @@ -8,7 +8,6 @@ import android.view.View import android.view.animation.DecelerateInterpolator import android.view.inputmethod.InputMethodManager import android.widget.TextView -import androidx.fragment.app.FragmentActivity import com.google.android.material.bottomsheet.BottomSheetDialog import com.tangem.tangem_sdk_new.R import com.tangem.tangem_sdk_new.SessionViewDelegateState @@ -18,7 +17,7 @@ import com.tangem.tangem_sdk_new.postUI import kotlinx.android.synthetic.main.layout_touch_card.* import kotlinx.android.synthetic.main.nfc_bottom_sheet.* -class NfcSessionDialog(val activity: FragmentActivity) : BottomSheetDialog(activity) { +class NfcSessionDialog(val activity: Activity) : BottomSheetDialog(activity) { private var currentState: SessionViewDelegateState? = null