show on map modal fix, Status added
This commit is contained in:
parent
b7b284252b
commit
4300c33d65
|
|
@ -412,7 +412,6 @@ public abstract class BaseActivity
|
|||
FragmentTransaction ft = getFragmentManager().beginTransaction();
|
||||
ft.replace(R.id.activity_content, sharingFragment);
|
||||
ft.commit();
|
||||
|
||||
}
|
||||
|
||||
private void loadUserListFragment() {
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ import static com.uam.wmi.findmytutor.utils.Const.mapRefreshInterval;
|
|||
public class MapActivity extends BaseActivity
|
||||
implements PermissionsListener, OnMapReadyCallback {
|
||||
|
||||
public HashMap<Long, String> markerUserHash = new HashMap<>();
|
||||
private HashMap<Long, String> markerUserHash = new HashMap<>();
|
||||
private String tag = getClass().getName();
|
||||
private PermissionsManager permissionsManager;
|
||||
private LocationComponent locationComponent;
|
||||
|
|
@ -90,7 +90,7 @@ public class MapActivity extends BaseActivity
|
|||
private Button removeLocationButton;
|
||||
private Marker tmpLocalMarker;
|
||||
private Coordinate droppedMarkercoordinate;
|
||||
private HashMap<String, Coordinate> coordsMap = new HashMap<>();
|
||||
public HashMap<String, Coordinate> coordsMap = new HashMap<>();
|
||||
private HashMap<String, MapMarker> markerHash = new HashMap<>();
|
||||
private Set<String> previousCoordsIds = new HashSet<>();
|
||||
private ManualLocationUtils manualLocationUtils;
|
||||
|
|
|
|||
|
|
@ -24,13 +24,16 @@ import android.view.MenuItem;
|
|||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.ListView;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.annimon.stream.Stream;
|
||||
import com.jakewharton.retrofit2.adapter.rxjava2.HttpException;
|
||||
import com.uam.wmi.findmytutor.R;
|
||||
import com.uam.wmi.findmytutor.adapters.TutorsListAdapter;
|
||||
import com.uam.wmi.findmytutor.model.Coordinate;
|
||||
import com.uam.wmi.findmytutor.model.DutyHourViewModel;
|
||||
import com.uam.wmi.findmytutor.model.TutorTabViewModel;
|
||||
import com.uam.wmi.findmytutor.model.User;
|
||||
|
|
@ -192,6 +195,9 @@ public class UsersListFragment extends Fragment {
|
|||
TextView userRoom = view.findViewById(R.id.userRoom);
|
||||
TextView userEmail = view.findViewById(R.id.userEmail);
|
||||
TextView department = view.findViewById(R.id.userDepartment);
|
||||
TextView userStatusLabel = view.findViewById(R.id.user_status_label);
|
||||
LinearLayout userStatusLabelLL = view.findViewById(R.id.user_status_label_linearLayout);
|
||||
|
||||
|
||||
|
||||
userName.setText(String.format("%s %s", user.getFirstName(), user.getLastName()));
|
||||
|
|
@ -221,7 +227,8 @@ public class UsersListFragment extends Fragment {
|
|||
@Override
|
||||
public void onSuccess(TutorTabViewModel tutorTabViewModel) {
|
||||
final AlertDialog alertDialog;
|
||||
if (((MapActivity) getActivity()).markerUserHash.containsValue(user.getId())) {
|
||||
if (((MapActivity) getActivity()).coordsMap.containsKey(user.getId())) {
|
||||
|
||||
alertDialogBuilderUserInput.setPositiveButton(R.string.show_on_map, (dialog, id) -> {
|
||||
// User cancelled the dialog
|
||||
((MapActivity) getActivity()).activeFragment = ActiveFragment.NONE;
|
||||
|
|
@ -230,11 +237,6 @@ public class UsersListFragment extends Fragment {
|
|||
fragmentTransaction.commit();
|
||||
((MapActivity) getActivity()).searchUser(user.getFirstName());
|
||||
((MapActivity) getActivity()).updateNavigationBarState();
|
||||
|
||||
/* List<User> list = new ArrayList<User>();
|
||||
list.add(user);
|
||||
((MapActivity) getActivity()).filterMarkers(list);
|
||||
((MapActivity) getActivity()).updateNavigationBarState();*/
|
||||
});
|
||||
}
|
||||
alertDialog = alertDialogBuilderUserInput.create();
|
||||
|
|
@ -257,6 +259,16 @@ public class UsersListFragment extends Fragment {
|
|||
department.setText(String.format("%s: %s", getString(R.string.userDepartment), user.getDepartment()));
|
||||
userDutyHoursTitle.setText(String.format("%s:", getString(R.string.userDutyHoursHeader)));
|
||||
|
||||
Coordinate coordinate = ((MapActivity) getActivity()).coordsMap.get(user.getId());
|
||||
if (coordinate != null){
|
||||
String label = coordinate.getLabel();
|
||||
if (!label.isEmpty()) {
|
||||
userStatusLabelLL.setVisibility(View.VISIBLE);
|
||||
userStatusLabel.setText(String.format("%s: %s", getString(R.string.user_status_label),label));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
final ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(getActivity(),
|
||||
R.layout.duty_hours_item, dutyHoursList);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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="#ffffff"
|
||||
android:pathData="M22 10l-6-6H4c-1.1 0-2 0.9-2 2v12.01c0 1.1 0.9 1.99 2 1.99l16-0.01c1.1 0 2-0.89 2-1.99v-8zm-7-4.5l5.5 5.5H15V5.5z" />
|
||||
<path
|
||||
android:pathData="M0 0h24v24H0V0z" />
|
||||
</vector>
|
||||
|
|
@ -27,19 +27,20 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userName"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="15dp"
|
||||
android:drawablePadding="10dp"
|
||||
android:gravity="center_horizontal"
|
||||
android:text="Name Surname"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/lbl_new_note_title"
|
||||
android:textStyle="normal"
|
||||
android:drawablePadding="10dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"/>
|
||||
app:layout_constraintStart_toStartOf="parent" />
|
||||
|
||||
</android.support.constraint.ConstraintLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -50,6 +51,28 @@
|
|||
android:layout_marginTop="25dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/user_status_label_linearLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone"
|
||||
android:paddingLeft="20dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:src="@drawable/user_modal_title" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/user_status_label"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:paddingLeft="10dp"
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -59,15 +82,15 @@
|
|||
<ImageView
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:src="@drawable/user_modal_department"/>
|
||||
android:src="@drawable/user_modal_department" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userDepartment"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:textColor="@color/mapboxWhite"
|
||||
android:paddingLeft="10dp"
|
||||
/>
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -80,15 +103,15 @@
|
|||
<ImageView
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:src="@drawable/user_modal_room"/>
|
||||
android:src="@drawable/user_modal_room" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userRoom"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:textColor="@color/mapboxWhite"
|
||||
android:paddingLeft="10dp"
|
||||
/>
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -101,15 +124,15 @@
|
|||
<ImageView
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:src="@drawable/user_modal_email"/>
|
||||
android:src="@drawable/user_modal_email" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userEmail"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:textColor="@color/mapboxWhite"
|
||||
android:paddingLeft="10dp"
|
||||
/>
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
|
@ -123,15 +146,14 @@
|
|||
<ImageView
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:src="@drawable/user_modal_duty"/>
|
||||
android:src="@drawable/user_modal_duty" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userDutyHoursTitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="@color/mapboxWhite"
|
||||
android:paddingLeft="10dp"
|
||||
/>
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -151,12 +173,11 @@
|
|||
android:id="@+id/userDutyHours"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="25dp"
|
||||
android:paddingTop="-10dp"
|
||||
android:divider="@color/background_user_modal"
|
||||
android:dividerHeight="1dp"
|
||||
android:textColor="@color/mapboxWhite"
|
||||
/>
|
||||
android:paddingLeft="25dp"
|
||||
android:paddingTop="-10dp"
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -169,15 +190,15 @@
|
|||
<ImageView
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:src="@drawable/user_modal_note"/>
|
||||
android:src="@drawable/user_modal_note" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/userNote"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:textColor="@color/mapboxWhite"
|
||||
android:paddingLeft="10dp"
|
||||
/>
|
||||
android:textColor="@color/mapboxWhite" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -453,4 +453,5 @@
|
|||
|
||||
<!--(ENG) Undefined manual -->
|
||||
<string name="other_location">Not saved location.</string>
|
||||
<string name="user_status_label">Status</string>
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in New Issue