From 7f16515074e3e456a22556dc07b10e333eba72ef Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Sun, 16 Dec 2018 17:37:18 +0100
Subject: [PATCH] translated strings, fixed validation filter

---
 .../uam/wmi/findmytutor/adapters/DutyHoursAdapter.java |  4 ++--
 app/src/main/res/values-pl/strings.xml                 | 10 ++++++++++
 app/src/main/res/values/strings.xml                    |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java b/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
index ba7041c..2de243f 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
@@ -34,8 +34,8 @@ public DutyHoursAdapter(Context context, List<DutyHourViewModel> hours) {
 
 
 public List<DutyHourViewModel> getDutyList(){
-   ArrayList<DutyHourViewModel> notEmpty = Stream.of(hours).filter(DutyHourViewModel::isValid).collect(Collectors.toList());
-   return hours;
+   ArrayList<DutyHourViewModel> notEmpty = Stream.of(hours).filter(DutyHourViewModel::isValid).collect(Collectors.toCollection(ArrayList::new));
+   return notEmpty;
 }
 public void addDuty(DutyHourViewModel duty){
    hours.add(duty);
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index bac8b17..8cfa304 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -212,6 +212,16 @@
     <string name="info_icon_userlist_tab_level_status_offline">- użytkownik jest obecnie offline</string>
     <string name="info_icon_userlist_tab_level_status_inactive">- użytkownik jest nieaktywny</string>
     <string name="info_icon_userlist_tab_level_status_inactive_tip">(nie udostępnił żadnych danych o lokalizacji od conajmniej tygodnia)</string>
+    <string name="hint_duty_day">Dzień</string>
+    <string name="hint_duty_start">Start</string>
+    <string name="hint_duty_end">Koniec</string>
+    <string name="hint_department">Zakład</string>
+    <string name="hint_room">Pokój</string>
+    <string name="addDuty">DODAJ DYŻUR</string>
+    <string name="dutyTitle">Godziny dyżurów</string>
+    <string name="personalInfoTitle">Dane kontaktowe</string>
+    <string name="userNoteTitle">Twoja notka</string>
+    <string name="updateToast">Dziękujemy za aktualizację profilu</string>
 
 </resources>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8885f2e..3871a73 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -303,7 +303,7 @@
     <string name="hint_duty_end">End</string>
     <string name="hint_department">Department</string>
     <string name="hint_room">Room</string>
-    <string name="hint_email">Email</string>
+    <string name="hint_email" translatable="false">Email</string>
     <string name="addDuty">ADD DUTY</string>
     <string name="dutyTitle">Duty hours</string>
     <string name="personalInfoTitle">Personal info</string>