diff --git a/app/src/main/java/ru/myitschool/work/ui/list/ListViewHolder.kt b/app/src/main/java/ru/myitschool/work/ui/list/ListViewHolder.kt index a04c678..50f3e45 100644 --- a/app/src/main/java/ru/myitschool/work/ui/list/ListViewHolder.kt +++ b/app/src/main/java/ru/myitschool/work/ui/list/ListViewHolder.kt @@ -9,7 +9,7 @@ class ListViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { private val binding = ItemRecyclerViewEntrancedataBinding.bind(itemView) fun bind(item: ListInfo) { - binding.text1.text = item.time + binding.text1.text = item.time.replace("T", " ") binding.text2.text = item.value binding.text3.text = item.type } diff --git a/app/src/main/java/ru/myitschool/work/ui/result/ResultFragment.kt b/app/src/main/java/ru/myitschool/work/ui/result/ResultFragment.kt index df74102..3f28f62 100644 --- a/app/src/main/java/ru/myitschool/work/ui/result/ResultFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/result/ResultFragment.kt @@ -58,7 +58,9 @@ class ResultFragment : Fragment(R.layout.fragment_scan_result) { if (qrData != null) { authPreferences.getLogin()?.let { login -> + val currentTime = getCurrentTime() + viewModel.open(login, CodeJson( value = qrData.toString(), type = OpenType.QR_TYPE, diff --git a/app/src/main/java/ru/myitschool/work/ui/scan/qr/QrScanFragment.kt b/app/src/main/java/ru/myitschool/work/ui/scan/qr/QrScanFragment.kt index 46314dc..ba9deb7 100644 --- a/app/src/main/java/ru/myitschool/work/ui/scan/qr/QrScanFragment.kt +++ b/app/src/main/java/ru/myitschool/work/ui/scan/qr/QrScanFragment.kt @@ -22,7 +22,6 @@ import com.google.mlkit.vision.barcode.BarcodeScanning import com.google.mlkit.vision.barcode.common.Barcode import ru.myitschool.work.R import ru.myitschool.work.databinding.FragmentQrScanBinding -import ru.myitschool.work.ui.main.MainDestination import ru.myitschool.work.ui.result.ResultDestination import ru.myitschool.work.utils.QrPreferences import ru.myitschool.work.utils.collectWhenStarted @@ -41,10 +40,8 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) { private val viewModel: QrScanViewModel by viewModels() private lateinit var qrPreferences: QrPreferences - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - qrPreferences = QrPreferences(requireContext()) } @@ -77,8 +74,7 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) { goBack() } is QrScanViewModel.Action.CloseWithResult -> { - sendResult(QrScanDestination.packToBundle(action.result)) - goResult() + // Удаляем этот блок, так как мы будем обрабатывать результат в другом месте } } } @@ -108,8 +104,12 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) { executor ) { result -> result?.getValue(barcodeScanner)?.firstOrNull()?.let { value -> - viewModel.findBarcode(value) + qrPreferences.saveQr(value.displayValue ?: value.rawValue ?: "") + + sendResult(QrScanDestination.packToBundle(value.displayValue ?: value.rawValue ?: "")) + + goResult() } } ) @@ -125,31 +125,17 @@ class QrScanFragment : Fragment(R.layout.fragment_qr_scan) { super.onDestroyView() } - private fun goBack() { - val qrData = arguments?.let { QrScanDestination.getDataIfExist(it) } - qrPreferences.saveQr(qrData.toString()) - - findNavControllerOrNull()?.popBackStack() - ?: requireActivity().onBackPressedDispatcher.onBackPressed() - } - private fun goResult() { - try { - val qrData = arguments?.let { QrScanDestination.getDataIfExist(it) } - qrPreferences.saveQr(qrData.toString()) - - Log.i("ResultFragment", qrData.toString()) - - findNavController().apply { - popBackStack(ResultDestination, false) - navigate(ResultDestination) - } - } catch (e: Exception) { - Log.e("ResultFragment", "Navigation error", e) - Toast.makeText(context, getText(R.string.errorGoText).toString(), Toast.LENGTH_SHORT).show() + findNavController().apply { + popBackStack(ResultDestination, false) + navigate(ResultDestination) } } + private fun goBack() { + findNavControllerOrNull()?.popBackStack() + ?: requireActivity().onBackPressedDispatcher.onBackPressed() + } private fun sendResult(bundle: Bundle) { setFragmentResult( diff --git a/app/src/main/res/drawable/button_beigestroke_whitefill.xml b/app/src/main/res/drawable/button_beigestroke_whitefill.xml deleted file mode 100644 index 5de5240..0000000 --- a/app/src/main/res/drawable/button_beigestroke_whitefill.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/res_error.xml b/app/src/main/res/drawable/res_error.xml index f613449..6b14052 100644 --- a/app/src/main/res/drawable/res_error.xml +++ b/app/src/main/res/drawable/res_error.xml @@ -1,1117 +1,36 @@ + android:width="32dp" + android:height="32dp" + android:viewportWidth="32" + android:viewportHeight="32"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:strokeColor="#000000"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:strokeColor="#000000"/> + android:strokeColor="#000000"/> + android:strokeColor="#000000"/> + android:strokeColor="#000000"/> diff --git a/app/src/main/res/drawable/res_success.xml b/app/src/main/res/drawable/res_success.xml deleted file mode 100644 index dfefcb7..0000000 --- a/app/src/main/res/drawable/res_success.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/res_success_ic.xml b/app/src/main/res/drawable/res_success_ic.xml new file mode 100644 index 0000000..3c71223 --- /dev/null +++ b/app/src/main/res/drawable/res_success_ic.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/fragment_administrator_screen.xml b/app/src/main/res/layout/fragment_admin.xml similarity index 88% rename from app/src/main/res/layout/fragment_administrator_screen.xml rename to app/src/main/res/layout/fragment_admin.xml index 3444646..12ab792 100644 --- a/app/src/main/res/layout/fragment_administrator_screen.xml +++ b/app/src/main/res/layout/fragment_admin.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.36" /> + app:layout_constraintGuide_percent="0.4" /> - - - - - - - + app:layout_constraintTop_toBottomOf="@+id/block" + app:layout_constraintVertical_bias="0.0" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 9f085e6..8df4958 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -10,7 +10,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_percent="0.31" /> + app:layout_constraintGuide_percent="0.37" /> + app:layout_constraintGuide_percent="0.29" /> + app:layout_constraintGuide_percent="0.58" /> @@ -76,7 +76,7 @@ android:layout_width="320dp" android:layout_height="80dp" android:layout_marginTop="10dp" - android:background="@drawable/button_beige" + android:background="@drawable/button_grey" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/guideline_bottom" /> diff --git a/app/src/main/res/layout/item_recycler_view_entrancedata.xml b/app/src/main/res/layout/item_recycler_view_entrancedata.xml index 2f1b91b..db67975 100644 --- a/app/src/main/res/layout/item_recycler_view_entrancedata.xml +++ b/app/src/main/res/layout/item_recycler_view_entrancedata.xml @@ -1,6 +1,6 @@ - NTO Pass + DoorRock логин Добро пожаловать! Введите свой логин