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

Aggiornato tema.

Browse Source 
Aggiornato DialogProgressView.
Aggiornato DialogYesNoView.
Aggiornato DialogInputPesoLuView.
This commit is contained in:
Giuseppe Scorrano 2022-09-01 15:08:13 +02:00
parent 8c80918521
commit b129bb51c6
29 changed files with 764 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseActivity.java
View File

@ -49,7 +49,7 @@ public class BaseActivity extends AppCompatActivity {
public void onError(Exception ex) { public void onError(Exception ex) {
this.runOnUiThread(() -> { this.runOnUiThread(() -> {
this.closeProgress(); this.closeProgress();
UtilityExceptions.defaultException(this, ex, mCurrentProgress); UtilityExceptions.defaultException(this, ex);
BarcodeManager.enable(); BarcodeManager.enable();
}); });
} }

2
app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java
View File

@ -84,7 +84,7 @@ public abstract class BaseFragment extends Fragment {
public void onError(Exception ex) { public void onError(Exception ex) {
requireActivity().runOnUiThread(() -> { requireActivity().runOnUiThread(() -> {
this.closeProgress(); this.closeProgress();
UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress); UtilityExceptions.defaultException(getActivity(), ex);
BarcodeManager.enable(); BarcodeManager.enable();
}); });
} }

8
app/src/main/java/it/integry/integrywmsnative/core/update/UpdatesManager.java
View File

@ -61,8 +61,8 @@ public class UpdatesManager {
String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/"; String destination = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS) + "/";
var progressDialog = DialogProgressView.newInstance("Download", null, false); var progressDialogBuilder = new DialogProgressView("Download", null, false);
progressDialog.show(mContext.getSupportFragmentManager(), "tag"); progressDialogBuilder.show(mContext.getSupportFragmentManager(), "tag");
var fileDownloader = new FileDownloader() var fileDownloader = new FileDownloader()
@ -70,13 +70,13 @@ public class UpdatesManager {
.setUrlString(downloadURL) .setUrlString(downloadURL)
.setOnProgressUpdate(progress -> { .setOnProgressUpdate(progress -> {
mContext.runOnUiThread(() -> { mContext.runOnUiThread(() -> {
progressDialog.setProgress(progress); progressDialogBuilder.setProgress(progress);
}); });
}) })
.setOnDownloadCompleted(destPath -> { .setOnDownloadCompleted(destPath -> {
mContext.runOnUiThread(() -> { mContext.runOnUiThread(() -> {
progressDialog.dismiss(); progressDialogBuilder.dismiss();
Uri fileLoc; Uri fileLoc;
Intent intent; Intent intent;

7
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
View File

@ -15,7 +15,6 @@ import it.integry.integrywmsnative.core.exception.InvalidConnectionException;
import it.integry.integrywmsnative.core.exception.InvalidLUException; import it.integry.integrywmsnative.core.exception.InvalidLUException;
import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException; import it.integry.integrywmsnative.core.exception.InvalidLUGestioneException;
import it.integry.integrywmsnative.core.rest.CommonRESTException; import it.integry.integrywmsnative.core.rest.CommonRESTException;
import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
public class UtilityExceptions { public class UtilityExceptions {
@ -25,12 +24,6 @@ public class UtilityExceptions {
InvalidLUGestioneException.class, InvalidLUGestioneException.class,
InvalidLUException.class InvalidLUException.class
}; };
public static void defaultException(Context context, Exception ex, DialogProgressView progressDialog) {
defaultException(context, ex);
if (progressDialog != null && progressDialog.isVisible()) progressDialog.dismiss();
}
public static void defaultException(Context context, Exception ex) { public static void defaultException(Context context, Exception ex) {
defaultException(context, ex, false); defaultException(context, ex, false);
} }

2
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityProgress.java
View File

@ -7,7 +7,7 @@ import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
public class UtilityProgress { public class UtilityProgress {
public static DialogProgressView createDefaultProgressDialog(FragmentActivity mContext) { public static DialogProgressView createDefaultProgressDialog(FragmentActivity mContext) {
var progress = DialogProgressView.newInstance(); var progress = DialogProgressView.newInstance(null, null, true);
progress.show(mContext.getSupportFragmentManager(), "tag"); progress.show(mContext.getSupportFragmentManager(), "tag");
return progress; return progress;
} }

2
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
View File

@ -798,7 +798,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
if (ex instanceof InvalidPesoKGException) { if (ex instanceof InvalidPesoKGException) {
UtilityToast.showToast(ex.getMessage()); UtilityToast.showToast(ex.getMessage());
} else { } else {
UtilityExceptions.defaultException(this, ex, mCurrentProgress); UtilityExceptions.defaultException(this, ex);
} }
BarcodeManager.enable(); BarcodeManager.enable();

14
app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
View File

@ -49,7 +49,7 @@ import it.integry.integrywmsnative.core.utility.UtilityContext;
import it.integry.integrywmsnative.databinding.ActivityMainBinding; import it.integry.integrywmsnative.databinding.ActivityMainBinding;
import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.login.LoginActivity;
import it.integry.integrywmsnative.gest.settings.MainSettingsFragment; import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
public class MainActivity extends BaseActivity public class MainActivity extends BaseActivity
implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity { implements NavigationView.OnNavigationItemSelectedListener, IPoppableActivity {
@ -71,9 +71,8 @@ public class MainActivity extends BaseActivity
@Inject @Inject
UpdatesManager updatesManager; UpdatesManager updatesManager;
@Inject @Inject
DialogInputQuantityV2View mDialogInputQuantityV2View; DialogProgressView mDialogProgressView;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -81,6 +80,7 @@ public class MainActivity extends BaseActivity
MainApplication.appComponent MainApplication.appComponent
.mainActivityComponent() .mainActivityComponent()
.create() .create()
.inject(this); .inject(this);
@ -108,14 +108,6 @@ public class MainActivity extends BaseActivity
init(); init();
// mDialogInputQuantityV2View
// .setDialogInputQuantityV2DTO(new DialogInputQuantityV2DTO()
// .setMtbAart(new MtbAart()
// .setCodMart("AAAA")
// .setFlagQtaCnfFissa("S")))
// .show(getSupportFragmentManager(), "tag");
} }
private void startLoginActivity() { private void startLoginActivity() {

8
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
View File

@ -171,10 +171,10 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
private void initRecyclerView() { private void initRecyclerView() {
mBindings.pickingLiberoMainList.setNestedScrollingEnabled(false); mBindings.pickingLiberoMainList.setNestedScrollingEnabled(false);
mBindings.pickingLiberoMainList.setHasFixedSize(true); mBindings.pickingLiberoMainList.setHasFixedSize(true);
mBindings.pickingLiberoMainList.setLayoutManager(new LinearLayoutManager(getActivity())); mBindings.pickingLiberoMainList.setLayoutManager(new LinearLayoutManager(requireActivity()));
SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL); SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireActivity(), SimpleDividerItemDecoration.VERTICAL);
itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider)); itemDecorator.setDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.divider));
mBindings.pickingLiberoMainList.addItemDecoration(itemDecorator); mBindings.pickingLiberoMainList.addItemDecoration(itemDecorator);
} }
@ -277,7 +277,7 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
if (ex instanceof InvalidPesoKGException) { if (ex instanceof InvalidPesoKGException) {
UtilityToast.showToast(ex.getMessage()); UtilityToast.showToast(ex.getMessage());
} else { } else {
UtilityExceptions.defaultException(getActivity(), ex, mCurrentProgress); UtilityExceptions.defaultException(getActivity(), ex);
} }
BarcodeManager.enable(); BarcodeManager.enable();

2
app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java
View File

@ -287,7 +287,7 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag
if (ex instanceof InvalidPesoKGException) { if (ex instanceof InvalidPesoKGException) {
UtilityToast.showToast(ex.getMessage()); UtilityToast.showToast(ex.getMessage());
} else { } else {
UtilityExceptions.defaultException(this, ex, mCurrentProgress); UtilityExceptions.defaultException(this, ex);
} }
BarcodeManager.enable(); BarcodeManager.enable();

6
app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
View File

@ -63,7 +63,7 @@ import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.Dialo
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView; import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUView;
import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNo; import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, RettificaGiacenzeViewModel.Listener, BottomSheetMtbColrEditView.Listener { public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, RettificaGiacenzeViewModel.Listener, BottomSheetMtbColrEditView.Listener {
@ -341,7 +341,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
if (ex instanceof InvalidPesoKGException) { if (ex instanceof InvalidPesoKGException) {
UtilityToast.showToast(ex.getMessage()); UtilityToast.showToast(ex.getMessage());
} else { } else {
UtilityExceptions.defaultException(requireActivity(), ex, mCurrentProgress); UtilityExceptions.defaultException(requireActivity(), ex);
} }
} }
@ -476,7 +476,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
@Override @Override
public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) { public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) {
DialogYesNo.make(getActivity(), "Posiziona UL", "Vuoi cambiare la posizione della UL corrente?", result -> { new DialogYesNoView(requireActivity(), "Posiziona UL", "Vuoi cambiare la posizione della UL corrente?", result -> {
switch (result) { switch (result) {
case YES: case YES:
DialogAskPositionOfLU.makeBase(getActivity(), false, (status, mtbDepoPosizione) -> { DialogAskPositionOfLU.makeBase(getActivity(), false, (status, mtbDepoPosizione) -> {

18
app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
View File

@ -75,11 +75,11 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts; import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts;
import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotView; import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotView;
import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog; import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog;
import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPeso; import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLuView;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView; import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtView;
import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNo; import it.integry.integrywmsnative.view.dialogs.yes_no.DialogYesNoView;
public class SpedizioneActivity extends BaseActivity implements SpedizioneViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener { public class SpedizioneActivity extends BaseActivity implements SpedizioneViewModel.Listener, BottomSheetFragmentLUContentViewModel.Listener, BottomSheetFragmentLUContentView.Listener {
@ -722,9 +722,15 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
@Override @Override
public void onLUPesoRequired(String codTcol, BigDecimal netWeightKG, BigDecimal grossWeightKG, RunnableArgsss<String, BigDecimal, BigDecimal> onComplete) { public void onLUPesoRequired(String codTcol, BigDecimal netWeightKG, BigDecimal grossWeightKG, RunnableArgsss<String, BigDecimal, BigDecimal> onComplete) {
DialogInputPeso.make(this, codTcol, netWeightKG, grossWeightKG, (newCodTcol, newNetWeight, newGrossWeight) -> { // DialogInputPesoView.make(this, codTcol, netWeightKG, grossWeightKG, (newCodTcol, newNetWeight, newGrossWeight) -> {
onComplete.run(newCodTcol, netWeightKG, grossWeightKG); // onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
}).show(); // }).show();
new DialogInputPesoLuView(null, new BigDecimal(50), new BigDecimal(55), (newCodTcol, newNetWeight, newGrossWeight) -> {
// onComplete.run(newCodTcol, netWeightKG, grossWeightKG);
})
.show(getSupportFragmentManager(), "tag");
} }
@Override @Override
@ -856,7 +862,7 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
@Override @Override
public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) { public void onLUPositionChangeRequest(RunnableArgss<Boolean, MtbDepoPosizione> onComplete) {
DialogYesNo.make(this, "Posiziona UL", "Vuoi cambiare la posizione della UL corrente?", result -> { new DialogYesNoView(this, "Posiziona UL", "Vuoi cambiare la posizione della UL corrente?", result -> {
switch (result) { switch (result) {
case YES: case YES:
DialogAskPositionOfLU.makeBase(this, false, (status, mtbDepoPosizione) -> { DialogAskPositionOfLU.makeBase(this, false, (status, mtbDepoPosizione) -> {

14
app/src/main/java/it/integry/integrywmsnative/ui/filter_chips/FilterChipView.java
View File

@ -29,13 +29,13 @@ public class FilterChipView extends Chip {
this.defaultChipBackgroundColor = getChipBackgroundColor(); this.defaultChipBackgroundColor = getChipBackgroundColor();
this.defaultChipTextColor = getTextColors(); this.defaultChipTextColor = getTextColors();
setShapeAppearanceModel( // setShapeAppearanceModel(
getShapeAppearanceModel() // getShapeAppearanceModel()
.withCornerSize(4) // .withCornerSize(4)
.toBuilder() // .toBuilder()
.build()); // .build());
//
setChipMinHeight(getChipMinHeight() * 1.25f); // setChipMinHeight(getChipMinHeight() * 1.25f);
setOnCloseIconClickListener(v -> { setOnCloseIconClickListener(v -> {
if (onResetClicked != null) onResetClicked.run(); if (onResetClicked != null) onResetClicked.run();

64
app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogProgressView.java
View File

@ -1,18 +1,16 @@
package it.integry.integrywmsnative.view.dialogs; package it.integry.integrywmsnative.view.dialogs;
import android.graphics.Color; import android.app.Dialog;
import android.graphics.drawable.ColorDrawable;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import javax.inject.Singleton; import javax.inject.Singleton;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
@ -29,36 +27,51 @@ public class DialogProgressView extends DialogFragment {
private boolean indeterminateProgress; private boolean indeterminateProgress;
public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) { public static DialogProgressView newInstance(String title, String subtitle, boolean indeterminate) {
return new DialogProgressView() return new DialogProgressView(title, subtitle, indeterminate);
.setIndeterminateProgress(indeterminate)
.setTitle(title)
.setSubtitle(subtitle);
} }
public static DialogProgressView newInstance() { public static DialogProgressView newInstance() {
return newInstance(null, null, true); return newInstance(null, null, true);
} }
@Nullable public DialogProgressView(String title, String subtitle, boolean indeterminate) {
this.setTitle(title);
this.setSubtitle(subtitle);
this.setIndeterminateProgress(indeterminate);
}
@NonNull
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_progress, container, false); mBindings = DialogProgressBinding.inflate(LayoutInflater.from(requireContext()));
setCancelable(false); mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireContext().getString(R.string.loading) : title);
getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); if (!UtilityString.isNullOrEmpty(subtitle)) mBindings.setSubtitle(subtitle);
mBindings.setTitle(UtilityString.isNullOrEmpty(title) ? requireActivity().getString(R.string.loading) : title);
mBindings.setSubtitle(subtitle);
mBindings.progressBar.setIndeterminate(isIndeterminateProgress()); mBindings.progressBar.setIndeterminate(isIndeterminateProgress());
if (!isIndeterminateProgress()) mBindings.progressBar.setMax(100);
if(!isIndeterminateProgress()){ return new MaterialAlertDialogBuilder(requireContext())
mBindings.progressBar.setMax(100); .setView(mBindings.getRoot())
.setCancelable(false)
.create();
} }
return mBindings.getRoot(); public String getTitle() {
return title;
} }
public void setTitle(String title) {
this.title = title;
}
public String getSubtitle() {
return subtitle;
}
public void setSubtitle(String subtitle) {
this.subtitle = subtitle;
}
public boolean isIndeterminateProgress() { public boolean isIndeterminateProgress() {
return indeterminateProgress; return indeterminateProgress;
@ -69,17 +82,6 @@ public class DialogProgressView extends DialogFragment {
return this; return this;
} }
public DialogProgressView setTitle(String title) {
this.title = title;
return this;
}
public DialogProgressView setSubtitle(String subtitle) {
this.subtitle = subtitle;
return this;
}
public void setProgress(int progress) { public void setProgress(int progress) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
mBindings.progressBar.setProgress(progress, true); mBindings.progressBar.setProgress(progress, true);

135
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPeso.java
View File

@ -1,135 +0,0 @@
package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import android.widget.ArrayAdapter;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.FragmentActivity;
import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import java.math.BigDecimal;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.di.BindableString;
import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
import it.integry.integrywmsnative.core.model.MtbTCol;
import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityNumber;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
public class DialogInputPeso {
private final FragmentActivity mContext;
private final DialogInputPesoLuBinding mBindings;
private final DialogInputPesoViewModel mViewModel;
private final Dialog currentDialog;
private List<MtbTCol> codTcolList = null;
private ArrayAdapter<String> codTcolArrayAdapter = null;
public static Dialog make(final FragmentActivity context, String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
return new DialogInputPeso(context, codTcol, netWeight, grossWeight, onDialogDismiss).currentDialog;
}
private DialogInputPeso(final FragmentActivity context, String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
this.mContext = context;
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_input_peso_lu, null, false);
currentDialog = new Dialog(context);
currentDialog.setContentView(mBindings.getRoot());
currentDialog.setCanceledOnTouchOutside(false);
currentDialog.setCancelable(false);
currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
mViewModel = new DialogInputPesoViewModel();
mViewModel.codTcol.set(codTcol);
mViewModel.netWeight.set(UtilityNumber.decimalToString(netWeight));
mViewModel.grossWeight.set(UtilityNumber.decimalToString(grossWeight));
mBindings.setViewModel(mViewModel);
mBindings.buttonConfirm.setOnClickListener(v -> {
currentDialog.dismiss();
String newCodTcol = null;
if(mViewModel.codTcol.get() != null) {
Optional<MtbTCol> newCodTcolOptional = Stream.of(codTcolList)
.filter(x -> (x.getCodTcol() + " - " + x.getDescrizione()).equalsIgnoreCase(mViewModel.codTcol.get()))
.findSingle();
if(newCodTcolOptional.isPresent()) newCodTcol = newCodTcolOptional.get().getCodTcol();
}
BigDecimal netWeightDecimal = new BigDecimal(mViewModel.netWeight.get());
BigDecimal grossWeightDecimal = new BigDecimal(mViewModel.grossWeight.get());
onDialogDismiss.run(newCodTcol, netWeightDecimal, grossWeightDecimal);
});
this.init();
}
private void init() {
final DialogProgressView progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
MagazzinoRESTConsumer.getTipiColloStatic(codTcols -> {
this.codTcolList = codTcols;
List<String> codTcolDescriptions = Stream.of(codTcols)
.map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
.toList();
if(mViewModel.codTcol.get() != null) {
Optional<String> newCodTcol = Stream.of(codTcols)
.filter(x -> x.getCodTcol().equalsIgnoreCase(mViewModel.codTcol.get()))
.map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
.findSingle();
if(newCodTcol.isPresent()) mViewModel.codTcol.set(newCodTcol.get());
}
codTcolArrayAdapter = new ArrayAdapter(mContext, R.layout.array_adapter_single_item);
codTcolArrayAdapter.addAll(codTcolDescriptions);
mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
progressDialog.dismiss();
}, ex -> {
UtilityExceptions.defaultException(mContext, ex, progressDialog);
});
}
public class DialogInputPesoViewModel {
public BindableString codTcol = new BindableString();
public BindableString netWeight = new BindableString();
public BindableString grossWeight = new BindableString();
}
}

114
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_peso_lu/DialogInputPesoLuView.java Normal file
View File

@ -0,0 +1,114 @@
package it.integry.integrywmsnative.view.dialogs.input_peso_lu;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.widget.ArrayAdapter;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import com.annimon.stream.Optional;
import com.annimon.stream.Stream;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.math.BigDecimal;
import java.util.List;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.di.BindableString;
import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
import it.integry.integrywmsnative.core.model.MtbTCol;
import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityNumber;
import it.integry.integrywmsnative.databinding.DialogInputPesoLuBinding;
public class DialogInputPesoLuView extends DialogFragment {
private DialogInputPesoLuBinding mBindings;
private RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss;
public BindableString codTcol = new BindableString();
public BindableString netWeight = new BindableString();
public BindableString grossWeight = new BindableString();
private List<MtbTCol> codTcolList = null;
private ArrayAdapter<String> codTcolArrayAdapter = null;
public DialogInputPesoLuView(String codTcol, BigDecimal netWeight, BigDecimal grossWeight, RunnableArgsss<String, BigDecimal, BigDecimal> onDialogDismiss) {
this.onDialogDismiss = onDialogDismiss;
this.codTcol.set(codTcol);
this.netWeight.set(UtilityNumber.decimalToString(netWeight));
this.grossWeight.set(UtilityNumber.decimalToString(grossWeight));
}
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
mBindings = DialogInputPesoLuBinding.inflate(LayoutInflater.from(requireContext()), null, false);
mBindings.setView(this);
this.init();
return new MaterialAlertDialogBuilder(requireContext())
.setView(mBindings.getRoot())
.setCancelable(false)
.setPositiveButton(R.string.confirm, (dialog, which) -> {
String newCodTcol = null;
if(codTcol.get() != null) {
Optional<MtbTCol> newCodTcolOptional = Stream.of(codTcolList)
.filter(x -> (x.getCodTcol() + " - " + x.getDescrizione()).equalsIgnoreCase(codTcol.get()))
.findSingle();
if(newCodTcolOptional.isPresent()) newCodTcol = newCodTcolOptional.get().getCodTcol();
}
BigDecimal netWeightDecimal = new BigDecimal(netWeight.get());
BigDecimal grossWeightDecimal = new BigDecimal(grossWeight.get());
onDialogDismiss.run(newCodTcol, netWeightDecimal, grossWeightDecimal);
})
.create();
}
private void init() {
// final DialogProgressView progressDialog = UtilityProgress.createDefaultProgressDialog(mContext);
MagazzinoRESTConsumer.getTipiColloStatic(codTcols -> {
this.codTcolList = codTcols;
List<String> codTcolDescriptions = Stream.of(codTcols)
.map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
.toList();
if(codTcol.get() != null) {
Optional<String> newCodTcol = Stream.of(codTcols)
.filter(x -> x.getCodTcol().equalsIgnoreCase(codTcol.get()))
.map(codTcol -> codTcol.getCodTcol() + " - " + codTcol.getDescrizione())
.findSingle();
if(newCodTcol.isPresent()) codTcol.set(newCodTcol.get());
}
codTcolArrayAdapter = new ArrayAdapter(requireContext(), R.layout.array_adapter_single_item);
codTcolArrayAdapter.addAll(codTcolDescriptions);
mBindings.filledExposedDropdownCodTcol.setAdapter(codTcolArrayAdapter);
// progressDialog.dismiss();
}, ex -> {
UtilityExceptions.defaultException(requireContext(), ex);
});
}
}

52
app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNo.java
View File

@ -1,52 +0,0 @@
package it.integry.integrywmsnative.view.dialogs.yes_no;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import androidx.databinding.DataBindingUtil;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.databinding.DialogYesNoBinding;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
public class DialogYesNo {
private Dialog currentDialog;
public static Dialog make(final Context context, final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
return new DialogYesNo(context, title, description, onDialogDismiss).currentDialog;
}
private DialogYesNo(Context context, String title, String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
DialogYesNoBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_yes_no, null, false);
currentDialog = new Dialog(context);
currentDialog.setContentView(bindings.getRoot());
currentDialog.setCancelable(false);
currentDialog.setCanceledOnTouchOutside(false);
currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
bindings.titleText.setText(title);
bindings.descriptionText.setText(description);
bindings.buttonYes.setOnClickListener(v -> {
onDialogDismiss.run(DialogConsts.Results.YES);
currentDialog.dismiss();
});
bindings.buttonNo.setOnClickListener(v -> {
onDialogDismiss.run(DialogConsts.Results.NO);
currentDialog.dismiss();
});
}
}

68
app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java Normal file
View File

@ -0,0 +1,68 @@
package it.integry.integrywmsnative.view.dialogs.yes_no;
import android.content.Context;
import android.view.LayoutInflater;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.databinding.DialogYesNoBinding;
import it.integry.integrywmsnative.view.dialogs.DialogConsts;
public class DialogYesNoView extends MaterialAlertDialogBuilder {
public DialogYesNoView(Context context, final String title, final String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
super(context);
var binding = DialogYesNoBinding.inflate(LayoutInflater.from(context));
// binding.setView(this);
binding.executePendingBindings();
// this.qtaResidua.set(qtaResidua);
this.setTitle(title);
this.setMessage(description);
// this.setView(binding.getRoot());
this.setPositiveButton("Ok", (dialog, which) -> {
if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.YES);
});
this.setNegativeButton("Annulla", (dialog, which) -> {
if (onDialogDismiss != null) onDialogDismiss.run(DialogConsts.Results.NO);
});
}
// private DialogYesNo(Context context, String title, String description, RunnableArgs<DialogConsts.Results> onDialogDismiss) {
// LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
// DialogYesNoBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_yes_no, null, false);
//
// currentDialog = new Dialog(context);
//
// currentDialog.setContentView(bindings.getRoot());
//
// currentDialog.setCancelable(false);
// currentDialog.setCanceledOnTouchOutside(false);
// currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
//
// bindings.titleText.setText(title);
// bindings.descriptionText.setText(description);
//
// bindings.buttonYes.setOnClickListener(v -> {
// onDialogDismiss.run(DialogConsts.Results.YES);
// currentDialog.dismiss();
// });
//
// bindings.buttonNo.setOnClickListener(v -> {
// onDialogDismiss.run(DialogConsts.Results.NO);
// currentDialog.dismiss();
// });
//
//
// }
}

140
app/src/main/res/layout/dialog_input_peso_lu.xml
View File

@ -1,83 +1,81 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<import type="android.text.Html" /> <import type="android.text.Html" />
<import type="it.integry.integrywmsnative.R" /> <import type="it.integry.integrywmsnative.R" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" /> <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" /> <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<variable <variable
name="mContext" name="mContext"
type="android.content.Context" /> type="android.content.Context" />
<variable <variable
name="viewModel" name="view"
type="it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPeso.DialogInputPesoViewModel" /> type="it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLuView" />
</data> </data>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView
android:orientation="vertical" android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardCornerRadius="12dp" app:cardCornerRadius="12dp"
app:cardElevation="0dp"> app:cardElevation="0dp">
<LinearLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<androidx.appcompat.widget.AppCompatImageView
style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_error_white_24dp"
app:tint="?colorPrimary" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/light_blue_300"
android:gravity="center_horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_error_white_24dp"
android:layout_margin="24dp"/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="24dp"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<TextView <TextView
android:id="@+id/title_text" android:id="@+id/title_text"
style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextViewMaterial.Dialog.HeadlineText" android:gravity="center_horizontal"
android:text="@string/action_insert_weight" android:text="@string/action_insert_weight" />
android:gravity="center_horizontal"/>
<TextView </androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatTextView
style="@style/MaterialAlertDialog.Material3.Body.Text.CenterStacked"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextViewMaterial"
android:text="@string/dialog_input_peso_lu_description" android:text="@string/dialog_input_peso_lu_description"
android:gravity="center"
android:layout_marginTop="16dp"/> android:layout_marginTop="16dp"/>
<androidx.appcompat.widget.LinearLayoutCompat
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp"> android:layout_marginTop="16dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
@ -91,12 +89,12 @@
android:id="@+id/filled_exposed_dropdown_cod_tcol" android:id="@+id/filled_exposed_dropdown_cod_tcol"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:inputType="textNoSuggestions"
android:nextFocusForward="@id/filled_exposed_dropdown_vettore" android:nextFocusForward="@id/filled_exposed_dropdown_vettore"
app:binding="@{viewModel.codTcol}"/> android:singleLine="true"
app:binding="@{view.codTcol}" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
@ -120,69 +118,47 @@
app:layout_constraintGuide_percent="0.51" /> app:layout_constraintGuide_percent="0.51" />
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
style="@style/TextInputLayout.OutlinePrimary"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@id/guide_center_1"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
style="@style/TextInputLayout.OutlinePrimary"> app:layout_constraintEnd_toEndOf="@id/guide_center_1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
style="@style/TextInputEditText.OutlinePrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/gross_weight" android:hint="@string/gross_weight"
android:inputType="numberDecimal" android:inputType="numberDecimal"
app:binding="@{viewModel.grossWeight}" app:binding="@{view.grossWeight}" />
style="@style/TextInputEditText.OutlinePrimary"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
style="@style/TextInputLayout.OutlinePrimary"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="@id/guide_center_2"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
style="@style/TextInputLayout.OutlinePrimary"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/guide_center_2"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputEditText
style="@style/TextInputEditText.OutlinePrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/net_weight" android:hint="@string/net_weight"
android:inputType="numberDecimal" android:inputType="numberDecimal"
app:binding="@{viewModel.netWeight}" app:binding="@{view.netWeight}" />
style="@style/TextInputEditText.OutlinePrimary"/>
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout </androidx.appcompat.widget.LinearLayoutCompat>
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingTop="12dp"
android:paddingBottom="8dp"
android:gravity="bottom|center_horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Button.PrimaryFull"
app:icon="@drawable/ic_save_24dp"
android:text="@string/confirm"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView> </androidx.cardview.widget.CardView>

51
app/src/main/res/layout/dialog_progress.xml
View File

@ -3,8 +3,11 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<import type="android.view.View" /> <import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" /> <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<variable <variable
@ -15,38 +18,33 @@
name="subtitle" name="subtitle"
type="String" /> type="String" />
</data> </data>
<androidx.cardview.widget.CardView
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:cardCornerRadius="12dp"
app:cardElevation="0dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="24dp"
android:paddingLeft="24dp" android:paddingLeft="24dp"
android:paddingTop="24dp"
android:paddingRight="24dp"> android:paddingRight="24dp">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/TextViewMaterial.Dialog.HeadlineText" android:gravity="center_horizontal"
android:text="@{title}" android:text="@{title}"
android:gravity="center_horizontal"/> tools:text="Loading" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
style="@style/MaterialAlertDialog.Material3.Body.Text.CenterStacked"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text.Small" android:gravity="center_horizontal"
android:text="@{subtitle}" android:text="@{subtitle}"
tools:text="@string/loading"
android:visibility="@{UtilityString.isNullOrEmpty(subtitle) ? View.GONE : View.VISIBLE}" android:visibility="@{UtilityString.isNullOrEmpty(subtitle) ? View.GONE : View.VISIBLE}"
android:gravity="center_horizontal"/> tools:text="@string/loading" />
<ProgressBar <ProgressBar
@ -58,36 +56,7 @@
android:layout_marginBottom="24dp" android:layout_marginBottom="24dp"
android:indeterminate="true" /> android:indeterminate="true" />
<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="32dp"-->
<!-- android:layout_marginBottom="40dp"-->
<!-- android:layout_marginStart="40dp"-->
<!-- android:layout_marginEnd="40dp"-->
<!-- android:paddingStart="4dp"-->
<!-- android:paddingEnd="4dp"-->
<!-- android:backgroundTint="@color/white_bg_alpha"-->
<!-- android:background="@drawable/circular_background">-->
<!-- <ProgressBar-->
<!-- android:id="@+id/progressBar"-->
<!-- style="?android:attr/progressBarStyleHorizontal"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="20dp"-->
<!-- android:indeterminate="true"-->
<!-- android:layout_marginTop="-5dp"-->
<!-- android:layout_marginBottom="-5dp"/>-->
<!-- </RelativeLayout>-->
</LinearLayout> </LinearLayout>
</androidx.cardview.widget.CardView>
</layout> </layout>

19
app/src/main/res/layout/fragment_main_ordini_uscita.xml
View File

@ -24,9 +24,10 @@
android:background="@android:color/white" android:background="@android:color/white"
tools:context=".gest.vendita.MainVenditaFragment"> tools:context=".gest.vendita.MainVenditaFragment">
<RelativeLayout <androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:orientation="vertical">
<HorizontalScrollView <HorizontalScrollView
android:id="@+id/filter_chips" android:id="@+id/filter_chips"
@ -50,8 +51,7 @@
android:id="@+id/vendita_main_list" android:id="@+id/vendita_main_list"
android:scrollbars="vertical" android:scrollbars="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"/>
android:layout_below="@id/filter_chips"/>
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ordini_vendita_empty_view" android:id="@+id/ordini_vendita_empty_view"
@ -106,18 +106,17 @@
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout> </androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/vendita_main_fab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin" android:layout_margin="16dp"
android:tint="@android:color/white" android:contentDescription="Dispatch orders"
style="@style/Widget.MaterialComponents.FloatingActionButton"
app:srcCompat="@drawable/ic_check_black_24dp" app:srcCompat="@drawable/ic_check_black_24dp"
android:onClick="@{() -> view.dispatchOrders()}"
app:visibility="@{view.fabVisible}" app:visibility="@{view.fabVisible}"
android:onClick="@{() -> view.dispatchOrders()}" /> style="?attr/floatingActionButtonPrimaryStyle" />
</FrameLayout> </FrameLayout>
</layout> </layout>

19
app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
View File

@ -17,6 +17,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:paddingVertical="2dp"
android:orientation="horizontal"> android:orientation="horizontal">
@ -24,33 +25,29 @@
<View <View
android:id="@+id/empty_view" android:id="@+id/empty_view"
android:layout_width="8dp" android:layout_width="8dp"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" />
<RelativeLayout <androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/ordine_lavorazione_main_list_group_item_container_root" android:id="@+id/ordine_lavorazione_main_list_group_item_container_root"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@color/full_white"> android:background="@color/full_white">
<androidx.appcompat.widget.AppCompatCheckBox <CheckBox
android:id="@+id/checkbox" android:id="@+id/checkbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@android:color/transparent"
app:checked="@{selected}" /> app:checked="@{selected}" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true">
android:layout_toEndOf="@id/checkbox">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/right_descrizione" android:id="@+id/right_descrizione"
@ -96,7 +93,7 @@
android:layout_toStartOf="@id/right_sub_descrizione"/> android:layout_toStartOf="@id/right_sub_descrizione"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>

31
app/src/main/res/layout/fragment_main_ordini_uscita__list_model.xml
View File

@ -1,23 +1,15 @@
<layout> <layout>
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.LinearLayoutCompat <androidx.appcompat.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/mainOrange" android:background="@color/mainOrange"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="12dp" android:paddingStart="12dp"
android:paddingTop="8dp" xmlns:tools="http://schemas.android.com/tools">
android:paddingEnd="8dp"
android:paddingBottom="8dp">
<CheckBox <CheckBox
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -30,16 +22,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:textStyle="bold" android:ellipsize="end"
style="@style/AppTheme.NewMaterial.Text.Medium" android:singleLine="true"
style="@style/TextAppearance.Material3.TitleMedium"
tools:text="NOME GRUPPO"/> tools:text="NOME GRUPPO"/>
</androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</layout> </layout>

104
app/src/main/res/layout/fragment_picking_libero.xml
View File

@ -1,26 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:fab="http://schemas.android.com/apk/res-auto"> xmlns:fab="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<import type="android.view.View" /> <import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" /> <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<variable <variable
name="view" name="view"
type="it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment" /> type="it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment" />
</data> </data>
<androidx.coordinatorlayout.widget.CoordinatorLayout android:layout_width="match_parent" <androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/picking_libero_main_list" android:id="@+id/picking_libero_main_list"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -28,10 +25,9 @@
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="92dp" android:layout_marginBottom="92dp"
android:paddingStart="2dp" android:paddingStart="2dp"
android:paddingEnd="2dp"> android:paddingEnd="2dp"
tools:itemCount="3"
</androidx.recyclerview.widget.RecyclerView> tools:listitem="@layout/lista_picking_libero_list_model" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
@ -63,76 +59,84 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:alpha="0.4" android:alpha="0.4"
app:visibility="@{view.thereIsntAnOpenedUL}" android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
app:layout_constraintLeft_toRightOf="@id/free_picking__suggestion_1__guideline_left" app:layout_constraintLeft_toRightOf="@id/free_picking__suggestion_1__guideline_left"
app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right"> app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right"
app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
app:visibility="@{view.thereIsntAnOpenedUL}">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="18sp"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/free_picking_suggestion_1"/> android:gravity="center_horizontal"
android:text="@string/free_picking_suggestion_1"
android:textColor="@android:color/black"
android:textSize="18sp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:alpha="0.4" android:alpha="0.4"
app:visibility="@{view.thereIsAnOpenULWithoutRows}" android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
app:layout_constraintLeft_toRightOf="@id/free_picking__suggestion_1__guideline_left" app:layout_constraintLeft_toRightOf="@id/free_picking__suggestion_1__guideline_left"
app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right"> app:layout_constraintRight_toLeftOf="@id/free_picking__suggestion_1__guideline_right"
app:layout_constraintTop_toBottomOf="@id/free_picking__suggestion_1__guideline_top"
app:visibility="@{view.thereIsAnOpenULWithoutRows}">
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="18sp"
android:gravity="center_horizontal"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/free_picking_suggestion_2"/> android:gravity="center_horizontal"
android:text="@string/free_picking_suggestion_2"
android:textColor="@android:color/black"
android:textSize="18sp" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.github.clans.fab.FloatingActionButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginBottom="8dp" android:layout_margin="16dp"
android:layout_marginEnd="8dp" android:contentDescription=""
android:src="@drawable/fab_add" app:srcCompat="@drawable/fab_add"
android:onClick="@{() -> view.createNewLU()}" android:onClick="@{() -> view.createNewLU()}"
app:visibility="@{view.thereIsntAnOpenedUL}" app:visibility="@{view.thereIsntAnOpenedUL}"
fab:fab_colorNormal="@color/colorPrimary" style="?attr/floatingActionButtonPrimaryStyle" />
fab:fab_colorPressed="@color/white_pressed"
fab:fab_colorRipple="#66FFFFFF"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
<com.github.clans.fab.FloatingActionButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginBottom="8dp" android:layout_margin="16dp"
android:layout_marginEnd="8dp" android:contentDescription=""
android:src="@drawable/ic_check_white_24dp" app:srcCompat="@drawable/ic_check_white_24dp"
android:onClick="@{() -> view.closeLU()}" android:onClick="@{() -> view.closeLU()}"
app:visibility="@{view.thereIsAnOpenedUL}" app:visibility="@{view.thereIsAnOpenedUL}"
fab:fab_colorNormal="@color/mainGreen" style="?attr/floatingActionButtonSecondaryStyle" />
fab:fab_colorPressed="@color/white_pressed"
fab:fab_colorRipple="#66FFFFFF"/>
<!-- <com.github.clans.fab.FloatingActionButton-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="bottom|end"-->
<!-- android:layout_marginEnd="8dp"-->
<!-- android:layout_marginBottom="8dp"-->
<!-- android:onClick="@{() -> view.closeLU()}"-->
<!-- android:src="@drawable/ic_check_white_24dp"-->
<!-- app:visibility="@{view.thereIsAnOpenedUL}"-->
<!-- fab:fab_colorNormal="@color/mainGreen"-->
<!-- fab:fab_colorPressed="@color/white_pressed"-->
<!-- fab:fab_colorRipple="#66FFFFFF" />-->
<View <View
@ -140,9 +144,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#99000000" android:background="#99000000"
android:visibility="gone"
android:clickable="true" android:clickable="true"
android:focusable="true" /> android:focusable="true"
android:visibility="gone" />
<it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView <it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView
android:id="@+id/bottom_sheet__mtb_colr_edit" android:id="@+id/bottom_sheet__mtb_colr_edit"

31
app/src/main/res/values-night/themes.xml Normal file
View File

@ -0,0 +1,31 @@
<resources>
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
<item name="colorPrimary">@color/md_theme_dark_primary</item>
<item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_dark_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_dark_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_dark_secondary</item>
<item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_dark_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_dark_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_dark_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_dark_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_dark_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_dark_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_dark_error</item>
<item name="colorErrorContainer">@color/md_theme_dark_errorContainer</item>
<item name="colorOnError">@color/md_theme_dark_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_dark_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_dark_background</item>
<item name="colorOnBackground">@color/md_theme_dark_onBackground</item>
<item name="colorSurface">@color/md_theme_dark_surface</item>
<item name="colorOnSurface">@color/md_theme_dark_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_dark_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_dark_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_dark_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
</style>
</resources>

176
app/src/main/res/values/colors.xml
View File

@ -1,118 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#1A73E8</color> <color name="seed">#4c4dcf</color>
<color name="colorPrimaryDark">#0049b4</color> <color name="md_theme_light_primary">#4C4DCF</color>
<color name="colorSecondary">#4db6ac</color> <color name="md_theme_light_onPrimary">#FFFFFF</color>
<color name="colorSecondaryDark">#459B90</color> <color name="md_theme_light_primaryContainer">#E1DFFF</color>
<color name="colorAccent">#387ef5</color> <color name="md_theme_light_onPrimaryContainer">#08006C</color>
<color name="colorRipple">#3f3f51b5</color> <color name="md_theme_light_secondary">#0059C5</color>
<color name="colorPrimaryGray">#757575</color> <color name="md_theme_light_onSecondary">#FFFFFF</color>
<color name="md_theme_light_secondaryContainer">#D8E2FF</color>
<color name="mainGreen">@color/green_500</color> <color name="md_theme_light_onSecondaryContainer">#001A43</color>
<color name="mainOrange">@color/orange_700</color> <color name="md_theme_light_tertiary">#795369</color>
<color name="letturaFacilitataBG">#eeeeee</color> <color name="md_theme_light_onTertiary">#FFFFFF</color>
<color name="md_theme_light_tertiaryContainer">#FFD8EC</color>
<!-- FAB DEFINITIONS --> <color name="md_theme_light_onTertiaryContainer">#2E1125</color>
<color name="black_semi_transparent">#B2000000</color> <color name="md_theme_light_error">#BA1A1A</color>
<color name="full_white">#FFFFFF</color> <color name="md_theme_light_errorContainer">#FFDAD6</color>
<color name="white">#fafafa</color> <color name="md_theme_light_onError">#FFFFFF</color>
<color name="white_bg_alpha">#88BCBCBC</color> <color name="md_theme_light_onErrorContainer">#410002</color>
<color name="white_pressed">#f1f1f1</color> <color name="md_theme_light_background">#F6FEFF</color>
<color name="half_black">#808080</color> <color name="md_theme_light_onBackground">#001F24</color>
<color name="md_theme_light_surface">#F6FEFF</color>
<!-- EMPTY VIEW --> <color name="md_theme_light_onSurface">#001F24</color>
<color name="empty_view_gray">#bdbdbd</color> <color name="md_theme_light_surfaceVariant">#E4E1EC</color>
<color name="empty_view_bg_gray">#f5f5f5</color> <color name="md_theme_light_onSurfaceVariant">#47464F</color>
<color name="md_theme_light_outline">#777680</color>
<color name="md_theme_light_inverseOnSurface">#D0F8FF</color>
<color name="md_theme_light_inverseSurface">#00363D</color>
<color name="bg_checked_layout">#E8F0FE</color> <color name="md_theme_light_inversePrimary">#C1C1FF</color>
<color name="bg_checked_layout_dark">#C9D5F0</color> <color name="md_theme_light_shadow">#000000</color>
<color name="md_theme_light_surfaceTint">#4C4DCF</color>
<color name="md_theme_light_surfaceTintColor">#4C4DCF</color>
<color name="md_theme_dark_primary">#C1C1FF</color>
<color name="colorPrimaryA10">#1A1A73E8</color> <color name="md_theme_dark_onPrimary">#160AA2</color>
<color name="colorPrimaryA20">#331A73E8</color> <color name="md_theme_dark_primaryContainer">#3231B6</color>
<color name="colorPrimaryA30">#4D1A73E8</color> <color name="md_theme_dark_onPrimaryContainer">#E1DFFF</color>
<color name="colorPrimaryA40">#661A73E8</color> <color name="md_theme_dark_secondary">#AEC6FF</color>
<color name="colorPrimaryA50">#801A73E8</color> <color name="md_theme_dark_onSecondary">#002E6C</color>
<color name="colorPrimaryA60">#991A73E8</color> <color name="md_theme_dark_secondaryContainer">#004397</color>
<color name="colorPrimaryA70">#B31A73E8</color> <color name="md_theme_dark_onSecondaryContainer">#D8E2FF</color>
<color name="colorPrimaryA80">#CC1A73E8</color> <color name="md_theme_dark_tertiary">#E9B9D3</color>
<color name="colorPrimaryA90">#E61A73E8</color> <color name="md_theme_dark_onTertiary">#46263A</color>
<color name="md_theme_dark_tertiaryContainer">#5F3C51</color>
<color name="md_theme_dark_onTertiaryContainer">#FFD8EC</color>
<color name="alpha_blue_500">#2d42a5f5</color> <color name="md_theme_dark_error">#FFB4AB</color>
<color name="md_theme_dark_errorContainer">#93000A</color>
<color name="blue_100">#BBDEFB</color> <color name="md_theme_dark_onError">#690005</color>
<color name="blue_300">#64B5F6</color> <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
<color name="blue_400">#42A5F5</color> <color name="md_theme_dark_background">#001F24</color>
<color name="blue_500">#2196F3</color> <color name="md_theme_dark_onBackground">#97F0FF</color>
<color name="blue_600">#1E88E5</color> <color name="md_theme_dark_surface">#001F24</color>
<color name="blue_700">#1976D2</color> <color name="md_theme_dark_onSurface">#97F0FF</color>
<color name="blue_800">#1565C0</color> <color name="md_theme_dark_surfaceVariant">#47464F</color>
<color name="md_theme_dark_onSurfaceVariant">#C8C5D0</color>
<color name="brown_500">#795548</color> <color name="md_theme_dark_outline">#918F9A</color>
<color name="md_theme_dark_inverseOnSurface">#001F24</color>
<color name="green_100">#C8E6C9</color> <color name="md_theme_dark_inverseSurface">#97F0FF</color>
<color name="green_200">#A5D6A7</color> <color name="md_theme_dark_inversePrimary">#4C4DCF</color>
<color name="green_300">#81c784</color> <color name="md_theme_dark_shadow">#000000</color>
<color name="green_400">#66bb6a</color> <color name="md_theme_dark_surfaceTint">#C1C1FF</color>
<color name="green_500_with_alpha">#884CAF50</color> <color name="md_theme_dark_surfaceTintColor">#C1C1FF</color>
<color name="green_500">#4CAF50</color>
<color name="green_600">#43A047</color>
<color name="green_700">#388E3C</color>
<color name="green_800">#2e7d32</color>
<color name="green_900">#1b5e20</color>
<color name="gray_050">#FAFAFA</color>
<color name="gray_100">#F5F5F5</color>
<color name="gray_200">#eeeeee</color>
<color name="gray_300">#e0e0e0</color>
<color name="gray_400">#BDBDBD</color>
<color name="gray_500">#9E9E9E</color>
<color name="gray_600">#757575</color>
<color name="gray_700">#616161</color>
<color name="gray_800">#424242</color>
<color name="alpha_indigo_500">#813f51b5</color>
<color name="indigo_400">#5C6BC0</color>
<color name="indigo_500">#3F51B5</color>
<color name="indigo_600">#3949AB</color>
<color name="indigo_700">#303F9F</color>
<color name="light_blue_100">#B3E5FC</color>
<color name="light_blue_200">#81D4FA</color>
<color name="light_blue_300">#4fc3f7</color>
<color name="light_blue_400">#29B6F6</color>
<color name="light_blue_500">#03A9F4</color>
<color name="light_blue_600">#039BE5</color>
<color name="light_blue_700">#0288D1</color>
<color name="light_blue_800">#0277BD</color>
<color name="orange_600_with_alpha">#88FB8C00</color>
<color name="orange_600">#FB8C00</color>
<color name="orange_700">#F57C00</color>
<color name="orange_800">#EF6C00</color>
<color name="red_200">#ef9a9a</color>
<color name="red_300">#e57373</color>
<color name="red_400">#EF5350</color>
<color name="red_500">#F44336</color>
<color name="red_600">#E53935</color>
<color name="red_700">#D32F2F</color>
<color name="teal_500">#009688</color>
<color name="yellow_100">#FFF9C4</color>
<color name="yellow_600">#FDD835</color>
<color name="yellow_800">#F9A825</color>
</resources> </resources>

118
app/src/main/res/values/custom_colors.xml Normal file
View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#1A73E8</color>
<color name="colorPrimaryDark">#0049b4</color>
<color name="colorSecondary">#4db6ac</color>
<color name="colorSecondaryDark">#459B90</color>
<color name="colorAccent">#387ef5</color>
<color name="colorRipple">#3f3f51b5</color>
<color name="colorPrimaryGray">#757575</color>
<color name="mainGreen">@color/green_500</color>
<color name="mainOrange">@color/orange_700</color>
<color name="letturaFacilitataBG">#eeeeee</color>
<!-- FAB DEFINITIONS -->
<color name="black_semi_transparent">#B2000000</color>
<color name="full_white">#FFFFFF</color>
<color name="white">#fafafa</color>
<color name="white_bg_alpha">#88BCBCBC</color>
<color name="white_pressed">#f1f1f1</color>
<color name="half_black">#808080</color>
<!-- EMPTY VIEW -->
<color name="empty_view_gray">#bdbdbd</color>
<color name="empty_view_bg_gray">#f5f5f5</color>
<color name="bg_checked_layout">#E8F0FE</color>
<color name="bg_checked_layout_dark">#C9D5F0</color>
<color name="colorPrimaryA10">#1A1A73E8</color>
<color name="colorPrimaryA20">#331A73E8</color>
<color name="colorPrimaryA30">#4D1A73E8</color>
<color name="colorPrimaryA40">#661A73E8</color>
<color name="colorPrimaryA50">#801A73E8</color>
<color name="colorPrimaryA60">#991A73E8</color>
<color name="colorPrimaryA70">#B31A73E8</color>
<color name="colorPrimaryA80">#CC1A73E8</color>
<color name="colorPrimaryA90">#E61A73E8</color>
<color name="alpha_blue_500">#2d42a5f5</color>
<color name="blue_100">#BBDEFB</color>
<color name="blue_300">#64B5F6</color>
<color name="blue_400">#42A5F5</color>
<color name="blue_500">#2196F3</color>
<color name="blue_600">#1E88E5</color>
<color name="blue_700">#1976D2</color>
<color name="blue_800">#1565C0</color>
<color name="brown_500">#795548</color>
<color name="green_100">#C8E6C9</color>
<color name="green_200">#A5D6A7</color>
<color name="green_300">#81c784</color>
<color name="green_400">#66bb6a</color>
<color name="green_500_with_alpha">#884CAF50</color>
<color name="green_500">#4CAF50</color>
<color name="green_600">#43A047</color>
<color name="green_700">#388E3C</color>
<color name="green_800">#2e7d32</color>
<color name="green_900">#1b5e20</color>
<color name="gray_050">#FAFAFA</color>
<color name="gray_100">#F5F5F5</color>
<color name="gray_200">#eeeeee</color>
<color name="gray_300">#e0e0e0</color>
<color name="gray_400">#BDBDBD</color>
<color name="gray_500">#9E9E9E</color>
<color name="gray_600">#757575</color>
<color name="gray_700">#616161</color>
<color name="gray_800">#424242</color>
<color name="alpha_indigo_500">#813f51b5</color>
<color name="indigo_400">#5C6BC0</color>
<color name="indigo_500">#3F51B5</color>
<color name="indigo_600">#3949AB</color>
<color name="indigo_700">#303F9F</color>
<color name="light_blue_100">#B3E5FC</color>
<color name="light_blue_200">#81D4FA</color>
<color name="light_blue_300">#4fc3f7</color>
<color name="light_blue_400">#29B6F6</color>
<color name="light_blue_500">#03A9F4</color>
<color name="light_blue_600">#039BE5</color>
<color name="light_blue_700">#0288D1</color>
<color name="light_blue_800">#0277BD</color>
<color name="orange_600_with_alpha">#88FB8C00</color>
<color name="orange_600">#FB8C00</color>
<color name="orange_700">#F57C00</color>
<color name="orange_800">#EF6C00</color>
<color name="red_200">#ef9a9a</color>
<color name="red_300">#e57373</color>
<color name="red_400">#EF5350</color>
<color name="red_500">#F44336</color>
<color name="red_600">#E53935</color>
<color name="red_700">#D32F2F</color>
<color name="teal_500">#009688</color>
<color name="yellow_100">#FFF9C4</color>
<color name="yellow_600">#FDD835</color>
<color name="yellow_800">#F9A825</color>
</resources>

34
app/src/main/res/values/styles.xml
View File

@ -1,23 +1,23 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge"> <!-- <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">-->
<!-- Customize your theme here. --> <!-- &lt;!&ndash; Customize your theme here. &ndash;&gt;-->
<item name="colorPrimary">@color/colorPrimary</item> <!-- <item name="colorPrimary">@color/colorPrimary</item>-->
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <!-- <item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
<item name="colorAccent">@color/colorAccent</item> <!-- <item name="colorAccent">@color/colorAccent</item>-->
<item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat --> <!-- <item name="fontFamily">@font/google_sans_regular</item> &lt;!&ndash; target android sdk versions < 26 and > 14 if theme other than AppCompat &ndash;&gt;-->
<!-- Add these --> <!-- &lt;!&ndash; Add these &ndash;&gt;-->
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item> <!-- <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>-->
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item> <!-- <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>-->
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item> <!-- <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>-->
<item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item> <!-- <item name="bottomSheetDialogTheme">@style/CustomBottomSheetDialog</item>-->
</style> <!-- </style>-->
<style name="AppTheme.NoActionBar"> <style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
@ -94,7 +94,7 @@
</style> </style>
<style name="AppTheme.NewMaterial.Dialog.FullscreenDialog" parent="Theme.AppCompat.Light.DialogWhenLarge"> <style name="AppTheme.NewMaterial.Dialog.FullscreenDialog" parent="Theme.Material3.Light.DialogWhenLarge">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
@ -124,7 +124,7 @@
<item name="android:windowBackground">@drawable/splash_background</item> <item name="android:windowBackground">@drawable/splash_background</item>
</style> </style>
<style name="Light" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge"> <style name="Light" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
@ -192,7 +192,7 @@
<style name="MaterialToolbar.Base" parent=""> <style name="MaterialToolbar.Base" parent="">
<item name="popupTheme">@style/AppTheme.PopupOverlay</item> <item name="popupTheme">@style/AppTheme.PopupOverlay</item>
<item name="theme">@style/Theme.MaterialComponents.Light</item> <item name="theme">@style/Theme.Material3.Light</item>
</style> </style>
<style name="MaterialToolbar" parent="MaterialToolbar.Base"/> <style name="MaterialToolbar" parent="MaterialToolbar.Base"/>
@ -201,11 +201,11 @@
<item name="titleTextAppearance">@style/AppTheme.NewMaterial.Text.ToolbarTitle</item> <item name="titleTextAppearance">@style/AppTheme.NewMaterial.Text.ToolbarTitle</item>
</style> </style>
<style name="CustomBottomSheetDialog" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog"> <style name="CustomBottomSheetDialog" parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
<item name="bottomSheetStyle">@style/CustomBottomSheet</item> <item name="bottomSheetStyle">@style/CustomBottomSheet</item>
</style> </style>
<style name="CustomBottomSheet" parent="Widget.MaterialComponents.BottomSheet"> <style name="CustomBottomSheet" parent="Widget.Material3.BottomSheet">
<item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item> <item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>
</style> </style>

31
app/src/main/res/values/themes.xml Normal file
View File

@ -0,0 +1,31 @@
<resources>
<style name="AppTheme" parent="Theme.Material3.Light.NoActionBar">
<item name="colorPrimary">@color/md_theme_light_primary</item>
<item name="colorOnPrimary">@color/md_theme_light_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_light_primaryContainer</item>
<item name="colorOnPrimaryContainer">@color/md_theme_light_onPrimaryContainer</item>
<item name="colorSecondary">@color/md_theme_light_secondary</item>
<item name="colorOnSecondary">@color/md_theme_light_onSecondary</item>
<item name="colorSecondaryContainer">@color/md_theme_light_secondaryContainer</item>
<item name="colorOnSecondaryContainer">@color/md_theme_light_onSecondaryContainer</item>
<item name="colorTertiary">@color/md_theme_light_tertiary</item>
<item name="colorOnTertiary">@color/md_theme_light_onTertiary</item>
<item name="colorTertiaryContainer">@color/md_theme_light_tertiaryContainer</item>
<item name="colorOnTertiaryContainer">@color/md_theme_light_onTertiaryContainer</item>
<item name="colorError">@color/md_theme_light_error</item>
<item name="colorErrorContainer">@color/md_theme_light_errorContainer</item>
<item name="colorOnError">@color/md_theme_light_onError</item>
<item name="colorOnErrorContainer">@color/md_theme_light_onErrorContainer</item>
<item name="android:colorBackground">@color/md_theme_light_background</item>
<item name="colorOnBackground">@color/md_theme_light_onBackground</item>
<item name="colorSurface">@color/md_theme_light_surface</item>
<item name="colorOnSurface">@color/md_theme_light_onSurface</item>
<item name="colorSurfaceVariant">@color/md_theme_light_surfaceVariant</item>
<item name="colorOnSurfaceVariant">@color/md_theme_light_onSurfaceVariant</item>
<item name="colorOutline">@color/md_theme_light_outline</item>
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
</style>
</resources>