diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index 48e7532e..0f74a1f7 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -19,8 +19,8 @@ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3ece0f60..490d6698 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -49,21 +49,61 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -74,6 +114,16 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme @@ -84,6 +134,21 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme @@ -94,11 +159,26 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @style/AppTheme @@ -120,11 +200,31 @@ @style/AppTheme + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme @@ -135,11 +235,31 @@ @style/AppTheme + + + @style/AppTheme + + + + + @style/AppTheme + + + + + @style/AppTheme + + @style/AppTheme + + + @style/AppTheme + + @@ -182,130 +302,28 @@ - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -1122,22 +1155,16 @@ + + + + + @@ -1172,9 +1210,6 @@ - - - \ No newline at end of file diff --git a/app/beta/release/output-metadata.json b/app/beta/release/output-metadata.json index 4c929701..f4f4b60a 100644 --- a/app/beta/release/output-metadata.json +++ b/app/beta/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 290, - "versionName": "24.20Beta", + "versionCode": 302, + "versionName": "24.22Beta", "outputFile": "app-beta-release.apk" } ], diff --git a/app/build.gradle b/app/build.gradle index 86b602f1..cb99a07a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "es.verdnatura" minSdkVersion 26 targetSdkVersion 33 // se deja con target si no Play Protect la bloquea - versionCode 290 - versionName = "24.20Beta" + versionCode 302 //qr + versionName = "24.22Beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt index 1cc311ac..3fd7a3f5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt @@ -38,7 +38,9 @@ import es.verdnatura.presentation.view.feature.login.adapter.WorkFormAdapter import es.verdnatura.presentation.view.feature.login.model.WorkForms import es.verdnatura.presentation.view.feature.main.activity.MainActivity import kotlinx.coroutines.runBlocking +import java.text.SimpleDateFormat import java.util.Date +import java.util.Locale import kotlin.system.exitProcess class LoginFragment(private var imageUri: Uri?) : @@ -57,6 +59,7 @@ class LoginFragment(private var imageUri: Uri?) : override fun getLayoutId(): Int = R.layout.fragment_login override fun init() { + customDialogList = CustomDialogList(requireContext()) customDialog = CustomDialog(requireContext()) //createFolderSerial() @@ -459,7 +462,12 @@ class LoginFragment(private var imageUri: Uri?) : if (it.errorMessage.contains("Unauthorized")) { getString(R.string.messageUserError) } else { - it.errorMessage + if (it.errorMessage.contains("Unable to resolve")) { + getString(R.string.messageInternetError) + } else { + it.errorMessage + } + } ).setOkButton( getString(R.string.accept) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt index 2ce723a5..78e025e5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/adapter/ListImageAdapter.kt @@ -27,6 +27,7 @@ class ListImageAdapter( override fun getItemCount() = items.size + inner class ItemHolder( val binding: ItemImageRowBinding ) : RecyclerView.ViewHolder(binding.root) {