From e72acd21f3a3d79c9b2638a66b995ef9b5a8fe80 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Wed, 20 Nov 2024 08:09:51 +0100 Subject: [PATCH] feat: refs #8175 refactorCode --- .idea/kotlinc.xml | 2 +- .idea/workspace.xml | 212 +++++++++++++++--- .../feature/main/activity/MainActivity.kt | 37 ++- 3 files changed, 198 insertions(+), 53 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 6d0ee1c2..5815a4a6 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ca02584f..d32fcd14 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -40,6 +40,16 @@ + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme @@ -55,6 +65,11 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -75,11 +90,21 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -90,6 +115,16 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme @@ -125,6 +160,11 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -155,6 +195,11 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -170,6 +215,11 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -195,11 +245,21 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -220,6 +280,16 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme @@ -230,6 +300,11 @@ @style/AppTheme + + + @style/AppTheme + + Landscape @@ -286,6 +361,11 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -296,6 +376,11 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -321,16 +406,36 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + @@ -373,7 +478,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - @@ -623,11 +762,11 @@ + + + - - - @@ -776,6 +915,13 @@ + + + C:\Users\sergiodt\AppData\Roaming\Subversion @@ -1131,7 +1277,7 @@ @@ -1259,22 +1405,6 @@ file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt - 72 - + 76 + file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt - 82 + 86 file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt - 81 + 85 file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixCallback.kt - 83 + 87 diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt index de875a72..1b7b1b09 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt @@ -143,7 +143,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking -import timber.log.Timber.d import java.util.Date import java.util.concurrent.Executors import java.util.concurrent.ScheduledExecutorService @@ -545,23 +544,23 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL // Ya no se utiliza : addFragmentOnTop(ControladorFragment.newInstance()) - if (mobileApplication.userId == 19591) { - println("Revisando nueva") - addFragmentOnTop( - CollectionFragmentChecker.newInstance( - CollectionVO(collectionFk = 0), - type = CONTROLADOR - ) + // if (mobileApplication.userId == 19591) { + println("Revisando nueva") + addFragmentOnTop( + CollectionFragmentChecker.newInstance( + CollectionVO(collectionFk = 0), + type = CONTROLADOR ) - } else { - println("Revisando vieja") - addFragmentOnTop( - CollectionFragment.newInstance( - CollectionVO(collectionFk = 0), - type = CONTROLADOR - ) - ) - } + ) + /* } else { + println("Revisando vieja") + addFragmentOnTop( + CollectionFragment.newInstance( + CollectionVO(collectionFk = 0), + type = CONTROLADOR + ) + ) + }*/ /* addFragmentOnTop( CollectionFragment.newInstance( CollectionVO(collectionFk = 0), @@ -991,7 +990,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL } } catch (ex: Exception) { - d("$ex") + ex.message!!.toast(this) } } @@ -1222,7 +1221,7 @@ class MainActivity : BaseActivity(), OnPasillerosItemClickL userFk = (application as MobileApplication).userId!! ) } catch (ex: Exception) { - d(ex.message.toString()) + ex.message!!.toast(this) } }