From 4300c33d65ec48f765b8974a41aa18915109726e Mon Sep 17 00:00:00 2001 From: Domagalski Date: Wed, 9 Jan 2019 21:20:48 +0100 Subject: [PATCH] show on map modal fix, Status added --- .../findmytutor/activity/BaseActivity.java | 1 - .../wmi/findmytutor/activity/MapActivity.java | 4 +- .../activity/UsersListFragment.java | 24 +++- .../main/res/drawable/user_modal_title.xml | 13 ++ app/src/main/res/layout/user_list_modal.xml | 113 +++++++++++------- app/src/main/res/values/strings.xml | 1 + 6 files changed, 101 insertions(+), 55 deletions(-) create mode 100644 app/src/main/res/drawable/user_modal_title.xml diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java index 5c49fb5..df166ef 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java @@ -412,7 +412,6 @@ public abstract class BaseActivity FragmentTransaction ft = getFragmentManager().beginTransaction(); ft.replace(R.id.activity_content, sharingFragment); ft.commit(); - } private void loadUserListFragment() { diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java index 4688914..b5603d3 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java @@ -74,7 +74,7 @@ import static com.uam.wmi.findmytutor.utils.Const.mapRefreshInterval; public class MapActivity extends BaseActivity implements PermissionsListener, OnMapReadyCallback { - public HashMap markerUserHash = new HashMap<>(); + private HashMap 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 coordsMap = new HashMap<>(); + public HashMap coordsMap = new HashMap<>(); private HashMap markerHash = new HashMap<>(); private Set previousCoordsIds = new HashSet<>(); private ManualLocationUtils manualLocationUtils; diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java index 7837ce8..1d85d80 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java @@ -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 list = new ArrayList(); - 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 arrayAdapter = new ArrayAdapter<>(getActivity(), R.layout.duty_hours_item, dutyHoursList); diff --git a/app/src/main/res/drawable/user_modal_title.xml b/app/src/main/res/drawable/user_modal_title.xml new file mode 100644 index 0000000..42e9b61 --- /dev/null +++ b/app/src/main/res/drawable/user_modal_title.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/user_list_modal.xml b/app/src/main/res/layout/user_list_modal.xml index b92f8eb..9f0abcd 100644 --- a/app/src/main/res/layout/user_list_modal.xml +++ b/app/src/main/res/layout/user_list_modal.xml @@ -27,19 +27,20 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + - @@ -50,6 +51,28 @@ android:layout_marginTop="25dp" android:orientation="vertical"> + + + + + + + + android:src="@drawable/user_modal_department" /> + + android:textColor="@color/mapboxWhite" /> + android:src="@drawable/user_modal_room" /> + + android:textColor="@color/mapboxWhite" /> + android:src="@drawable/user_modal_email" /> + + android:textColor="@color/mapboxWhite" /> @@ -123,15 +146,14 @@ + android:src="@drawable/user_modal_duty" /> + android:textColor="@color/mapboxWhite" /> + android:paddingLeft="25dp" + android:paddingTop="-10dp" + android:textColor="@color/mapboxWhite" /> - - - - + android:layout_marginTop="5dp" + android:orientation="horizontal" + android:paddingLeft="20dp"> + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6b9c670..be3d01a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -453,4 +453,5 @@ Not saved location. + Status