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

Creata key per la build e modifiche al Dialog Filtro Avanzato

Browse Source
This commit is contained in:
Gius95
2018-12-04 09:31:00 +01:00
parent 4afe613189
commit 7d1d01f006
17 changed files with 184 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,6 +15,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.widget.ImageButton;
import android.widget.TextView;
import butterknife.BindView;
import butterknife.ButterKnife;
@@ -55,7 +56,6 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// ExceptionsHandler.toCatch(this);
if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
startLoginActivity();
@@ -64,9 +64,6 @@ public class MainActivity extends AppCompatActivity
ButterKnife.bind(this);
// WaterfallToolbar waterfallToolbar = findViewById(R.id.waterfall_toolbar);
// waterfallToolbar.set
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
@@ -76,6 +73,7 @@ public class MainActivity extends AppCompatActivity
drawer.setDrawerListener(toggle);
toggle.syncState();
mNavigationView = findViewById(R.id.nav_view);
mNavigationView.setNavigationItemSelectedListener(this);
@@ -261,6 +259,8 @@ public class MainActivity extends AppCompatActivity
}
});
}
}

34
app/src/main/java/it/integry/integrywmsnative/core/di/BindableInteger.java Normal file
View File

@@ -0,0 +1,34 @@
package it.integry.integrywmsnative.core.di;
import android.databinding.BaseObservable;
import org.parceler.Parcel;
@Parcel
public class BindableInteger extends BaseObservable {
Integer value;
public Integer get() {
return get(true);
}
public Integer get(boolean defaultIfNull) {
if(value == null){
if(defaultIfNull) return 0;
else return null;
} else return value;
}
public void set(Integer value) {
if (!Objects.equals(this.value, value)) {
this.value = value;
notifyChange();
}
}
public boolean isEmpty() {
return value == null;
}
}

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

@@ -7,6 +7,7 @@ import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import net.cachapa.expandablelayout.ExpandableLayout;
@@ -29,6 +30,7 @@ public class MainFragment extends Fragment implements ITitledFragment {
@BindView(R.id.no_connection_top_layout) ExpandableLayout mNoConnectionLayout;
@BindView(R.id.current_user_name) TextView currentUsername;
private View mView;
@@ -76,6 +78,10 @@ public class MainFragment extends Fragment implements ITitledFragment {
WiFiCheckerViewHolder wiFiCheckerViewHolder = new WiFiCheckerViewHolder(getActivity(), mView, R.id.wifi_power);
wiFiCheckerViewHolder.startMonitoring();
currentUsername.setText(SettingsManager.i().user.fullname);
}
private void collapseNoConnectionLayout(){

3
app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
View File

@@ -34,6 +34,7 @@ import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding;
import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
import it.integry.integrywmsnative.gest.vendita.core.MainListVenditaAdapter;
import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper;
import it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzato;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
@@ -320,7 +321,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IR
@Override
public void onFilterClick() {
DialogVenditaFiltroAvanzato.makeBase(getActivity()).show();
}
}

28
app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
View File

@@ -2,16 +2,42 @@ package it.integry.integrywmsnative.gest.vendita.dialogs;
import android.app.AlertDialog;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import android.view.LayoutInflater;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.databinding.DialogVenditaFiltroAvanzatoBinding;
public class DialogVenditaFiltroAvanzato {
private static AlertDialog currentAlert;
private static Context currentContext;
private static DialogVenditaFiltroAvanzatoViewModel currentViewModel;
public static AlertDialog makeBase(final Context context) {
currentContext = context;
currentViewModel = new DialogVenditaFiltroAvanzatoViewModel();
return null;
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
DialogVenditaFiltroAvanzatoBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_vendita_filtro_avanzato, null, false);
final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
.setView(contentView.getRoot())
.setPositiveButton(context.getText(R.string.confirm), null)
.setNegativeButton(context.getText(R.string.abort), null);
contentView.setViewmodel(currentViewModel);
currentAlert = alertDialog.create();
currentAlert.setCanceledOnTouchOutside(false);
return currentAlert;
}
}

13
app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzatoViewModel.java Normal file
View File

@@ -0,0 +1,13 @@
package it.integry.integrywmsnative.gest.vendita.dialogs;
import it.integry.integrywmsnative.core.di.BindableFloat;
import it.integry.integrywmsnative.core.di.BindableInteger;
import it.integry.integrywmsnative.core.di.BindableString;
public class DialogVenditaFiltroAvanzatoViewModel {
public BindableString numOrds = new BindableString();
public BindableString cliente = new BindableString();
}

15
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
View File

@@ -42,6 +42,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
import it.integry.integrywmsnative.core.utility.UtilityProgress;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding;
import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO;
import it.integry.plugins.barcode_base_library.model.BarcodeType;
@@ -207,13 +208,13 @@ public class DialogInputQuantity {
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
ViewDataBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_articolo, null, false);
DialogInputQuantityArticoloBinding contentView = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_articolo, null, false);
final TextInputLayout txlInputBatchLot = contentView.getRoot().findViewById(R.id.input_partita_mag);
final TextInputLayout txlInputBatchLot = contentView.inputPartitaMag;
final TextInputLayout txlInputNumDiCnf = contentView.getRoot().findViewById(R.id.input_num_cnf);
final TextInputLayout txlInputQtaPerCnf = contentView.getRoot().findViewById(R.id.input_qta_cnf);
final TextInputLayout txlInputQtaTot = contentView.getRoot().findViewById(R.id.input_qta_tot);
final TextInputLayout txlInputNumDiCnf = contentView.inputNumCnf;
final TextInputLayout txlInputQtaPerCnf = contentView.inputQtaCnf;
final TextInputLayout txlInputQtaTot = contentView.inputQtaTot;
txlInputNumDiCnf.getEditText().setSelectAllOnFocus(true);
txlInputQtaPerCnf.getEditText().setSelectAllOnFocus(true);
@@ -229,8 +230,8 @@ public class DialogInputQuantity {
setupQuantityListener(currentQuantityDto, txlInputNumDiCnf, txlInputQtaPerCnf, txlInputQtaTot);
contentView.setVariable(BR.viewmodel, dto);
contentView.setVariable(BR.quantityViewModel, currentQuantityDto);
contentView.setViewmodel(dto);
contentView.setQuantityViewModel(currentQuantityDto);
final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context)
.setView(contentView.getRoot())