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

Aggiornato dialog annotazioni UL.

Browse Source 
Aggiunto ordinamento fornitori in Accettazione.
This commit is contained in:
Giuseppe Scorrano 2019-03-25 18:53:59 +01:00
parent bc4af54300
commit e40329ed89
4 changed files with 162 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
View File

@ -166,6 +166,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
return groupedOrdine; return groupedOrdine;
}) })
.distinctBy(x -> x.codAnagForn + "_" + x.nomeFornitore) .distinctBy(x -> x.codAnagForn + "_" + x.nomeFornitore)
.sortBy(x -> x.nomeFornitore)
.toList(); .toList();

4
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java
View File

@ -396,7 +396,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
} }
ProgressDialog finalProgress = progress; ProgressDialog finalProgress = progress;
NoteAggiuntiveNuovaULDialog.show(mActivity, new NoteAggiuntiveNuovaULDialog.Callback() { NoteAggiuntiveNuovaULDialog.make(mActivity, new NoteAggiuntiveNuovaULDialog.Callback() {
@Override @Override
public void onSuccess(String noteString) { public void onSuccess(String noteString) {
@ -507,7 +507,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
public void onAbort() { public void onAbort() {
finalProgress.dismiss(); finalProgress.dismiss();
} }
}); }).show();
} }

58
app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java
View File

@ -1,59 +1,57 @@
package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views; package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views;
import android.app.Dialog;
import android.content.Context; import android.content.Context;
import com.google.android.material.textfield.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import androidx.databinding.DataBindingUtil;
import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.utility.UtilityDimension; import it.integry.integrywmsnative.core.utility.UtilityDimension;
import it.integry.integrywmsnative.databinding.DialogNoteAggiuntiveNuovaUlBinding;
public class NoteAggiuntiveNuovaULDialog { public class NoteAggiuntiveNuovaULDialog {
private Dialog currentDialog;
public interface Callback { public interface Callback {
void onSuccess(String noteString); void onSuccess(String noteString);
void onAbort(); void onAbort();
} }
public static Dialog make(Context context, final Callback callback) {
return new NoteAggiuntiveNuovaULDialog(context, callback).currentDialog;
}
public static void show(Context mContext, final Callback callback){ private NoteAggiuntiveNuovaULDialog(Context context, final Callback callback){
RelativeLayout relativeLayout = new RelativeLayout(mContext); LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false);
relativeLayout.setLayoutParams( currentDialog = new Dialog(context);
new RelativeLayout.LayoutParams( currentDialog.setContentView(bindings.getRoot());
RelativeLayout.LayoutParams.MATCH_PARENT,
RelativeLayout.LayoutParams.MATCH_PARENT));
relativeLayout.setPadding(UtilityDimension.convertSizeToDP(mContext, 22), currentDialog.setCanceledOnTouchOutside(false);
UtilityDimension.convertSizeToDP(mContext, 8), currentDialog.setCancelable(false);
UtilityDimension.convertSizeToDP(mContext, 24), currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
0);
final TextInputEditText mTextInputEditText = new TextInputEditText(mContext); bindings.buttonConfirm.setOnClickListener(v -> {
mTextInputEditText.setHint(R.string.hint_additional_notes); currentDialog.dismiss();
callback.onSuccess(bindings.additionalNotesText.getText().toString());
});
ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams( bindings.buttonAbort.setOnClickListener(v -> {
ViewGroup.LayoutParams.MATCH_PARENT, currentDialog.dismiss();
ViewGroup.LayoutParams.WRAP_CONTENT); callback.onAbort();
});
mTextInputEditText.setLayoutParams(layoutParams);
relativeLayout.addView(mTextInputEditText);
AlertDialog dialog = new AlertDialog.Builder(mContext)
.setTitle(mContext.getText(R.string.action_create_ul))
.setMessage(R.string.dialog_message_additional_notes)
.setCancelable(false)
.setView(relativeLayout)
.setPositiveButton(R.string.confirm, (dialog1, which) -> callback.onSuccess(mTextInputEditText.getText().toString()))
.setNegativeButton(R.string.abort, (dialogInterface, i) -> callback.onAbort())
.create();
dialog.show();
} }
} }

131
app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml Normal file
View File

@ -0,0 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="android.text.Html" />
<import type="it.integry.integrywmsnative.R" />
<variable
name="mContext"
type="android.content.Context" />
</data>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
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
android:layout_width="match_parent"
android:layout_height="wrap_content"
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
android:id="@+id/title_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextViewMaterial.DialogTitle"
android:text="@string/action_create_ul"
android:gravity="center_horizontal"/>
<!--<TextView-->
<!--android:id="@+id/description_text"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--style="@style/TextViewMaterial"-->
<!--android:text="@string/dialog_message_additional_notes"-->
<!--android:gravity="left"-->
<!--android:layout_marginTop="16dp"-->
<!--android:layout_marginBottom="16dp" />-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/level_number_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
style="@style/TextInputLayout.OutlinePrimary">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/additional_notes_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/hint_additional_notes"
android:inputType="text"
style="@style/TextInputEditText.OutlinePrimary"/>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:gravity="bottom|center_horizontal">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_abort"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Button.PrimaryOutline"
app:icon="@drawable/ic_clear_24dp"
android:layout_marginEnd="8dp"
android:text="@string/abort"/>
<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>
</layout>