diff --git a/app/build.gradle b/app/build.gradle index 3bb5c167..0d92908b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 534 - def appVersionName = '1.47.21' + def appVersionCode = 535 + def appVersionName = '1.47.22' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java index 8f7bcf4a..784894bd 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java @@ -155,6 +155,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule; import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent; import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule; +import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeComponent; +import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeModule; import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoComponent; import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoModule; import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent; @@ -273,7 +275,9 @@ import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAva TrasferimentoPedaneModule.class, DialogAskInfoTrasferimentoModule.class, TrasferimentoPedaneEditModule.class, - DialogTrasferimentoPedaneConfirmExportModule.class + DialogTrasferimentoPedaneConfirmExportModule.class, + DialogChooseArtFromListaArtsModule.class, + DialogDeviceEndOfLifeModule.class }) public interface MainApplicationComponent { @@ -460,6 +464,8 @@ public interface MainApplicationComponent { DialogTrasferimentoPedaneConfirmExportComponent.Factory dialogTrasferimentoPedaneConfirmExportComponent(); + DialogDeviceEndOfLifeComponent.Factory dialogDeviceEndOfLifeComponent(); + void inject(MainApplication mainApplication); void inject(AppContext mainApplication); diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index 838a517c..81dfe8ee 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -4,6 +4,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.text.SpannableString; @@ -12,8 +13,10 @@ import android.view.LayoutInflater; import androidx.databinding.DataBindingUtil; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CountDownLatch; import javax.inject.Inject; @@ -27,6 +30,7 @@ import it.integry.integrywmsnative.databinding.ActivitySplashBinding; import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.main.MainActivity; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; +import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeView; public class SplashActivity extends BaseActivity implements MainContext.Listener { @@ -65,9 +69,24 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener UtilityContext.initMainActivity(this); + LocalDate endSupportDate = LocalDate.of(2026, 1, 31); - initAppVersion(); - initPermissions(this::init); + boolean isOldAndroid = Build.VERSION.SDK_INT < Build.VERSION_CODES.O; + + executorService.execute(() -> { + + if (isOldAndroid) + showDeviceEndOfLifeMessage(); + + handler.post(() -> { + if (LocalDate.now().isBefore(endSupportDate) || !isOldAndroid) { + initAppVersion(); + initPermissions(this::init); + } else { + this.finish(); + } + }); + }); } private void initAppVersion() { @@ -105,6 +124,21 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener } } + + private void showDeviceEndOfLifeMessage() { + + CountDownLatch latch = new CountDownLatch(1); + + DialogDeviceEndOfLifeView.newInstance(latch::countDown) + .show(this.getSupportFragmentManager(), "dialog_device_end_of_life"); + + try { + latch.await(); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + @Override public void onDBDataLoading(String item) { handler.post(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item)); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java index d6d9571c..35a108b8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java @@ -48,6 +48,7 @@ import java.util.Locale; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.utility.LocaleDecimalKeyListener; import it.integry.integrywmsnative.core.helper.ContextHelper; import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityDate; @@ -1246,4 +1247,16 @@ public class Converters { view.setText(date.format(formatter)); } -} \ No newline at end of file + /** + * BindingAdapter che applica automaticamente il KeyListener localizzato + * ai campi con inputType numberDecimal, permettendo l'uso della virgola + * come separatore decimale in base al locale del dispositivo. + */ + @BindingAdapter("useLocaleDecimalInput") + public static void setLocaleDecimalInput(EditText view, boolean useLocaleInput) { + if (useLocaleInput) { + view.setKeyListener(LocaleDecimalKeyListener.getInstance()); + } + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java @@ -0,0 +1 @@ + diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java new file mode 100644 index 00000000..18db4ddd --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java @@ -0,0 +1,29 @@ +package it.integry.integrywmsnative.core.utility; + +import android.text.method.DigitsKeyListener; + +import java.text.DecimalFormatSymbols; +import java.util.Locale; + +/** + * KeyListener personalizzato che accetta numeri decimali + * usando il separatore decimale del locale corrente (virgola per italiano) + */ +public class LocaleDecimalKeyListener { + + /** + * Ottiene un'istanza del KeyListener per il locale corrente + */ + public static DigitsKeyListener getInstance() { + return getInstance(Locale.getDefault()); + } + + /** + * Ottiene un'istanza del KeyListener per un locale specifico + */ + public static DigitsKeyListener getInstance(Locale locale) { + DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale); + char decimalSeparator = symbols.getDecimalSeparator(); + return DigitsKeyListener.getInstance("0123456789" + decimalSeparator); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java index bf8f8a83..6010f2e8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java @@ -114,7 +114,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd } else if (position % 2 == 1) { holder.mBinding.getRoot().setBackgroundColor(Color.WHITE); } else { - holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); + holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight)); } holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java index eb21ba04..4ec1481a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java @@ -114,7 +114,7 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA } else if (position % 2 == 1) { holder.mBinding.getRoot().setBackgroundColor(Color.WHITE); } else { - holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); + holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight)); } holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java index e3ac134e..a1dbee92 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java @@ -102,7 +102,7 @@ public class MainActivity extends BaseActivity ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( this, mBinding.drawerLayout, mBinding.appBarMain.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close); - mBinding.drawerLayout.setDrawerListener(toggle); + mBinding.drawerLayout.addDrawerListener(toggle); toggle.syncState(); @@ -122,6 +122,16 @@ public class MainActivity extends BaseActivity startActivity(myIntent); } + + public void toggleDrawer() { + if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) { + mBinding.drawerLayout.closeDrawer(GravityCompat.START); + } else { + mBinding.drawerLayout.openDrawer(GravityCompat.START); + } + } + + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { if (keyCode == KeyEvent.KEYCODE_BACK) { @@ -294,9 +304,13 @@ public class MainActivity extends BaseActivity for (int i = 0; i < count; i++) { getSupportFragmentManager().popBackStack(); } + + mBinding.appBarMain.elevatedToolbar.setVisibility(getSupportFragmentManager().getBackStackEntryCount() > 1 ? View.VISIBLE : View.GONE); } private void adaptViewToFragment(Fragment fragment) { + mBinding.appBarMain.elevatedToolbar.setVisibility(fragment instanceof MainFragment ? View.GONE : View.VISIBLE); + if (fragment instanceof ISearchableFragment) { mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment); mBinding.appBarMain.mainSearch.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index 6d35a7d5..95c8c62c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -1,10 +1,7 @@ package it.integry.integrywmsnative.gest.main; -import android.animation.ArgbEvaluator; -import android.animation.ObjectAnimator; import android.content.Context; -import android.graphics.Color; import android.os.Bundle; import android.os.Handler; import android.view.LayoutInflater; @@ -122,7 +119,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false); mBindings.setView(this); - mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(false, false); return mBindings.getRoot(); } @@ -246,6 +242,13 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab } + + public void toggleDrawer() { + if (getActivity() != null && getActivity() instanceof MainActivity) { + ((MainActivity) getActivity()).toggleDrawer(); + } + } + private void collapseNoConnectionLayout() { if (getActivity() != null) getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true)); @@ -335,89 +338,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab this.mOnPreDestroyList.add(onPreDestroy); } - - public void toggleEasterEggMode() { - easterEggToggle = !easterEggToggle; - - - int rootBgStart, rootBgEnd; - int profileBgStart, profileBgEnd; - float titleFlipStart, titleFlipEnd; - int animationTimeMillis = 0; - - if (easterEggToggle) { - rootBgStart = Color.argb(255, 255, 255, 255); - rootBgEnd = Color.argb(255, 0, 0, 0); - - profileBgStart = Color.argb(255, 26, 115, 232); - profileBgEnd = Color.argb(255, 211, 47, 47); - animationTimeMillis = 2500; - titleFlipStart = 1f; - titleFlipEnd = -1f; - } else { - rootBgStart = Color.argb(255, 0, 0, 0); - rootBgEnd = Color.argb(255, 255, 255, 255); - - profileBgStart = Color.argb(255, 211, 47, 47); - profileBgEnd = Color.argb(255, 26, 115, 232); - animationTimeMillis = 750; - titleFlipStart = -1f; - titleFlipEnd = 1f; - } - - mBindings.easterEggHorrorBloodExpandableLayout.setDuration(animationTimeMillis); - mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(easterEggToggle, true); - - View rootActivityView = requireActivity().findViewById(R.id.drawer_layout); - ObjectAnimator colorFadeRootBg = ObjectAnimator.ofObject(rootActivityView, "backgroundColor", - new ArgbEvaluator(), - rootBgStart, - rootBgEnd); - - colorFadeRootBg.setDuration(animationTimeMillis); - colorFadeRootBg.start(); - - View toolbarActivityView = requireActivity().findViewById(R.id.toolbar); - ObjectAnimator colorFadeToolbarBg = ObjectAnimator.ofObject(toolbarActivityView, "backgroundColor", - new ArgbEvaluator(), - rootBgStart, - rootBgEnd); - - colorFadeToolbarBg.setDuration(animationTimeMillis); - colorFadeToolbarBg.start(); - - ObjectAnimator colorFadeProfileBg = ObjectAnimator.ofObject(mBindings.profileRootContainer, "backgroundColor", - new ArgbEvaluator(), - profileBgStart, - profileBgEnd); - - colorFadeProfileBg.setDuration(animationTimeMillis); - colorFadeProfileBg.start(); - - View toolbarTitleActivityView = requireActivity().findViewById(R.id.toolbar_title); - ObjectAnimator flipToolbarTitleX = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleX", - titleFlipStart, - titleFlipEnd); - - flipToolbarTitleX.setDuration(animationTimeMillis); - flipToolbarTitleX.start(); - - ObjectAnimator flipToolbarTitleY = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleY", - titleFlipStart, - titleFlipEnd); - - flipToolbarTitleY.setDuration(animationTimeMillis); - flipToolbarTitleY.start(); - - ObjectAnimator colorFadeTitleTextColor = ObjectAnimator.ofObject(toolbarTitleActivityView, "textColor", - new ArgbEvaluator(), - rootBgEnd, - rootBgStart); - - colorFadeTitleTextColor.setDuration(animationTimeMillis); - colorFadeTitleTextColor.start(); - } - public void changeUserDepo() { DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableDepos(), this::onUserDepoChanged) .show(getParentFragmentManager(), "switch-user-depo"); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java index 1aa0c67f..9e5ff558 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java @@ -282,6 +282,9 @@ public class OrdiniUscitaElencoFiltroViewModel { .filter(Objects::nonNull) .collect(Collectors.toList()); + if(codMdeps.isEmpty()) + return new ArrayList<>(); + return Objects.requireNonNull(availableDepos).stream() .filter(x -> codMdeps.contains(x.getCodMdep())) .distinct() diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java index 3125668b..98352b42 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java @@ -103,7 +103,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter 0) { holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha)); } else if (position % 2 == 1) { - holder.mBinding.getRoot().setBackgroundColor(Color.WHITE); + holder.mBinding.getRoot().setBackgroundColor(0); } else { - holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); + holder.mBinding.getRoot().setBackgroundColor(UtilityResources.getColorResourceFromAttr(mContext, R.attr.colorLetturaFacilitataSurface)); } holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE); @@ -146,8 +146,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter { colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.yellow_600); - yield ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_warning_white_24dp, null); + yield ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_baseline_warning_24, null); } case ERROR -> { colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_300); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java new file mode 100644 index 00000000..584da834 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java @@ -0,0 +1,14 @@ +package it.integry.integrywmsnative.view.dialogs.device_end_of_life; + +import dagger.Subcomponent; + +@Subcomponent +public interface DialogDeviceEndOfLifeComponent { + + @Subcomponent.Factory + interface Factory { + DialogDeviceEndOfLifeComponent create(); + } + + void inject(DialogDeviceEndOfLifeView dialogDeviceEndOfLifeView); +} \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java new file mode 100644 index 00000000..1b13bdec --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java @@ -0,0 +1,14 @@ +package it.integry.integrywmsnative.view.dialogs.device_end_of_life; + +import dagger.Module; +import dagger.Provides; + +@Module(subcomponents = DialogDeviceEndOfLifeComponent.class) +public class DialogDeviceEndOfLifeModule { + + @Provides + DialogDeviceEndOfLifeViewModel providesDialogDeviceEndOfLifeViewModel() { + return new DialogDeviceEndOfLifeViewModel(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java new file mode 100644 index 00000000..58343ce9 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java @@ -0,0 +1,77 @@ +package it.integry.integrywmsnative.view.dialogs.device_end_of_life; + +import android.app.Dialog; +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + +import javax.inject.Inject; + +import it.integry.integrywmsnative.MainApplication; +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; +import it.integry.integrywmsnative.databinding.DialogDeviceEndOfLifeBinding; + +public class DialogDeviceEndOfLifeView extends BaseDialogFragment { + + @Inject + DialogDeviceEndOfLifeViewModel mViewModel; + + private DialogDeviceEndOfLifeBinding mBindings; + private Context mContext; + + private final Runnable onComplete; + + //Pass here all external parameters + public static DialogDeviceEndOfLifeView newInstance(Runnable onComplete) { + return new DialogDeviceEndOfLifeView(onComplete); + } + + private DialogDeviceEndOfLifeView(Runnable onComplete) { + super(); + + this.onComplete = onComplete; + + MainApplication.appComponent + .dialogDeviceEndOfLifeComponent() + .create() + .inject(this); + } + + + @NonNull + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + this.mContext = requireContext(); + + mBindings = DialogDeviceEndOfLifeBinding.inflate(LayoutInflater.from(this.mContext), null, false); + mBindings.setLifecycleOwner(this); + + + setCancelable(false); + + var alertDialog = new MaterialAlertDialogBuilder(this.mContext) + .setView(mBindings.getRoot()) + .setCancelable(isCancelable()) + .setPositiveButton(R.string.i_understand_action, (dialog, which) -> { + if (onComplete != null) onComplete.run(); + dismiss(); + }) + .create(); + + alertDialog.setCanceledOnTouchOutside(isCancelable()); + alertDialog.setOnShowListener(this); + return alertDialog; + } + + @Override + public void dismiss() { + if (getDialog() != null) getDialog().dismiss(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java new file mode 100644 index 00000000..fce6b11b --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java @@ -0,0 +1,5 @@ +package it.integry.integrywmsnative.view.dialogs.device_end_of_life; + +public class DialogDeviceEndOfLifeViewModel { + +} \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index 1821ca0e..61144572 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -208,6 +208,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia } }); } + + return mBindings.getRoot(); } diff --git a/app/src/main/res/drawable/easter_egg__horror_blood.xml b/app/src/main/res/drawable/easter_egg__horror_blood.xml deleted file mode 100644 index adc323f1..00000000 --- a/app/src/main/res/drawable/easter_egg__horror_blood.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_white_24dp.xml deleted file mode 100644 index 3aea284b..00000000 --- a/app/src/main/res/drawable/ic_warning_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml index 23286b90..386c920e 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml @@ -218,7 +218,8 @@ android:imeOptions="actionDone" android:inputType="numberDecimal" android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}" - app:binding="@{view.currentPesoCollo}" /> + app:binding="@{view.currentPesoCollo}" + app:useLocaleDecimalInput="@{true}" /> diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml index 195aa1a5..50b5b5af 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml @@ -107,7 +107,7 @@ + app:binding="@{view.currentQtaCnf}" + app:useLocaleDecimalInput="@{true}" /> @@ -821,7 +822,8 @@ android:digits="0123456789" android:hint="@string/tot_qty" android:inputType="number" - app:binding="@{view.currentQtaTot}" /> + app:binding="@{view.currentQtaTot}" + app:useLocaleDecimalInput="@{true}" /> @@ -856,7 +858,8 @@ android:hint="@string/tare_art" android:inputType="number" android:textColor="@color/gray_400" - app:binding="@{view.currentTaraArticolo}" /> + app:binding="@{view.currentTaraArticolo}" + app:useLocaleDecimalInput="@{true}" /> @@ -880,7 +883,8 @@ android:imeOptions="actionDone" android:inputType="numberDecimal" android:textColor="@color/gray_400" - app:binding="@{view.currentTaraTot}" /> + app:binding="@{view.currentTaraTot}" + app:useLocaleDecimalInput="@{true}" /> @@ -903,7 +907,8 @@ android:hint="@string/LU_weight" android:inputType="number" android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }" - app:binding="@{view.currentPesoLordo}" /> + app:binding="@{view.currentPesoLordo}" + app:useLocaleDecimalInput="@{true}" /> diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml index f064faae..3f8eb194 100644 --- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml +++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml @@ -1231,7 +1231,7 @@ android:src="@drawable/ic_playlist_add_check_24dp" /> @@ -44,7 +43,6 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/full_white" android:minHeight="?attr/actionBarSize"> diff --git a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml index 17c29d95..9a800f4e 100644 --- a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml +++ b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml @@ -52,7 +52,7 @@ android:orientation="horizontal"> + style="@style/TextAppearance.Material3.BodyLarge"/> diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml index 17a80322..e87885b6 100644 --- a/app/src/main/res/layout/dialog_basket_lu__page2.xml +++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml @@ -78,7 +78,7 @@ android:tint="@android:color/black" /> + app:binding="@{viewmodel.qtaCnf}" + app:useLocaleDecimalInput="@{true}" /> diff --git a/app/src/main/res/layout/dialog_device_end_of_life.xml b/app/src/main/res/layout/dialog_device_end_of_life.xml new file mode 100644 index 00000000..1f33d9f0 --- /dev/null +++ b/app/src/main/res/layout/dialog_device_end_of_life.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml index c803fb6d..6cfef45c 100644 --- a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml +++ b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml @@ -40,7 +40,7 @@ + app:binding="@{view.currentPesoCollo}" + app:useLocaleDecimalInput="@{true}" /> diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index c842030a..ba6320a6 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -217,7 +217,7 @@ android:tint="@color/gray_600" /> + + app:binding="@{view.currentQtaCnf}" + app:useLocaleDecimalInput="@{true}" /> @@ -838,7 +840,8 @@ android:imeOptions="actionDone" android:inputType="number" android:selectAllOnFocus="true" - app:binding="@{view.currentQtaTot}" /> + app:binding="@{view.currentQtaTot}" + app:useLocaleDecimalInput="@{true}" /> @@ -873,7 +876,8 @@ android:hint="@string/tare_art" android:inputType="number" android:textColor="@color/gray_400" - app:binding="@{view.currentTaraArticolo}" /> + app:binding="@{view.currentTaraArticolo}" + app:useLocaleDecimalInput="@{true}" /> @@ -897,7 +901,8 @@ android:imeOptions="actionDone" android:inputType="numberDecimal" android:textColor="@color/gray_400" - app:binding="@{view.currentTaraTot}" /> + app:binding="@{view.currentTaraTot}" + app:useLocaleDecimalInput="@{true}" /> @@ -920,7 +925,8 @@ android:layout_height="wrap_content" android:hint="@string/LU_weight" android:inputType="number" - app:binding="@{view.currentPesoLordo}" /> + app:binding="@{view.currentPesoLordo}" + app:useLocaleDecimalInput="@{true}" /> diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml index 645e502d..7d79e38d 100644 --- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml +++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml @@ -151,7 +151,7 @@ android:layout_marginTop="8dp"> + + app:binding="@{view.currentQtaCnf}" + app:useLocaleDecimalInput="@{true}" /> diff --git a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml index 936337a8..e40fc974 100644 --- a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml +++ b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml @@ -57,7 +57,7 @@ diff --git a/app/src/main/res/layout/fragment_articoli_in_giacenza.xml b/app/src/main/res/layout/fragment_articoli_in_giacenza.xml index 3ff6ecd3..285bfe54 100644 --- a/app/src/main/res/layout/fragment_articoli_in_giacenza.xml +++ b/app/src/main/res/layout/fragment_articoli_in_giacenza.xml @@ -67,7 +67,7 @@ android:src="@drawable/ic_playlist_add_check_24dp" /> + @@ -25,6 +26,162 @@ android:layout_height="wrap_content" android:orientation="vertical"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent"> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:listitem="@layout/fragment_main_ordini_uscita__list_group_model"/> + android:src="@drawable/ic_playlist_add_check_24dp" + android:tint="?attr/colorControlNormal" /> diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml index 04b3a4da..2b7882a1 100644 --- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml +++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml @@ -54,7 +54,6 @@ tools:text="Ord. Ven. 39 del 27 ott 2017" android:ellipsize="end" android:maxLines="1" - android:textColor="#000" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:text="@{Html.fromHtml(@string/ord_ven_testata(String.valueOf(item.numOrd), UtilityDate.formatDate(item.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}" @@ -84,7 +83,6 @@ android:id="@+id/right_descrizione" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="#000" android:text="@{Html.fromHtml(@string/ord_ven_testata_data_cons(UtilityDate.formatDate(item.dataCons, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}" tools:text="Cons 07 nov 2018" app:visibilityWhenNotNull="@{item.dataCons}" diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml index 7bb6a5dc..87fae766 100644 --- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml +++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml @@ -61,7 +61,7 @@ android:paddingBottom="8dp"> @@ -124,7 +124,7 @@ android:paddingStart="6dp" android:paddingEnd="6dp" android:text="@{UtilityNumber.decimalToString(mtbColr.pesoLordoKg, 0) + ` KG`}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium" + android:textAppearance="@style/TextAppearance.Material3.BodyLarge" android:textColor="@android:color/black" android:textStyle="bold" tools:text="658 KG" /> diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml index 5505eb0a..ef6d41a5 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml @@ -60,7 +60,7 @@ @@ -59,8 +58,7 @@ android:maxLines="2" android:paddingStart="0dp" android:paddingEnd="8dp" - android:text="Seleziona l'agente che vuoi filtrare" - android:textColor="#444" /> + android:text="Seleziona l'agente che vuoi filtrare" /> @@ -68,8 +66,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_automezzo.xml b/app/src/main/res/layout/layout_filter_automezzo.xml index 00d0197e..8aed8686 100644 --- a/app/src/main/res/layout/layout_filter_automezzo.xml +++ b/app/src/main/res/layout/layout_filter_automezzo.xml @@ -39,7 +39,7 @@ @@ -60,7 +59,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona l'automezzo che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +67,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white"/> + android:layout_alignParentEnd="true"/> diff --git a/app/src/main/res/layout/layout_filter_cliente.xml b/app/src/main/res/layout/layout_filter_cliente.xml index 821dc449..4354cdd3 100644 --- a/app/src/main/res/layout/layout_filter_cliente.xml +++ b/app/src/main/res/layout/layout_filter_cliente.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona il cliente che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_cod_art.xml b/app/src/main/res/layout/layout_filter_cod_art.xml index 5511a58f..d73e4597 100644 --- a/app/src/main/res/layout/layout_filter_cod_art.xml +++ b/app/src/main/res/layout/layout_filter_cod_art.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona il codice articolo che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_commessa.xml b/app/src/main/res/layout/layout_filter_commessa.xml index 0a4e3aa1..0dc05489 100644 --- a/app/src/main/res/layout/layout_filter_commessa.xml +++ b/app/src/main/res/layout/layout_filter_commessa.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona la commessa che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_deposito.xml b/app/src/main/res/layout/layout_filter_deposito.xml index 0638b413..6edbc818 100644 --- a/app/src/main/res/layout/layout_filter_deposito.xml +++ b/app/src/main/res/layout/layout_filter_deposito.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona il deposito che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_descr.xml b/app/src/main/res/layout/layout_filter_descr.xml index 86ded055..1e3a6391 100644 --- a/app/src/main/res/layout/layout_filter_descr.xml +++ b/app/src/main/res/layout/layout_filter_descr.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona la descrizione articolo che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_gruppo_merc.xml b/app/src/main/res/layout/layout_filter_gruppo_merc.xml index 5a4c8bae..f4cd3c88 100644 --- a/app/src/main/res/layout/layout_filter_gruppo_merc.xml +++ b/app/src/main/res/layout/layout_filter_gruppo_merc.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona il gruppo merceologico che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_numero_ordine.xml b/app/src/main/res/layout/layout_filter_numero_ordine.xml index 7cb87d9f..bd3f8e03 100644 --- a/app/src/main/res/layout/layout_filter_numero_ordine.xml +++ b/app/src/main/res/layout/layout_filter_numero_ordine.xml @@ -38,7 +38,7 @@ @@ -58,8 +57,7 @@ android:maxLines="2" android:paddingStart="0dp" android:paddingEnd="8dp" - android:text="Seleziona il numero d'ordine che vuoi filtrare" - android:textColor="#444" /> + android:text="Seleziona il numero d'ordine che vuoi filtrare" /> @@ -67,8 +65,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_paese.xml b/app/src/main/res/layout/layout_filter_paese.xml index ecad9251..1068a7d9 100644 --- a/app/src/main/res/layout/layout_filter_paese.xml +++ b/app/src/main/res/layout/layout_filter_paese.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona l'automezzo che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_posizione.xml b/app/src/main/res/layout/layout_filter_posizione.xml index 4d8d27ee..45ba9be6 100644 --- a/app/src/main/res/layout/layout_filter_posizione.xml +++ b/app/src/main/res/layout/layout_filter_posizione.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona la posizione che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_term_cons.xml b/app/src/main/res/layout/layout_filter_term_cons.xml index b9a8c3c4..93204c96 100644 --- a/app/src/main/res/layout/layout_filter_term_cons.xml +++ b/app/src/main/res/layout/layout_filter_term_cons.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona i termini di consegna che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_vettore.xml b/app/src/main/res/layout/layout_filter_vettore.xml index d1770693..3dfe3b54 100644 --- a/app/src/main/res/layout/layout_filter_vettore.xml +++ b/app/src/main/res/layout/layout_filter_vettore.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona il vettore che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/layout_filter_viaggio.xml b/app/src/main/res/layout/layout_filter_viaggio.xml index 6b48b5c2..0e277fe7 100644 --- a/app/src/main/res/layout/layout_filter_viaggio.xml +++ b/app/src/main/res/layout/layout_filter_viaggio.xml @@ -39,7 +39,7 @@ @@ -60,7 +60,7 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="Seleziona il viaggio che vuoi filtrare" - android:textColor="#444" /> + /> @@ -68,8 +68,7 @@ android:id="@+id/search_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:backgroundTint="@android:color/white" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/picking_resi_main_list__item.xml b/app/src/main/res/layout/picking_resi_main_list__item.xml index 0eb69578..aa19a1dc 100644 --- a/app/src/main/res/layout/picking_resi_main_list__item.xml +++ b/app/src/main/res/layout/picking_resi_main_list__item.xml @@ -67,7 +67,7 @@ + android:layout_height="wrap_content"> @@ -65,8 +63,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" - android:textColor="@android:color/black" - style="@style/AppTheme.NewMaterial.Text.Medium" + style="@style/TextAppearance.Material3.BodyLarge" tools:text="QTA" /> @@ -131,7 +124,6 @@ android:id="@+id/subdescrizione2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="14sp" style="@style/TextAppearance.Material3.BodyMedium" tools:text="SUB DESCRIZIONE" /> @@ -174,7 +166,7 @@ android:layout_alignTop="@id/content_view_child" android:layout_alignBottom="@id/content_view_child" android:alpha="0.15" - android:background="@android:color/black" /> + android:background="?attr/colorDisabledSurface" /> \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 03691187..41e94742 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -38,6 +38,7 @@ Ops Attenzione OK + Ho capito Annulla Resetta Evasi @@ -529,4 +530,6 @@ Conferma esportazione non sarà più possibile modificarne il contenuto. Vuoi procedere?]]> + + 1 febbraio 2026, i dispositivi con una versione di Android inferiore alla 8.0 non saranno più supportati. Per continuare a utilizzare l’app in modo sicuro e con tutte le funzionalità, ti consigliamo di aggiornare il tuo sistema operativo o utilizzare un dispositivo compatibile.]]> \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 1fc9d4d1..842a7a73 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -35,5 +35,7 @@ @color/md_theme_dark_inverseOnSurface @color/md_theme_dark_inverseSurface @color/md_theme_dark_inversePrimary + @android:color/white + @color/letturaFacilitataBGDark diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml index ee7326d9..48759c3f 100644 --- a/app/src/main/res/values/attr.xml +++ b/app/src/main/res/values/attr.xml @@ -37,4 +37,7 @@ + + + diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml index 72dab875..c940865c 100644 --- a/app/src/main/res/values/custom_colors.xml +++ b/app/src/main/res/values/custom_colors.xml @@ -13,7 +13,8 @@ @color/green_500 @color/orange_700 - #eeeeee + #eeeeee + #111111 #B2000000 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1cae29d1..857c5e77 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ Ops Warning OK + Got it Abort Reset Dspch @@ -536,4 +537,6 @@ Confirm export it will no longer be possible to modify their contents. Do you want to proceed?]]> + + February 1, 2026, devices running Android versions earlier than 8.0 will no longer be supported.
To continue using the app securely and with full functionality, please update your operating system or switch to a compatible device.]]> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c4d4edbc..ea4bb7ba 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -18,10 +18,6 @@ @drawable/material_text_color 12sp -