Merge branch 'fix-users-list-UI' of s416084/find-my-tutor-android into develop

This commit is contained in:
Mieszko Wrzeszczyński 2019-01-02 16:43:06 +00:00 committed by Gogs
commit be7a0cec0a
2 changed files with 7 additions and 5 deletions

View File

@ -6,7 +6,7 @@ import java.util.Arrays;
import java.util.List;
public class Const {
public final static String BASE_URL = "https://s416084.projektstudencki.pl/develop/";
public final static String BASE_URL = "https://s416084.projektstudencki.pl/master/";
public final static Integer onlineBackgroundLocationInterval = 7000;
public final static Integer offlineBackgroundLocationInterval = 36000;
public final static Integer defaultMapZoom = 17;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="90dp"
android:clickable="true"
android:focusable="true"
@ -13,7 +13,7 @@
<TextView
android:id="@+id/firstName"
android:layout_width="271dp"
android:layout_width="270dp"
android:layout_height="22dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
@ -26,23 +26,25 @@
android:id="@+id/lastName"
android:layout_width="270dp"
android:layout_height="22dp"
android:layout_marginStart="12dp"
android:layout_below="@+id/firstName"
android:layout_alignEnd="@+id/firstName"
android:layout_marginTop="10dp"
android:layout_marginEnd="0dp"
android:layout_alignParentStart="true"
android:textColor="@color/note_list_text"
android:textSize="15sp" />
<TextView
android:id="@+id/isOnline"
android:layout_width="48dp"
android:layout_width="50dp"
android:layout_height="30dp"
android:layout_below="@+id/firstName"
android:layout_marginStart="7dp"
android:layout_marginTop="-10dp"
android:layout_toEndOf="@+id/firstName"
android:textColor="@color/note_list_text"
android:layout_alignParentEnd="true"
android:textSize="@dimen/note_list_text" />