s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

Add Lato font & improve user modal

Browse Source
This commit is contained in:
Mieszko Wrzeszczyński 2018-12-02 22:15:39 +01:00
parent ee6d11fe44
commit 6115958efb
34 changed files with 187 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/uam/wmi/findmytutor/adapters/TutorsListAdapter.java
View File

@ -4,7 +4,6 @@ import android.content.Context;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -65,13 +64,13 @@ public class TutorsListAdapter extends RecyclerView.Adapter<TutorsListAdapter.My
holder.lastName.setText(tutor.getLastName()); holder.lastName.setText(tutor.getLastName());
if(tutor.isIsOnline()) { if(tutor.isIsOnline()) {
image = context.getResources().getDrawable(R.drawable.online_user); image = context.getResources().getDrawable(R.drawable.user_list_online);
} else { } else {
image = context.getResources().getDrawable(R.drawable.not_online); image = context.getResources().getDrawable(R.drawable.user_list_offline);
} }
if(!tutor.isIsActive()){ if(!tutor.isIsActive()){
image = context.getResources().getDrawable(R.drawable.not_active_user); image = context.getResources().getDrawable(R.drawable.user_list_off);
} }
image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight()); image.setBounds(0, 0, image.getIntrinsicWidth(), image.getIntrinsicHeight());

9
app/src/main/res/drawable/user_list_off.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

9
app/src/main/res/drawable/user_list_offline.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/mapboxRedDark"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

9
app/src/main/res/drawable/user_list_online.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/mapboxGreenDark"
android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
</vector>

9
app/src/main/res/drawable/user_modal_department.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFF"
android:pathData="M15,11L15,5l-3,-3 -3,3v2L3,7v14h18L21,11h-6zM7,19L5,19v-2h2v2zM7,15L5,15v-2h2v2zM7,11L5,11L5,9h2v2zM13,19h-2v-2h2v2zM13,15h-2v-2h2v2zM13,11h-2L11,9h2v2zM13,7h-2L11,5h2v2zM19,19h-2v-2h2v2zM19,15h-2v-2h2v2z"/>
</vector>

9
app/src/main/res/drawable/user_modal_duty.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFF"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,19h-2v-2h2v2zM15.07,11.25l-0.9,0.92C13.45,12.9 13,13.5 13,15h-2v-0.5c0,-1.1 0.45,-2.1 1.17,-2.83l1.24,-1.26c0.37,-0.36 0.59,-0.86 0.59,-1.41 0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2L8,9c0,-2.21 1.79,-4 4,-4s4,1.79 4,4c0,0.88 -0.36,1.68 -0.93,2.25z"/>
</vector>

9
app/src/main/res/drawable/user_modal_email.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFF"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z"/>
</vector>

9
app/src/main/res/drawable/user_modal_icon.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFF"
android:pathData="M12,2c-4.97,0 -9,4.03 -9,9 0,4.17 2.84,7.67 6.69,8.69L12,22l2.31,-2.31C18.16,18.67 21,15.17 21,11c0,-4.97 -4.03,-9 -9,-9zM12,4c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,18.3c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
</vector>

9
app/src/main/res/drawable/user_modal_note.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFF"
android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM8,14L6,14v-2h2v2zM8,11L6,11L6,9h2v2zM8,8L6,8L6,6h2v2zM15,14h-5v-2h5v2zM18,11h-8L10,9h8v2zM18,8h-8L10,6h8v2z"/>
</vector>

9
app/src/main/res/drawable/user_modal_room.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FFFF"
android:pathData="M14,6v15L3,21v-2h2L5,3h9v1h5v15h2v2h-4L17,6h-3zM10,11v2h2v-2h-2z"/>
</vector>

BIN
app/src/main/res/font/lato_bold.ttf Normal file
View File

Binary file not shown.

11
app/src/main/res/font/lato_font.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:android="http://schemas.android.com/apk/res/android">
<font
android:fontStyle="normal"
android:fontWeight="400"
android:font="@font/lato_regular" />
<font
android:fontStyle="italic"
android:fontWeight="400"
android:font="@font/lato_italic" />
</font-family>

BIN
app/src/main/res/font/lato_italic.ttf Normal file
View File

Binary file not shown.

BIN
app/src/main/res/font/lato_regular.ttf Normal file
View File

Binary file not shown.

1
app/src/main/res/layout/activity_login.xml
View File

@ -10,6 +10,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:fontFamily="@font/lato_regular"
tools:context=".activity.LoginActivity"> tools:context=".activity.LoginActivity">

1
app/src/main/res/layout/activity_main.xml
View File

@ -9,6 +9,7 @@
android:clickable="true" android:clickable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:visibility="visible" android:visibility="visible"
android:fontFamily="@font/lato_regular"
tools:openDrawer="start"> tools:openDrawer="start">
<com.mapbox.mapboxsdk.maps.MapView <com.mapbox.mapboxsdk.maps.MapView

1
app/src/main/res/layout/activity_map.xml
View File

@ -6,6 +6,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="@font/lato_regular"
tools:context=".activity.MapActivity"> tools:context=".activity.MapActivity">
<com.mapbox.mapboxsdk.maps.MapView <com.mapbox.mapboxsdk.maps.MapView

1
app/src/main/res/layout/activity_tutor_tab.xml
View File

@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="@font/lato_regular"
tools:context=".activity.TutorTab"> tools:context=".activity.TutorTab">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout

1
app/src/main/res/layout/app_bar_main.xml
View File

@ -9,6 +9,7 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:elevation="0dp" android:elevation="0dp"
android:fontFamily="@font/lato_regular"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/AppTheme.AppBarOverlay">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar

1
app/src/main/res/layout/base_activity.xml
View File

@ -3,6 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:fontFamily="@font/lato_regular"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout

3
app/src/main/res/layout/content_tutor_tab.xml
View File

@ -4,6 +4,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fontFamily="@font/lato_regular"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/activity_margin">
@ -14,7 +15,7 @@
android:layout_marginBottom="@dimen/dimen_10" android:layout_marginBottom="@dimen/dimen_10"
android:fontFamily="sans-serif-medium" android:fontFamily="sans-serif-medium"
android:lineSpacingExtra="8sp" android:lineSpacingExtra="8sp"
android:textColor="@color/colorAccent" android:textColor="@color/mapboxRedDark"
android:textSize="@dimen/lbl_new_note_title" android:textSize="@dimen/lbl_new_note_title"
android:textStyle="normal" /> android:textStyle="normal" />

3
app/src/main/res/layout/duty_hours_item.xml
View File

@ -5,5 +5,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall" android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical" android:gravity="center_vertical"
android:fontFamily="sans-serif" android:textSize="16sp"
android:fontFamily="@font/lato_regular"
android:textColor="@color/mapboxWhite" /> android:textColor="@color/mapboxWhite" />

1
app/src/main/res/layout/feedback_modal.xml
View File

@ -5,6 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fontFamily="@font/lato_regular"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"

10
app/src/main/res/layout/location_modal.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="@font/lato_regular"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"> android:paddingBottom="@dimen/activity_vertical_margin">
<TextView <TextView
android:id="@+id/feedback_modal_title" android:id="@+id/feedback_modal_title"
@ -34,9 +34,9 @@ android:paddingTop="@dimen/activity_vertical_margin">
android:hint="@string/modal_feedback_hint" android:hint="@string/modal_feedback_hint"
android:maxLength="30" android:maxLength="30"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/note_list_text"
android:requiresFadingEdge="vertical" android:requiresFadingEdge="vertical"
android:scrollbars="vertical" /> android:scrollbars="vertical"
android:textColor="@color/note_list_text" />
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/layout/marker_modal.xml
View File

@ -3,6 +3,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:fontFamily="@font/lato_regular"
android:paddingLeft="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin" android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"> android:paddingRight="@dimen/activity_margin">

3
app/src/main/res/layout/nav_header_main.xml
View File

@ -5,13 +5,14 @@
android:id="@+id/nav_header" android:id="@+id/nav_header"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="160dp" android:layout_height="160dp"
android:background="@color/colorAccent" android:background="@color/mapboxWhite"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?attr/selectableItemBackgroundBorderless" android:foreground="?attr/selectableItemBackgroundBorderless"
android:gravity="bottom" android:gravity="bottom"
android:orientation="vertical" android:orientation="vertical"
android:padding="4dp" android:padding="4dp"
android:fontFamily="@font/lato_regular"
android:theme="@style/ThemeOverlay.AppCompat.Dark"> android:theme="@style/ThemeOverlay.AppCompat.Dark">
<ImageView <ImageView

1
app/src/main/res/layout/pref_main.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:fontFamily="@font/lato_regular"
android:layout_height="match_parent"> android:layout_height="match_parent">
<PreferenceCategory android:title="@string/settings_category_general"> <PreferenceCategory android:title="@string/settings_category_general">

1
app/src/main/res/layout/pref_sharing.xml
View File

@ -4,6 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:ignore="MissingDefaultResource" tools:ignore="MissingDefaultResource"
android:layout_width="match_parent" android:layout_width="match_parent"
android:fontFamily="@font/lato_regular"
android:layout_height="match_parent"> android:layout_height="match_parent">
<PreferenceCategory <PreferenceCategory

1
app/src/main/res/layout/tutor_list_row.xml
View File

@ -7,6 +7,7 @@
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingTop="@dimen/dimen_10" android:paddingTop="@dimen/dimen_10"
android:paddingRight="10dp" android:paddingRight="10dp"
android:fontFamily="@font/lato_regular"
android:paddingBottom="@dimen/dimen_10"> android:paddingBottom="@dimen/dimen_10">

83
app/src/main/res/layout/user_list_modal.xml
View File

