From 962a222fa811d3b931594eecde7f72990a3dd899 Mon Sep 17 00:00:00 2001 From: "marcin.jedynski" Date: Sun, 16 Dec 2018 18:19:58 +0100 Subject: [PATCH 1/6] minor cleanup --- app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java | 1 - 1 file changed, 1 deletion(-) 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 31ac9e6..85bf19b 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 @@ -65,7 +65,6 @@ public class TutorTab extends AppCompatActivity { setContentView(R.layout.content_tutor_tab); userName = findViewById(R.id.userName); -// TextView userDutyHours = findViewById(R.id.userDutyHours); userNote = findViewById(R.id.userNote); userRoom = findViewById(R.id.userRoom); userEmail = findViewById(R.id.userEmail); From c1bf626bbc25f692b122a09e371afb7a40b54cee Mon Sep 17 00:00:00 2001 From: "marcin.jedynski" Date: Mon, 17 Dec 2018 00:45:38 +0100 Subject: [PATCH 2/6] changed hint strings --- .../java/com/uam/wmi/findmytutor/activity/TutorTab.java | 7 +++++-- app/src/main/res/layout/content_tutor_tab.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 4 files changed, 8 insertions(+), 5 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 85bf19b..2ebbdae 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 @@ -1,6 +1,8 @@ package com.uam.wmi.findmytutor.activity; import android.os.Bundle; +import android.support.design.widget.TextInputEditText; +import android.support.design.widget.TextInputLayout; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; @@ -45,7 +47,7 @@ public class TutorTab extends AppCompatActivity { private CompositeDisposable disposable = new CompositeDisposable(); private TextView userName; private TextView userDutyHours; - private EditText userNote; + private TextInputEditText userNote; private TextView userRoom; private TextView userEmail; private TextView department; @@ -65,7 +67,8 @@ public class TutorTab extends AppCompatActivity { setContentView(R.layout.content_tutor_tab); userName = findViewById(R.id.userName); - userNote = findViewById(R.id.userNote); + userNote = (TextInputEditText) findViewById(R.id.userNote); + userNote.setHint("kupa kamieni tutaj leży"+"\n"+"a tutaj kupa gruzu"); userRoom = findViewById(R.id.userRoom); userEmail = findViewById(R.id.userEmail); department = findViewById(R.id.userDepartment); diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml index 178d4ac..d2a3519 100644 --- a/app/src/main/res/layout/content_tutor_tab.xml +++ b/app/src/main/res/layout/content_tutor_tab.xml @@ -143,7 +143,7 @@ - Usuń manualną lokację Profil Zapisz! - Tutaj możesz dodać swoją notatkę. Będzie widoczna dla innych użytkowników. + Edytuj swoją notatkę. Będzie widoczna dla innych. WYŚLIJ Proszę nazwać wybraną lokację. Czy chcesz zapisać tę lokalizację? diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3871a73..53766b8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -88,7 +88,7 @@ Descrition Save - Here you can add your note. It will be visible to the other users. + Edit your note. It will be shown in the users list. key_description From 3ddcccb1767bb9b39c5b49fc32b5fd62de90062a Mon Sep 17 00:00:00 2001 From: "marcin.jedynski" Date: Mon, 17 Dec 2018 00:48:35 +0100 Subject: [PATCH 3/6] minor adjustments --- app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java | 1 + app/src/main/res/layout/content_tutor_tab.xml | 1 + app/src/main/res/values/strings.xml | 1 + 3 files changed, 3 insertions(+) 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 2ebbdae..fd6091b 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 @@ -174,6 +174,7 @@ public class TutorTab extends AppCompatActivity { putUserTab(newTab); }else{ postUserTab(newTab); + ifTutorTabExists=true; } } }); diff --git a/app/src/main/res/layout/content_tutor_tab.xml b/app/src/main/res/layout/content_tutor_tab.xml index d2a3519..9925918 100644 --- a/app/src/main/res/layout/content_tutor_tab.xml +++ b/app/src/main/res/layout/content_tutor_tab.xml @@ -144,6 +144,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> Save Edit your note. It will be shown in the users list. + key_description From 00ea68379bf39ba37b0e2dc64a475c1a43a01efd Mon Sep 17 00:00:00 2001 From: "marcin.jedynski" Date: Mon, 17 Dec 2018 00:51:11 +0100 Subject: [PATCH 4/6] rmved test hint --- app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java | 1 - 1 file changed, 1 deletion(-) 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 fd6091b..1fa3793 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 @@ -68,7 +68,6 @@ public class TutorTab extends AppCompatActivity { userName = findViewById(R.id.userName); userNote = (TextInputEditText) findViewById(R.id.userNote); - userNote.setHint("kupa kamieni tutaj leży"+"\n"+"a tutaj kupa gruzu"); userRoom = findViewById(R.id.userRoom); userEmail = findViewById(R.id.userEmail); department = findViewById(R.id.userDepartment); From 4bdebcf52d6297bdeef6b29f4b372870e18c5f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Mon, 17 Dec 2018 10:39:37 +0100 Subject: [PATCH 5/6] Add strings --- app/src/main/res/values-pl/strings.xml | 3 ++- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index fabac29..9b3bbec 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -121,7 +121,7 @@ Login (Ldap) Zaloguj! Niepoprawny format loginu. - Lista użytkowników + Kadra Wybierz lokalizacje Nie dodano uprawnień do lokalizacji. Ta aplikacja potrzebuje uprawnień do lokalizacji. @@ -232,6 +232,7 @@ Dane kontaktowe Twoja notka Dziękujemy za aktualizację profilu + Błąd podczas pobierania lokalizacji. Użytkownik nie zdefiniował statusu. Tak diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 597be47..5574b00 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -299,6 +299,7 @@ (didn’t share any localization data since 7 days) After clicking on a name, the tutor tab will pop up, containing details about selected tutor. + Yes App issues reporting @@ -314,7 +315,6 @@ Personal info Your note Thank you for updating your profile. - yes No In order to use this function, you have to enable localization sharing. May I do it for you? Sharing From ce14928bc681b9ebe8914d02fa733a189a862bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Mon, 17 Dec 2018 10:41:09 +0100 Subject: [PATCH 6/6] fix duty hours --- .../com/uam/wmi/findmytutor/model/DutyHourViewModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 241d998..0e0245e 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 @@ -108,12 +108,11 @@ public class DutyHourViewModel { return Objects.hash(day, start, end); } + public String getSummary() { - return this.getDay() + " " + this.getStart() + " " + this.getEnd(); + return this.getDay() + ": " + this.getStart() + " - " + this.getEnd(); } - - @Override public String toString() { StringBuilder sb = new StringBuilder();