Commit cbc3a595 authored by Preetam Ozarde's avatar Preetam Ozarde

Minor Codacy Changes and Tag Categories Added

parent b3143ebe
......@@ -72,7 +72,7 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
circleImageView = itemView.findViewById(R.id.circleImageViewUserImage);
}
void bindHolder(final int position) {
private void bindHolder(final int position) {
final Venter.Comment comment = commentList.get(position);
try {
......
......@@ -51,7 +51,7 @@ public class UpVotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
});
}
void bindHolder(final int position) {
private void bindHolder(final int position) {
final User user = userList.get(position);
try {
......
......@@ -73,8 +73,8 @@ public class UserAdapter extends RecyclerView.Adapter<UserAdapter.ViewHolder> {
}
public class ViewHolder extends RecyclerView.ViewHolder {
TextView userName;
TextView role;
private TextView userName;
private TextView role;
public ImageView image;
public ViewHolder(View itemView) {
......
......@@ -127,6 +127,7 @@ public class FileComplaintFragment extends Fragment {
private CollapsingToolbarLayout collapsing_toolbar;
private LinearLayout linearLayoutAnalyse;
private LinearLayout linearLayoutScrollTags;
private boolean userAddedTag = false;
public static FileComplaintFragment getMainActivity() {
return mainactivity;
......@@ -265,8 +266,10 @@ public class FileComplaintFragment extends Fragment {
@Override
public void onClick(View v) {
//Add Tags
populateTags(editTextTags.getText().toString());
userAddedTag = true;
populateTags(editTextTags.getText().toString(),userAddedTag);
editTextTags.setText("");
userAddedTag = false;
tagViewPopulate.addTags(new ArrayList<Tag>());
MainActivity.hideKeyboard(getActivity());
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
......@@ -354,9 +357,10 @@ public class FileComplaintFragment extends Fragment {
tagViewPopulate.setOnTagClickListener(new TagView.OnTagClickListener() {
@Override
public void onTagClick(Tag tag, int i) {
userAddedTag = false;
editTextTags.setText(tag.text);
editTextTags.setSelection(tag.text.length());
populateTags(editTextTags.getText().toString());
populateTags(editTextTags.getText().toString(), userAddedTag);
editTextTags.setText("");
tagViewPopulate.addTags(new ArrayList<Tag>());
MainActivity.hideKeyboard(getActivity());
......@@ -572,8 +576,9 @@ public class FileComplaintFragment extends Fragment {
}
}
private void populateTags(String cs) {
private void populateTags(String cs, Boolean userAddedTag) {
if (!(cs.isEmpty())) {
tagList2.add(new ComplaintTag(cs));
ArrayList<Tag> tags = new ArrayList<>();
Tag tag;
......@@ -584,6 +589,13 @@ public class FileComplaintFragment extends Fragment {
tags.add(tag);
}
tagView.addTags(tags);
for (int i = 0; i < tagList2.size(); i++){
if (userAddedTag == true){
if (tagList2.get(i).getName() == cs)
tagList2.get(i).setName(cs + " (U)");
}
}
} else {
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);
......
......@@ -14,7 +14,6 @@ import app.insti.adapter.ComplaintsAdapter;
public class RelevantComplaintsFragment extends Fragment {
private ComplaintsAdapter relevantComplaintsAdapter;
private SwipeRefreshLayout swipeContainer;
private boolean isCalled = false;
private static String sID, uID;
......@@ -48,7 +47,7 @@ public class RelevantComplaintsFragment extends Fragment {
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_relevant_complaints, container, false);
RecyclerView recyclerViewRelevantComplaints = (RecyclerView) view.findViewById(R.id.recyclerViewRelevantComplaints);
relevantComplaintsAdapter = new ComplaintsAdapter(getActivity(), sID, uID, ""); //Change userProfileUrl to the current user Profile Pic
ComplaintsAdapter relevantComplaintsAdapter = new ComplaintsAdapter(getActivity(), sID, uID, ""); //Change userProfileUrl to the current user Profile Pic
swipeContainer = (SwipeRefreshLayout) view.findViewById(R.id.swipeContainer);
LinearLayoutManager llm = new LinearLayoutManager(getActivity());
......
......@@ -16,17 +16,16 @@ public class DateTimeUtil {
long seconds = TimeUnit.MILLISECONDS.toSeconds(now.getTime() - date.getTime());
long minutes = TimeUnit.MILLISECONDS.toMinutes(now.getTime() - date.getTime());
long hours = TimeUnit.MILLISECONDS.toHours(now.getTime() - date.getTime());
String time_ago = "";
if (seconds <= 0) {
return time_ago = "now";
return "now";
} else if (seconds == 1){
return time_ago = seconds + " second ago";
return seconds + " second ago";
} else if (seconds < 60 && seconds > 1) {
return time_ago = seconds + " seconds ago";
return seconds + " seconds ago";
} else if (minutes == 1) {
return time_ago = minutes + " 1 minute ago";
return minutes + " 1 minute ago";
} else if (minutes < 60 && minutes > 1) {
return time_ago = minutes + " minutes ago";
return minutes + " minutes ago";
} else if (hours == 1) {
return hours + " hour ago";
} else if (hours < 24 && hours > 1) {
......
......@@ -28,6 +28,13 @@ public class TagCategories {
"Fencing issues",
"Security issues",
"Infrastructural defaults in the academic area",
"Cycle pooling issues"};
"Cycle pooling issues",
"Water coolers & Aqua Guards",
"Mess menu complaints",
"PHO cleaning complaints",
"PHO cleaning complaints",
"Hostel common room complaints",
"Hostel Stationary shop complaints"
};
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment