From 2f4f3c13b6d28a3e662e5edd4e400663693415f0 Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Wed, 12 Dec 2018 03:27:04 +0100
Subject: [PATCH 1/7] work in progress

---
 .../wmi/findmytutor/activity/TutorTab.java    |  1 +
 app/src/main/res/layout/content_tutor_tab.xml | 96 ++++++++++++++++---
 2 files changed, 86 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
index f96a2b0..d5df1cf 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
@@ -126,6 +126,7 @@ public class TutorTab extends AppCompatActivity {
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(this::handleResponse, this::handleError));
     }
+//    private void postUserTab()
 
     private void handleResponse(TutorTabViewModel tutorTabViewModel) {
         Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.modal_feedback_thankyou), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml
index dae766a..fd25a24 100644
--- a/app/src/main/res/layout/content_tutor_tab.xml
+++ b/app/src/main/res/layout/content_tutor_tab.xml
@@ -17,7 +17,9 @@
         android:layout_gravity="right"
         mapbox:srcCompat="@drawable/outline_info_24"/>
 
-    <TextView android:id="@+id/userName"
+
+    <TextView
+        android:id="@+id/userName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dimen_10"
@@ -27,40 +29,104 @@
         android:textSize="@dimen/lbl_new_note_title"
         android:textStyle="normal" />
 
-    <TextView
+
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    <android.support.design.widget.TextInputEditText
         android:id="@+id/userDepartment"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:lineSpacingExtra="8sp"
         android:paddingTop="5dp"
         android:textColor="@color/note_list_text"
+        android:hint="hint"
         />
+    </android.support.design.widget.TextInputLayout>
 
-    <TextView
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    <android.support.design.widget.TextInputEditText
         android:id="@+id/userRoom"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:lineSpacingExtra="8sp"
         android:paddingTop="5dp"
         android:textColor="@color/note_list_text"
+        android:hint="hint"
         />
+    </android.support.design.widget.TextInputLayout>
 
-    <TextView
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+    <android.support.design.widget.TextInputEditText
         android:id="@+id/userEmail"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:lineSpacingExtra="8sp"
         android:paddingTop="5dp"
-        android:textColor="@color/note_list_text" />
+        android:textColor="@color/note_list_text"
+        android:hint="hint"
+        />
+    </android.support.design.widget.TextInputLayout>
 
-    <TextView
-        android:id="@+id/userDutyHours"
+
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:lineSpacingExtra="8sp"
-        android:paddingTop="5dp"
-        android:textColor="@color/note_list_text"
-        tools:text="@string/dutyHours" />
+        android:orientation="horizontal">
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userDutyHours"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="hint"
+                android:lineSpacingExtra="8sp"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text"
+                tools:text="@string/dutyHours" />
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userDutyStart"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="hint"
+                android:lineSpacingExtra="8sp"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text"
+                tools:text="@string/dutyHours" />
+        </android.support.design.widget.TextInputLayout>
+
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userDutyStop"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:hint="hint"
+                android:lineSpacingExtra="8sp"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text"
+                tools:text="@string/dutyHours" />
+        </android.support.design.widget.TextInputLayout>
+    </LinearLayout>
+
 
     <TextView
         android:id="@+id/userNoteTitle"
@@ -70,6 +136,9 @@
         android:paddingBottom="0dp"
         android:paddingStart="@dimen/activity_margin"
         android:textColor="@color/note_list_text" />
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
     <EditText
         android:id="@+id/userNote"
         android:layout_width="match_parent"
@@ -83,6 +152,8 @@
         android:maxLines="7"
         android:requiresFadingEdge="vertical"
         android:scrollbars="vertical"/>
+    </android.support.design.widget.TextInputLayout>
+
 
     <Button
         android:id="@+id/saveButon"
@@ -90,4 +161,7 @@
         android:layout_height="wrap_content"
         android:text="@string/saveButton" />
 
+
+
+
 </LinearLayout>
\ No newline at end of file

From a3a847fdebbb5ed90adb2e290f238571af773b4b Mon Sep 17 00:00:00 2001
From: Marcin Jedynski <marcin.jedynski@cognifide.com>
Date: Thu, 13 Dec 2018 10:33:02 +0100
Subject: [PATCH 2/7] moved duty hours to the center of the screen

---
 .../wmi/findmytutor/activity/TutorTab.java    |  2 +-
 app/src/main/res/layout/content_tutor_tab.xml | 30 ++++++++++++++-----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
index d5df1cf..4dd3397 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
@@ -80,7 +80,7 @@ public class TutorTab extends AppCompatActivity {
                                 if (!tutorTabViewModel.getNote().equals("")) {
                                     userNote.setText(String.format("%s", tutorTabViewModel.getNote()));
                                 }
-                                userDutyHours.setText(String.format("%s: %s", getString(R.string.userDutyHoursHeader), Arrays.toString(dutyHoursList.toArray())));
+//                                userDutyHours.setText(String.format("%s: %s", getString(R.string.userDutyHoursHeader), Arrays.toString(dutyHoursList.toArray())));
 
                             }
 
diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml
index fd25a24..86479bb 100644
--- a/app/src/main/res/layout/content_tutor_tab.xml
+++ b/app/src/main/res/layout/content_tutor_tab.xml
@@ -10,6 +10,7 @@
     android:paddingRight="@dimen/activity_margin"
     android:paddingTop="@dimen/activity_margin">
 
+
     <ImageButton
         android:id="@+id/contentTutorTabInfoImageButton"
         android:layout_width="wrap_content"
@@ -79,41 +80,50 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        >
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/userDutyHours"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:hint="hint"
                 android:lineSpacingExtra="8sp"
                 android:paddingTop="5dp"
+                android:text="@string/dutyHours"
                 android:textColor="@color/note_list_text"
                 tools:text="@string/dutyHours" />
         </android.support.design.widget.TextInputLayout>
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/userDutyStart"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:hint="hint"
                 android:lineSpacingExtra="8sp"
                 android:paddingTop="5dp"
+                android:text="@string/dutyHours"
                 android:textColor="@color/note_list_text"
                 tools:text="@string/dutyHours" />
         </android.support.design.widget.TextInputLayout>
 
         <android.support.design.widget.TextInputLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/userDutyStop"
@@ -122,19 +132,25 @@
                 android:hint="hint"
                 android:lineSpacingExtra="8sp"
                 android:paddingTop="5dp"
+                android:text="@string/dutyHours"
                 android:textColor="@color/note_list_text"
                 tools:text="@string/dutyHours" />
         </android.support.design.widget.TextInputLayout>
     </LinearLayout>
 
 
+    <ListView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </ListView>
     <TextView
         android:id="@+id/userNoteTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="@dimen/activity_margin"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
-        android:paddingStart="@dimen/activity_margin"
         android:textColor="@color/note_list_text" />
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"

From e775961ed2e047de7526289b9c7a20a962c82ce6 Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Sat, 15 Dec 2018 00:33:09 +0100
Subject: [PATCH 3/7] created duty hour adapter

---
 .../adapters/DutyHoursAdapter.java            | 68 +++++++++++++++++++
 app/src/main/res/layout/duty_hour_row.xml     | 68 +++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
 create mode 100644 app/src/main/res/layout/duty_hour_row.xml

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
new file mode 100644
index 0000000..2b7fe31
--- /dev/null
+++ b/app/src/main/java/com/uam/wmi/findmytutor/adapters/DutyHoursAdapter.java
@@ -0,0 +1,68 @@
+package com.uam.wmi.findmytutor.adapters;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.model.DutyHour;
+import java.util.List;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+
+public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyViewHolder> {
+      private Context context;
+      private List<DutyHour> hours;
+
+public DutyHoursAdapter(Context context, List<DutyHour> hours) {
+        this.context = context;
+        this.hours = hours;
+        }
+
+@NonNull
+@Override
+public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View itemView = LayoutInflater.from(parent.getContext())
+        .inflate(R.layout.duty_hour_row, parent, false);
+
+        return new MyViewHolder(itemView);
+        }
+
+@Override
+public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
+        DutyHour duty = hours.get(position);
+        holder.dutyDay.setText(duty.getDay());
+        holder.dutyStart.setText(duty.getStart());
+        holder.dutyStop.setText(duty.getEnd());
+
+        }
+
+@Override
+public int getItemCount() {
+        return hours.size();
+        }
+
+class MyViewHolder extends RecyclerView.ViewHolder {
+
+   @BindView(R.id.duty_day)
+   TextView dutyDay;
+
+   @BindView(R.id.duty_start)
+   TextView dutyStart;
+
+   @BindView(R.id.duty_stop)
+   TextView dutyStop;
+
+   MyViewHolder(View view) {
+      super(view);
+      ButterKnife.bind(this, view);
+   }
+}
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/duty_hour_row.xml b/app/src/main/res/layout/duty_hour_row.xml
new file mode 100644
index 0000000..250c616
--- /dev/null
+++ b/app/src/main/res/layout/duty_hour_row.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:fontFamily="@font/lato_regular"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/duty_day"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <android.support.design.widget.TextInputEditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignStart="@+id/duty_day"
+            android:hint="hint"
+            tools:text="@tools:sample/date/day_of_week" />
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/duty_start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="50dp"
+        android:layout_toEndOf="@+id/duty_day">
+
+        <android.support.design.widget.TextInputEditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignTop="@+id/duty_start"
+            android:hint="hint"
+            tools:text="@tools:sample/date/hhmm" />
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:id="@+id/duty_stop"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="50dp"
+        android:layout_toEndOf="@+id/duty_start">
+
+        <android.support.design.widget.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignStart="@+id/duty_stop"
+            android:layout_alignTop="@+id/duty_stop"
+            android:hint="hint"
+            tools:text="@tools:sample/date/hhmm" />
+    </android.support.design.widget.TextInputLayout>
+
+    <ImageButton
+        android:id="@+id/deleteRow"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="35dp"
+        android:layout_toEndOf="@+id/duty_stop"
+        android:scaleX="0.7"
+        android:scaleY="0.7"
+        app:srcCompat="@android:drawable/ic_delete" />
+</RelativeLayout>
\ No newline at end of file

From baa8cac0e447994d89155466dccc3855a44e9ca9 Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Sat, 15 Dec 2018 17:35:20 +0100
Subject: [PATCH 4/7] working dutyhour adapter

---
 .idea/codeStyles/Project.xml                  | 56 +++++++-------
 .../wmi/findmytutor/activity/TutorTab.java    | 52 ++++++++++---
 .../adapters/DutyHoursAdapter.java            | 17 +++--
 .../uam/wmi/findmytutor/model/DutyHour.java   |  3 +
 app/src/main/res/layout/content_tutor_tab.xml | 76 ++-----------------
 app/src/main/res/layout/duty_hour_row.xml     | 51 +++++++------
 app/src/main/res/values/strings.xml           | 13 ++++
 7 files changed, 131 insertions(+), 137 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 30aa626..2715a34 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,29 +1,29 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
 </component>
\ No newline at end of file
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
index 4dd3397..f647bf3 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
@@ -2,16 +2,21 @@ package com.uam.wmi.findmytutor.activity;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
 import com.annimon.stream.Stream;
 import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
 import com.uam.wmi.findmytutor.R;
+import com.uam.wmi.findmytutor.adapters.DutyHoursAdapter;
+import com.uam.wmi.findmytutor.model.DutyHour;
 import com.uam.wmi.findmytutor.model.DutyHourViewModel;
 import com.uam.wmi.findmytutor.model.TutorTabViewModel;
 import com.uam.wmi.findmytutor.model.User;
