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

Merge branch 'profileUIfix' of s416084/find-my-tutor-android into develop

Browse Source
This commit is contained in:
Marcin Jedyński 2019-01-06 22:41:42 +00:00 committed by Gogs
commit 701ee6e9d5
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/src/main/res/layout/content_tutor_tab_layout.xml
View File

@ -23,10 +23,10 @@
android:id="@+id/userDepartmentLayout" android:id="@+id/userDepartmentLayout"
android:layout_width="189dp" android:layout_width="189dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_below="@+id/userEmailLayout"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginStart="25dp" android:layout_marginStart="25dp"
android:layout_marginTop="95dp" android:layout_marginTop="10dp"
android:layout_marginEnd="30dp" android:layout_marginEnd="30dp"
android:layout_toEndOf="@+id/userRoomLayout"> android:layout_toEndOf="@+id/userRoomLayout">
@ -34,6 +34,8 @@
android:id="@+id/userDepartment" android:id="@+id/userDepartment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/userDepartmentLayout"
android:layout_alignStart="@+id/userDepartmentLayout"
android:layout_alignTop="@+id/userDepartmentLayout" android:layout_alignTop="@+id/userDepartmentLayout"
android:hint="@string/hint_department" android:hint="@string/hint_department"
android:inputType="text" android:inputType="text"
@ -47,10 +49,10 @@
android:id="@+id/userRoomLayout" android:id="@+id/userRoomLayout"
android:layout_width="115dp" android:layout_width="115dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/userEmailLayout"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginTop="95dp"> android:layout_marginTop="10dp">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/userRoom" android:id="@+id/userRoom"
@ -73,10 +75,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignStart="@+id/userRoomLayout" android:layout_alignStart="@+id/userRoomLayout"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginTop="10dp" android:layout_marginTop="30dp"
android:text="@string/personalInfoTitle" android:text="@string/personalInfoTitle"
android:textColor="@color/mapboxRedDark" android:textColor="@color/mapboxRedDark"
android:textSize="18sp" /> android:textSize="18sp"
android:textStyle="bold" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/userEmailLayout" android:id="@+id/userEmailLayout"
@ -86,7 +89,7 @@
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginTop="50dp" android:layout_marginTop="70dp"
android:layout_marginEnd="30dp"> android:layout_marginEnd="30dp">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
@ -94,6 +97,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignStart="@+id/userEmailLayout" android:layout_alignStart="@+id/userEmailLayout"
android:layout_alignTop="@+id/userEmailLayout"
android:hint="@string/hint_email" android:hint="@string/hint_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:lineSpacingExtra="8sp" android:lineSpacingExtra="8sp"
@ -105,30 +109,32 @@
<TextView <TextView
android:id="@+id/dutyTitle" android:id="@+id/dutyTitle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="60dp" android:layout_height="wrap_content"
android:layout_below="@+id/userRoomLayout"
android:layout_alignStart="@+id/userRoomLayout" android:layout_alignStart="@+id/userRoomLayout"
android:layout_alignParentTop="true" android:layout_marginStart="0dp"
android:layout_centerVertical="false" android:layout_marginTop="10dp"
android:layout_marginStart="-1dp"
android:layout_marginTop="141dp"
android:gravity="center" android:gravity="center"
android:text="@string/dutyTitle" android:text="@string/dutyTitle"
android:textColor="@color/mapboxRedDark" android:textColor="@color/mapboxRedDark"
android:textSize="18sp" /> android:textSize="18sp"
android:textStyle="bold" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/dutyHourView" android:id="@+id/dutyHourView"
android:layout_width="300dp" android:layout_width="300dp"
android:layout_height="100dp" android:layout_height="100dp"
android:layout_below="@+id/dutyTitle" android:layout_below="@+id/addDuty"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_marginStart="30dp" android:layout_marginStart="30dp"
android:layout_marginTop="0dp"
android:layout_marginEnd="30dp" android:layout_marginEnd="30dp"
android:scrollbars="vertical" /> android:scrollbars="vertical" />
<TextView <TextView
android:id="@+id/userNoteTitle" android:id="@+id/userNoteTitle"
android:textStyle="bold"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/dutyHourView" android:layout_below="@+id/dutyHourView"
@ -141,10 +147,8 @@
android:id="@+id/addDuty" android:id="@+id/addDuty"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignBottom="@+id/dutyTitle" android:layout_alignBaseline="@+id/dutyTitle"
android:layout_marginStart="-1dp" android:layout_toEndOf="@+id/userRoomLayout"
android:layout_marginBottom="0dp"
android:layout_toEndOf="@+id/personalInfoTitle"
android:text="@string/addDuty" /> android:text="@string/addDuty" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
@ -179,10 +183,8 @@
android:id="@+id/scrapTutorTab" android:id="@+id/scrapTutorTab"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_alignBaseline="@+id/personalInfoTitle"
android:layout_alignParentEnd="true" android:layout_alignEnd="@+id/userEmailLayout"
android:layout_marginTop="0dp"
android:layout_marginEnd="30dp"
android:text="@string/scrap_tutor_tab" /> android:text="@string/scrap_tutor_tab" />
<Button <Button