diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index d7a7dfa..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e5042a6..d7e6c83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,6 +33,7 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:preference-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:27.1.1'
+ implementation 'com.android.support:cardview-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:support-v4:27.1.1'
implementation 'com.android.support:support-vector-drawable:27.1.1'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3f3dd4d..2477479 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/AppTheme"
+ tools:ignore="AllowBackup,GoogleAppIndexingWarning">
dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours())
.map(DutyHourViewModel::getSummary).toList();
+ if(dutyHoursList.isEmpty()){
+ dutyHoursList.add(getString(R.string.lack_duty_hours));
+ }
+
+ if(tutorTabViewModel.getNote().isEmpty()){
+ userNoteText = getString(R.string.lack_note);
+ }
+
userRoom.setText(String.format("%s: %s", getString(R.string.userRoom), tutorTabViewModel.getRoom()));
userEmail.setText(String.format("%s: %s", getString(R.string.userEmail), tutorTabViewModel.getEmailTutorTab()));
- userNote.setText(String.format("%s: %s", getString(R.string.userNote), tutorTabViewModel.getNote()));
+ userNote.setText(String.format("%s: %s", getString(R.string.userNote), userNoteText));
department.setText(String.format("%s: %s", getString(R.string.userDepartment), user.getDepartment()));
userDutyHoursTitle.setText(String.format("%s:", getString(R.string.userDutyHoursHeader)));
final ArrayAdapter arrayAdapter = new ArrayAdapter<>(getActivity(),
- android.R.layout.test_list_item, dutyHoursList);
+ R.layout.duty_hours_item, dutyHoursList);
userDutyHours.setAdapter(arrayAdapter);
alertDialog.show();
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java b/app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
index 36c7f00..87210e5 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
@@ -4,7 +4,6 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -28,25 +27,6 @@ public class TutorsListAdapter extends RecyclerView.Adapter
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_user_account_icon.xml b/app/src/main/res/drawable/ic_user_account_icon.xml
new file mode 100644
index 0000000..6b5dc28
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user_account_icon.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_list_off.xml b/app/src/main/res/drawable/user_list_off.xml
new file mode 100644
index 0000000..6823803
--- /dev/null
+++ b/app/src/main/res/drawable/user_list_off.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/user_list_offline.xml b/app/src/main/res/drawable/user_list_offline.xml
new file mode 100644
index 0000000..99f0702
--- /dev/null
+++ b/app/src/main/res/drawable/user_list_offline.xml
@@ -0,0 +1,10 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/user_list_online.xml b/app/src/main/res/drawable/user_list_online.xml
new file mode 100644
index 0000000..f76ba37
--- /dev/null
+++ b/app/src/main/res/drawable/user_list_online.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_modal_department.xml b/app/src/main/res/drawable/user_modal_department.xml
new file mode 100644
index 0000000..265f411
--- /dev/null
+++ b/app/src/main/res/drawable/user_modal_department.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_modal_duty.xml b/app/src/main/res/drawable/user_modal_duty.xml
new file mode 100644
index 0000000..6ddc642
--- /dev/null
+++ b/app/src/main/res/drawable/user_modal_duty.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_modal_email.xml b/app/src/main/res/drawable/user_modal_email.xml
new file mode 100644
index 0000000..b5a038e
--- /dev/null
+++ b/app/src/main/res/drawable/user_modal_email.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_modal_icon.xml b/app/src/main/res/drawable/user_modal_icon.xml
new file mode 100644
index 0000000..26f5b37
--- /dev/null
+++ b/app/src/main/res/drawable/user_modal_icon.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_modal_note.xml b/app/src/main/res/drawable/user_modal_note.xml
new file mode 100644
index 0000000..bdeae81
--- /dev/null
+++ b/app/src/main/res/drawable/user_modal_note.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_modal_room.xml b/app/src/main/res/drawable/user_modal_room.xml
new file mode 100644
index 0000000..c6a8899
--- /dev/null
+++ b/app/src/main/res/drawable/user_modal_room.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/drawable/user_photo.xml b/app/src/main/res/drawable/user_photo.xml
new file mode 100644
index 0000000..c0a725a
--- /dev/null
+++ b/app/src/main/res/drawable/user_photo.xml
@@ -0,0 +1,9 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/lato_bold.ttf b/app/src/main/res/font/lato_bold.ttf
new file mode 100644
index 0000000..ef5ae3b
Binary files /dev/null and b/app/src/main/res/font/lato_bold.ttf differ
diff --git a/app/src/main/res/font/lato_font.xml b/app/src/main/res/font/lato_font.xml
new file mode 100644
index 0000000..741dfb9
--- /dev/null
+++ b/app/src/main/res/font/lato_font.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/lato_italic.ttf b/app/src/main/res/font/lato_italic.ttf
new file mode 100644
index 0000000..b23256f
Binary files /dev/null and b/app/src/main/res/font/lato_italic.ttf differ
diff --git a/app/src/main/res/font/lato_regular.ttf b/app/src/main/res/font/lato_regular.ttf
new file mode 100644
index 0000000..adbfc46
Binary files /dev/null and b/app/src/main/res/font/lato_regular.ttf differ
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a48aee8..260b88c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -10,6 +10,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
+ android:fontFamily="@font/lato_regular"
tools:context=".activity.LoginActivity">
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c548804..cb89d14 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,6 +9,7 @@
android:clickable="true"
android:focusableInTouchMode="true"
android:visibility="visible"
+ android:fontFamily="@font/lato_regular"
tools:openDrawer="start">
@@ -14,7 +15,7 @@
android:layout_marginBottom="@dimen/dimen_10"
android:fontFamily="sans-serif-medium"
android:lineSpacingExtra="8sp"
- android:textColor="@color/colorAccent"
+ android:textColor="@color/mapboxRedDark"
android:textSize="@dimen/lbl_new_note_title"
android:textStyle="normal" />
diff --git a/app/src/main/res/layout/duty_hours_item.xml b/app/src/main/res/layout/duty_hours_item.xml
new file mode 100644
index 0000000..88a7c3b
--- /dev/null
+++ b/app/src/main/res/layout/duty_hours_item.xml
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/feedback_modal.xml b/app/src/main/res/layout/feedback_modal.xml
index 591746d..0c6dc58 100644
--- a/app/src/main/res/layout/feedback_modal.xml
+++ b/app/src/main/res/layout/feedback_modal.xml
@@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
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"
diff --git a/app/src/main/res/layout/location_modal.xml b/app/src/main/res/layout/location_modal.xml
index 5aaf83e..51949bd 100644
--- a/app/src/main/res/layout/location_modal.xml
+++ b/app/src/main/res/layout/location_modal.xml
@@ -1,42 +1,42 @@
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fontFamily="@font/lato_regular"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/activity_horizontal_margin"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingRight="@dimen/activity_horizontal_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin">
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/marker_modal.xml b/app/src/main/res/layout/marker_modal.xml
index e94bbad..282be2c 100644
--- a/app/src/main/res/layout/marker_modal.xml
+++ b/app/src/main/res/layout/marker_modal.xml
@@ -3,6 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
+ android:fontFamily="@font/lato_regular"
android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin">
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 338b7ff..5cff9b8 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -5,20 +5,20 @@
android:id="@+id/nav_header"
android:layout_width="match_parent"
android:layout_height="160dp"
- android:background="@color/colorAccent"
+ android:background="@color/white_pressed"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackgroundBorderless"
android:gravity="bottom"
android:orientation="vertical"
android:padding="4dp"
+ android:fontFamily="@font/lato_regular"
android:theme="@style/ThemeOverlay.AppCompat.Dark">
diff --git a/app/src/main/res/layout/pref_main.xml b/app/src/main/res/layout/pref_main.xml
index bad194d..131685a 100644
--- a/app/src/main/res/layout/pref_main.xml
+++ b/app/src/main/res/layout/pref_main.xml
@@ -1,6 +1,7 @@
diff --git a/app/src/main/res/layout/pref_sharing.xml b/app/src/main/res/layout/pref_sharing.xml
index 740abf4..0f03421 100644
--- a/app/src/main/res/layout/pref_sharing.xml
+++ b/app/src/main/res/layout/pref_sharing.xml
@@ -4,6 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:ignore="MissingDefaultResource"
android:layout_width="match_parent"
+ android:fontFamily="@font/lato_regular"
android:layout_height="match_parent">
diff --git a/app/src/main/res/layout/user_list_modal.xml b/app/src/main/res/layout/user_list_modal.xml
index f154ef3..def2edd 100644
--- a/app/src/main/res/layout/user_list_modal.xml
+++ b/app/src/main/res/layout/user_list_modal.xml
@@ -1,73 +1,176 @@
+ android:background="@color/background_user_modal"
+ android:orientation="vertical">
-
-
-
+ android:layout_height="match_parent"
+ android:fontFamily="@font/lato_regular">
-
+
-
+
-
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/users_list.xml b/app/src/main/res/layout/users_list.xml
index 18f41e8..397f01e 100644
--- a/app/src/main/res/layout/users_list.xml
+++ b/app/src/main/res/layout/users_list.xml
@@ -4,6 +4,7 @@
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:fontFamily="@font/lato_regular"
tools:context=".activity.UsersListFragment">
diff --git a/app/src/main/res/layout/users_list_main.xml b/app/src/main/res/layout/users_list_main.xml
index 541ff95..58a94c5 100644
--- a/app/src/main/res/layout/users_list_main.xml
+++ b/app/src/main/res/layout/users_list_main.xml
@@ -8,6 +8,7 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".activity.UsersListFragment"
+ android:fontFamily="@font/lato_regular"
tools:showIn="@layout/users_list_main">
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 3d964f2..9d9f483 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -7,5 +7,5 @@
android:icon="@drawable/ic_menu_search"
app:showAsAction="always"
app:actionViewClass="android.support.v7.widget.SearchView"
- android:title="Search"/>
+ android:title="@string/search"/>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 67820c5..c5c9e8f 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 67820c5..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 5a0db4f..459e0f3 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index fc1f7ee..3b786e4 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 45664dd..459e0f3 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 98fd076..ee3e8d8 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index 44c2c4b..1ff8270 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 5e680a3..ee3e8d8 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 13e7bab..7e0bfec 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 9dd0531..82eb652 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index ad283e8..7e0bfec 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index df81e90..2d958e3 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 54969c0..3cb2f31 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 37acc64..2d958e3 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index a30db0e..cfe246e 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 08bccd9..d01ad01 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 1f3a67b..cfe246e 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 194554a..b5db5f1 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -159,6 +159,9 @@
Błąd sieci!
Błąd podczas pobierania danych.
Błąd podczas pobierania statusów.
+ Brak informacji o dyzurze.
+ Brak notatki.
+ Wyszukiwarka
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index be1a4f3..8b0e7c0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -70,5 +70,7 @@
#B2000000
#808080
#f1f1f1
+ #406B82
+ #2D4255
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 1f5cf2a..c5d5899 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
-
-
- #A62613
+
+
+ #FFFFFF
\ 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 d1dc9eb..cd25c3a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -228,4 +228,7 @@
Network Error!
Error handling status fetch
Error handling status fetch
+ Lack information about duty hours
+ No note.
+ Search