Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/FastPickingSpedizione

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java
#	app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/SystemRESTConsumer.java
This commit is contained in:
Giuseppe Scorrano
2025-02-26 10:27:27 +01:00
parent 706878b1e4 581e56a245
commit 1c6de11e04
16 changed files with 281 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/res/values-it/strings.xml
View File

@@ -190,6 +190,8 @@
<string name="tare_pckg">Tara collo</string>
<string name="tare_art">Tara articolo</string>
<string name="checking_updates">Controllo gli aggiornamenti</string>
<string name="saving">Salvataggio</string>
<string name="data_saved">Salvataggio completato</string>
<string name="alert_print_completed_message">Stampa completata</string>
@@ -458,8 +460,10 @@
<string name="action_print_production_SSCC">Stampa etichetta lavorazione</string>
<string name="scanner_settings">Impostazioni scanner</string>
<string name="developer_settings">Svilupppo</string>
<string name="developer_settings_title">Esporta log</string>
<string name="developer_settings_summary">Esporta il log degli eventi</string>
<string name="developer_settings_export_log_title">Esporta log</string>
<string name="developer_settings_export_log_summary">Esporta il log degli eventi</string>
<string name="developer_settings_enable_beta_version_title">Aggiornamenti beta</string>
<string name="developer_settings_enable_beta_version_summary">Abilita aggiornamenti beta (fortemente sconsigliato)</string>
<string name="scanner_settings_scanner_delay_title">Ritardo scansione</string>
<string name="scanner_settings_scanner_delay_summary">Imposta un ritardo di lettura per la scansione</string>
<string name="scanner_settings_trigger_scan_mode_title">Modalità scansione</string>

6
app/src/main/res/values/attr.xml
View File

@@ -20,4 +20,10 @@
<attr name="backgroundView" />
<attr name="parentView" />
</declare-styleable>
<declare-styleable name="ConfirmSwitchPreferenceCompat">
<attr name="confirmTitle" format="string" />
<attr name="confirmMessage" format="string" />
</declare-styleable>
</resources>

8
app/src/main/res/values/strings.xml
View File

@@ -189,6 +189,8 @@
<string name="tare_art">Tare product</string>
<string name="tare_pckg">Tare pckg</string>
<string name="checking_updates">Checking for updates</string>
<string name="saving">Saving</string>
<string name="data_saved">Data saved</string>
<string name="alert_print_completed_message">Printing job completed</string>
@@ -463,8 +465,10 @@
<string name="action_print_production_SSCC">Print production label</string>
<string name="scanner_settings">Scanner settings</string>
<string name="developer_settings">Developer settings</string>
<string name="developer_settings_title">Esporta log</string>
<string name="developer_settings_summary">Esporta il log degli eventi</string>
<string name="developer_settings_export_log_title">Export log</string>
<string name="developer_settings_export_log_summary">Export event log</string>
<string name="developer_settings_enable_beta_version_title">Beta updates</string>
<string name="developer_settings_enable_beta_version_summary">Enable beta updates (strongly discouraged)</string>
<string name="scanner_settings_scanner_delay_title">Scan delay</string>
<string name="scanner_settings_scanner_delay_summary">Set reading scanner delay</string>
<string name="scanner_settings_trigger_scan_mode_title">Modalità scansione</string>

21
app/src/main/res/xml/app_preferences.xml
View File

@@ -67,10 +67,27 @@
app:title="@string/developer_settings"
app:iconSpaceReserved="false">
<it.integry.integrywmsnative.view.components.ConfirmSwitchPreferenceCompat
android:title="@string/developer_settings_enable_beta_version_title"
android:key="ENABLE_BETA"
android:summary="@string/developer_settings_enable_beta_version_summary"
app:iconSpaceReserved="false"
android:defaultValue="false"
app:confirmTitle="@string/developer_settings_enable_beta_version_title"
app:confirmMessage="Sei sicuro di voler abilitare gli aggiornamenti beta? Se accetti dovrai chiudere e riaprire l'app per scaricare l'aggiornamento."
/>
<Preference
android:title="@string/developer_settings_title"
android:title="Verifica aggiornamenti"
android:key="CHECK_UPDATES"
android:summary="Verifica la disponibilità di nuovi aggiornamenti"
app:iconSpaceReserved="false"
/>
<Preference
android:title="@string/developer_settings_export_log_title"
android:key="EXPORT_LOG"
android:summary="@string/developer_settings_summary"
android:summary="@string/developer_settings_export_log_summary"
app:iconSpaceReserved="false"
/>