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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.idea/assetWizardSettings.xml generated
View File

@ -1,51 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="WizardSettings">
<option name="children">
<map>
<entry key="imageWizard">
<value>
<PersistentState />
</value>
</entry>
<entry key="vectorWizard">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="vectorAssetStep">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipartAsset">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/av/ic_playlist_add_check_black_24dp.xml" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
<option name="values">
<map>
<entry key="outputName" value="ic_playlist_add_check_24dp" />
<entry key="sourceFile" value="C:\Users\GiuseppeS" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</component>
</project>

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

2
.idea/modules.xml generated
View File

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/IntegryWMSNative.iml" filepath="$PROJECT_DIR$/IntegryWMSNative.iml" />
<module fileurl="file://$PROJECT_DIR$/WMS.iml" filepath="$PROJECT_DIR$/WMS.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" filepath="$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" />
<module fileurl="file://$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" filepath="$PROJECT_DIR$/pointmobilescannerlibrary/pointmobilescannerlibrary.iml" />

BIN
Integry.jks Normal file
View File

Binary file not shown.

1
app/.gitignore vendored
View File

@ -1 +1,2 @@
/build
/release

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())

48
app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
View File

@ -4,14 +4,21 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="viewmodel"
type="it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzatoViewModel" />
</data>
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="16dp">
<android.support.v7.widget.AppCompatTextView
@ -20,10 +27,45 @@
android:textSize="22sp"
android:text="@string/dialog_vendita_filtro_avanzato"
android:textStyle="bold"
android:textColor="@android:color/black" />
android:textColor="@android:color/black"
android:layout_marginBottom="12dp"/>
</RelativeLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/input_num_ords"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hintTextAppearance="@style/hint_text">
<android.support.design.widget.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:hint="@string/num_ords"
app:binding="@{viewmodel.numOrds}"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/input_cliente"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hintTextAppearance="@style/hint_text">
<android.support.design.widget.TextInputEditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:hint="@string/customer"
app:binding="@{viewmodel.cliente}"/>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
</android.support.v7.widget.CardView>

33
app/src/main/res/layout/fragment_main.xml
View File

@ -71,6 +71,39 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.constraint.Guideline
android:id="@+id/guideline_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.40"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="Utente corrente"
android:textColor="@android:color/black"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/current_user_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
android:text="N/A"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/guideline_username"
app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

4
app/src/main/res/layout/nav_header_main.xml
View File

@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_header_height"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/side_nav_bar"
android:gravity="bottom"
android:orientation="vertical"
@ -20,10 +21,11 @@
app:srcCompat="@android:drawable/sym_def_app_icon" />
<TextView
android:id="@+id/drawer_username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/nav_header_vertical_spacing"
android:text="Android Studio"
tools:text="Android Studio"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView

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

@ -136,4 +136,7 @@
<string name="cod_art_or_description">Cod art / Descrizione</string>
<string name="no_supplier_selected">Seleziona un fornitore prima</string>
<string name="num_ords">Numero ordine</string>
<string name="customer">Cliente</string>
</resources>

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

@ -144,4 +144,8 @@
<string name="cod_art_or_description">Item code / Description</string>
<string name="no_supplier_selected">Please select a supplier first</string>
<string name="num_ords">Orders number</string>
<string name="customer">Customer</string>
</resources>