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..d88a573 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; @@ -65,13 +64,13 @@ public class TutorsListAdapter extends RecyclerView.Adapter + + 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..ef2aafc --- /dev/null +++ b/app/src/main/res/drawable/user_list_offline.xml @@ -0,0 +1,9 @@ + + + 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..1e7f8eb --- /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/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 index 44c8531..88a7c3b 100644 --- a/app/src/main/res/layout/duty_hours_item.xml +++ b/app/src/main/res/layout/duty_hours_item.xml @@ -5,5 +5,6 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceListItemSmall" android:gravity="center_vertical" - android:fontFamily="sans-serif" + android:textSize="16sp" + android:fontFamily="@font/lato_regular" android:textColor="@color/mapboxWhite" /> \ 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..641538b 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -5,13 +5,14 @@ android:id="@+id/nav_header" android:layout_width="match_parent" android:layout_height="160dp" - android:background="@color/colorAccent" + android:background="@color/mapboxWhite" 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_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 0e022d5..def2edd 100644 --- a/app/src/main/res/layout/user_list_modal.xml +++ b/app/src/main/res/layout/user_list_modal.xml @@ -9,20 +9,20 @@ + android:fontFamily="@font/lato_regular"> + android:layout_height="145dp" + android:background="@color/top_user_modal"> @@ -31,11 +31,9 @@ android:id="@+id/userName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="10dp" - android:fontFamily="sans-serif-medium" + android:layout_marginBottom="15dp" android:gravity="center_horizontal" - android:text="asdsd" - android:textColor="@color/white_user_modal" + android:textColor="@color/white" android:textSize="@dimen/lbl_new_note_title" android:textStyle="normal" app:layout_constraintBottom_toBottomOf="parent" @@ -54,19 +52,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingLeft="10dp"> + android:paddingLeft="20dp"> - + android:layout_width="25dp" + android:layout_height="25dp" + android:src="@drawable/user_modal_department"/> + /> + android:paddingLeft="20dp"> - + android:layout_width="25dp" + android:layout_height="25dp" + android:src="@drawable/user_modal_room"/> + /> + android:paddingLeft="20dp"> - + android:layout_width="25dp" + android:layout_height="25dp" + android:src="@drawable/user_modal_email"/> + /> @@ -115,19 +113,19 @@ android:layout_height="wrap_content" android:layout_marginTop="15dp" android:orientation="horizontal" - android:paddingLeft="10dp"> + android:paddingLeft="20dp"> - >\ + android:layout_width="25dp" + android:layout_height="25dp" + android:src="@drawable/user_modal_duty"/> + /> - / + android:layout_width="25dp" + android:layout_height="25dp" /> + + android:paddingLeft="20dp"> - + android:layout_width="25dp" + android:layout_height="25dp" + android:src="@drawable/user_modal_note"/> + /> - - \ 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/values/colors.xml b/app/src/main/res/values/colors.xml index f9f153e..8b0e7c0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -70,7 +70,7 @@ #B2000000 #808080 #f1f1f1 - #EEF4F2 - #415B76 + #406B82 + #2D4255 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ae10ab..93e2988 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -229,5 +229,5 @@ Error handling status fetch Error handling status fetch Lack information about duty hours - Lack of note. + No note.