From aa3dbfb185fdac4cce7a6cc10b882305a8b8e10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= Date: Fri, 2 Nov 2018 15:45:18 +0100 Subject: [PATCH] Add search to list --- app/build.gradle | 1 - .../findmytutor/activity/BaseActivity.java | 65 +- .../findmytutor/activity/SharingFragment.java | 9 + .../activity/UsersListActivity.java | 46 +- .../com/uam/wmi/findmytutor/model/User.java | 1374 +++++++++-------- app/src/main/res/layout/users_list_main.xml | 11 + 6 files changed, 790 insertions(+), 716 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 054989e..72c08c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,6 +57,5 @@ dependencies { implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation 'com.auth0.android:jwtdecode:1.1.1' implementation 'com.annimon:stream:1.2.1' - implementation 'com.facebook.shimmer:shimmer:0.3.0' } 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 58c8e4c..dc2e651 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 @@ -2,10 +2,10 @@ package com.uam.wmi.findmytutor.activity; import android.app.Fragment; import android.app.FragmentTransaction; -import android.content.Intent; import android.content.res.Configuration; import android.support.annotation.NonNull; import android.support.design.widget.BottomNavigationView; +import android.support.v4.app.FragmentManager; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarDrawerToggle; @@ -13,14 +13,10 @@ import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.support.v7.widget.SearchView; import android.support.v7.widget.Toolbar; -import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; import android.widget.FrameLayout; import android.widget.ListView; -import android.widget.Toast; import com.uam.wmi.findmytutor.ListViewAdapter; import com.uam.wmi.findmytutor.R; @@ -32,17 +28,13 @@ public abstract class BaseActivity implements BottomNavigationView.OnNavigationItemSelectedListener { protected BottomNavigationView navigationView; - protected Toolbar toolbar; - public DrawerLayout drawerLayout; private ActionBarDrawerToggle actionBarDrawerToggle; - // 4 search - private ListView listView; - private ArrayList stringArrayList; - private ListViewAdapter adapter; + private SharingFragment sharingFragment; private Fragment userListFragment; + private String activeFragment = ""; @Override @@ -54,14 +46,12 @@ public abstract class BaseActivity navigationView.setOnNavigationItemSelectedListener(this); sharingFragment = new SharingFragment(); userListFragment = new UsersListActivity(); - - } @Override public void setContentView(int layoutResID) { DrawerLayout fullView = (DrawerLayout) getLayoutInflater().inflate(R.layout.base_activity, null); - FrameLayout activityContainer = (FrameLayout) fullView.findViewById(R.id.activity_content); + FrameLayout activityContainer = fullView.findViewById(R.id.activity_content); getLayoutInflater().inflate(layoutResID, activityContainer, true); super.setContentView(fullView); @@ -69,7 +59,7 @@ public abstract class BaseActivity } private void initToolbar() { - toolbar = (Toolbar) findViewById(R.id.toolbar); + toolbar = findViewById(R.id.toolbar); setSupportActionBar(toolbar); } @@ -117,12 +107,10 @@ public abstract class BaseActivity @Override public boolean onQueryTextChange(String newText) { - if (TextUtils.isEmpty(newText)) { - adapter.filter(""); - listView.clearTextFilter(); - } else { - adapter.filter(newText); + if(activeFragment.equals("userList")){ + ((UsersListActivity) userListFragment).searchUser(newText); } + return true; } }); @@ -150,15 +138,10 @@ public abstract class BaseActivity overridePendingTransition(0,0); } - private void setFragment(Fragment fragment) { - FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.replace(R.id.activity_content, fragment); - fragmentTransaction.commit(); - } - private void removeFragment(Fragment fragment) { + activeFragment = "map"; FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); - fragmentTransaction.remove(fragment); + fragmentTransaction.hide(fragment); fragmentTransaction.commit(); } @@ -171,16 +154,10 @@ public abstract class BaseActivity if (itemId == R.id.nav_map) { removeFragment(sharingFragment); removeFragment(userListFragment); - // startActivity(new Intent(this, MapActivity.class)); } else if (itemId == R.id.nav_profile) { - // startActivity(new Intent(this, ProfileActivity.class)); - setFragment(sharingFragment); - removeFragment(userListFragment); - + loadUserSettingsFragment(); } else if (itemId == R.id.nav_user_list) { - removeFragment(sharingFragment); - setFragment(userListFragment); - //startActivity(new Intent(this, UsersListActivity.class)); + loadUserListFragment(); } //finish(); }, 300); @@ -188,6 +165,24 @@ public abstract class BaseActivity return true; } + private void loadUserSettingsFragment() { + activeFragment = "sharedSettings"; + sharingFragment = SharingFragment.newInstance(); + FragmentTransaction ft = getFragmentManager().beginTransaction(); + ft.replace(R.id.activity_content, sharingFragment); + ft.commit(); + } + + private void loadUserListFragment() { + activeFragment = "userList"; + + userListFragment = UsersListActivity.newInstance(); + FragmentTransaction ft = getFragmentManager().beginTransaction(); + ft.replace(R.id.activity_content, userListFragment); + ft.commit(); + } + + private void updateNavigationBarState() { int actionId = getNavigationMenuItemId(); selectBottomNavigationBarItem(actionId); diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java index 586fa13..03f6f2d 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SharingFragment.java @@ -1,5 +1,6 @@ package com.uam.wmi.findmytutor.activity; +import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; @@ -21,6 +22,7 @@ import java.util.Set; //} public class SharingFragment extends PreferenceFragment { + @SuppressLint("ResourceType") @Override public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -46,6 +48,13 @@ public class SharingFragment extends PreferenceFragment { }); } + + public static SharingFragment newInstance() { + + return new SharingFragment(); + } + + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = super.onCreateView(inflater, container, savedInstanceState); diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java index 0d86a32..134678f 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListActivity.java @@ -53,19 +53,28 @@ public class UsersListActivity extends Fragment { CoordinatorLayout coordinatorLayout; @BindView(R.id.recycler_view) RecyclerView recyclerView; - + @BindView(R.id.txt_empty_notes_view) + TextView noNotesView; private UserService userService; private TutorTabApi tutorTabService; private CompositeDisposable disposable = new CompositeDisposable(); private TutorsAdapter mAdapter; private List tutorsList = new ArrayList<>(); + private List tutorsFiltered = new ArrayList<>(); + + public static UsersListActivity newInstance() { + + return new UsersListActivity(); + } public UsersListActivity() { } + + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mAdapter = new TutorsAdapter(getActivity().getApplicationContext(), tutorsList); + mAdapter = new TutorsAdapter(getActivity().getApplicationContext(), tutorsFiltered); View view = inflater.inflate(R.layout.users_list, container, false); view.setBackgroundColor(getResources().getColor(android.R.color.white)); return view; @@ -81,11 +90,10 @@ public class UsersListActivity extends Fragment { tutorTabService = ApiClient.getClient(getActivity().getApplicationContext()) .create(TutorTabApi.class); - - RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity().getApplicationContext()); + RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getActivity()); recyclerView.setLayoutManager(mLayoutManager); recyclerView.setItemAnimator(new DefaultItemAnimator()); - recyclerView.addItemDecoration(new MyDividerItemDecoration(getActivity().getApplicationContext(), LinearLayoutManager.VERTICAL, 16)); + recyclerView.addItemDecoration(new MyDividerItemDecoration(getActivity(), LinearLayoutManager.VERTICAL, 16)); recyclerView.setAdapter(mAdapter); fetchAllTutors(); @@ -94,21 +102,30 @@ public class UsersListActivity extends Fragment { recyclerView, new RecyclerTouchListener.ClickListener() { @Override public void onClick(View view, final int position) { - showNoteDialog(true, tutorsList.get(position), position); + showNoteDialog(tutorsFiltered.get(position)); } @Override public void onLongClick(View view, int position) { } })); + + } + public void searchUser( String textToSearch){ + Log.e("SEARCH","textToSearch"); - private void showNoteDialog(final boolean shouldUpdate, final User user, final int position) { + tutorsFiltered.clear(); + tutorsFiltered.addAll(Stream.of(tutorsList).filter(t -> t.toSearchString().contains(textToSearch)).toList()); + mAdapter.notifyDataSetChanged(); + } + + private void showNoteDialog(final User user) { LayoutInflater layoutInflaterAndroid = LayoutInflater.from(getActivity().getApplicationContext()); View view = layoutInflaterAndroid.inflate(R.layout.note_dialog, null); - AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(getActivity().getApplicationContext()); + AlertDialog.Builder alertDialogBuilderUserInput = new AlertDialog.Builder(getActivity()); alertDialogBuilderUserInput.setView(view); alertDialogBuilderUserInput.setNegativeButton(R.string.cancel, (dialog, id) -> { @@ -135,11 +152,13 @@ public class UsersListActivity extends Fragment { List dutyHoursList = Stream.of(tutorTabViewModel.getDutyHours()) .map(DutyHourViewModel::getSummary).toList(); + Log.e("DUTY",dutyHoursList.toString()); + userRoom.setText(String.format("%s: %s", getString(R.string.userRoom), tutorTabViewModel.getRoom())); userEmail.setText(String.format("%s: %s", getString(R.string.userEmail), tutorTabViewModel.getEmailTutorTab())); userNote.setText(String.format("%s: %s", getString(R.string.userNote), tutorTabViewModel.getNote())); - final ArrayAdapter arrayAdapter = new ArrayAdapter<>(getActivity().getApplicationContext(), + final ArrayAdapter arrayAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_activated_1, dutyHoursList); userDutyHours.setAdapter(arrayAdapter); @@ -183,10 +202,11 @@ public class UsersListActivity extends Fragment { .subscribeWith(new DisposableSingleObserver>() { @Override public void onSuccess(List users) { - //toggleEmptyNotes(); tutorsList.clear(); tutorsList.addAll(users); + tutorsFiltered.addAll(users); mAdapter.notifyDataSetChanged(); + toggleEmptyNotes(); } @@ -217,13 +237,13 @@ public class UsersListActivity extends Fragment { snackbar.show(); } -/* private void toggleEmptyNotes() { + private void toggleEmptyNotes() { if (tutorsList.size() > 0) { noNotesView.setVisibility(View.GONE); } else { noNotesView.setVisibility(View.VISIBLE); } - }*/ + } @Override public void onDestroy() { @@ -254,4 +274,6 @@ public class UsersListActivity extends Fragment { public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); } + + } \ No newline at end of file diff --git a/app/src/main/java/com/uam/wmi/findmytutor/model/User.java b/app/src/main/java/com/uam/wmi/findmytutor/model/User.java index f16add4..4cfce36 100644 --- a/app/src/main/java/com/uam/wmi/findmytutor/model/User.java +++ b/app/src/main/java/com/uam/wmi/findmytutor/model/User.java @@ -15,712 +15,750 @@ import io.swagger.annotations.ApiModelProperty; * User */ -public class User extends BaseResponse{ - @SerializedName("isOnline") - private Boolean isOnline = null; +public class User extends BaseResponse { + @SerializedName("isOnline") + private Boolean isOnline = null; - @SerializedName("isUsingBlacklist") - private Boolean isUsingBlacklist = null; + @SerializedName("isUsingBlacklist") + private Boolean isUsingBlacklist = null; - @SerializedName("isUsingWhitelist") - private Boolean isUsingWhitelist = null; + @SerializedName("isUsingWhitelist") + private Boolean isUsingWhitelist = null; - @SerializedName("blacklist") - private List blacklist = null; + @SerializedName("blacklist") + private List blacklist = null; - @SerializedName("whitelist") - private List whitelist = null; + @SerializedName("whitelist") + private List whitelist = null; - @SerializedName("department") - private String department = null; + @SerializedName("department") + private String department = null; - @SerializedName("ldapLogin") - private String ldapLogin = null; + @SerializedName("ldapLogin") + private String ldapLogin = null; - @SerializedName("title") - private String title = null; + @SerializedName("title") + private String title = null; - @SerializedName("firstName") - private String firstName = null; + @SerializedName("firstName") + private String firstName = null; - @SerializedName("lastName") - private String lastName = null; + @SerializedName("lastName") + private String lastName = null; - @SerializedName("isActive") - private Boolean isActive = null; + @SerializedName("isActive") + private Boolean isActive = null; - @SerializedName("tutorTab") - private TutorTab tutorTab = null; + @SerializedName("tutorTab") + private TutorTab tutorTab = null; - @SerializedName("coordinates") - private List coordinates = null; + @SerializedName("coordinates") + private List coordinates = null; - @SerializedName("id") - private String id = null; + @SerializedName("id") + private String id = null; - @SerializedName("userName") - private String userName = null; + @SerializedName("userName") + private String userName = null; - @SerializedName("normalizedUserName") - private String normalizedUserName = null; + @SerializedName("normalizedUserName") + private String normalizedUserName = null; - @SerializedName("email") - private String email = null; + @SerializedName("email") + private String email = null; - @SerializedName("normalizedEmail") - private String normalizedEmail = null; + @SerializedName("normalizedEmail") + private String normalizedEmail = null; - @SerializedName("emailConfirmed") - private Boolean emailConfirmed = null; + @SerializedName("emailConfirmed") + private Boolean emailConfirmed = null; - @SerializedName("passwordHash") - private String passwordHash = null; + @SerializedName("passwordHash") + private String passwordHash = null; - @SerializedName("securityStamp") - private String securityStamp = null; + @SerializedName("securityStamp") + private String securityStamp = null; - @SerializedName("concurrencyStamp") - private String concurrencyStamp = null; + @SerializedName("concurrencyStamp") + private String concurrencyStamp = null; - @SerializedName("phoneNumber") - private String phoneNumber = null; + @SerializedName("phoneNumber") + private String phoneNumber = null; - @SerializedName("phoneNumberConfirmed") - private Boolean phoneNumberConfirmed = null; + @SerializedName("phoneNumberConfirmed") + private Boolean phoneNumberConfirmed = null; - @SerializedName("twoFactorEnabled") - private Boolean twoFactorEnabled = null; + @SerializedName("twoFactorEnabled") + private Boolean twoFactorEnabled = null; - @SerializedName("lockoutEnd") - private OffsetDateTime lockoutEnd = null; + @SerializedName("lockoutEnd") + private OffsetDateTime lockoutEnd = null; - @SerializedName("lockoutEnabled") - private Boolean lockoutEnabled = null; + @SerializedName("lockoutEnabled") + private Boolean lockoutEnabled = null; - @SerializedName("accessFailedCount") - private Integer accessFailedCount = null; + @SerializedName("accessFailedCount") + private Integer accessFailedCount = null; - public User isOnline(Boolean isOnline) { - this.isOnline = isOnline; - return this; - } - - /** - * Get isOnline - * @return isOnline - **/ - @ApiModelProperty(value = "") - public Boolean isIsOnline() { - return isOnline; - } - - public void setIsOnline(Boolean isOnline) { - this.isOnline = isOnline; - } - - public User isUsingBlacklist(Boolean isUsingBlacklist) { - this.isUsingBlacklist = isUsingBlacklist; - return this; - } - - /** - * Get isUsingBlacklist - * @return isUsingBlacklist - **/ - @ApiModelProperty(value = "") - public Boolean isIsUsingBlacklist() { - return isUsingBlacklist; - } - - public void setIsUsingBlacklist(Boolean isUsingBlacklist) { - this.isUsingBlacklist = isUsingBlacklist; - } - - public User isUsingWhitelist(Boolean isUsingWhitelist) { - this.isUsingWhitelist = isUsingWhitelist; - return this; - } - - /** - * Get isUsingWhitelist - * @return isUsingWhitelist - **/ - @ApiModelProperty(value = "") - public Boolean isIsUsingWhitelist() { - return isUsingWhitelist; - } - - public void setIsUsingWhitelist(Boolean isUsingWhitelist) { - this.isUsingWhitelist = isUsingWhitelist; - } - - public User blacklist(List blacklist) { - this.blacklist = blacklist; - return this; - } - - public User addBlacklistItem(String blacklistItem) { - if (this.blacklist == null) { - this.blacklist = new ArrayList(); + public User isOnline(Boolean isOnline) { + this.isOnline = isOnline; + return this; } - this.blacklist.add(blacklistItem); - return this; - } - /** - * Get blacklist - * @return blacklist - **/ - @ApiModelProperty(value = "") - public List getBlacklist() { - return blacklist; - } - - public void setBlacklist(List blacklist) { - this.blacklist = blacklist; - } - - public User whitelist(List whitelist) { - this.whitelist = whitelist; - return this; - } - - public User addWhitelistItem(String whitelistItem) { - if (this.whitelist == null) { - this.whitelist = new ArrayList(); + /** + * Get isOnline + * + * @return isOnline + **/ + @ApiModelProperty(value = "") + public Boolean isIsOnline() { + return isOnline; } - this.whitelist.add(whitelistItem); - return this; - } - /** - * Get whitelist - * @return whitelist - **/ - @ApiModelProperty(value = "") - public List getWhitelist() { - return whitelist; - } - - public void setWhitelist(List whitelist) { - this.whitelist = whitelist; - } - - public User department(String department) { - this.department = department; - return this; - } - - /** - * Get department - * @return department - **/ - @ApiModelProperty(required = true, value = "") - public String getDepartment() { - return department; - } - - public void setDepartment(String department) { - this.department = department; - } - - public User ldapLogin(String ldapLogin) { - this.ldapLogin = ldapLogin; - return this; - } - - /** - * Get ldapLogin - * @return ldapLogin - **/ - @ApiModelProperty(required = true, value = "") - public String getLdapLogin() { - return ldapLogin; - } - - public void setLdapLogin(String ldapLogin) { - this.ldapLogin = ldapLogin; - } - - public User title(String title) { - this.title = title; - return this; - } - - /** - * Get title - * @return title - **/ - @ApiModelProperty(required = true, value = "") - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public User firstName(String firstName) { - this.firstName = firstName; - return this; - } - - /** - * Get firstName - * @return firstName - **/ - @ApiModelProperty(required = true, value = "") - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public User lastName(String lastName) { - this.lastName = lastName; - return this; - } - - /** - * Get lastName - * @return lastName - **/ - @ApiModelProperty(required = true, value = "") - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - - public User isActive(Boolean isActive) { - this.isActive = isActive; - return this; - } - - /** - * Get isActive - * @return isActive - **/ - @ApiModelProperty(required = true, value = "") - public Boolean isIsActive() { - return isActive; - } - - public void setIsActive(Boolean isActive) { - this.isActive = isActive; - } - - public User tutorTab(TutorTab tutorTab) { - this.tutorTab = tutorTab; - return this; - } - - /** - * Get tutorTab - * @return tutorTab - **/ - @ApiModelProperty(value = "") - public TutorTab getTutorTab() { - return tutorTab; - } - - public void setTutorTab(TutorTab tutorTab) { - this.tutorTab = tutorTab; - } - - public User coordinates(List coordinates) { - this.coordinates = coordinates; - return this; - } - - public User addCoordinatesItem(Coordinate coordinatesItem) { - if (this.coordinates == null) { - this.coordinates = new ArrayList(); + public void setIsOnline(Boolean isOnline) { + this.isOnline = isOnline; } - this.coordinates.add(coordinatesItem); - return this; - } - /** - * Get coordinates - * @return coordinates - **/ - @ApiModelProperty(value = "") - public List getCoordinates() { - return coordinates; - } - - public void setCoordinates(List coordinates) { - this.coordinates = coordinates; - } - - public User id(String id) { - this.id = id; - return this; - } - - /** - * Get id - * @return id - **/ - @ApiModelProperty(value = "") - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public User userName(String userName) { - this.userName = userName; - return this; - } - - /** - * Get userName - * @return userName - **/ - @ApiModelProperty(value = "") - public String getUserName() { - return userName; - } - - public void setUserName(String userName) { - this.userName = userName; - } - - public User normalizedUserName(String normalizedUserName) { - this.normalizedUserName = normalizedUserName; - return this; - } - - /** - * Get normalizedUserName - * @return normalizedUserName - **/ - @ApiModelProperty(value = "") - public String getNormalizedUserName() { - return normalizedUserName; - } - - public void setNormalizedUserName(String normalizedUserName) { - this.normalizedUserName = normalizedUserName; - } - - public User email(String email) { - this.email = email; - return this; - } - - /** - * Get email - * @return email - **/ - @ApiModelProperty(value = "") - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public User normalizedEmail(String normalizedEmail) { - this.normalizedEmail = normalizedEmail; - return this; - } - - /** - * Get normalizedEmail - * @return normalizedEmail - **/ - @ApiModelProperty(value = "") - public String getNormalizedEmail() { - return normalizedEmail; - } - - public void setNormalizedEmail(String normalizedEmail) { - this.normalizedEmail = normalizedEmail; - } - - public User emailConfirmed(Boolean emailConfirmed) { - this.emailConfirmed = emailConfirmed; - return this; - } - - /** - * Get emailConfirmed - * @return emailConfirmed - **/ - @ApiModelProperty(value = "") - public Boolean isEmailConfirmed() { - return emailConfirmed; - } - - public void setEmailConfirmed(Boolean emailConfirmed) { - this.emailConfirmed = emailConfirmed; - } - - public User passwordHash(String passwordHash) { - this.passwordHash = passwordHash; - return this; - } - - /** - * Get passwordHash - * @return passwordHash - **/ - @ApiModelProperty(value = "") - public String getPasswordHash() { - return passwordHash; - } - - public void setPasswordHash(String passwordHash) { - this.passwordHash = passwordHash; - } - - public User securityStamp(String securityStamp) { - this.securityStamp = securityStamp; - return this; - } - - /** - * Get securityStamp - * @return securityStamp - **/ - @ApiModelProperty(value = "") - public String getSecurityStamp() { - return securityStamp; - } - - public void setSecurityStamp(String securityStamp) { - this.securityStamp = securityStamp; - } - - public User concurrencyStamp(String concurrencyStamp) { - this.concurrencyStamp = concurrencyStamp; - return this; - } - - /** - * Get concurrencyStamp - * @return concurrencyStamp - **/ - @ApiModelProperty(value = "") - public String getConcurrencyStamp() { - return concurrencyStamp; - } - - public void setConcurrencyStamp(String concurrencyStamp) { - this.concurrencyStamp = concurrencyStamp; - } - - public User phoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - return this; - } - - /** - * Get phoneNumber - * @return phoneNumber - **/ - @ApiModelProperty(value = "") - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; - } - - public User phoneNumberConfirmed(Boolean phoneNumberConfirmed) { - this.phoneNumberConfirmed = phoneNumberConfirmed; - return this; - } - - /** - * Get phoneNumberConfirmed - * @return phoneNumberConfirmed - **/ - @ApiModelProperty(value = "") - public Boolean isPhoneNumberConfirmed() { - return phoneNumberConfirmed; - } - - public void setPhoneNumberConfirmed(Boolean phoneNumberConfirmed) { - this.phoneNumberConfirmed = phoneNumberConfirmed; - } - - public User twoFactorEnabled(Boolean twoFactorEnabled) { - this.twoFactorEnabled = twoFactorEnabled; - return this; - } - - /** - * Get twoFactorEnabled - * @return twoFactorEnabled - **/ - @ApiModelProperty(value = "") - public Boolean isTwoFactorEnabled() { - return twoFactorEnabled; - } - - public void setTwoFactorEnabled(Boolean twoFactorEnabled) { - this.twoFactorEnabled = twoFactorEnabled; - } - - public User lockoutEnd(OffsetDateTime lockoutEnd) { - this.lockoutEnd = lockoutEnd; - return this; - } - - /** - * Get lockoutEnd - * @return lockoutEnd - **/ - @ApiModelProperty(value = "") - public OffsetDateTime getLockoutEnd() { - return lockoutEnd; - } - - public void setLockoutEnd(OffsetDateTime lockoutEnd) { - this.lockoutEnd = lockoutEnd; - } - - public User lockoutEnabled(Boolean lockoutEnabled) { - this.lockoutEnabled = lockoutEnabled; - return this; - } - - /** - * Get lockoutEnabled - * @return lockoutEnabled - **/ - @ApiModelProperty(value = "") - public Boolean isLockoutEnabled() { - return lockoutEnabled; - } - - public void setLockoutEnabled(Boolean lockoutEnabled) { - this.lockoutEnabled = lockoutEnabled; - } - - public User accessFailedCount(Integer accessFailedCount) { - this.accessFailedCount = accessFailedCount; - return this; - } - - /** - * Get accessFailedCount - * @return accessFailedCount - **/ - @ApiModelProperty(value = "") - public Integer getAccessFailedCount() { - return accessFailedCount; - } - - public void setAccessFailedCount(Integer accessFailedCount) { - this.accessFailedCount = accessFailedCount; - } - - - @Override - public boolean equals(java.lang.Object o) { - if (this == o) { - return true; + public User isUsingBlacklist(Boolean isUsingBlacklist) { + this.isUsingBlacklist = isUsingBlacklist; + return this; } - if (o == null || getClass() != o.getClass()) { - return false; + + /** + * Get isUsingBlacklist + * + * @return isUsingBlacklist + **/ + @ApiModelProperty(value = "") + public Boolean isIsUsingBlacklist() { + return isUsingBlacklist; } - User user = (User) o; - return Objects.equals(this.isOnline, user.isOnline) && - Objects.equals(this.isUsingBlacklist, user.isUsingBlacklist) && - Objects.equals(this.isUsingWhitelist, user.isUsingWhitelist) && - Objects.equals(this.blacklist, user.blacklist) && - Objects.equals(this.whitelist, user.whitelist) && - Objects.equals(this.department, user.department) && - Objects.equals(this.ldapLogin, user.ldapLogin) && - Objects.equals(this.title, user.title) && - Objects.equals(this.firstName, user.firstName) && - Objects.equals(this.lastName, user.lastName) && - Objects.equals(this.isActive, user.isActive) && - Objects.equals(this.tutorTab, user.tutorTab) && - Objects.equals(this.coordinates, user.coordinates) && - Objects.equals(this.id, user.id) && - Objects.equals(this.userName, user.userName) && - Objects.equals(this.normalizedUserName, user.normalizedUserName) && - Objects.equals(this.email, user.email) && - Objects.equals(this.normalizedEmail, user.normalizedEmail) && - Objects.equals(this.emailConfirmed, user.emailConfirmed) && - Objects.equals(this.passwordHash, user.passwordHash) && - Objects.equals(this.securityStamp, user.securityStamp) && - Objects.equals(this.concurrencyStamp, user.concurrencyStamp) && - Objects.equals(this.phoneNumber, user.phoneNumber) && - Objects.equals(this.phoneNumberConfirmed, user.phoneNumberConfirmed) && - Objects.equals(this.twoFactorEnabled, user.twoFactorEnabled) && - Objects.equals(this.lockoutEnd, user.lockoutEnd) && - Objects.equals(this.lockoutEnabled, user.lockoutEnabled) && - Objects.equals(this.accessFailedCount, user.accessFailedCount); - } - @Override - public int hashCode() { - return Objects.hash(isOnline, isUsingBlacklist, isUsingWhitelist, blacklist, whitelist, department, ldapLogin, title, firstName, lastName, isActive, tutorTab, coordinates, id, userName, normalizedUserName, email, normalizedEmail, emailConfirmed, passwordHash, securityStamp, concurrencyStamp, phoneNumber, phoneNumberConfirmed, twoFactorEnabled, lockoutEnd, lockoutEnabled, accessFailedCount); - } - - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class User {\n"); - - sb.append(" isOnline: ").append(toIndentedString(isOnline)).append("\n"); - sb.append(" isUsingBlacklist: ").append(toIndentedString(isUsingBlacklist)).append("\n"); - sb.append(" isUsingWhitelist: ").append(toIndentedString(isUsingWhitelist)).append("\n"); - sb.append(" blacklist: ").append(toIndentedString(blacklist)).append("\n"); - sb.append(" whitelist: ").append(toIndentedString(whitelist)).append("\n"); - sb.append(" department: ").append(toIndentedString(department)).append("\n"); - sb.append(" ldapLogin: ").append(toIndentedString(ldapLogin)).append("\n"); - sb.append(" title: ").append(toIndentedString(title)).append("\n"); - sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); - sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); - sb.append(" isActive: ").append(toIndentedString(isActive)).append("\n"); - sb.append(" tutorTab: ").append(toIndentedString(tutorTab)).append("\n"); - sb.append(" coordinates: ").append(toIndentedString(coordinates)).append("\n"); - sb.append(" id: ").append(toIndentedString(id)).append("\n"); - sb.append(" userName: ").append(toIndentedString(userName)).append("\n"); - sb.append(" normalizedUserName: ").append(toIndentedString(normalizedUserName)).append("\n"); - sb.append(" email: ").append(toIndentedString(email)).append("\n"); - sb.append(" normalizedEmail: ").append(toIndentedString(normalizedEmail)).append("\n"); - sb.append(" emailConfirmed: ").append(toIndentedString(emailConfirmed)).append("\n"); - sb.append(" passwordHash: ").append(toIndentedString(passwordHash)).append("\n"); - sb.append(" securityStamp: ").append(toIndentedString(securityStamp)).append("\n"); - sb.append(" concurrencyStamp: ").append(toIndentedString(concurrencyStamp)).append("\n"); - sb.append(" phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n"); - sb.append(" phoneNumberConfirmed: ").append(toIndentedString(phoneNumberConfirmed)).append("\n"); - sb.append(" twoFactorEnabled: ").append(toIndentedString(twoFactorEnabled)).append("\n"); - sb.append(" lockoutEnd: ").append(toIndentedString(lockoutEnd)).append("\n"); - sb.append(" lockoutEnabled: ").append(toIndentedString(lockoutEnabled)).append("\n"); - sb.append(" accessFailedCount: ").append(toIndentedString(accessFailedCount)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(java.lang.Object o) { - if (o == null) { - return "null"; + public void setIsUsingBlacklist(Boolean isUsingBlacklist) { + this.isUsingBlacklist = isUsingBlacklist; + } + + public User isUsingWhitelist(Boolean isUsingWhitelist) { + this.isUsingWhitelist = isUsingWhitelist; + return this; + } + + /** + * Get isUsingWhitelist + * + * @return isUsingWhitelist + **/ + @ApiModelProperty(value = "") + public Boolean isIsUsingWhitelist() { + return isUsingWhitelist; + } + + public void setIsUsingWhitelist(Boolean isUsingWhitelist) { + this.isUsingWhitelist = isUsingWhitelist; + } + + public User blacklist(List blacklist) { + this.blacklist = blacklist; + return this; + } + + public User addBlacklistItem(String blacklistItem) { + if (this.blacklist == null) { + this.blacklist = new ArrayList(); + } + this.blacklist.add(blacklistItem); + return this; + } + + /** + * Get blacklist + * + * @return blacklist + **/ + @ApiModelProperty(value = "") + public List getBlacklist() { + return blacklist; + } + + public void setBlacklist(List blacklist) { + this.blacklist = blacklist; + } + + public User whitelist(List whitelist) { + this.whitelist = whitelist; + return this; + } + + public User addWhitelistItem(String whitelistItem) { + if (this.whitelist == null) { + this.whitelist = new ArrayList(); + } + this.whitelist.add(whitelistItem); + return this; + } + + /** + * Get whitelist + * + * @return whitelist + **/ + @ApiModelProperty(value = "") + public List getWhitelist() { + return whitelist; + } + + public void setWhitelist(List whitelist) { + this.whitelist = whitelist; + } + + public User department(String department) { + this.department = department; + return this; + } + + /** + * Get department + * + * @return department + **/ + @ApiModelProperty(required = true, value = "") + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + + public User ldapLogin(String ldapLogin) { + this.ldapLogin = ldapLogin; + return this; + } + + /** + * Get ldapLogin + * + * @return ldapLogin + **/ + @ApiModelProperty(required = true, value = "") + public String getLdapLogin() { + return ldapLogin; + } + + public void setLdapLogin(String ldapLogin) { + this.ldapLogin = ldapLogin; + } + + public User title(String title) { + this.title = title; + return this; + } + + /** + * Get title + * + * @return title + **/ + @ApiModelProperty(required = true, value = "") + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public User firstName(String firstName) { + this.firstName = firstName; + return this; + } + + /** + * Get firstName + * + * @return firstName + **/ + @ApiModelProperty(required = true, value = "") + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public User lastName(String lastName) { + this.lastName = lastName; + return this; + } + + /** + * Get lastName + * + * @return lastName + **/ + @ApiModelProperty(required = true, value = "") + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public User isActive(Boolean isActive) { + this.isActive = isActive; + return this; + } + + /** + * Get isActive + * + * @return isActive + **/ + @ApiModelProperty(required = true, value = "") + public Boolean isIsActive() { + return isActive; + } + + public void setIsActive(Boolean isActive) { + this.isActive = isActive; + } + + public User tutorTab(TutorTab tutorTab) { + this.tutorTab = tutorTab; + return this; + } + + /** + * Get tutorTab + * + * @return tutorTab + **/ + @ApiModelProperty(value = "") + public TutorTab getTutorTab() { + return tutorTab; + } + + public void setTutorTab(TutorTab tutorTab) { + this.tutorTab = tutorTab; + } + + public User coordinates(List coordinates) { + this.coordinates = coordinates; + return this; + } + + public User addCoordinatesItem(Coordinate coordinatesItem) { + if (this.coordinates == null) { + this.coordinates = new ArrayList(); + } + this.coordinates.add(coordinatesItem); + return this; + } + + /** + * Get coordinates + * + * @return coordinates + **/ + @ApiModelProperty(value = "") + public List getCoordinates() { + return coordinates; + } + + public void setCoordinates(List coordinates) { + this.coordinates = coordinates; + } + + public User id(String id) { + this.id = id; + return this; + } + + /** + * Get id + * + * @return id + **/ + @ApiModelProperty(value = "") + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public User userName(String userName) { + this.userName = userName; + return this; + } + + /** + * Get userName + * + * @return userName + **/ + @ApiModelProperty(value = "") + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public User normalizedUserName(String normalizedUserName) { + this.normalizedUserName = normalizedUserName; + return this; + } + + /** + * Get normalizedUserName + * + * @return normalizedUserName + **/ + @ApiModelProperty(value = "") + public String getNormalizedUserName() { + return normalizedUserName; + } + + public void setNormalizedUserName(String normalizedUserName) { + this.normalizedUserName = normalizedUserName; + } + + public User email(String email) { + this.email = email; + return this; + } + + /** + * Get email + * + * @return email + **/ + @ApiModelProperty(value = "") + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public User normalizedEmail(String normalizedEmail) { + this.normalizedEmail = normalizedEmail; + return this; + } + + /** + * Get normalizedEmail + * + * @return normalizedEmail + **/ + @ApiModelProperty(value = "") + public String getNormalizedEmail() { + return normalizedEmail; + } + + public void setNormalizedEmail(String normalizedEmail) { + this.normalizedEmail = normalizedEmail; + } + + public User emailConfirmed(Boolean emailConfirmed) { + this.emailConfirmed = emailConfirmed; + return this; + } + + /** + * Get emailConfirmed + * + * @return emailConfirmed + **/ + @ApiModelProperty(value = "") + public Boolean isEmailConfirmed() { + return emailConfirmed; + } + + public void setEmailConfirmed(Boolean emailConfirmed) { + this.emailConfirmed = emailConfirmed; + } + + public User passwordHash(String passwordHash) { + this.passwordHash = passwordHash; + return this; + } + + /** + * Get passwordHash + * + * @return passwordHash + **/ + @ApiModelProperty(value = "") + public String getPasswordHash() { + return passwordHash; + } + + public void setPasswordHash(String passwordHash) { + this.passwordHash = passwordHash; + } + + public User securityStamp(String securityStamp) { + this.securityStamp = securityStamp; + return this; + } + + /** + * Get securityStamp + * + * @return securityStamp + **/ + @ApiModelProperty(value = "") + public String getSecurityStamp() { + return securityStamp; + } + + public void setSecurityStamp(String securityStamp) { + this.securityStamp = securityStamp; + } + + public User concurrencyStamp(String concurrencyStamp) { + this.concurrencyStamp = concurrencyStamp; + return this; + } + + /** + * Get concurrencyStamp + * + * @return concurrencyStamp + **/ + @ApiModelProperty(value = "") + public String getConcurrencyStamp() { + return concurrencyStamp; + } + + public void setConcurrencyStamp(String concurrencyStamp) { + this.concurrencyStamp = concurrencyStamp; + } + + public User phoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + return this; + } + + /** + * Get phoneNumber + * + * @return phoneNumber + **/ + @ApiModelProperty(value = "") + public String getPhoneNumber() { + return phoneNumber; + } + + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + + public User phoneNumberConfirmed(Boolean phoneNumberConfirmed) { + this.phoneNumberConfirmed = phoneNumberConfirmed; + return this; + } + + /** + * Get phoneNumberConfirmed + * + * @return phoneNumberConfirmed + **/ + @ApiModelProperty(value = "") + public Boolean isPhoneNumberConfirmed() { + return phoneNumberConfirmed; + } + + public void setPhoneNumberConfirmed(Boolean phoneNumberConfirmed) { + this.phoneNumberConfirmed = phoneNumberConfirmed; + } + + public User twoFactorEnabled(Boolean twoFactorEnabled) { + this.twoFactorEnabled = twoFactorEnabled; + return this; + } + + /** + * Get twoFactorEnabled + * + * @return twoFactorEnabled + **/ + @ApiModelProperty(value = "") + public Boolean isTwoFactorEnabled() { + return twoFactorEnabled; + } + + public void setTwoFactorEnabled(Boolean twoFactorEnabled) { + this.twoFactorEnabled = twoFactorEnabled; + } + + public User lockoutEnd(OffsetDateTime lockoutEnd) { + this.lockoutEnd = lockoutEnd; + return this; + } + + /** + * Get lockoutEnd + * + * @return lockoutEnd + **/ + @ApiModelProperty(value = "") + public OffsetDateTime getLockoutEnd() { + return lockoutEnd; + } + + public void setLockoutEnd(OffsetDateTime lockoutEnd) { + this.lockoutEnd = lockoutEnd; + } + + public User lockoutEnabled(Boolean lockoutEnabled) { + this.lockoutEnabled = lockoutEnabled; + return this; + } + + /** + * Get lockoutEnabled + * + * @return lockoutEnabled + **/ + @ApiModelProperty(value = "") + public Boolean isLockoutEnabled() { + return lockoutEnabled; + } + + public void setLockoutEnabled(Boolean lockoutEnabled) { + this.lockoutEnabled = lockoutEnabled; + } + + public User accessFailedCount(Integer accessFailedCount) { + this.accessFailedCount = accessFailedCount; + return this; + } + + /** + * Get accessFailedCount + * + * @return accessFailedCount + **/ + @ApiModelProperty(value = "") + public Integer getAccessFailedCount() { + return accessFailedCount; + } + + public void setAccessFailedCount(Integer accessFailedCount) { + this.accessFailedCount = accessFailedCount; + } + + + @Override + public boolean equals(java.lang.Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(this.isOnline, user.isOnline) && + Objects.equals(this.isUsingBlacklist, user.isUsingBlacklist) && + Objects.equals(this.isUsingWhitelist, user.isUsingWhitelist) && + Objects.equals(this.blacklist, user.blacklist) && + Objects.equals(this.whitelist, user.whitelist) && + Objects.equals(this.department, user.department) && + Objects.equals(this.ldapLogin, user.ldapLogin) && + Objects.equals(this.title, user.title) && + Objects.equals(this.firstName, user.firstName) && + Objects.equals(this.lastName, user.lastName) && + Objects.equals(this.isActive, user.isActive) && + Objects.equals(this.tutorTab, user.tutorTab) && + Objects.equals(this.coordinates, user.coordinates) && + Objects.equals(this.id, user.id) && + Objects.equals(this.userName, user.userName) && + Objects.equals(this.normalizedUserName, user.normalizedUserName) && + Objects.equals(this.email, user.email) && + Objects.equals(this.normalizedEmail, user.normalizedEmail) && + Objects.equals(this.emailConfirmed, user.emailConfirmed) && + Objects.equals(this.passwordHash, user.passwordHash) && + Objects.equals(this.securityStamp, user.securityStamp) && + Objects.equals(this.concurrencyStamp, user.concurrencyStamp) && + Objects.equals(this.phoneNumber, user.phoneNumber) && + Objects.equals(this.phoneNumberConfirmed, user.phoneNumberConfirmed) && + Objects.equals(this.twoFactorEnabled, user.twoFactorEnabled) && + Objects.equals(this.lockoutEnd, user.lockoutEnd) && + Objects.equals(this.lockoutEnabled, user.lockoutEnabled) && + Objects.equals(this.accessFailedCount, user.accessFailedCount); + } + + @Override + public int hashCode() { + return Objects.hash(isOnline, isUsingBlacklist, isUsingWhitelist, blacklist, whitelist, department, ldapLogin, title, firstName, lastName, isActive, tutorTab, coordinates, id, userName, normalizedUserName, email, normalizedEmail, emailConfirmed, passwordHash, securityStamp, concurrencyStamp, phoneNumber, phoneNumberConfirmed, twoFactorEnabled, lockoutEnd, lockoutEnabled, accessFailedCount); + } + + + public String toSearchString() { + StringBuilder sb = new StringBuilder(); + sb.append(userName); + sb.append(lastName); + sb.append(department); + sb.append(email); + + return sb.toString(); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + + sb.append(" isOnline: ").append(toIndentedString(isOnline)).append("\n"); + sb.append(" isUsingBlacklist: ").append(toIndentedString(isUsingBlacklist)).append("\n"); + sb.append(" isUsingWhitelist: ").append(toIndentedString(isUsingWhitelist)).append("\n"); + sb.append(" blacklist: ").append(toIndentedString(blacklist)).append("\n"); + sb.append(" whitelist: ").append(toIndentedString(whitelist)).append("\n"); + sb.append(" department: ").append(toIndentedString(department)).append("\n"); + sb.append(" ldapLogin: ").append(toIndentedString(ldapLogin)).append("\n"); + sb.append(" title: ").append(toIndentedString(title)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" isActive: ").append(toIndentedString(isActive)).append("\n"); + sb.append(" tutorTab: ").append(toIndentedString(tutorTab)).append("\n"); + sb.append(" coordinates: ").append(toIndentedString(coordinates)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" userName: ").append(toIndentedString(userName)).append("\n"); + sb.append(" normalizedUserName: ").append(toIndentedString(normalizedUserName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" normalizedEmail: ").append(toIndentedString(normalizedEmail)).append("\n"); + sb.append(" emailConfirmed: ").append(toIndentedString(emailConfirmed)).append("\n"); + sb.append(" passwordHash: ").append(toIndentedString(passwordHash)).append("\n"); + sb.append(" securityStamp: ").append(toIndentedString(securityStamp)).append("\n"); + sb.append(" concurrencyStamp: ").append(toIndentedString(concurrencyStamp)).append("\n"); + sb.append(" phoneNumber: ").append(toIndentedString(phoneNumber)).append("\n"); + sb.append(" phoneNumberConfirmed: ").append(toIndentedString(phoneNumberConfirmed)).append("\n"); + sb.append(" twoFactorEnabled: ").append(toIndentedString(twoFactorEnabled)).append("\n"); + sb.append(" lockoutEnd: ").append(toIndentedString(lockoutEnd)).append("\n"); + sb.append(" lockoutEnabled: ").append(toIndentedString(lockoutEnabled)).append("\n"); + sb.append(" accessFailedCount: ").append(toIndentedString(accessFailedCount)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(java.lang.Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); } - return o.toString().replace("\n", "\n "); - } } diff --git a/app/src/main/res/layout/users_list_main.xml b/app/src/main/res/layout/users_list_main.xml index fd7aafc..d45ea30 100644 --- a/app/src/main/res/layout/users_list_main.xml +++ b/app/src/main/res/layout/users_list_main.xml @@ -16,6 +16,17 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + +