From 67294f58020e9d5c19bdeabc34d33df79b45091a Mon Sep 17 00:00:00 2001 From: Mandeep Date: Sun, 4 Apr 2021 16:06:55 +0530 Subject: [PATCH] Logging of characters typed removed Logging of typed characters and lifecycles logs removed --- .../java/cash/z/ecc/android/ui/home/HomeFragment.kt | 13 ------------- .../cash/z/ecc/android/ui/home/HomeViewModel.kt | 11 +++++------ 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt b/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt index 099b761..9aa2dd7 100644 --- a/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt +++ b/app/src/main/java/cash/z/ecc/android/ui/home/HomeFragment.kt @@ -74,7 +74,6 @@ class HomeFragment : BaseFragment() { twig("Done reopening wallet.") } } - twig("HomeFragment.onAttach COMPLETE") } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -121,7 +120,6 @@ class HomeFragment : BaseFragment() { onModelUpdated(null, uiModel.copy(pendingSend = WalletZecFormmatter.toZecStringFull(sendViewModel.zatoshiAmount.coerceAtLeast(0)))) } - twig("HomeFragment.onViewCreated COMPLETE") } private fun onClearAmount() { @@ -168,7 +166,6 @@ class HomeFragment : BaseFragment() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) - twig("HomeFragment.onSaveInstanceState") // if (::uiModel.isInitialized) { // outState.putParcelable("uiModel", uiModel) // } @@ -177,7 +174,6 @@ class HomeFragment : BaseFragment() { override fun onViewStateRestored(savedInstanceState: Bundle?) { super.onViewStateRestored(savedInstanceState) savedInstanceState?.let { inState -> - twig("HomeFragment.onViewStateRestored") // onModelUpdated(HomeViewModel.UiModel(), inState.getParcelable("uiModel")!!) } } @@ -404,7 +400,6 @@ class HomeFragment : BaseFragment() { val c = text[0] setOnClickListener { lifecycleScope.launch { - twig("CHAR TYPED: $c") viewModel.onChar(c) } } @@ -414,14 +409,11 @@ class HomeFragment : BaseFragment() { - // TODO: remove these troubleshooting logs override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - twig("HomeFragment.onCreate") } override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - twig("HomeFragment.onActivityCreated") } override fun onStart() { super.onStart() @@ -429,22 +421,17 @@ class HomeFragment : BaseFragment() { } override fun onPause() { super.onPause() - twig("HomeFragment.onPause resumeScope.isActive: ${resumedScope.isActive}") } override fun onStop() { super.onStop() - twig("HomeFragment.onStop") } override fun onDestroyView() { super.onDestroyView() - twig("HomeFragment.onDestroyView") } override fun onDestroy() { super.onDestroy() - twig("HomeFragment.onDestroy") } override fun onDetach() { super.onDetach() - twig("HomeFragment.onDetach") } } \ No newline at end of file diff --git a/app/src/main/java/cash/z/ecc/android/ui/home/HomeViewModel.kt b/app/src/main/java/cash/z/ecc/android/ui/home/HomeViewModel.kt index e8f4858..4f46df6 100644 --- a/app/src/main/java/cash/z/ecc/android/ui/home/HomeViewModel.kt +++ b/app/src/main/java/cash/z/ecc/android/ui/home/HomeViewModel.kt @@ -46,23 +46,22 @@ class HomeViewModel @Inject constructor() : ViewModel() { // no-op cases acc == "0" && c == '0' || (c == backspace && acc == "0") - || (c == decimal && acc.contains(decimal)) -> {twig("triggered: 1 acc: $acc c: $c") + || (c == decimal && acc.contains(decimal)) -> { acc } - c == backspace && acc.length <= 1 -> {twig("triggered: 2 $typedChars") + c == backspace && acc.length <= 1 -> { "0" } - c == backspace -> {twig("triggered: 3") + c == backspace -> { acc.substring(0, acc.length - 1) } - acc == "0" && c != decimal -> {twig("triggered: 4 $typedChars") + acc == "0" && c != decimal -> { c.toString() } acc.contains(decimal) && acc.length - acc.indexOf(decimal) > 8 -> { - twig("triggered: 5 $typedChars") acc } - else -> {twig("triggered: 6 $typedChars") + else -> { "$acc$c" } }