@@ -43,27 +48,35 @@ public class TutorTab extends AppCompatActivity {
     private TextView userEmail;
     private TextView department;
     private Button saveButon;
+    private List<DutyHourViewModel> dutyHourList;
+    private RecyclerView dutyHoursRecycller;
+    private RecyclerView.Adapter dutyHoursAdapter;
+    private RecyclerView.LayoutManager dutyHoursLayoutManager;
     private TutorTabViewModel newTab;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        tutorTabService = ApiClient.getClient(getApplicationContext())
-                .create(TutorTabApi.class);
-        userService = ApiClient.getClient(getApplicationContext())
-                .create(UserService.class);
         setContentView(R.layout.content_tutor_tab);
+
         TextView userName = findViewById(R.id.userName);
-        TextView userDutyHours = findViewById(R.id.userDutyHours);
+//        TextView userDutyHours = findViewById(R.id.userDutyHours);
         EditText userNote = findViewById(R.id.userNote);
         TextView userRoom = findViewById(R.id.userRoom);
         TextView userEmail = findViewById(R.id.userEmail);
         TextView department = findViewById(R.id.userDepartment);
         Button saveButon = findViewById(R.id.saveButon);
-        findViewById(R.id.contentTutorTabInfoImageButton).setOnClickListener(v-> InfoHelperUtils.infoPopUp(v,R.layout.info_popup_tutor_tab));
+        dutyHoursRecycller = (RecyclerView) findViewById(R.id.dutyHourView);
+        dutyHoursLayoutManager = new LinearLayoutManager(this);
+        dutyHoursRecycller.setLayoutManager(dutyHoursLayoutManager);
 
-        userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext())));
+
+
+        tutorTabService = ApiClient.getClient(getApplicationContext())
+                .create(TutorTabApi.class);
+        userService = ApiClient.getClient(getApplicationContext())
+                .create(UserService.class);
         disposable.add(
                 tutorTabService.apiUsersTutorTabByTutorIdGet(PrefUtils.getUserId(getApplicationContext()))
                         .subscribeOn(Schedulers.io())
@@ -71,12 +84,22 @@ public class TutorTab extends AppCompatActivity {
                         .subscribeWith(new DisposableSingleObserver<TutorTabViewModel>() {
                             @Override
                             public void onSuccess(TutorTabViewModel tutorTabViewModel) {
+                                Log.d("dupa tab", tutorTabViewModel.toString());
 
-                                List<String> dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours())
-                                        .map(DutyHourViewModel::getSummary).toList();
+                                dutyHourList = tutorTabViewModel.getDutyHours();
+                                if(dutyHourList == null){
+                                    Log.d("dupa godziny","null godziny");
+                                }else{
 
-                                userRoom.setText(String.format("%s: %s", getString(R.string.userRoom), tutorTabViewModel.getRoom()));
-                                userEmail.setText(String.format("%s: %s", getString(R.string.userEmail), tutorTabViewModel.getEmailTutorTab()));
+                                    dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),dutyHourList);
+                                    dutyHoursRecycller.setAdapter(dutyHoursAdapter);
+                                    Log.d("dupa godziny",dutyHourList.toString());
+                                }
+//                                List<String> dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours())
+//                                        .map(DutyHourViewModel::getSummary).toList();
+
+                                userRoom.setText(String.format("%s", tutorTabViewModel.getRoom()));
+                                userEmail.setText(String.format("%s", tutorTabViewModel.getEmailTutorTab()));
                                 if (!tutorTabViewModel.getNote().equals("")) {
                                     userNote.setText(String.format("%s", tutorTabViewModel.getNote()));
                                 }
@@ -89,6 +112,13 @@ public class TutorTab extends AppCompatActivity {
                                 showError(e);
                             }
                         }));