@ -9,20 +9,20 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="sans-serif"> android:fontFamily="@font/lato_regular">
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="125dp" android:layout_height="145dp"
android:background="@color/white_user_modal"> android:background="@color/top_user_modal">
<ImageView <ImageView
android:id="@+id/imageView2" android:id="@+id/imageView2"
android:layout_width="75dp" android:layout_width="75dp"
android:layout_height="75dp" android:layout_height="75dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:src="@drawable/ic_user_account_icon" android:src="@drawable/user_modal_icon"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@ -31,11 +31,9 @@
android:id="@+id/userName" android:id="@+id/userName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="15dp"
android:fontFamily="sans-serif-medium"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="asdsd" android:textColor="@color/white"
android:textColor="@color/white_user_modal"
android:textSize="@dimen/lbl_new_note_title" android:textSize="@dimen/lbl_new_note_title"
android:textStyle="normal" android:textStyle="normal"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
@ -54,19 +52,19 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp"> android:paddingLeft="20dp">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" /> android:layout_height="25dp"
<!--android:src="@drawable/ic_email_black_24dp"/--> android:src="@drawable/user_modal_department"/>
<TextView <TextView
android:id="@+id/userDepartment" android:id="@+id/userDepartment"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textStyle="bold" /> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -74,39 +72,39 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp"> android:paddingLeft="20dp">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" /> android:layout_height="25dp"
<!--android:src="@drawable/ic_phone_android_black_24dp"/--> android:src="@drawable/user_modal_room"/>
<TextView <TextView
android:id="@+id/userRoom" android:id="@+id/userRoom"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textStyle="bold" /> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp"> android:paddingLeft="20dp">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" /> android:layout_height="25dp"
<!--android:src="@drawable/ic_phone_android_black_24dp"/--> android:src="@drawable/user_modal_email"/>
<TextView <TextView
android:id="@+id/userEmail" android:id="@+id/userEmail"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textStyle="bold" /> />
</LinearLayout> </LinearLayout>
@ -115,19 +113,19 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp"> android:paddingLeft="20dp">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" /> android:layout_height="25dp"
<!--android:src="@drawable/ic_forum_black_24dp"/-->>\ android:src="@drawable/user_modal_duty"/>
<TextView <TextView
android:id="@+id/userDutyHoursTitle" android:id="@+id/userDutyHoursTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textStyle="bold" /> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -135,13 +133,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp" android:paddingLeft="20dp"
android:textColor="@color/mapboxWhite"> android:textColor="@color/mapboxWhite">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" /> android:layout_height="25dp" />
<!-- android:src="@drawable/ic_group_add_black_24dp"-->/
<ListView <ListView
android:id="@+id/userDutyHours" android:id="@+id/userDutyHours"
@ -158,30 +156,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingLeft="10dp"> android:paddingLeft="20dp">
<ImageView <ImageView
android:layout_width="36dp" android:layout_width="25dp"
android:layout_height="36dp" /> android:layout_height="25dp"
<!--android:src="@drawable/ic_phone_android_black_24dp"/--> android:src="@drawable/user_modal_note"/>
<TextView <TextView
android:id="@+id/userNote" android:id="@+id/userNote"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:textStyle="bold" /> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!--<Button
android:textColor="#fff"
android:background="@drawable/buttonstyleithgradient"
android:layout_marginTop="35dp"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Follow Me"/>-->
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/users_list.xml
View File

@ -4,6 +4,7 @@
android:id="@+id/coordinator_layout" android:id="@+id/coordinator_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fontFamily="@font/lato_regular"
tools:context=".activity.UsersListFragment"> tools:context=".activity.UsersListFragment">

1
app/src/main/res/layout/users_list_main.xml
View File

@ -8,6 +8,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".activity.UsersListFragment" tools:context=".activity.UsersListFragment"
android:fontFamily="@font/lato_regular"
tools:showIn="@layout/users_list_main"> tools:showIn="@layout/users_list_main">

4
app/src/main/res/values/colors.xml
View File

@ -70,7 +70,7 @@
<color name="black_semi_transparent">#B2000000</color> <color name="black_semi_transparent">#B2000000</color>
<color name="half_black">#808080</color> <color name="half_black">#808080</color>
<color name="white_pressed">#f1f1f1</color> <color name="white_pressed">#f1f1f1</color>
<color name="white_user_modal">#EEF4F2</color> <color name="top_user_modal">#406B82</color>
<color name="background_user_modal">#415B76</color> <color name="background_user_modal">#2D4255</color>
</resources> </resources>

2
app/src/main/res/values/strings.xml
View File

@ -229,5 +229,5 @@
<string name="manual_status_error">Error handling status fetch</string> <string name="manual_status_error">Error handling status fetch</string>
<string name="error_status_fetch">Error handling status fetch</string> <string name="error_status_fetch">Error handling status fetch</string>
<string name="lack_duty_hours">Lack information about duty hours</string> <string name="lack_duty_hours">Lack information about duty hours</string>
<string name="lack_note">Lack of note.</string> <string name="lack_note">No note.</string>
</resources> </resources>