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

Integrato GFont.

Browse Source 
Inseriti campi mancanti in avantielenco documenti di vendita (resi da cliente).
This commit is contained in:
Giuseppe Scorrano 2019-07-26 12:09:11 +02:00
parent 40c2cf58ff
commit 0624b87a1f
16 changed files with 133 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/it/integry/integrywmsnative/core/exception/DateNotRecognizedException.java Normal file
View File

@ -0,0 +1,9 @@
package it.integry.integrywmsnative.core.exception;
public class DateNotRecognizedException extends Exception {
public DateNotRecognizedException(String dateString) {
super("Data non riconosciuta (" + dateString + ")");
}
}

9
app/src/main/java/it/integry/integrywmsnative/core/exception/TimeNotRecognizedException.java Normal file
View File

@ -0,0 +1,9 @@
package it.integry.integrywmsnative.core.exception;
public class TimeNotRecognizedException extends Exception {
public TimeNotRecognizedException(String dateString) {
super("Time non riconosciuto (" + dateString + ")");
}
}

19
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDate.java
View File

@ -1,8 +1,12 @@
package it.integry.integrywmsnative.core.utility;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
/**
* Created by GiuseppeS on 07/03/2018.
*/
@ -21,7 +25,16 @@ public class UtilityDate {
public static final String DMY_HUMAN_LONG = "dd MMMM yyyy";
}
public static Date recognizeDate(String dateString) throws Exception{
public static Date recognizeDateWithExceptionHandler(String dateString) {
try{
return UtilityDate.recognizeDate(dateString);
} catch (ParseException | DateNotRecognizedException | TimeNotRecognizedException pex){
UtilityLogger.errorMe(pex);
return null;
}
}
public static Date recognizeDate(String dateString) throws ParseException, DateNotRecognizedException, TimeNotRecognizedException {
if (dateString == null) {
return null;
@ -36,7 +49,7 @@ public class UtilityDate {
if(onlyDateSubstring.contains("/")) dateSeparator = '/';
else if(onlyDateSubstring.contains("-")) dateSeparator = '-';
else if(onlyDateSubstring.contains(".")) dateSeparator = '.';
else throw new Exception("Data non riconosciuta (" + dateString + ")");
else throw new DateNotRecognizedException(dateString);
String dateFormatString = (dateString.charAt(2) == dateSeparator)
? "dd" + dateSeparator + "MM" + dateSeparator + "yyyy"
@ -50,7 +63,7 @@ public class UtilityDate {
String onlyTimeSubstring = dateString.substring(10, 14);
if(onlyTimeSubstring.contains("-")) timeSeparator = '-';
else if(onlyTimeSubstring.contains(":")) timeSeparator = ':';
else throw new Exception("Time non riconosciuto (" + dateString + ")");
else throw new TimeNotRecognizedException(dateString);
String timeFormatString = "HH" + timeSeparator + "mm" + timeSeparator + "ss";

2
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneClienteViewModel.java
View File

@ -50,7 +50,7 @@ public class UltimeConsegneClienteViewModel {
private void initDataAdapter(ArrayList<ConsegnaClienteDTO> dataset) {
UltimeConsegneMainListAdapter adapter = new UltimeConsegneMainListAdapter(mContext, dataset);
adapter.setOnItemClickListener(consegna -> {
Toast.makeText(mContext, String.format("Selezionato doc n° %d del %s", consegna.getNumDoc(), consegna.getDataDoc()), Toast.LENGTH_SHORT).show();
Toast.makeText(mContext, String.format("Selezionato doc n° %d del %s", consegna.getNumDoc(), consegna.getDataDocS()), Toast.LENGTH_SHORT).show();
});
mBinding.recyclerView.setHasFixedSize(true);

20
app/src/main/java/it/integry/integrywmsnative/gest/ultime_consegne_cliente/viewmodel/UltimeConsegneMainListAdapter.java
View File

@ -112,7 +112,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
.width(40)
.height(40)
.fontSize(24)
.useFont(ResourcesCompat.getFont(mContext, R.font.product_sans_regular))
.useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
.endConfig();
mediumIconBuilder = TextDrawable.builder()
@ -120,7 +120,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
.width(40)
.height(40)
.fontSize(20)
.useFont(ResourcesCompat.getFont(mContext, R.font.product_sans_regular))
.useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
.endConfig();
largeIconBuilder = TextDrawable.builder()
@ -128,7 +128,7 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
.width(40)
.height(40)
.fontSize(16)
.useFont(ResourcesCompat.getFont(mContext, R.font.product_sans_regular))
.useFont(ResourcesCompat.getFont(mContext, R.font.google_sans_regular))
.endConfig();
}
@ -150,7 +150,11 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
public void onBindItemViewHolder(final SingleItemViewHolder holder, final int position) {
final ConsegnaClienteDTO consegna = this.mDataset.get(position);
holder.mBinding.descriptionMain.setText(UtilityString.isNullOrEmpty(consegna.getRifOrd()) ? "" : consegna.getRifOrd());
holder.mBinding.descriptionMain.setText(UtilityString.isNullOrEmpty(consegna.getIndirizzo()) ? "" : consegna.getIndirizzo());
if(consegna.getDataInizTraspD() != null) {
holder.mBinding.subDescriptionMain.setText(String.format(mContext.getText(R.string.shipped_on).toString(), UtilityDate.formatDate(consegna.getDataInizTraspD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)));
}
String numDoc = "" + consegna.getNumDoc();
@ -163,18 +167,16 @@ public class UltimeConsegneMainListAdapter extends SectionedRecyclerViewAdapter<
}
try {
Date dataDoc = UtilityDate.recognizeDate(consegna.getDataDoc());
Calendar calendarNow = Calendar.getInstance(TimeZone.getDefault());
Calendar calendarDataDoc = Calendar.getInstance(TimeZone.getDefault());
calendarDataDoc.setTime(dataDoc);
calendarDataDoc.setTime(consegna.getDataDocD());
String dataDocString = "";
if(calendarDataDoc.get(Calendar.YEAR) == calendarNow.get(Calendar.YEAR)) {
dataDocString = UtilityDate.formatDate(dataDoc, UtilityDate.COMMONS_DATE_FORMATS.DM_HUMAN);
dataDocString = UtilityDate.formatDate(consegna.getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.DM_HUMAN);
} else {
dataDocString = UtilityDate.formatDate(dataDoc, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN);
dataDocString = UtilityDate.formatDate(consegna.getDataDocD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN);
}
holder.mBinding.date.setText(dataDocString);

64
app/src/main/java/it/integry/integrywmsnative/gest/vendita/rest/model/ConsegnaClienteDTO.java
View File

@ -1,5 +1,14 @@
package it.integry.integrywmsnative.gest.vendita.rest.model;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import it.integry.integrywmsnative.core.exception.DateNotRecognizedException;
import it.integry.integrywmsnative.core.exception.TimeNotRecognizedException;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilityLogger;
public class ConsegnaClienteDTO {
private String codAnag;
@ -8,10 +17,13 @@ public class ConsegnaClienteDTO {
private String dataDoc;
private String serDoc;
private int numDoc;
private String destinatario;
private String indirizzo;
private String ragSoc;
private String compilatoDa;
private String rifOrd;
private String dataord;
private String dataOrd;
private String dataInizTrasp;
public String getCodAnag() {
return codAnag;
@ -40,10 +52,14 @@ public class ConsegnaClienteDTO {
return this;
}
public String getDataDoc() {
public String getDataDocS() {
return dataDoc;
}
public Date getDataDocD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataDocS());
}
public ConsegnaClienteDTO setDataDoc(String dataDoc) {
this.dataDoc = dataDoc;
return this;
@ -67,6 +83,24 @@ public class ConsegnaClienteDTO {
return this;
}
public String getDestinatario() {
return destinatario;
}
public ConsegnaClienteDTO setDestinatario(String destinatario) {
this.destinatario = destinatario;
return this;
}
public String getIndirizzo() {
return indirizzo;
}
public ConsegnaClienteDTO setIndirizzo(String indirizzo) {
this.indirizzo = indirizzo;
return this;
}
public String getRagSoc() {
return ragSoc;
}
@ -94,12 +128,30 @@ public class ConsegnaClienteDTO {
return this;
}
public String getDataord() {
return dataord;
public String getDataOrdS() {
return dataOrd;
}
public ConsegnaClienteDTO setDataord(String dataord) {
this.dataord = dataord;
public Date getDataOrdD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataOrdS());
}
public ConsegnaClienteDTO setDataOrd(String dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public String getDataInizTraspS() {
return dataInizTrasp;
}
public Date getDataInizTraspD() {
return UtilityDate.recognizeDateWithExceptionHandler(getDataInizTraspS());
}
public ConsegnaClienteDTO setDataInizTrasp(String dataInizTrasp) {
this.dataInizTrasp = dataInizTrasp;
return this;
}
}

BIN
app/src/main/res/font/google_sans_bold.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/google_sans_bold_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/google_sans_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/google_sans_medium.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/google_sans_medium_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/google_sans_regular.ttf Normal file
View File

Binary file not shown.

24
app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
View File

@ -32,13 +32,16 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_main"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textStyle="italic"
style="@android:style/TextAppearance.Medium"
style="@android:style/TextAppearance.Small"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/date"
android:ellipsize="end"
android:singleLine="true"
tools:text="TITLE"/>
<androidx.appcompat.widget.AppCompatTextView
@ -51,6 +54,19 @@
android:textSize="14sp"
tools:text="13 Apr"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sub_description_main"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Small"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/compilato_da"
android:layout_below="@id/description_main"
android:singleLine="true"
android:ellipsize="end"
tools:text="SUB TITLE"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/compilato_da"
android:layout_width="wrap_content"

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

@ -235,4 +235,7 @@
<string name="select_a_recipient_message">Prima di procedere seleziona un <b>destinatario</b></string>
<string name="not_valid_customer_error">Cliente non valido</string>
<string name="not_valid_recipient_error">Destinatario non valido</string>
<string name="shipped_on">Spedito il %s</string>
<string name="delivered_on">Consegnato il %s</string>
</resources>

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

@ -241,5 +241,7 @@
<string name="not_valid_customer_error">Invalid customer</string>
<string name="not_valid_recipient_error">Invalid recipient</string>
<string name="shipped_on">Shipped %s</string>
<string name="delivered_on">Delivered on %s</string>
</resources>

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

@ -8,7 +8,7 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="fontFamily">@font/product_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
<item name="fontFamily">@font/google_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
</style>
@ -18,10 +18,10 @@
</style>
<style name="AppTheme.NewMaterial">
<item name="android:fontFamily">@font/product_sans_regular</item>
<item name="android:fontFamily">@font/google_sans_regular</item>
</style>
<style name="AppTheme.NewMaterial.Text" parent = "AppTheme.NewMaterial">
<item name="android:fontFamily">@font/product_sans_regular</item>
<item name="android:fontFamily">@font/google_sans_regular</item>
<item name="android:textStyle">normal</item>
</style>
<style name="AppTheme.NewMaterial.Text.Small" parent = "AppTheme.NewMaterial.Text">
@ -29,7 +29,7 @@
<item name="android:textSize">14sp</item>
</style>
<style name="AppTheme.NewMaterial.Text.Badge" parent = "AppTheme.NewMaterial">
<item name="android:fontFamily">@font/product_sans_regular</item>
<item name="android:fontFamily">@font/google_sans_regular</item>
<item name="android:textStyle">normal</item>
<item name="android:background">@drawable/gray_detail_background_round4</item>
<item name="android:paddingStart">8dp</item>