+
+
+
+        findViewById(R.id.contentTutorTabInfoImageButton).setOnClickListener(v-> InfoHelperUtils.infoPopUp(v,R.layout.info_popup_tutor_tab));
+
+        userName.setText(String.format("%s %s", PrefUtils.getUserFirstName(getApplicationContext()), PrefUtils.getUserLastName(getApplicationContext())));
+
         disposable.add(
 
               userService.getUserById(PrefUtils.getUserId(getApplicationContext()))
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 2b7fe31..43725c2 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
@@ -9,6 +9,9 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import com.uam.wmi.findmytutor.R;
 import com.uam.wmi.findmytutor.model.DutyHour;
+import com.uam.wmi.findmytutor.model.DutyHourViewModel;
+
+import java.util.ArrayList;
 import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -16,11 +19,11 @@ import butterknife.ButterKnife;
 
 public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyViewHolder> {
       private Context context;
-      private List<DutyHour> hours;
+      private List<DutyHourViewModel> hours;
 
-public DutyHoursAdapter(Context context, List<DutyHour> hours) {
+public DutyHoursAdapter(Context context, List<DutyHourViewModel> hours) {
         this.context = context;
-        this.hours = hours;
+        this.hours = new ArrayList<DutyHourViewModel>(hours);
         }
 
 @NonNull
@@ -34,7 +37,7 @@ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
 
 @Override
 public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
-        DutyHour duty = hours.get(position);
+        DutyHourViewModel duty = hours.get(position);
         holder.dutyDay.setText(duty.getDay());
         holder.dutyStart.setText(duty.getStart());
         holder.dutyStop.setText(duty.getEnd());
@@ -48,13 +51,13 @@ public int getItemCount() {
 
 class MyViewHolder extends RecyclerView.ViewHolder {
 
-   @BindView(R.id.duty_day)
+   @BindView(R.id.duty_day_value)
    TextView dutyDay;
 
-   @BindView(R.id.duty_start)
+   @BindView(R.id.duty_start_value)
    TextView dutyStart;
 
-   @BindView(R.id.duty_stop)
+   @BindView(R.id.duty_stop_value)
    TextView dutyStop;
 
    MyViewHolder(View view) {
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java b/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java
index 46cbdb3..3c17824 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHour.java
@@ -33,6 +33,9 @@ public class DutyHour extends BaseResponse {
   public DutyHour dutyHourId(UUID dutyHourId) {
     this.dutyHourId = dutyHourId;
     return this;
+  }
+  public DutyHour(){
+
   }
 
    /**
diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml
index 86479bb..4fea9d1 100644
--- a/app/src/main/res/layout/content_tutor_tab.xml
+++ b/app/src/main/res/layout/content_tutor_tab.xml
@@ -42,7 +42,7 @@
         android:lineSpacingExtra="8sp"
         android:paddingTop="5dp"
         android:textColor="@color/note_list_text"
-        android:hint="hint"
+        android:hint="@string/hint_department"
         />
     </android.support.design.widget.TextInputLayout>
 
@@ -57,7 +57,7 @@
         android:lineSpacingExtra="8sp"
         android:paddingTop="5dp"
         android:textColor="@color/note_list_text"
-        android:hint="hint"
+        android:hint="@string/hint_room"
         />
     </android.support.design.widget.TextInputLayout>
 
@@ -72,78 +72,16 @@
         android:lineSpacingExtra="8sp"
         android:paddingTop="5dp"
         android:textColor="@color/note_list_text"
-        android:hint="hint"
+        android:hint="@string/hint_email"
         />
     </android.support.design.widget.TextInputLayout>
 
-
-    <LinearLayout
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/dutyHourView"
+        android:scrollbars="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        >
+        android:layout_height="match_parent"/>
 
-        <android.support.design.widget.TextInputLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1">
-
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/userDutyHours"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="hint"
-                android:lineSpacingExtra="8sp"
-                android:paddingTop="5dp"
-                android:text="@string/dutyHours"
-                android:textColor="@color/note_list_text"
-                tools:text="@string/dutyHours" />
-        </android.support.design.widget.TextInputLayout>
-
-        <android.support.design.widget.TextInputLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1">
-
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/userDutyStart"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="hint"
-                android:lineSpacingExtra="8sp"
-                android:paddingTop="5dp"
-                android:text="@string/dutyHours"
-                android:textColor="@color/note_list_text"
-                tools:text="@string/dutyHours" />
-        </android.support.design.widget.TextInputLayout>
-
-        <android.support.design.widget.TextInputLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1">
-
-            <android.support.design.widget.TextInputEditText
-                android:id="@+id/userDutyStop"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="hint"
-                android:lineSpacingExtra="8sp"
-                android:paddingTop="5dp"
-                android:text="@string/dutyHours"
-                android:textColor="@color/note_list_text"
-                tools:text="@string/dutyHours" />
-        </android.support.design.widget.TextInputLayout>
-    </LinearLayout>
-
-
-    <ListView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-    </ListView>
     <TextView
         android:id="@+id/userNoteTitle"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/duty_hour_row.xml b/app/src/main/res/layout/duty_hour_row.xml
index 250c616..5bbefee 100644
--- a/app/src/main/res/layout/duty_hour_row.xml
+++ b/app/src/main/res/layout/duty_hour_row.xml
@@ -5,23 +5,26 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:fontFamily="@font/lato_regular"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="12dp"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp"
+    android:paddingTop="12dp"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="100dp">
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/duty_day"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_width="88dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:hint="@string/hint_duty_day">
 
         <android.support.design.widget.TextInputEditText
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:id="@+id/duty_day_value"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_alignStart="@+id/duty_day"
-            android:hint="hint"
             tools:text="@tools:sample/date/day_of_week" />
     </android.support.design.widget.TextInputLayout>
 
@@ -29,14 +32,16 @@
         android:id="@+id/duty_start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="50dp"
-        android:layout_toEndOf="@+id/duty_day">
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="142dp"
+        android:hint="@string/hint_duty_start">
 
         <android.support.design.widget.TextInputEditText
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:id="@+id/duty_start_value"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_alignTop="@+id/duty_start"
-            android:hint="hint"
             tools:text="@tools:sample/date/hhmm" />
     </android.support.design.widget.TextInputLayout>
 
@@ -44,24 +49,26 @@
         android:id="@+id/duty_stop"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="50dp"
-        android:layout_toEndOf="@+id/duty_start">
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="75dp"
+        android:hint="@string/hint_duty_end">
 
         <android.support.design.widget.TextInputEditText
+            android:id="@+id/duty_stop_value"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_alignStart="@+id/duty_stop"
             android:layout_alignTop="@+id/duty_stop"
-            android:hint="hint"
             tools:text="@tools:sample/date/hhmm" />
     </android.support.design.widget.TextInputLayout>
 
     <ImageButton
         android:id="@+id/deleteRow"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="35dp"
-        android:layout_toEndOf="@+id/duty_stop"
+        android:layout_height="41dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
         android:scaleX="0.7"
         android:scaleY="0.7"
         app:srcCompat="@android:drawable/ic_delete" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d51b4a7..bb86d84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -297,4 +297,17 @@
     <string name="info_icon_userlist_tab_level_status_inactive">- user is inactive </string>
     <string name="info_icon_userlist_tab_level_status_inactive_tip">(didn’t share any localization data since 7 days)</string>
 
+
+    <!--(ENG) Profile Activity strings-->
+    <string name="hint_duty_day">Day</string>
+    <string name="hint_duty_start">Start</string>
+    <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>
+
+
+
+
+
 </resources>

From f37fe44f2ec0c650180b0d10f161c9f00b946a23 Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Sat, 15 Dec 2018 22:59:34 +0100
Subject: [PATCH 5/7] added strings and adjusted layout but needs fixing for
 smaller screens

---
 app/src/main/res/layout/content_tutor_tab.xml | 39 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  7 +++-
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml
index 4fea9d1..95ddbe6 100644
--- a/app/src/main/res/layout/content_tutor_tab.xml
+++ b/app/src/main/res/layout/content_tutor_tab.xml
@@ -31,7 +31,15 @@
         android:textStyle="normal" />
 
 
-
+    <TextView
+        android:id="@+id/personalInfoTitle"
+        android:textSize="16sp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:textColor="@color/note_list_text"
+        android:text="@string/personalInfoTitle"/>
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
@@ -76,20 +84,41 @@
         />
     </android.support.design.widget.TextInputLayout>
 
+    <TextView
+        android:id="@+id/dutyTitle"
+        android:textSize="16sp"
+
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="0dp"
+        android:paddingBottom="0dp"
+        android:textColor="@color/note_list_text"
+        android:text="@string/dutyTitle"/>
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/dutyHourView"
-        android:scrollbars="vertical"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="200dp"
+        android:scrollbars="vertical" />
+
+
+
+    <Button
+        android:id="@+id/addDuty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/addDuty"
+        android:layout_gravity="end"/>
 
     <TextView
+        android:textSize="16sp"
         android:id="@+id/userNoteTitle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/activity_margin"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
-        android:textColor="@color/note_list_text" />
+        android:textColor="@color/note_list_text"
+        android:text="@string/userNoteTitle"/>
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb86d84..d95dd7b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -297,7 +297,6 @@
     <string name="info_icon_userlist_tab_level_status_inactive">- user is inactive </string>
     <string name="info_icon_userlist_tab_level_status_inactive_tip">(didn’t share any localization data since 7 days)</string>
 
-
     <!--(ENG) Profile Activity strings-->
     <string name="hint_duty_day">Day</string>
     <string name="hint_duty_start">Start</string>
@@ -305,6 +304,12 @@
     <string name="hint_department">Department</string>
     <string name="hint_room">Room</string>
     <string name="hint_email">Email</string>
+    <string name="addDuty">ADD DUTY</string>
+    <string name="dutyTitle">Duty hours</string>
+    <string name="personalInfoTitle">Personal info</string>
+    <string name="userNoteTitle">Your note</string>
+
+
 
 
 

From 80b0948033158df221fd76248b2a2bcaf34ac0fa Mon Sep 17 00:00:00 2001
From: "marcin.jedynski" <marjed12@st.amu.edu.pl>
Date: Sun, 16 Dec 2018 16:56:54 +0100
Subject: [PATCH 6/7] working on duty hours validation

---
 .../findmytutor/activity/SharingFragment.java |   5 +-
 .../wmi/findmytutor/activity/TutorTab.java    |  89 ++++++---
 .../adapters/DutyHoursAdapter.java            | 106 ++++++++++-
 .../findmytutor/model/DutyHourViewModel.java  |  14 ++
 .../findmytutor/model/TutorTabViewModel.java  |   7 +-
 .../wmi/findmytutor/service/TutorTabApi.java  |   7 +-
 app/src/main/res/layout/content_tutor_tab.xml | 170 ++++++++++--------
 app/src/main/res/layout/duty_hour_row.xml     |  42 ++---
 app/src/main/res/values/strings.xml           |   2 +
 9 files changed, 299 insertions(+), 143 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
index 6bf9a04..1ede65f 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java
@@ -7,6 +7,7 @@ import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
+import android.preference.SwitchPreference;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,7 +41,7 @@ import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext;
 
 
 public class SharingFragment extends PreferenceFragment {
-    protected Preference locationSharing;
+    protected SwitchPreference locationSharing;
     protected Preference locationMode;
     protected ListPreference manualLocationList;
     protected PreferenceCategory preferenceCategory;
@@ -113,7 +114,7 @@ public class SharingFragment extends PreferenceFragment {
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.layout.pref_sharing);
-        locationSharing = findPreference("key_sharing_enabled");
+        locationSharing = (SwitchPreference) findPreference("key_sharing_enabled");
         locationMode = findPreference("key_location_level");
         preferenceCategory = (PreferenceCategory) findPreference("category_sharing");
         manualLocationList = (ListPreference)  findPreference("key_manual_location_value");
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
index f647bf3..31ac9e6 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
@@ -6,6 +6,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
+import android.widget.Adapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -27,6 +28,7 @@ import com.uam.wmi.findmytutor.utils.InfoHelperUtils;
 import com.uam.wmi.findmytutor.utils.PrefUtils;
 import com.uam.wmi.findmytutor.utils.RestApiHelper;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -47,10 +49,12 @@ public class TutorTab extends AppCompatActivity {
     private TextView userRoom;
     private TextView userEmail;
     private TextView department;
+    private Button addDutyButton;
     private Button saveButon;
+    private Boolean ifTutorTabExists = true;
     private List<DutyHourViewModel> dutyHourList;
     private RecyclerView dutyHoursRecycller;
-    private RecyclerView.Adapter dutyHoursAdapter;
+    private DutyHoursAdapter dutyHoursAdapter;
     private RecyclerView.LayoutManager dutyHoursLayoutManager;
     private TutorTabViewModel newTab;
 
@@ -60,19 +64,19 @@ public class TutorTab extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.content_tutor_tab);
 
-        TextView userName = findViewById(R.id.userName);
+        userName = findViewById(R.id.userName);
 //        TextView userDutyHours = findViewById(R.id.userDutyHours);
-        EditText userNote = findViewById(R.id.userNote);
-        TextView userRoom = findViewById(R.id.userRoom);
-        TextView userEmail = findViewById(R.id.userEmail);
-        TextView department = findViewById(R.id.userDepartment);
-        Button saveButon = findViewById(R.id.saveButon);
+        userNote = findViewById(R.id.userNote);
+        userRoom = findViewById(R.id.userRoom);
+        userEmail = findViewById(R.id.userEmail);
+        department = findViewById(R.id.userDepartment);
+        saveButon = findViewById(R.id.saveButon);
+        addDutyButton = findViewById(R.id.addDuty);
         dutyHoursRecycller = (RecyclerView) findViewById(R.id.dutyHourView);
         dutyHoursLayoutManager = new LinearLayoutManager(this);
         dutyHoursRecycller.setLayoutManager(dutyHoursLayoutManager);
 
 
-
         tutorTabService = ApiClient.getClient(getApplicationContext())
                 .create(TutorTabApi.class);
         userService = ApiClient.getClient(getApplicationContext())
@@ -84,31 +88,40 @@ public class TutorTab extends AppCompatActivity {
                         .subscribeWith(new DisposableSingleObserver<TutorTabViewModel>() {
                             @Override
                             public void onSuccess(TutorTabViewModel tutorTabViewModel) {
-                                Log.d("dupa tab", tutorTabViewModel.toString());
 
                                 dutyHourList = tutorTabViewModel.getDutyHours();
                                 if(dutyHourList == null){
-                                    Log.d("dupa godziny","null godziny");
                                 }else{
-
                                     dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),dutyHourList);
                                     dutyHoursRecycller.setAdapter(dutyHoursAdapter);
-                                    Log.d("dupa godziny",dutyHourList.toString());
+                                    addDutyButton.setOnClickListener(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            addEmptyDuty(dutyHoursAdapter);
+                                        }
+                                    });
                                 }
-//                                List<String> dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours())
-//                                        .map(DutyHourViewModel::getSummary).toList();
-
                                 userRoom.setText(String.format("%s", tutorTabViewModel.getRoom()));
                                 userEmail.setText(String.format("%s", tutorTabViewModel.getEmailTutorTab()));
                                 if (!tutorTabViewModel.getNote().equals("")) {
                                     userNote.setText(String.format("%s", tutorTabViewModel.getNote()));
                                 }
-//                                userDutyHours.setText(String.format("%s: %s", getString(R.string.userDutyHoursHeader), Arrays.toString(dutyHoursList.toArray())));
-
                             }
 
                             @Override
                             public void onError(Throwable e) {
+                                int code = ((HttpException) e).response().code();
+                                if( code == 404){
+                                    ifTutorTabExists = false;
+                                    dutyHoursAdapter = new DutyHoursAdapter(getApplicationContext(),new ArrayList<DutyHourViewModel>());
+                                    dutyHoursRecycller.setAdapter(dutyHoursAdapter);
+                                   addDutyButton.setOnClickListener(new View.OnClickListener() {
+                                      @Override
+                                      public void onClick(View v) {
+                                         addEmptyDuty(dutyHoursAdapter);
+                                      }
+                                   });
+                                }
                                 showError(e);
                             }
                         }));
@@ -134,18 +147,32 @@ public class TutorTab extends AppCompatActivity {
 
                             @Override
                             public void onError(Throwable e) {
+
                                 showError(e);
                             }
                         }));
-    setUpSaveListener(saveButon, userNote);
+    setUpSaveListener(saveButon);
+    }
+    private void addEmptyDuty(DutyHoursAdapter adapter){
+        adapter.addDuty(new DutyHourViewModel());
+        adapter.notifyItemInserted(adapter.getItemCount());
+       dutyHoursRecycller.scrollToPosition(adapter.getItemCount()-1);
     }
 
-    private void setUpSaveListener(Button button, EditText note) {
+    private void setUpSaveListener(Button button) {
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                newTab = new TutorTabViewModel(PrefUtils.getUserId(getApplicationContext()),note.getText().toString());
-                putUserTab(newTab);
+                newTab = new TutorTabViewModel(PrefUtils.getUserId(getApplicationContext()),
+                        userRoom.getText().toString(),
+                        userEmail.getText().toString(),
+                        userNote.getText().toString(),
+                        dutyHoursAdapter.getDutyList());
+                if(ifTutorTabExists){
+                    putUserTab(newTab);
+                }else{
+                    postUserTab(newTab);
+                }
             }
         });
     }
@@ -154,12 +181,21 @@ public class TutorTab extends AppCompatActivity {
         disposable.add(tutorTabService.apiUsersTutorTabByTutorIdPut(PrefUtils.getUserId(getApplicationContext()), tutorTabViewModel)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(this::handleResponse, this::handleError));
+                .subscribe(this::handleResponsePut, this::handleError));
+    }
+    private void postUserTab(TutorTabViewModel tutorTabViewModel) {
+        disposable.add(tutorTabService.apiUsersTutorTabByTutorIdPost(PrefUtils.getUserId(getApplicationContext()), tutorTabViewModel)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(this::handleResponsePost, this::handleError));
     }
-//    private void postUserTab()
 
-    private void handleResponse(TutorTabViewModel tutorTabViewModel) {
-        Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.modal_feedback_thankyou), Toast.LENGTH_SHORT).show();
+    private void handleResponsePut(Response<Void> resp) {
+        Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.updateToast), Toast.LENGTH_SHORT).show();
+
+    }
+    private void handleResponsePost(TutorTabViewModel tutorTabViewModel ) {
+        Toast.makeText(getApplicationContext(), getApplicationContext().getString(R.string.updateToast), Toast.LENGTH_SHORT).show();
 
     }
 
@@ -186,9 +222,6 @@ public class TutorTab extends AppCompatActivity {
         } else {
             message = "Network Error!";
         }
-
-//      Snackbar.make(coordinatorLayout, message, Snackbar.LENGTH_LONG)
-//              .show();
         Toast.makeText(getApplicationContext(), message, Toast.LENGTH_SHORT).show();
     }
 
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 43725c2..ba7041c 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
@@ -3,12 +3,18 @@ package com.uam.wmi.findmytutor.adapters;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.TextView;
+
+import com.annimon.stream.Collectors;
+import com.annimon.stream.Stream;
 import com.uam.wmi.findmytutor.R;
-import com.uam.wmi.findmytutor.model.DutyHour;
 import com.uam.wmi.findmytutor.model.DutyHourViewModel;
 
 import java.util.ArrayList;
@@ -22,9 +28,24 @@ public class DutyHoursAdapter extends  RecyclerView.Adapter<DutyHoursAdapter.MyV
       private List<DutyHourViewModel> hours;
 
 public DutyHoursAdapter(Context context, List<DutyHourViewModel> hours) {
-        this.context = context;
-        this.hours = new ArrayList<DutyHourViewModel>(hours);
-        }
+   this.context = context;
+   this.hours = new ArrayList<DutyHourViewModel>(hours);
+}
+
+
+public List<DutyHourViewModel> getDutyList(){
+   ArrayList<DutyHourViewModel> notEmpty = Stream.of(hours).filter(DutyHourViewModel::isValid).collect(Collectors.toList());
+   return hours;
+}
+public void addDuty(DutyHourViewModel duty){
+   hours.add(duty);
+}
+private void removeDuty(int pos){
+   hours.remove(pos);
+   this.notifyItemRemoved(pos);
+   Log.d("DutyIndex af rm size",Integer.toString(getItemCount()));
+
+}
 
 @NonNull
 @Override
@@ -38,9 +59,77 @@ public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
 @Override
 public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
         DutyHourViewModel duty = hours.get(position);
-        holder.dutyDay.setText(duty.getDay());
-        holder.dutyStart.setText(duty.getStart());
-        holder.dutyStop.setText(duty.getEnd());
+   holder.dutyDay.setText(duty.getDay());
+   holder.dutyDay.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+      }
+
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+      }
+
+      @Override
+      public void afterTextChanged(Editable s) {
+         duty.setDay(holder.dutyDay.getText().toString());
+      }
+   });
+   holder.dutyStart.setText(duty.getStart());
+   holder.dutyStart.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+      }
+
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+      }
+
+      @Override
+      public void afterTextChanged(Editable s) {
+         duty.setStart(holder.dutyStart.getText().toString());
+      }
+   });
+   holder.dutyStop.setText(duty.getEnd());
+   holder.dutyStop.addTextChangedListener(new TextWatcher() {
+      @Override
+      public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+      }
+
+      @Override
+      public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+      }
+
+      @Override
+      public void afterTextChanged(Editable s) {
+         duty.setEnd(holder.dutyStop.getText().toString());
+      }
+   });
+        holder.deleteRow.setOnClickListener(new View.OnClickListener() {
+           @Override
+           public void onClick(View v) {
+              try{
+                 Log.d("DutyIndex bf rm size",Integer.toString(getItemCount()));
+                 Log.d("DutyIndex bf rm pos",Integer.toString(holder.getLayoutPosition()));
+                 removeDuty(holder.getLayoutPosition());
+                 Log.d("DutyIndex af rm pos",Integer.toString(holder.getLayoutPosition()));
+
+
+              }catch(Error e){
+                 Log.e("DutyIndex error",e.getMessage());
+                 Log.e("DutyIndex size",Integer.toString(getItemCount()));
+                 Log.e("DutyIndex pos",Integer.toString(holder.getAdapterPosition()));
+
+
+              }
+
+           }
+        });
 
         }
 
@@ -60,6 +149,9 @@ class MyViewHolder extends RecyclerView.ViewHolder {
    @BindView(R.id.duty_stop_value)
    TextView dutyStop;
 
+   @BindView(R.id.deleteRow)
+   ImageButton deleteRow;
+
    MyViewHolder(View view) {
       super(view);
       ButterKnife.bind(this, view);
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHourViewModel.java b/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHourViewModel.java
index d3bcbe2..241d998 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHourViewModel.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/model/DutyHourViewModel.java
@@ -24,6 +24,20 @@ public class DutyHourViewModel {
         this.day = day;
         return this;
     }
+    public Boolean isValid(){
+        if(this.day.isEmpty()){
+            return false;
+        }else if( !this.start.isEmpty() && this.end.isEmpty() ){
+            return false;
+        }else{
+            return true;
+        }
+    }
+    public DutyHourViewModel(){
+        day="";
+        start="";
+        end="";
+    }
 
     /**
      * Get day
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java b/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java
index e726ce9..73ed9d8 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/model/TutorTabViewModel.java
@@ -33,11 +33,12 @@ public class TutorTabViewModel {
     @SerializedName("dutyHours")
     private List<DutyHourViewModel> dutyHours = null;
 
-    public TutorTabViewModel(String userId, String note){
+    public TutorTabViewModel(String userId, String room, String email, String note, List<DutyHourViewModel> dutyHours){
         this.userId=userId;
-//        this.room=room;
-//        this.emailTutorTab=emailTutorTab;
+        this.room=room;
+        this.emailTutorTab=email;
         this.note=note;
+        this.dutyHours = new ArrayList<DutyHourViewModel>(dutyHours);
     }
 
     public TutorTabViewModel tutorTabId(UUID tutorTabId) {
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/service/TutorTabApi.java b/app/src/main/java/com/uam/wmi/findmytutor/service/TutorTabApi.java
index e5ba6b1..837e356 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/service/TutorTabApi.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/service/TutorTabApi.java
@@ -5,6 +5,7 @@ import com.uam.wmi.findmytutor.model.TutorTabViewModel;
 
 import io.reactivex.Observable;
 import io.reactivex.Single;
+import retrofit2.Response;
 import retrofit2.http.*;
 
 
@@ -40,6 +41,10 @@ public interface TutorTabApi {
             @retrofit2.http.Path("tutorId") String tutorId
     );
 
+    @POST("api/users/tutorTab/{tutorId}")
+    Single<TutorTabViewModel> apiUsersTutorTabByTutorIdPost(
+            @retrofit2.http.Path("tutorId") String tutorId, @retrofit2.http.Body TutorTabViewModel tutorTab
+    );
     /**
      *
      *
@@ -51,7 +56,7 @@ public interface TutorTabApi {
             "Content-Type:application/json"
     })
     @PUT("api/users/tutorTab/{tutorId}")
-    Observable<TutorTabViewModel> apiUsersTutorTabByTutorIdPut(
+    Observable<Response<Void>> apiUsersTutorTabByTutorIdPut(
             @retrofit2.http.Path("tutorId") String tutorId, @retrofit2.http.Body TutorTabViewModel tutorTab
     );
 
diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml
index 95ddbe6..178d4ac 100644
--- a/app/src/main/res/layout/content_tutor_tab.xml
+++ b/app/src/main/res/layout/content_tutor_tab.xml
@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:mapbox="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:fontFamily="@font/lato_regular"
-    android:paddingLeft="@dimen/activity_margin"
-    android:paddingRight="@dimen/activity_margin"
-    android:paddingTop="@dimen/activity_margin">
-
+    android:layout_height="match_parent">
 
+    <LinearLayout
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:fontFamily="@font/lato_regular"
+        android:paddingLeft="@dimen/activity_margin"
+        android:paddingRight="@dimen/activity_margin"
+        android:paddingTop="@dimen/activity_margin">
     <ImageButton
         android:id="@+id/contentTutorTabInfoImageButton"
         android:layout_width="wrap_content"
@@ -30,60 +35,76 @@
         android:textSize="@dimen/lbl_new_note_title"
         android:textStyle="normal" />
 
-
-    <TextView
-        android:id="@+id/personalInfoTitle"
-        android:textSize="16sp"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="0dp"
-        android:paddingBottom="0dp"
-        android:textColor="@color/note_list_text"
-        android:text="@string/personalInfoTitle"/>
-    <android.support.design.widget.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    <android.support.design.widget.TextInputEditText
-        android:id="@+id/userDepartment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:lineSpacingExtra="8sp"
-        android:paddingTop="5dp"
-        android:textColor="@color/note_list_text"
-        android:hint="@string/hint_department"
-        />
-    </android.support.design.widget.TextInputLayout>
+        android:orientation="vertical"
+        >
+        <TextView
+            android:id="@+id/personalInfoTitle"
+            android:textSize="16sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="0dp"
+            android:paddingBottom="0dp"
+            android:textColor="@color/mapboxRedDark"
+            android:text="@string/personalInfoTitle"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            >
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.7">
 
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/userDepartment"
+                    android:maxLines="1"
+                    android:inputType="text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/hint_department"
+                    android:lineSpacingExtra="8sp"
+                    android:paddingTop="5dp"
+                    android:textColor="@color/note_list_text" />
+            </android.support.design.widget.TextInputLayout>
+            <android.support.design.widget.TextInputLayout
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.3">
 
-    <android.support.design.widget.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    <android.support.design.widget.TextInputEditText
-        android:id="@+id/userRoom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:lineSpacingExtra="8sp"
-        android:paddingTop="5dp"
-        android:textColor="@color/note_list_text"
-        android:hint="@string/hint_room"
-        />
-    </android.support.design.widget.TextInputLayout>
+                <android.support.design.widget.TextInputEditText
+                    android:id="@+id/userRoom"
+                    android:maxLines="1"
+                    android:inputType="text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/hint_room"
+                    android:lineSpacingExtra="8sp"
+                    android:paddingTop="5dp"
+                    android:textColor="@color/note_list_text" />
+            </android.support.design.widget.TextInputLayout>
+        </LinearLayout>
+        <android.support.design.widget.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <android.support.design.widget.TextInputEditText
+                android:id="@+id/userEmail"
+                android:maxLines="1"
+                android:inputType="text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8sp"
+                android:paddingTop="5dp"
+                android:textColor="@color/note_list_text"
+                android:hint="@string/hint_email"
+                />
+        </android.support.design.widget.TextInputLayout>
+    </LinearLayout>
 
 
-    <android.support.design.widget.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    <android.support.design.widget.TextInputEditText
-        android:id="@+id/userEmail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:lineSpacingExtra="8sp"
-        android:paddingTop="5dp"
-        android:textColor="@color/note_list_text"
-        android:hint="@string/hint_email"
-        />
-    </android.support.design.widget.TextInputLayout>
-
     <TextView
         android:id="@+id/dutyTitle"
         android:textSize="16sp"
@@ -92,13 +113,13 @@
         android:layout_height="wrap_content"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
-        android:textColor="@color/note_list_text"
+        android:textColor="@color/mapboxRedDark"
         android:text="@string/dutyTitle"/>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/dutyHourView"
         android:layout_width="match_parent"
-        android:layout_height="200dp"
+        android:layout_height="100dp"
         android:scrollbars="vertical" />
 
 
@@ -117,24 +138,24 @@
         android:layout_height="wrap_content"
         android:paddingTop="0dp"
         android:paddingBottom="0dp"
-        android:textColor="@color/note_list_text"
+        android:textColor="@color/mapboxRedDark"
         android:text="@string/userNoteTitle"/>
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-    <EditText
-        android:id="@+id/userNote"
-        android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:lineSpacingExtra="8sp"
-        android:paddingTop="5dp"
-        android:textColor="@color/note_list_text"
-        android:hint="@string/tutorTabHint"
-        android:inputType="textMultiLine"
-        android:maxLength="1000"
-        android:maxLines="7"
-        android:requiresFadingEdge="vertical"
-        android:scrollbars="vertical"/>
+        <EditText
+            android:id="@+id/userNote"
+            android:layout_width="match_parent"
+            android:layout_height="150dp"
+            android:lineSpacingExtra="8sp"
+            android:paddingTop="5dp"
+            android:textColor="@color/note_list_text"
+            android:hint="@string/tutorTabHint"
+            android:inputType="textMultiLine"
+            android:maxLength="1000"
+            android:maxLines="7"
+            android:requiresFadingEdge="vertical"
+            android:scrollbars="vertical"/>
     </android.support.design.widget.TextInputLayout>
 
 
@@ -145,6 +166,7 @@
         android:text="@string/saveButton" />
 
 
+</LinearLayout>
 
+</ScrollView>
 
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/duty_hour_row.xml b/app/src/main/res/layout/duty_hour_row.xml
index 5bbefee..c50c745 100644
--- a/app/src/main/res/layout/duty_hour_row.xml
+++ b/app/src/main/res/layout/duty_hour_row.xml
@@ -1,75 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:fontFamily="@font/lato_regular"
-    android:paddingBottom="12dp"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    android:paddingTop="12dp"
     android:layout_width="match_parent"
-    android:layout_height="100dp">
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/duty_day"
-        android:layout_width="88dp"
+        android:layout_width="95dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
         android:hint="@string/hint_duty_day">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/duty_day_value"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignStart="@+id/duty_day"
+            android:inputType="text"
+            android:maxLines="1"
             tools:text="@tools:sample/date/day_of_week" />
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/duty_start"
-        android:layout_width="wrap_content"
+        android:layout_width="65dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="142dp"
         android:hint="@string/hint_duty_start">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/duty_start_value"
+            android:maxLines="1"
+            android:inputType="text"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignTop="@+id/duty_start"
             tools:text="@tools:sample/date/hhmm" />
     </android.support.design.widget.TextInputLayout>
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/duty_stop"
-        android:layout_width="wrap_content"
+        android:layout_width="65dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="75dp"
         android:hint="@string/hint_duty_end">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/duty_stop_value"
+            android:maxLines="1"
+            android:inputType="text"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_alignStart="@+id/duty_stop"
-            android:layout_alignTop="@+id/duty_stop"
             tools:text="@tools:sample/date/hhmm" />
     </android.support.design.widget.TextInputLayout>
 
     <ImageButton
         android:id="@+id/deleteRow"
         android:layout_width="wrap_content"
-        android:layout_height="41dp"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
+        android:layout_height="match_parent"
         android:scaleX="0.7"
         android:scaleY="0.7"
         app:srcCompat="@android:drawable/ic_delete" />
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d95dd7b..8885f2e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -308,6 +308,8 @@
     <string name="dutyTitle">Duty hours</string>
     <string name="personalInfoTitle">Personal info</string>
     <string name="userNoteTitle">Your note</string>
+    <string name="updateToast">Thank you for updating your profile.</string>
+
 
 
 

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 7/7] 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>