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

Merge branch 'extendTutorTab' of git.wmi.amu.edu.pl:s416084/find-my-tutor-android into extendTutorTab

Browse Source
This commit is contained in:
marcin.jedynski 2018-12-15 00:33:41 +01:00
commit 0884fc4873
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/uam/wmi/findmytutor/activity/TutorTab.java
View File

@ -80,7 +80,7 @@ public class TutorTab extends AppCompatActivity {
if (!tutorTabViewModel.getNote().equals("")) { if (!tutorTabViewModel.getNote().equals("")) {
userNote.setText(String.format("%s", tutorTabViewModel.getNote())); userNote.setText(String.format("%s", tutorTabViewModel.getNote()));
} }
userDutyHours.setText(String.format("%s: %s", getString(R.string.userDutyHoursHeader), Arrays.toString(dutyHoursList.toArray()))); // userDutyHours.setText(String.format("%s: %s", getString(R.string.userDutyHoursHeader), Arrays.toString(dutyHoursList.toArray())));
} }

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

@ -10,6 +10,7 @@
android:paddingRight="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"> android:paddingTop="@dimen/activity_margin">
<ImageButton <ImageButton
android:id="@+id/contentTutorTabInfoImageButton" android:id="@+id/contentTutorTabInfoImageButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -79,41 +80,50 @@
<LinearLayout <LinearLayout
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.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/userDutyHours" android:id="@+id/userDutyHours"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="hint" android:hint="hint"
android:lineSpacingExtra="8sp" android:lineSpacingExtra="8sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="@string/dutyHours"
android:textColor="@color/note_list_text" android:textColor="@color/note_list_text"
tools:text="@string/dutyHours" /> tools:text="@string/dutyHours" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/userDutyStart" android:id="@+id/userDutyStart"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="hint" android:hint="hint"
android:lineSpacingExtra="8sp" android:lineSpacingExtra="8sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="@string/dutyHours"
android:textColor="@color/note_list_text" android:textColor="@color/note_list_text"
tools:text="@string/dutyHours" /> tools:text="@string/dutyHours" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1">
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/userDutyStop" android:id="@+id/userDutyStop"
@ -122,19 +132,25 @@
android:hint="hint" android:hint="hint"
android:lineSpacingExtra="8sp" android:lineSpacingExtra="8sp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="@string/dutyHours"
android:textColor="@color/note_list_text" android:textColor="@color/note_list_text"
tools:text="@string/dutyHours" /> tools:text="@string/dutyHours" />
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
</LinearLayout> </LinearLayout>
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content">
</ListView>
<TextView <TextView
android:id="@+id/userNoteTitle" android:id="@+id/userNoteTitle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/activity_margin"
android:paddingTop="0dp" android:paddingTop="0dp"
android:paddingBottom="0dp" android:paddingBottom="0dp"
android:paddingStart="@dimen/activity_margin"
android:textColor="@color/note_list_text" /> android:textColor="@color/note_list_text" />
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"