From 15afc5f8b366889e95893d1a477a0661a4c93f80 Mon Sep 17 00:00:00 2001 From: A1pha Date: Tue, 26 Nov 2024 19:21:48 +0300 Subject: [PATCH] Add realization of taking value from bundle qr --- .../ru/myitschool/work/ui/qr/result/QrResultFragment.java | 8 ++++---- .../ru/myitschool/work/ui/qr/scan/QrScanDestination.kt | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java index e7a05e4..3840bd0 100644 --- a/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java +++ b/app/src/main/java/ru/myitschool/work/ui/qr/result/QrResultFragment.java @@ -21,7 +21,7 @@ import ru.myitschool.work.ui.qr.scan.QrScanDestination; public class QrResultFragment extends Fragment { private FragmentQrResultBinding binding; - private Bundle resultQr; + private String resultQr; private QrResultViewModel viewModel; public QrResultFragment() { @@ -35,7 +35,7 @@ public class QrResultFragment extends Fragment { getParentFragmentManager().setFragmentResultListener(QrScanDestination.REQUEST_KEY, this, new FragmentResultListener() { @Override public void onFragmentResult(@NonNull String requestKey, @NonNull Bundle result) { - resultQr = result; + resultQr = QrScanDestination.INSTANCE.getDataIfExist(result); } }); } @@ -69,8 +69,8 @@ public class QrResultFragment extends Fragment { if (getContext() != null) { SharedPreferences sharedPreferences = getContext().getSharedPreferences("login", Context.MODE_PRIVATE); String login = sharedPreferences.getString("login", null); - if (login != null && getView() != null) { - viewModel.update(login, "12314543654745676"); + if (login != null && resultQr != null) { + viewModel.update(login, resultQr); } } diff --git a/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanDestination.kt b/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanDestination.kt index 44ba99b..7e34b28 100644 --- a/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanDestination.kt +++ b/app/src/main/java/ru/myitschool/work/ui/qr/scan/QrScanDestination.kt @@ -20,7 +20,6 @@ data object QrScanDestination { } else { null } - } internal fun packToBundle(data: String): Bundle {