Skip to content

I
InstiApp
Commit 143b9855 authored by Preetam Ozarde's avatar Preetam Ozarde
Browse files
Options

Update minor changes

parent 149badff
Show whitespace changes
Inline Side-by-side
Showing with 1454 additions and 1089 deletions
app/src/main/java/app/insti/TagClass.java → app/src/main/java/app/insti/ComplaintTag.java
View file @ 143b9855
...@@ -3,11 +3,11 @@ package app.insti; ...@@ -3,11 +3,11 @@ package app.insti;
/** /**
* Created by Shivam Sharma on 13-08-2018. * Created by Shivam Sharma on 13-08-2018.
*/ */
public class TagClass { public class ComplaintTag {
private String name; private String name;
public TagClass(String name) { public ComplaintTag(String name) {
this.name = name; this.name = name;
} }
......
app/src/main/java/app/insti/Constants.java
View file @ 143b9855
...@@ -20,6 +20,7 @@ public class Constants { ...@@ -20,6 +20,7 @@ public class Constants {
public static final String IS_LOGGED_IN = "IsLoggedIn"; public static final String IS_LOGGED_IN = "IsLoggedIn";
public static final String GCM_ID = "GcmId"; public static final String GCM_ID = "GcmId";
public static final String CURRENT_USER = "current_user"; public static final String CURRENT_USER = "current_user";
public static final String CURRENT_USER_PROFILE_PICTURE = "current_user_profile_picture";
public static final String SESSION_ID = "session_id"; public static final String SESSION_ID = "session_id";
public static final int STATUS_GOING = 2; public static final int STATUS_GOING = 2;
public static final int STATUS_INTERESTED = 1; public static final int STATUS_INTERESTED = 1;
......
app/src/main/java/app/insti/activity/MainActivity.java
View file @ 143b9855
...@@ -55,10 +55,8 @@ import app.insti.api.model.Role; ...@@ -55,10 +55,8 @@ import app.insti.api.model.Role;
import app.insti.api.model.User; import app.insti.api.model.User;
import app.insti.api.request.UserFCMPatchRequest; import app.insti.api.request.UserFCMPatchRequest;
import app.insti.fragment.BackHandledFragment; import app.insti.fragment.BackHandledFragment;
import app.insti.fragment.BodyFragment;
import app.insti.fragment.CalendarFragment; import app.insti.fragment.CalendarFragment;
import app.insti.fragment.ComplaintFragment; import app.insti.fragment.ComplaintsFragment;
import app.insti.fragment.EventFragment;
import app.insti.fragment.ExploreFragment; import app.insti.fragment.ExploreFragment;
import app.insti.fragment.FeedFragment; import app.insti.fragment.FeedFragment;
import app.insti.fragment.FileComplaintFragment; import app.insti.fragment.FileComplaintFragment;
...@@ -530,8 +528,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -530,8 +528,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
case R.id.nav_complaint: case R.id.nav_complaint:
if (session.isLoggedIn()) { if (session.isLoggedIn()) {
ComplaintFragment complaintFragment = new ComplaintFragment(); ComplaintsFragment complaintsFragment = new ComplaintsFragment();
updateFragment(complaintFragment); updateFragment(complaintsFragment);
} else { } else {
Toast.makeText(this, Constants.LOGIN_MESSAGE, Toast.LENGTH_LONG).show(); Toast.makeText(this, Constants.LOGIN_MESSAGE, Toast.LENGTH_LONG).show();
} }
...@@ -577,8 +575,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On ...@@ -577,8 +575,12 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
bundle.putString(Constants.SESSION_ID, session.pref.getString(Constants.SESSION_ID, "")); bundle.putString(Constants.SESSION_ID, session.pref.getString(Constants.SESSION_ID, ""));
if (fragment instanceof MessMenuFragment) if (fragment instanceof MessMenuFragment)
bundle.putString(Constants.USER_HOSTEL, session.isLoggedIn() && currentUser.getHostel() != null ? currentUser.getHostel() : "1"); bundle.putString(Constants.USER_HOSTEL, session.isLoggedIn() && currentUser.getHostel() != null ? currentUser.getHostel() : "1");
if (fragment instanceof SettingsFragment && session.isLoggedIn() || fragment instanceof ComplaintFragment && session.isLoggedIn()) if (fragment instanceof SettingsFragment && session.isLoggedIn())
bundle.putString(Constants.USER_ID, currentUser.getUserID()); bundle.putString(Constants.USER_ID, currentUser.getUserID());
if (fragment instanceof ComplaintsFragment && session.isLoggedIn()){
bundle.putString(Constants.USER_ID, currentUser.getUserID());
bundle.putString(Constants.CURRENT_USER_PROFILE_PICTURE, currentUser.getUserProfilePictureUrl());
}
fragment.setArguments(bundle); fragment.setArguments(bundle);
FragmentManager manager = getSupportFragmentManager(); FragmentManager manager = getSupportFragmentManager();
if (fragment instanceof FeedFragment) if (fragment instanceof FeedFragment)
......
app/src/main/java/app/insti/adapter/CommentRecyclerViewAdapter.java → app/src/main/java/app/insti/adapter/CommentsAdapter.java
View file @ 143b9855
...@@ -5,6 +5,7 @@ import android.content.ClipData; ...@@ -5,6 +5,7 @@ import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v7.widget.CardView; import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.util.Log; import android.util.Log;
...@@ -12,8 +13,6 @@ import android.view.LayoutInflater; ...@@ -12,8 +13,6 @@ import android.view.LayoutInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.PopupMenu; import android.widget.PopupMenu;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
...@@ -25,7 +24,6 @@ import java.util.List; ...@@ -25,7 +24,6 @@ import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.Venter; import app.insti.api.model.Venter;
import app.insti.utils.DateTimeUtil; import app.insti.utils.DateTimeUtil;
...@@ -38,25 +36,27 @@ import retrofit2.Response; ...@@ -38,25 +36,27 @@ import retrofit2.Response;
* Created by Shivam Sharma on 23-09-2018. * Created by Shivam Sharma on 23-09-2018.
*/ */
public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private static final String TAG = CommentRecyclerViewAdapter.class.getSimpleName(); private static final String TAG = CommentsAdapter.class.getSimpleName();
private Context context; private Context context;
private LayoutInflater inflater; private LayoutInflater inflater;
private String sessionId, userId; private String sessionId, userId;
Activity activity; Activity activity;
private TextView textViewCommentLabel; TextView textViewCommentLabel;
private Fragment fragment;
private List<Venter.Comment> commentList = new ArrayList<>(); private List<Venter.Comment> commentList = new ArrayList<>();
public CommentRecyclerViewAdapter(Activity activity, Context context, String sessionId, String userId, TextView textViewCommentLabel) { public CommentsAdapter(Activity activity, Context context, String sessionId, String userId, TextView textViewCommentLabel, Fragment fragment) {
this.context = context; this.context = context;
this.sessionId = sessionId; this.sessionId = sessionId;
this.userId = userId; this.userId = userId;
inflater = LayoutInflater.from(context); inflater = LayoutInflater.from(context);
this.activity = activity; this.activity = activity;
this.textViewCommentLabel = textViewCommentLabel; this.textViewCommentLabel = textViewCommentLabel;
this.fragment =fragment;
} }
public class CommentsViewHolder extends RecyclerView.ViewHolder { public class CommentsViewHolder extends RecyclerView.ViewHolder {
...@@ -66,7 +66,7 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie ...@@ -66,7 +66,7 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie
private TextView textViewName; private TextView textViewName;
private TextView textViewCommentTime; private TextView textViewCommentTime;
private TextView textViewComment; private TextView textViewComment;
final RetrofitInterface retrofitInterface = Utils.getRetrofitInterface(); private final RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
public CommentsViewHolder(View itemView) { public CommentsViewHolder(View itemView) {
super(itemView); super(itemView);
...@@ -83,10 +83,7 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie ...@@ -83,10 +83,7 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie
try { try {
String profileUrl = comment.getUser().getUserProfilePictureUrl(); String profileUrl = comment.getUser().getUserProfilePictureUrl();
Log.i(TAG, "PROFILE URL: " + profileUrl); Log.i(TAG, "PROFILE URL: " + profileUrl);
if (profileUrl != null) Picasso.get().load(profileUrl).placeholder(R.drawable.user_placeholder).into(circleImageView);
Picasso.get().load(profileUrl).into(circleImageView);
else
Picasso.get().load(R.drawable.baseline_account_circle_black_36).into(circleImageView);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -124,7 +121,6 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie ...@@ -124,7 +121,6 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie
@Override @Override
public void onResponse(Call<String> call, Response<String> response) { public void onResponse(Call<String> call, Response<String> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
Toast.makeText(context, "Comment Deleted", Toast.LENGTH_SHORT).show();
commentList.remove(position); commentList.remove(position);
notifyDataSetChanged(); notifyDataSetChanged();
notifyItemRemoved(position); notifyItemRemoved(position);
...@@ -156,7 +152,14 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie ...@@ -156,7 +152,14 @@ public class CommentRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVie
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = inflater.inflate(R.layout.comments_card, parent, false); View view = inflater.inflate(R.layout.comments_card, parent, false);
CommentsViewHolder commentsViewHolder = new CommentsViewHolder(view); final CommentsViewHolder commentsViewHolder = new CommentsViewHolder(view);
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Utils.openUserFragment(commentList.get(commentsViewHolder.getAdapterPosition()).getUser(), fragment.getActivity());
}
});
return commentsViewHolder; return commentsViewHolder;
} }
......
app/src/main/java/app/insti/adapter/ComplaintDetailsPagerAdapter.java
View file @ 143b9855
...@@ -6,8 +6,7 @@ import android.support.v4.app.FragmentManager; ...@@ -6,8 +6,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.app.FragmentPagerAdapter;
import app.insti.api.model.Venter; import app.insti.api.model.Venter;
import app.insti.fragment.DetailedComplaintFragment; import app.insti.fragment.ComplaintDetailsFragment;
import app.insti.fragment.RelevantComplaintsFragment;
/** /**
* Created by Shivam Sharma on 19-09-2018. * Created by Shivam Sharma on 19-09-2018.
...@@ -17,35 +16,33 @@ public class ComplaintDetailsPagerAdapter extends FragmentPagerAdapter { ...@@ -17,35 +16,33 @@ public class ComplaintDetailsPagerAdapter extends FragmentPagerAdapter {
Venter.Complaint detailedComplaint; Venter.Complaint detailedComplaint;
Context context; Context context;
String sessionid, complaintid, userid; private String sessionid, complaintid, userid, userProfileUrl;
int voteCount;
public ComplaintDetailsPagerAdapter(FragmentManager fm, Venter.Complaint detailedComplaint, Context context, String sessionid, String complaintid, String userid, int voteCount) { public ComplaintDetailsPagerAdapter(FragmentManager fm, Venter.Complaint detailedComplaint, Context context, String sessionid, String complaintid, String userid, String userProfileUrl) {
super(fm); super(fm);
this.context = context; this.context = context;
this.detailedComplaint = detailedComplaint; this.detailedComplaint = detailedComplaint;
this.sessionid = sessionid; this.sessionid = sessionid;
this.complaintid = complaintid; this.complaintid = complaintid;
this.userid = userid; this.userid = userid;
this.voteCount = voteCount; this.userProfileUrl = userProfileUrl;
} }
@Override @Override
public Fragment getItem(int position) { public Fragment getItem(int position) {
switch (position) { switch (position) {
case 0: case 0:
return DetailedComplaintFragment.getInstance(sessionid, complaintid, userid, voteCount); return ComplaintDetailsFragment.getInstance(sessionid, complaintid, userid, userProfileUrl);
return DetailedComplaintFragment.getInstance(sessionid, complaintid, userid); /* case 1:
case 1: return RelevantComplaintsFragment.getInstance(sessionid, userid);*/
return RelevantComplaintsFragment.getInstance(sessionid, userid);
default: default:
return DetailedComplaintFragment.getInstance(sessionid, complaintid, userid, voteCount); return ComplaintDetailsFragment.getInstance(sessionid, complaintid, userid, userProfileUrl);
} }
} }
@Override @Override
public CharSequence getPageTitle(int position) { public CharSequence getPageTitle(int position) {
if (position == 0){ if (position == 0) {
return "Complaint Details"; return "Complaint Details";
} else { } else {
return "Relevant Complaints"; return "Relevant Complaints";
......
app/src/main/java/app/insti/adapter/ComplaintFragmentViewPagerAdapter.java
View file @ 143b9855
...@@ -6,8 +6,8 @@ import android.support.v4.app.Fragment; ...@@ -6,8 +6,8 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.app.FragmentStatePagerAdapter;
import app.insti.fragment.HomeFragment; import app.insti.fragment.ComplaintsHomeFragment;
import app.insti.fragment.MeFragment; import app.insti.fragment.ComplaintsMeFragment;
/** /**
* Created by Shivam Sharma on 15-08-2018. * Created by Shivam Sharma on 15-08-2018.
...@@ -15,26 +15,26 @@ import app.insti.fragment.MeFragment; ...@@ -15,26 +15,26 @@ import app.insti.fragment.MeFragment;
public class ComplaintFragmentViewPagerAdapter extends FragmentStatePagerAdapter { public class ComplaintFragmentViewPagerAdapter extends FragmentStatePagerAdapter {
private static final String TAG = ComplaintFragmentViewPagerAdapter.class.getSimpleName();
Context context; Context context;
String userID, sessionID; private String userID, sessionID, userProfileUrl;
public ComplaintFragmentViewPagerAdapter(FragmentManager fm, Context context, String userID, String sessionID) { public ComplaintFragmentViewPagerAdapter(FragmentManager fm, Context context, String userID, String sessionID, String userProfileUrl) {
super(fm); super(fm);
this.context = context; this.context = context;
this.userID = userID; this.userID = userID;
this.sessionID = sessionID; this.sessionID = sessionID;
this.userProfileUrl = userProfileUrl;
} }
@Override @Override
public Fragment getItem(int position) { public Fragment getItem(int position) {
switch (position) { switch (position) {
case 0: case 0:
return HomeFragment.getInstance(sessionID, userID); return ComplaintsHomeFragment.getInstance(sessionID, userID, userProfileUrl);
case 1: case 1:
return MeFragment.getInstance(sessionID,userID); return ComplaintsMeFragment.getInstance(sessionID,userID, userProfileUrl);
default: default:
return HomeFragment.getInstance(sessionID, userID); return ComplaintsHomeFragment.getInstance(sessionID, userID, userProfileUrl);
} }
} }
......
app/src/main/java/app/insti/adapter/ComplaintsRecyclerViewAdapter.java → app/src/main/java/app/insti/adapter/ComplaintsAdapter.java
View file @ 143b9855
...@@ -2,36 +2,26 @@ package app.insti.adapter; ...@@ -2,36 +2,26 @@ package app.insti.adapter;
import android.app.Activity; import android.app.Activity;
import android.content.res.ColorStateList; import android.content.res.ColorStateList;
import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.CardView; import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView; import android.support.v7.widget.RecyclerView;
import android.text.format.DateUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.TimeZone;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.User;
import app.insti.api.model.Venter; import app.insti.api.model.Venter;
import app.insti.fragment.ComplaintDetailsFragment; import app.insti.fragment.ComplaintFragment;
import app.insti.utils.DateTimeUtil; import app.insti.utils.DateTimeUtil;
import app.insti.utils.GsonProvider;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
...@@ -40,14 +30,15 @@ import retrofit2.Response; ...@@ -40,14 +30,15 @@ import retrofit2.Response;
* Created by Shivam Sharma on 15-08-2018. * Created by Shivam Sharma on 15-08-2018.
*/ */
public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> { public class ComplaintsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private LayoutInflater inflater; private LayoutInflater inflater;
private Activity context; private Activity context;
private String sessionID; private String sessionID;
private String userID; private String userID;
private static final String TAG = ComplaintsRecyclerViewAdapter.class.getSimpleName(); private String userProfileUrl;
List<Venter.Complaint> complaintList = new ArrayList<>(); private static final String TAG = ComplaintsAdapter.class.getSimpleName();
private List<Venter.Complaint> complaintList = new ArrayList<>();
public class ComplaintsViewHolder extends RecyclerView.ViewHolder { public class ComplaintsViewHolder extends RecyclerView.ViewHolder {
...@@ -61,9 +52,7 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -61,9 +52,7 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
private TextView textViewUserName; private TextView textViewUserName;
private TextView textViewReportDate; private TextView textViewReportDate;
private TextView textViewStatus; private TextView textViewStatus;
private int pos; private int pos;
private int voteCount = 0;
public ComplaintsViewHolder(View currentView) { public ComplaintsViewHolder(View currentView) {
super(currentView); super(currentView);
...@@ -81,7 +70,6 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -81,7 +70,6 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
public void bindHolder(final int position) { public void bindHolder(final int position) {
this.pos = position; this.pos = position;
Log.i(TAG, "json = " + GsonProvider.getGsonOutput().toJson(complaintList.get(pos)));
cardView.setOnClickListener(new View.OnClickListener() { cardView.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -89,10 +77,11 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -89,10 +77,11 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
bundle.putString("id", complaintList.get(pos).getComplaintID()); bundle.putString("id", complaintList.get(pos).getComplaintID());
bundle.putString("sessionId", sessionID); bundle.putString("sessionId", sessionID);
bundle.putString("userId", userID); bundle.putString("userId", userID);
ComplaintDetailsFragment complaintDetailsFragment = new ComplaintDetailsFragment(); bundle.putString("userProfileUrl", userProfileUrl);
complaintDetailsFragment.setArguments(bundle); ComplaintFragment complaintFragment = new ComplaintFragment();
complaintFragment.setArguments(bundle);
AppCompatActivity activity = (AppCompatActivity) context; AppCompatActivity activity = (AppCompatActivity) context;
activity.getSupportFragmentManager().beginTransaction().replace(R.id.framelayout_for_fragment, complaintDetailsFragment).addToBackStack(TAG).commit(); activity.getSupportFragmentManager().beginTransaction().replace(R.id.framelayout_for_fragment, complaintFragment).addToBackStack(TAG).commit();
} }
}); });
...@@ -124,18 +113,19 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -124,18 +113,19 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
bundle.putString("id", complaintList.get(pos).getComplaintID()); bundle.putString("id", complaintList.get(pos).getComplaintID());
bundle.putString("sessionId", sessionID); bundle.putString("sessionId", sessionID);
bundle.putString("userId", userID); bundle.putString("userId", userID);
ComplaintDetailsFragment complaintDetailsFragment = new ComplaintDetailsFragment(); bundle.putString("userProfileUrl", userProfileUrl);
complaintDetailsFragment.setArguments(bundle); ComplaintFragment complaintFragment = new ComplaintFragment();
complaintFragment.setArguments(bundle);
AppCompatActivity activity = (AppCompatActivity) context; AppCompatActivity activity = (AppCompatActivity) context;
activity.getSupportFragmentManager().beginTransaction().replace(R.id.framelayout_for_fragment, complaintDetailsFragment).addToBackStack(TAG).commit(); activity.getSupportFragmentManager().beginTransaction().replace(R.id.framelayout_for_fragment, complaintFragment).addToBackStack(TAG).commit();
} }
}); });
buttonVotes.setOnClickListener(new View.OnClickListener() { buttonVotes.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (voteCount == 0) { if (complaintList.get(position).getVoteCount() == 0) {
RetrofitInterface retrofitInterface = Utils.getRetrofitInterface(); RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.upVote("sessionid=" + sessionID, complaintList.get(pos).getComplaintID()).enqueue(new Callback<Venter.Complaint>() { retrofitInterface.upVote("sessionid=" + sessionID, complaintList.get(pos).getComplaintID(), 1).enqueue(new Callback<Venter.Complaint>() {
@Override @Override
public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) { public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
...@@ -143,8 +133,26 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -143,8 +133,26 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
if (complaint != null) { if (complaint != null) {
textViewVotes.setText(String.valueOf(complaint.getUsersUpVoted().size())); textViewVotes.setText(String.valueOf(complaint.getUsersUpVoted().size()));
} }
Toast.makeText(context, "You have Up Voted this complaint", Toast.LENGTH_SHORT).show(); complaintList.get(position).setVoteCount(1);
voteCount++; }
}
@Override
public void onFailure(Call<Venter.Complaint> call, Throwable t) {
Log.i(TAG, "failure in up vote: " + t.toString());
}
});
} else if (complaintList.get(position).getVoteCount() == 1) {
RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.upVote("sessionid=" + sessionID, complaintList.get(pos).getComplaintID(), 0).enqueue(new Callback<Venter.Complaint>() {
@Override
public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) {
if (response.isSuccessful()) {
Venter.Complaint complaint = response.body();
if (complaint != null) {
textViewVotes.setText(String.valueOf(complaint.getUsersUpVoted().size()));
}
complaintList.get(position).setVoteCount(0);
} }
} }
...@@ -153,8 +161,6 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -153,8 +161,6 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
Log.i(TAG, "failure in up vote: " + t.toString()); Log.i(TAG, "failure in up vote: " + t.toString());
} }
}); });
} else {
Toast.makeText(context, "You have already UpVoted this complaint", Toast.LENGTH_SHORT).show();
} }
} }
}); });
...@@ -164,10 +170,11 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -164,10 +170,11 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
} }
} }
public ComplaintsRecyclerViewAdapter(Activity ctx, String sessionID, String userID) { public ComplaintsAdapter(Activity ctx, String sessionID, String userID, String userProfileUrl) {
this.context = ctx; this.context = ctx;
this.sessionID = sessionID; this.sessionID = sessionID;
this.userID = userID; this.userID = userID;
this.userProfileUrl = userProfileUrl;
inflater = LayoutInflater.from(ctx); inflater = LayoutInflater.from(ctx);
} }
...@@ -181,6 +188,13 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler ...@@ -181,6 +188,13 @@ public class ComplaintsRecyclerViewAdapter extends RecyclerView.Adapter<Recycler
@Override @Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) { public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int position) {
List<User> userList = complaintList.get(position).getUsersUpVoted();
for (User user : userList) {
if (user.getUserID().equals(userID))
complaintList.get(position).setVoteCount(1);
else
complaintList.get(position).setVoteCount(0);
}
if (viewHolder instanceof ComplaintsViewHolder) { if (viewHolder instanceof ComplaintsViewHolder) {
((ComplaintsViewHolder) viewHolder).bindHolder(position); ((ComplaintsViewHolder) viewHolder).bindHolder(position);
} }
......
app/src/main/java/app/insti/adapter/UpVotesAdapter.java 0 → 100644
View file @ 143b9855
package app.insti.adapter;
import android.app.Activity;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
import android.support.v7.widget.CardView;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import app.insti.R;
import app.insti.Utils;
import app.insti.api.model.User;
import de.hdodenhof.circleimageview.CircleImageView;
public class UpVotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
private static final String TAG = CommentsAdapter.class.getSimpleName();
Context context;
private LayoutInflater inflater;
String sessionId, userId;
Activity activity;
TextView textViewUserUpVoteName;
private Fragment fragment;
LinearLayout layoutUpVote;
private List<User> userList = new ArrayList<>();
public UpVotesAdapter(Activity activity, Context context, String sessionId, String userId, TextView textViewUserUpVoteName, Fragment fragment) {
this.context = context;
this.sessionId = sessionId;
this.userId = userId;
inflater = LayoutInflater.from(context);
this.activity = activity;
this.textViewUserUpVoteName = textViewUserUpVoteName;
this.fragment = fragment;
}
public class UpVotesViewHolder extends RecyclerView.ViewHolder {
private CardView cardView;
private CircleImageView circleImageView;
private TextView textViewName;
public UpVotesViewHolder(View itemView) {
super(itemView);
cardView = itemView.findViewById(R.id.cardViewUpVote);
textViewName = itemView.findViewById(R.id.textViewUserUpVoteName);
circleImageView = itemView.findViewById(R.id.circleImageViewUserUpVoteImage);
cardView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Utils.openUserFragment(userList.get(getAdapterPosition()), fragment.getActivity());
}
});
}
public void bindHolder(final int position) {
final User user = userList.get(position);
try {
String profileUrl = user.getUserProfilePictureUrl();
Log.i(TAG, "PROFILE URL: " + profileUrl);
Picasso.get().load(profileUrl).placeholder(R.drawable.user_placeholder).into(circleImageView);
textViewName.setText(user.getUserName());
} catch (Exception e) {
e.printStackTrace();
}
}
}
@NonNull
@Override
public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
View view = inflater.inflate(R.layout.vote_up_card, viewGroup, false);
final UpVotesViewHolder upVotesViewHolder = new UpVotesViewHolder(view);
layoutUpVote = view.findViewById(R.id.layoutUpVote);
return upVotesViewHolder;
}
@Override
public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
if (viewHolder instanceof UpVotesViewHolder) {
((UpVotesViewHolder) viewHolder).bindHolder(i);
}
}
@Override
public int getItemCount() {
return userList.size();
}
public void setUpVoteList(List<User> userList) {
this.userList = userList;
}
}
\ No newline at end of file
app/src/main/java/app/insti/api/LocationAPIUtils.java
View file @ 143b9855
...@@ -21,8 +21,8 @@ import com.google.android.gms.maps.model.MarkerOptions; ...@@ -21,8 +21,8 @@ import com.google.android.gms.maps.model.MarkerOptions;
public class LocationAPIUtils { public class LocationAPIUtils {
private static final String TAG = LocationAPIUtils.class.getSimpleName(); private static final String TAG = LocationAPIUtils.class.getSimpleName();
GoogleMap googleMap; private GoogleMap googleMap;
MapView mMapView; private MapView mMapView;
public LocationAPIUtils(GoogleMap googleMap, MapView mMapView) { public LocationAPIUtils(GoogleMap googleMap, MapView mMapView) {
this.googleMap = googleMap; this.googleMap = googleMap;
......
app/src/main/java/app/insti/api/RetrofitInterface.java
View file @ 143b9855
...@@ -123,8 +123,8 @@ public interface RetrofitInterface { ...@@ -123,8 +123,8 @@ public interface RetrofitInterface {
@GET("venter/complaints/{complaintId}") @GET("venter/complaints/{complaintId}")
Call<Venter.Complaint> getComplaint(@Header("Cookie") String sessionId, @Path("complaintId") String complaintId); Call<Venter.Complaint> getComplaint(@Header("Cookie") String sessionId, @Path("complaintId") String complaintId);
@PUT("venter/complaints/{complaintId}") @GET("venter/complaints/{complaintId}/upvote")
Call<Venter.Complaint> upVote(@Header("Cookie") String sessionId, @Path("complaintId") String complaintId); Call<Venter.Complaint> upVote(@Header("Cookie") String sessionId, @Path("complaintId") String complaintId, @Query("action") int count);
@POST("venter/complaints") @POST("venter/complaints")
Call<ComplaintCreateResponse> postComplaint(@Header("Cookie") String sessionId, @Body ComplaintCreateRequest complaintCreateRequest); Call<ComplaintCreateResponse> postComplaint(@Header("Cookie") String sessionId, @Body ComplaintCreateRequest complaintCreateRequest);
......
app/src/main/java/app/insti/api/model/Venter.java
View file @ 143b9855
...@@ -5,6 +5,7 @@ import com.google.gson.annotations.SerializedName; ...@@ -5,6 +5,7 @@ import com.google.gson.annotations.SerializedName;
import java.util.List; import java.util.List;
import app.insti.api.model.User; import app.insti.api.model.User;
import app.insti.interfaces.Browsable;
/** /**
* Created by Shivam Sharma on 04-09-2018. * Created by Shivam Sharma on 04-09-2018.
...@@ -12,36 +13,33 @@ import app.insti.api.model.User; ...@@ -12,36 +13,33 @@ import app.insti.api.model.User;
public class Venter { public class Venter {
public Venter(){ public static class Complaint{
}
public static class Complaint {
@NonNull @NonNull
@SerializedName("id") @SerializedName("id")
String complaintID; private String complaintID;
@SerializedName("created_by") @SerializedName("created_by")
User complaintCreatedBy; User complaintCreatedBy;
@SerializedName("description") @SerializedName("description")
String description; private String description;
@SerializedName("report_date") @SerializedName("report_date")
String complaintReportDate; private String complaintReportDate;
@SerializedName("status") @SerializedName("status")
String status; private String status;
@SerializedName("latitude") @SerializedName("latitude")
Float latitude; private Float latitude;
@SerializedName("longitude") @SerializedName("longitude")
Float longitude; private Float longitude;
@SerializedName("location_description") @SerializedName("location_description")
String locationDescription; private String locationDescription;
@SerializedName("tags") @SerializedName("tags")
List<TagUri> tags; private List<TagUri> tags;
@SerializedName("users_up_voted") @SerializedName("users_up_voted")
List<User> usersUpVoted; private List<User> usersUpVoted;
@SerializedName("images") @SerializedName("images")
List<String> images; private List<String> images;
@SerializedName("comments") @SerializedName("comments")
List<Comment> comment; private List<Comment> comment;
private int voteCount;
public Complaint(@NonNull String complaintID, User complaintCreatedBy, String description, String complaintReportDate, String status, Float latitude, Float longitude, String locationDescription, List<TagUri> tags, List<User> usersUpVoted, List<String> images, List<Comment> comment) { public Complaint(@NonNull String complaintID, User complaintCreatedBy, String description, String complaintReportDate, String status, Float latitude, Float longitude, String locationDescription, List<TagUri> tags, List<User> usersUpVoted, List<String> images, List<Comment> comment) {
this.complaintID = complaintID; this.complaintID = complaintID;
...@@ -154,6 +152,14 @@ public class Venter { ...@@ -154,6 +152,14 @@ public class Venter {
public void setComment(List<Comment> comment) { public void setComment(List<Comment> comment) {
this.comment = comment; this.comment = comment;
} }
public int getVoteCount() {
return voteCount;
}
public void setVoteCount(int voteCount) {
this.voteCount = voteCount;
}
} }
public static class TagUri { public static class TagUri {
......
app/src/main/java/app/insti/fragment/ComplaintDetailsFragment.java
View file @ 143b9855
package app.insti.fragment; package app.insti.fragment;
import android.content.res.TypedArray; import android.content.res.ColorStateList;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.view.ViewPager; import android.support.v7.widget.LinearLayoutManager;
import android.util.DisplayMetrics; import android.support.v7.widget.RecyclerView;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.gms.maps.CameraUpdateFactory;
import java.util.Objects; import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapView;
import com.google.android.gms.maps.MapsInitializer;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity; import app.insti.activity.MainActivity;
import app.insti.adapter.ComplaintDetailsPagerAdapter; import app.insti.adapter.CommentsAdapter;
import app.insti.adapter.ImageViewPagerAdapter; import app.insti.adapter.UpVotesAdapter;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.User; import app.insti.api.model.User;
import app.insti.api.model.Venter; import app.insti.api.model.Venter;
import me.relex.circleindicator.CircleIndicator; import app.insti.api.request.CommentCreateRequest;
import app.insti.utils.DateTimeUtil;
import de.hdodenhof.circleimageview.CircleImageView;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class ComplaintDetailsFragment extends Fragment { public class ComplaintDetailsFragment extends Fragment {
private static final String TAG = ComplaintDetailsFragment.class.getSimpleName(); private final String TAG = ComplaintDetailsFragment.class.getSimpleName();
TabLayout slidingTabLayout; private Venter.Complaint detailedComplaint;
ViewPager viewPager; private MapView mMapView;
View mview; private GoogleMap googleMap;
private String complaintId, sessionID, userId;
private ComplaintDetailsPagerAdapter complaintDetailsPagerAdapter; private TextView textViewUserName;
CircleIndicator circleIndicator; private TextView textViewReportDate;
private int voteCount = 0; private TextView textViewLocation;
private TextView textViewDescription;
private TextView textViewCommentLabel;
private TextView textViewVoteUpLabel;
private TextView textViewStatus;
private LinearLayout tagsLayout;
private EditText editTextComment;
private ImageButton imageButtonSend;
private CircleImageView circleImageViewCommentUserImage;
private RecyclerView recyclerViewComments;
private RecyclerView recyclerViewUpVotes;
private Button buttonVoteUp;
private static String sId, cId, uId, uProfileUrl;
private CommentsAdapter commentListAdapter;
private UpVotesAdapter upVotesAdapter;
private List<Venter.Comment> commentList;
private List<User> upVotesList;
private LinearLayout linearLayoutTags;
TextView textViewUserUpVoteName;
List<String> tagsList;
public static ComplaintDetailsFragment getInstance(String sessionid, String complaintid, String userid, String userProfileUrl) {
sId = sessionid;
cId = complaintid;
uId = userid;
uProfileUrl = userProfileUrl;
return new ComplaintDetailsFragment();
}
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_complaint_details, container, false); View view = inflater.inflate(R.layout.fragment_complaint_details, container, false);
commentList = new ArrayList<>();
initialiseViews(view);
upVotesList = new ArrayList<>();
tagsList = new ArrayList<>();
commentListAdapter = new CommentsAdapter(getActivity(), getContext(), sId, uId, textViewCommentLabel, this);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
upVotesAdapter = new UpVotesAdapter(getActivity(), getContext(), sId, uId, textViewUserUpVoteName, this);
recyclerViewComments.setLayoutManager(linearLayoutManager);
recyclerViewUpVotes.setLayoutManager(new LinearLayoutManager(getContext()));
recyclerViewComments.setHasFixedSize(true);
recyclerViewUpVotes.setHasFixedSize(true);
recyclerViewComments.setAdapter(commentListAdapter);
recyclerViewUpVotes.setAdapter(upVotesAdapter);
upVotesAdapter.setUpVoteList(upVotesList);
upVotesAdapter.notifyDataSetChanged();
mMapView = view.findViewById(R.id.google_map);
mMapView.onCreate(savedInstanceState);
mMapView.onResume();
LinearLayout imageViewHolder = view.findViewById(R.id.image_holder_view); try {
CollapsingToolbarLayout.LayoutParams layoutParams = new CollapsingToolbarLayout.LayoutParams MapsInitializer.initialize(getActivity().getApplicationContext());
(CollapsingToolbarLayout.LayoutParams.MATCH_PARENT, } catch (Exception e) {
getResources().getDisplayMetrics().heightPixels / 2); e.printStackTrace();
imageViewHolder.setLayoutParams(layoutParams);
slidingTabLayout = view.findViewById(R.id.sliding_tab_layout);
circleIndicator = view.findViewById(R.id.indicator);
this.mview = view;
return view;
} }
imageButtonSend.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onClick(View v) {
super.onViewCreated(view, savedInstanceState); if (!(editTextComment.getText().toString().trim().isEmpty())) {
postComment();
Bundle bundle = getArguments(); } else {
complaintId = bundle.getString("id"); Toast.makeText(getContext(), "Please enter comment text", Toast.LENGTH_SHORT).show();
sessionID = bundle.getString("sessionId");
userId = bundle.getString("userId");
if (bundle != null) {
Log.i(TAG, "bundle != null");
callServerToGetDetailedComplaint();
} }
} }
});
private void callServerToGetDetailedComplaint() { buttonVoteUp.setOnClickListener(new View.OnClickListener() {
RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.getComplaint("sessionid=" + sessionID, complaintId).enqueue(new Callback<Venter.Complaint>() {
@Override @Override
public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) { public void onClick(View v) {
if (response.body() != null) { upVote(detailedComplaint);
Venter.Complaint complaint = response.body();
for (User currentUser : complaint.getUsersUpVoted()) {
if (currentUser.getUserID().equals(userId)) {
voteCount = 1;
}
}
initViewPagerForImages(complaint);
initTabViews(complaint);
} }
});
return view;
} }
@Override private void initialiseViews(View view) {
public void onFailure(Call<Venter.Complaint> call, Throwable t) { textViewUserName = view.findViewById(R.id.textViewUserName);
if (t != null) { textViewReportDate = view.findViewById(R.id.textViewReportDate);
Log.i(TAG, "error and t = " + t.toString()); textViewLocation = view.findViewById(R.id.textViewLocation);
} textViewDescription = view.findViewById(R.id.textViewDescription);
} textViewStatus = view.findViewById(R.id.textViewStatus);
}); textViewCommentLabel = view.findViewById(R.id.comment_label);
textViewVoteUpLabel = view.findViewById(R.id.up_vote_label);
tagsLayout = view.findViewById(R.id.tags_layout);
linearLayoutTags = view.findViewById(R.id.linearLayoutTags);
recyclerViewComments = view.findViewById(R.id.recyclerViewComments);
recyclerViewUpVotes = view.findViewById(R.id.recyclerViewUpVotes);
editTextComment = view.findViewById(R.id.edit_comment);
imageButtonSend = view.findViewById(R.id.send_comment);
circleImageViewCommentUserImage = view.findViewById(R.id.comment_user_image);
buttonVoteUp = view.findViewById(R.id.buttonVoteUp);
} }
private void initViewPagerForImages(Venter.Complaint detailedComplaint) { public void setDetailedComplaint(Venter.Complaint detailedComplaint) {
this.detailedComplaint = detailedComplaint;
populateViews();
}
viewPager = mview.findViewById(R.id.complaint_image_view_pager); private void populateViews() {
if (viewPager != null) {
try { try {
ImageViewPagerAdapter imageFragmentPagerAdapter = new ImageViewPagerAdapter(getChildFragmentManager(), detailedComplaint); buttonVoteUp.setText("UpVote");
textViewUserName.setText(detailedComplaint.getComplaintCreatedBy().getUserName());
viewPager.setAdapter(imageFragmentPagerAdapter); String time = DateTimeUtil.getDate(detailedComplaint.getComplaintReportDate().toString());
circleIndicator.setViewPager(viewPager); Log.i(TAG, " time: " + time);
imageFragmentPagerAdapter.registerDataSetObserver(circleIndicator.getDataSetObserver()); textViewReportDate.setText(time);
viewPager.getAdapter().notifyDataSetChanged(); textViewLocation.setText(detailedComplaint.getLocationDescription());
synchronized (viewPager) { textViewDescription.setText(detailedComplaint.getDescription());
viewPager.notifyAll(); textViewStatus.setText(detailedComplaint.getStatus().toUpperCase());
if (detailedComplaint.getStatus().equalsIgnoreCase("Reported")) {
textViewStatus.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorRed)));
textViewStatus.setTextColor(getContext().getResources().getColor(R.color.primaryTextColor));
} else if (detailedComplaint.getStatus().equalsIgnoreCase("In Progress")) {
textViewStatus.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorSecondary)));
textViewStatus.setTextColor(getContext().getResources().getColor(R.color.secondaryTextColor));
} else if (detailedComplaint.getStatus().equalsIgnoreCase("Resolved")) {
textViewStatus.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorGreen)));
textViewStatus.setTextColor(getContext().getResources().getColor(R.color.secondaryTextColor));
} }
addTagsToView(detailedComplaint);
if (detailedComplaint.getTags().isEmpty())
linearLayoutTags.setVisibility(View.GONE);
textViewCommentLabel.setText("Comments (" + detailedComplaint.getComment().size() + ")");
textViewVoteUpLabel.setText("Up Votes (" + detailedComplaint.getUsersUpVoted().size() + ")");
Picasso.get().load(uProfileUrl).placeholder(R.drawable.user_placeholder).into(circleImageViewCommentUserImage);
addVotesToView(detailedComplaint);
addCommentsToView(detailedComplaint);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
mMapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(GoogleMap mGoogleMap) {
googleMap = mGoogleMap;
// For dropping a marker at a point on the Map
LatLng loc = new LatLng(detailedComplaint.getLatitude(), detailedComplaint.getLongitude());
if (loc != null) {
googleMap.addMarker(new MarkerOptions().position(loc).title(detailedComplaint.getLatitude().toString() + " , " + detailedComplaint.getLongitude().toString()).snippet(detailedComplaint.getLocationDescription()));
// For zooming automatically to the location of the marker
CameraPosition cameraPosition = new CameraPosition.Builder().target(loc).zoom(16).build();
googleMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
} }
} }
});
}
private void initTabViews(final Venter.Complaint detailedComplaint) { private void postComment() {
final CommentCreateRequest commentCreateRequest = new CommentCreateRequest(editTextComment.getText().toString());
try { RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
if (detailedComplaint != null) { retrofitInterface.postComment("sessionid=" + sId, cId, commentCreateRequest).enqueue(new Callback<Venter.Comment>() {
viewPager = mview.findViewById(R.id.tab_viewpager_details); @Override
if (viewPager != null) { public void onResponse(Call<Venter.Comment> call, Response<Venter.Comment> response) {
Log.i(TAG, "viewPager != null"); if (response.isSuccessful()) {
complaintDetailsPagerAdapter = new ComplaintDetailsPagerAdapter(getChildFragmentManager(), detailedComplaint, getContext(), sessionID, complaintId, userId, voteCount); Venter.Comment comment = response.body();
addNewComment(comment);
editTextComment.setText(null);
}
}
viewPager.setAdapter(complaintDetailsPagerAdapter); @Override
slidingTabLayout.setupWithViewPager(viewPager); public void onFailure(Call<Venter.Comment> call, Throwable t) {
Log.i(TAG, "failure in posting comments: " + t.toString());
}
});
}
slidingTabLayout.post(new Runnable() { private void addNewComment(Venter.Comment newComment) {
commentList.add(newComment);
commentListAdapter.setCommentList(commentList);
commentListAdapter.notifyItemInserted(commentList.indexOf(newComment));
commentListAdapter.notifyItemRangeChanged(0, commentListAdapter.getItemCount());
textViewCommentLabel.setText("Comments (" + commentList.size() + ")");
recyclerViewComments.post(new Runnable() {
@Override @Override
public void run() { public void run() {
int tablLayoutWidth = slidingTabLayout.getWidth(); MainActivity.hideKeyboard(getActivity());
}
DisplayMetrics metrics = new DisplayMetrics(); });
Objects.requireNonNull(getActivity()).getWindowManager().getDefaultDisplay().getMetrics(metrics); }
int deviceWidth = metrics.widthPixels;
if (tablLayoutWidth <= deviceWidth) {
final TypedArray styledAttributes = Objects.requireNonNull(ComplaintDetailsFragment.this.getActivity()).getTheme().obtainStyledAttributes(
new int[]{android.R.attr.actionBarSize});
int mActionBarSize = (int) styledAttributes.getDimension(0, 0);
styledAttributes.recycle();
// Replace second parameter to mActionBarSize after adding "Relevant Complaints"
AppBarLayout.LayoutParams layoutParams = new AppBarLayout.LayoutParams(AppBarLayout.LayoutParams.MATCH_PARENT,
0);
slidingTabLayout.setLayoutParams(layoutParams);
slidingTabLayout.setTabMode(TabLayout.MODE_FIXED); private void addCommentsToView(Venter.Complaint detailedComplaint) {
slidingTabLayout.setTabGravity(TabLayout.GRAVITY_FILL); for (Venter.Comment comment : detailedComplaint.getComment())
commentList.add(comment);
commentListAdapter.setCommentList(commentList);
commentListAdapter.notifyDataSetChanged();
}
} else { private void upVote(final Venter.Complaint detailedComplaint) {
slidingTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
if (detailedComplaint.getVoteCount() == 0) {
retrofitInterface.upVote("sessionid=" + sId, cId, 1).enqueue(new Callback<Venter.Complaint>() {
@Override
public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) {
if (response.isSuccessful()) {
Venter.Complaint complaint = response.body();
detailedComplaint.setVoteCount(1);
addVotesToView(complaint);
} }
} }
});
slidingTabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override @Override
public void onTabSelected(TabLayout.Tab tab) { public void onFailure(Call<Venter.Complaint> call, Throwable t) {
viewPager.setCurrentItem(tab.getPosition()); Log.i(TAG, "failure in up vote: " + t.toString());
} }
});
} else if (detailedComplaint.getVoteCount() ==1){
retrofitInterface.upVote("sessionid=" + sId, cId, 0).enqueue(new Callback<Venter.Complaint>() {
@Override @Override
public void onTabUnselected(TabLayout.Tab tab) { public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) {
if (response.isSuccessful()) {
Venter.Complaint complaint = response.body();
detailedComplaint.setVoteCount(0);
addVotesToView(complaint);
}
} }
@Override @Override
public void onTabReselected(TabLayout.Tab tab) { public void onFailure(Call<Venter.Complaint> call, Throwable t) {
Log.i(TAG, "failure in up vote: " + t.toString());
} }
}); });
}
}
DetailedComplaintFragment detailedComplaintFragment = (DetailedComplaintFragment) getChildFragmentManager().findFragmentByTag( public void addVotesToView(Venter.Complaint detailedComplaint) {
"android:switcher:" + R.id.tab_viewpager_details + ":0" upVotesList.clear();
); for (User users : detailedComplaint.getUsersUpVoted()) {
upVotesList.add(users);
}
upVotesAdapter.setUpVoteList(upVotesList);
upVotesAdapter.notifyDataSetChanged();
textViewVoteUpLabel.setText("Up Votes (" + detailedComplaint.getUsersUpVoted().size() + ")");
}
if (detailedComplaintFragment != null) private void addTagsToView(Venter.Complaint detailedComplaint) {
detailedComplaintFragment.setDetailedComplaint(detailedComplaint);
for (Venter.TagUri tagUri : detailedComplaint.getTags()) {
TextView textViewTags = new TextView(getContext());
LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
LinearLayout.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(10,10,10,10);
textViewTags.setLayoutParams(layoutParams);
textViewTags.setText(tagUri.getTagUri());
textViewTags.setBackgroundResource(R.drawable.customborder);
textViewTags.setPadding(30,25,30,25);
int fontDp = 4;
float density = getContext().getResources().getDisplayMetrics().density;
int fontPixel = (int) (fontDp * density);
textViewTags.setTextSize(fontPixel);
textViewTags.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorTagGreen)));
textViewTags.setTextColor(getContext().getResources().getColor(R.color.primaryTextColor));
tagsLayout.setLayoutParams(layoutParams);
tagsLayout.addView(textViewTags);
} }
} }
} catch (Exception e) {
e.printStackTrace(); @Override
public void onResume() {
super.onResume();
mMapView.onResume();
} }
@Override
public void onPause() {
super.onPause();
mMapView.onPause();
}
@Override
public void onDestroy() {
super.onDestroy();
mMapView.onDestroy();
}
@Override
public void onLowMemory() {
super.onLowMemory();
mMapView.onLowMemory();
} }
} }
\ No newline at end of file
app/src/main/java/app/insti/fragment/ComplaintFragment.java
View file @ 143b9855
package app.insti.fragment; package app.insti.fragment;
import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.design.widget.AppBarLayout; import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout; import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.app.FragmentManager; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.LinearLayout;
import java.util.Objects;
import app.insti.Constants;
import app.insti.R; import app.insti.R;
import app.insti.adapter.ComplaintFragmentViewPagerAdapter; import app.insti.Utils;
import app.insti.adapter.ComplaintDetailsPagerAdapter;
public class ComplaintFragment extends BaseFragment { import app.insti.adapter.ImageViewPagerAdapter;
import app.insti.api.RetrofitInterface;
private static String TAG = ComplaintFragment.class.getSimpleName(); import app.insti.api.model.User;
String userID; import app.insti.api.model.Venter;
Context context; import me.relex.circleindicator.CircleIndicator;
private Button buttonVentIssues; import retrofit2.Call;
private ViewPager viewPager; import retrofit2.Callback;
import retrofit2.Response;
public class ComplaintFragment extends Fragment {
private static final String TAG = ComplaintFragment.class.getSimpleName();
private TabLayout slidingTabLayout; private TabLayout slidingTabLayout;
private CollapsingToolbarLayout collapsingToolbarLayout; private ViewPager viewPager;
private View mview;
public ComplaintFragment() { private String complaintId, sessionID, userId, userProfileUrl;
// Required empty public constructor private ComplaintDetailsPagerAdapter complaintDetailsPagerAdapter;
} private CircleIndicator circleIndicator;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_complaint, container, false); View view = inflater.inflate(R.layout.fragment_complaint, container, false);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Complaints/Suggestions");
Bundle bundle = getArguments(); LinearLayout imageViewHolder = view.findViewById(R.id.image_holder_view);
userID = bundle.getString(Constants.USER_ID); CollapsingToolbarLayout.LayoutParams layoutParams = new CollapsingToolbarLayout.LayoutParams
collapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar); (CollapsingToolbarLayout.LayoutParams.MATCH_PARENT,
collapsingToolbarLayout.setTitleEnabled(false); getResources().getDisplayMetrics().heightPixels / 2);
viewPager = (ViewPager) view.findViewById(R.id.tab_viewpager); imageViewHolder.setLayoutParams(layoutParams);
slidingTabLayout = view.findViewById(R.id.sliding_tab_layout);
circleIndicator = view.findViewById(R.id.indicator);
this.mview = view;
return view;
}
slidingTabLayout = (TabLayout) view.findViewById(R.id.sliding_tab_layout); @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
context = getContext(); Bundle bundle = getArguments();
complaintId = bundle.getString("id");
sessionID = bundle.getString("sessionId");
userId = bundle.getString("userId");
userProfileUrl = bundle.getString("userProfileUrl");
if (bundle != null) {
Log.i(TAG, "bundle != null");
callServerToGetDetailedComplaint();
}
}
buttonVentIssues = view.findViewById(R.id.buttonVentIssues); private void callServerToGetDetailedComplaint() {
buttonVentIssues.setOnClickListener(new View.OnClickListener() { RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.getComplaint("sessionid=" + sessionID, complaintId).enqueue(new Callback<Venter.Complaint>() {
@Override @Override
public void onClick(View v) { public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) {
FileComplaintFragment fileComplaintFragment = new FileComplaintFragment(); if (response.body() != null) {
fileComplaintFragment.setArguments(getArguments()); Venter.Complaint complaint = response.body();
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction(); for (User currentUser : complaint.getUsersUpVoted()) {
fragmentTransaction.replace(R.id.framelayout_for_fragment, fileComplaintFragment, fileComplaintFragment.getTag()); if (currentUser.getUserID().equals(userId)) {
fragmentTransaction.addToBackStack("Complaint Fragment").commit(); complaint.setVoteCount(1);
} else {
complaint.setVoteCount(0);
}
}
initViewPagerForImages(complaint);
initTabViews(complaint);
}
} }
});
viewPager = view.findViewById(R.id.tab_viewpager); @Override
public void onFailure(Call<Venter.Complaint> call, Throwable t) {
if (t != null) {
Log.i(TAG, "error and t = " + t.toString());
}
}
});
}
slidingTabLayout = view.findViewById(R.id.sliding_tab_layout); private void initViewPagerForImages(Venter.Complaint detailedComplaint) {
viewPager = mview.findViewById(R.id.complaint_image_view_pager);
if (viewPager != null) { if (viewPager != null) {
setupViewPager(viewPager); try {
ImageViewPagerAdapter imageFragmentPagerAdapter = new ImageViewPagerAdapter(getChildFragmentManager(), detailedComplaint);
viewPager.setAdapter(imageFragmentPagerAdapter);
circleIndicator.setViewPager(viewPager);
imageFragmentPagerAdapter.registerDataSetObserver(circleIndicator.getDataSetObserver());
viewPager.getAdapter().notifyDataSetChanged();
synchronized (viewPager) {
viewPager.notifyAll();
}
} catch (Exception e) {
e.printStackTrace();
}
} }
return view;
} }
private void setupViewPager(final ViewPager viewPager) { private void initTabViews(final Venter.Complaint detailedComplaint) {
try {
if (detailedComplaint != null) {
viewPager = mview.findViewById(R.id.tab_viewpager_details);
if (viewPager != null) {
Log.i(TAG, "viewPager != null");
complaintDetailsPagerAdapter = new ComplaintDetailsPagerAdapter(getChildFragmentManager(), detailedComplaint, getContext(), sessionID, complaintId, userId, userProfileUrl);
viewPager.setAdapter(new ComplaintFragmentViewPagerAdapter(getChildFragmentManager(), getContext(), userID, getArguments().getString(Constants.SESSION_ID))); viewPager.setAdapter(complaintDetailsPagerAdapter);
slidingTabLayout.setupWithViewPager(viewPager); slidingTabLayout.setupWithViewPager(viewPager);
slidingTabLayout.post(new Runnable() { slidingTabLayout.post(new Runnable() {
@Override @Override
public void run() { public void run() {
int tabLayoutWidth = slidingTabLayout.getWidth(); int tablLayoutWidth = slidingTabLayout.getWidth();
DisplayMetrics metrics = new DisplayMetrics(); DisplayMetrics metrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics); Objects.requireNonNull(getActivity()).getWindowManager().getDefaultDisplay().getMetrics(metrics);
int deviceWidth = metrics.widthPixels; int deviceWidth = metrics.widthPixels;
if (tabLayoutWidth <= (deviceWidth + 1)) { if (tablLayoutWidth <= deviceWidth) {
final TypedArray styledAttributes = getActivity().getTheme().obtainStyledAttributes(
new int[]{android.R.attr.actionBarSize}
);
final TypedArray styledAttributes = Objects.requireNonNull(ComplaintFragment.this.getActivity()).getTheme().obtainStyledAttributes(
new int[]{android.R.attr.actionBarSize});
int mActionBarSize = (int) styledAttributes.getDimension(0, 0); int mActionBarSize = (int) styledAttributes.getDimension(0, 0);
styledAttributes.recycle(); styledAttributes.recycle();
AppBarLayout.LayoutParams layoutParams = new AppBarLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, // Replace second parameter to mActionBarSize after adding "Relevant Complaints"
mActionBarSize); AppBarLayout.LayoutParams layoutParams = new AppBarLayout.LayoutParams(AppBarLayout.LayoutParams.MATCH_PARENT,
0);
slidingTabLayout.setLayoutParams(layoutParams); slidingTabLayout.setLayoutParams(layoutParams);
slidingTabLayout.setTabMode(TabLayout.MODE_FIXED); slidingTabLayout.setTabMode(TabLayout.MODE_FIXED);
slidingTabLayout.setTabGravity(TabLayout.GRAVITY_FILL); slidingTabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
} else { } else {
slidingTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); slidingTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
} }
...@@ -128,6 +179,16 @@ public class ComplaintFragment extends BaseFragment { ...@@ -128,6 +179,16 @@ public class ComplaintFragment extends BaseFragment {
} }
}); });
viewPager.setOffscreenPageLimit(3); ComplaintDetailsFragment complaintDetailsFragment = (ComplaintDetailsFragment) getChildFragmentManager().findFragmentByTag(
"android:switcher:" + R.id.tab_viewpager_details + ":0"
);
if (complaintDetailsFragment != null)
complaintDetailsFragment.setDetailedComplaint(detailedComplaint);
}
}
} catch (Exception e) {
e.printStackTrace();
}
} }
} }
\ No newline at end of file
app/src/main/java/app/insti/fragment/ComplaintsFragment.java 0 → 100644
View file @ 143b9855
package app.insti.fragment;
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Bundle;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.design.widget.TabLayout;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
import android.util.DisplayMetrics;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import app.insti.Constants;
import app.insti.R;
import app.insti.adapter.ComplaintFragmentViewPagerAdapter;
public class ComplaintsFragment extends BaseFragment {
String userID, userProfileUrl;
Context context;
Button buttonVentIssues;
ViewPager viewPager;
private TabLayout slidingTabLayout;
CollapsingToolbarLayout collapsingToolbarLayout;
public ComplaintsFragment() {
// Required empty public constructor
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_complaints, container, false);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Complaints/Suggestions");
Bundle bundle = getArguments();
userID = bundle.getString(Constants.USER_ID);
userProfileUrl = bundle.getString(Constants.CURRENT_USER_PROFILE_PICTURE);
collapsingToolbarLayout = view.findViewById(R.id.collapsing_toolbar);
collapsingToolbarLayout.setTitleEnabled(false);
viewPager = (ViewPager) view.findViewById(R.id.tab_viewpager);
slidingTabLayout = (TabLayout) view.findViewById(R.id.sliding_tab_layout);
context = getContext();
buttonVentIssues = view.findViewById(R.id.buttonVentIssues);
buttonVentIssues.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
FileComplaintFragment fileComplaintFragment = new FileComplaintFragment();
fileComplaintFragment.setArguments(getArguments());
FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.framelayout_for_fragment, fileComplaintFragment, fileComplaintFragment.getTag());
fragmentTransaction.addToBackStack("Complaint Fragment").commit();
}
});
viewPager = view.findViewById(R.id.tab_viewpager);
slidingTabLayout = view.findViewById(R.id.sliding_tab_layout);
if (viewPager != null) {
setupViewPager(viewPager);
}
return view;
}
private void setupViewPager(final ViewPager viewPager) {
viewPager.setAdapter(new ComplaintFragmentViewPagerAdapter(getChildFragmentManager(), getContext(), userID, getArguments().getString(Constants.SESSION_ID), userProfileUrl));
slidingTabLayout.setupWithViewPager(viewPager);
slidingTabLayout.post(new Runnable() {
@Override
public void run() {
int tabLayoutWidth = slidingTabLayout.getWidth();
DisplayMetrics metrics = new DisplayMetrics();
getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
int deviceWidth = metrics.widthPixels;
if (tabLayoutWidth <= (deviceWidth + 1)) {
final TypedArray styledAttributes = getActivity().getTheme().obtainStyledAttributes(
new int[]{android.R.attr.actionBarSize}
);
int mActionBarSize = (int) styledAttributes.getDimension(0, 0);
styledAttributes.recycle();
AppBarLayout.LayoutParams layoutParams = new AppBarLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
mActionBarSize);
slidingTabLayout.setLayoutParams(layoutParams);
slidingTabLayout.setTabMode(TabLayout.MODE_FIXED);
slidingTabLayout.setTabGravity(TabLayout.GRAVITY_FILL);
} else {
slidingTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
}
}
});
slidingTabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
viewPager.setCurrentItem(tab.getPosition());
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
viewPager.setOffscreenPageLimit(3);
}
}
app/src/main/java/app/insti/fragment/HomeFragment.java → app/src/main/java/app/insti/fragment/ComplaintsHomeFragment.java
View file @ 143b9855
...@@ -12,35 +12,33 @@ import android.view.LayoutInflater; ...@@ -12,35 +12,33 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import java.util.List; import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity; import app.insti.adapter.ComplaintsAdapter;
import app.insti.adapter.ComplaintsRecyclerViewAdapter;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.Venter; import app.insti.api.model.Venter;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class HomeFragment extends Fragment { public class ComplaintsHomeFragment extends Fragment {
Activity activity; Activity activity;
ComplaintsRecyclerViewAdapter homeListAdapter; ComplaintsAdapter homeListAdapter;
RecyclerView recyclerViewHome; RecyclerView recyclerViewHome;
private SwipeRefreshLayout swipeContainer; private SwipeRefreshLayout swipeContainer;
private static String TAG = HomeFragment.class.getSimpleName(); private static String TAG = ComplaintsHomeFragment.class.getSimpleName();
private boolean isCalled = false; private boolean isCalled = false;
private TextView error_message_home; private TextView error_message_home;
static String sID, uID; static String sID, uID, uProfileUrl;
public static HomeFragment getInstance(String sessionID, String userID) { public static ComplaintsHomeFragment getInstance(String sessionID, String userID, String userProfileUrl) {
sID = sessionID; sID = sessionID;
uID = userID; uID = userID;
return new HomeFragment(); uProfileUrl = userProfileUrl;
return new ComplaintsHomeFragment();
} }
@Override @Override
...@@ -58,9 +56,9 @@ public class HomeFragment extends Fragment { ...@@ -58,9 +56,9 @@ public class HomeFragment extends Fragment {
@Override @Override
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_home, container, false); View view = inflater.inflate(R.layout.fragment_complaints_home, container, false);
recyclerViewHome = (RecyclerView) view.findViewById(R.id.recyclerViewHome); recyclerViewHome = (RecyclerView) view.findViewById(R.id.recyclerViewHome);
homeListAdapter = new ComplaintsRecyclerViewAdapter(getActivity(), sID, uID); homeListAdapter = new ComplaintsAdapter(getActivity(), sID, uID, uProfileUrl);
swipeContainer = (SwipeRefreshLayout) view.findViewById(R.id.swipeContainer); swipeContainer = (SwipeRefreshLayout) view.findViewById(R.id.swipeContainer);
error_message_home = view.findViewById(R.id.error_message_home); error_message_home = view.findViewById(R.id.error_message_home);
...@@ -130,3 +128,4 @@ public class HomeFragment extends Fragment { ...@@ -130,3 +128,4 @@ public class HomeFragment extends Fragment {
homeListAdapter.notifyDataSetChanged(); homeListAdapter.notifyDataSetChanged();
} }
} }
app/src/main/java/app/insti/fragment/MeFragment.java → app/src/main/java/app/insti/fragment/ComplaintsMeFragment.java
View file @ 143b9855
...@@ -12,34 +12,32 @@ import android.view.LayoutInflater; ...@@ -12,34 +12,32 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.TextView; import android.widget.TextView;
import java.util.List; import java.util.List;
import app.insti.R; import app.insti.R;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity; import app.insti.adapter.ComplaintsAdapter;
import app.insti.adapter.ComplaintsRecyclerViewAdapter;
import app.insti.api.RetrofitInterface; import app.insti.api.RetrofitInterface;
import app.insti.api.model.Venter; import app.insti.api.model.Venter;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
import retrofit2.Response; import retrofit2.Response;
public class MeFragment extends Fragment { public class ComplaintsMeFragment extends Fragment {
static String uID, sID; private static String uID, sID, uProfileUrl;
Activity activity; private Activity activity;
RecyclerView recyclerViewMe; RecyclerView recyclerViewMe;
ComplaintsRecyclerViewAdapter meListAdapter; private ComplaintsAdapter meListAdapter;
TextView error_message_me; private TextView error_message_me;
SwipeRefreshLayout swipeContainer; private SwipeRefreshLayout swipeContainer;
private static String TAG = MeFragment.class.getSimpleName(); private static String TAG = ComplaintsMeFragment.class.getSimpleName();
private boolean isCalled = false; private boolean isCalled = false;
public static MeFragment getInstance(String sessionID, String userID) { public static ComplaintsMeFragment getInstance(String sessionID, String userID, String userProfileUrl) {
sID = sessionID; sID = sessionID;
uID = userID; uID = userID;
return new MeFragment(); uProfileUrl = userProfileUrl;
return new ComplaintsMeFragment();
} }
@Override @Override
...@@ -58,9 +56,9 @@ public class MeFragment extends Fragment { ...@@ -58,9 +56,9 @@ public class MeFragment extends Fragment {
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
// Inflate the layout for this fragment // Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_me, container, false); View view = inflater.inflate(R.layout.fragment_complaints_me, container, false);
recyclerViewMe = view.findViewById(R.id.recyclerViewMe); recyclerViewMe = view.findViewById(R.id.recyclerViewMe);
meListAdapter = new ComplaintsRecyclerViewAdapter(getActivity(), sID, uID); meListAdapter = new ComplaintsAdapter(getActivity(), sID, uID, uProfileUrl);
swipeContainer = view.findViewById(R.id.swipeContainer); swipeContainer = view.findViewById(R.id.swipeContainer);
error_message_me = view.findViewById(R.id.error_message_me); error_message_me = view.findViewById(R.id.error_message_me);
......
app/src/main/java/app/insti/fragment/DetailedComplaintFragment.java deleted 100644 → 0
View file @ 149badff
package app.insti.fragment;
import android.content.res.ColorStateList;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.cunoraz.tagview.TagView;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapView;
import com.google.android.gms.maps.MapsInitializer;
import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.model.CameraPosition;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.MarkerOptions;
import com.squareup.picasso.Picasso;
import java.util.ArrayList;
import java.util.List;
import app.insti.R;
import app.insti.Utils;
import app.insti.activity.MainActivity;
import app.insti.adapter.CommentRecyclerViewAdapter;
import app.insti.api.RetrofitInterface;
import app.insti.api.model.User;
import app.insti.api.model.Venter;
import app.insti.api.request.CommentCreateRequest;
import app.insti.utils.DateTimeUtil;
import de.hdodenhof.circleimageview.CircleImageView;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
public class DetailedComplaintFragment extends Fragment {
private final String TAG = DetailedComplaintFragment.class.getSimpleName();
private LayoutInflater inflater;
private Venter.Complaint detailedComplaint;
private MapView mMapView;
private GoogleMap googleMap;
private TextView textViewUserName;
private TextView textViewReportDate;
private TextView textViewLocation;
private TextView textViewDescription;
private TextView textViewCommentLabel;
private TextView textViewVoteUpLabel;
private TextView textViewStatus;
private LinearLayout layoutVotes;
private TagView tagView;
private EditText editTextComment;
private ImageButton imageButtonSend;
private CircleImageView circleImageViewCommentUserImage;
private RecyclerView recyclerViewComments;
private Button buttonVoteUp;
private static String sId, cId, uId;
private CommentRecyclerViewAdapter commentListAdapter;
private List<Venter.Comment> commentList;
private static int voteCount;
public static DetailedComplaintFragment getInstance(String sessionid, String complaintid, String userid, int vCount) {
sId = sessionid;
cId = complaintid;
uId = userid;
voteCount = vCount;
return new DetailedComplaintFragment();
}
private void initialiseViews(View view) {
textViewUserName = view.findViewById(R.id.textViewUserName);
textViewReportDate = view.findViewById(R.id.textViewReportDate);
textViewLocation = view.findViewById(R.id.textViewLocation);
textViewDescription = view.findViewById(R.id.textViewDescription);
textViewStatus = view.findViewById(R.id.textViewStatus);
textViewCommentLabel = view.findViewById(R.id.comment_label);
textViewVoteUpLabel = view.findViewById(R.id.up_vote_label);
layoutVotes = view.findViewById(R.id.layoutVotes);
tagView = view.findViewById(R.id.tag_group);
recyclerViewComments = view.findViewById(R.id.recyclerViewComments);
editTextComment = view.findViewById(R.id.edit_comment);
imageButtonSend = view.findViewById(R.id.send_comment);
circleImageViewCommentUserImage = view.findViewById(R.id.comment_user_image);
Picasso.get().load(R.drawable.baseline_account_circle_black_36).into(circleImageViewCommentUserImage);
buttonVoteUp = view.findViewById(R.id.buttonVoteUp);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_detailed_complaint, container, false);
this.inflater = inflater;
commentList = new ArrayList<>();
initialiseViews(view);
commentListAdapter = new CommentRecyclerViewAdapter(getActivity(), getContext(), sId, uId, textViewCommentLabel);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
recyclerViewComments.setLayoutManager(linearLayoutManager);
recyclerViewComments.setHasFixedSize(true);
recyclerViewComments.setAdapter(commentListAdapter);
mMapView = view.findViewById(R.id.google_map);
mMapView.onCreate(savedInstanceState);
mMapView.onResume();
try {
MapsInitializer.initialize(getActivity().getApplicationContext());
} catch (Exception e) {
e.printStackTrace();
}
imageButtonSend.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!(editTextComment.getText().toString().trim().isEmpty())) {
postComment();
} else {
Toast.makeText(getContext(), "Please enter comment text", Toast.LENGTH_SHORT).show();
}
}
});
buttonVoteUp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
upVote();
}
});
return view;
}
private void postComment() {
final CommentCreateRequest commentCreateRequest = new CommentCreateRequest(editTextComment.getText().toString());
RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.postComment("sessionid=" + sId, cId, commentCreateRequest).enqueue(new Callback<Venter.Comment>() {
@Override
public void onResponse(Call<Venter.Comment> call, Response<Venter.Comment> response) {
if (response.isSuccessful()) {
Venter.Comment comment = response.body();
addNewComment(comment);
editTextComment.setText(null);
Toast.makeText(getActivity(), "Comment Added", Toast.LENGTH_SHORT).show();
}
}
@Override
public void onFailure(Call<Venter.Comment> call, Throwable t) {
Log.i(TAG, "failure in posting comments: " + t.toString());
}
});
}
private void addNewComment(Venter.Comment newComment) {
commentList.add(newComment);
commentListAdapter.setCommentList(commentList);
commentListAdapter.notifyItemInserted(commentList.indexOf(newComment));
commentListAdapter.notifyItemRangeChanged(0, commentListAdapter.getItemCount());
textViewCommentLabel.setText("Comments (" + commentList.size() + ")");
recyclerViewComments.post(new Runnable() {
@Override
public void run() {
MainActivity.hideKeyboard(getActivity());
}
});
}
public void setDetailedComplaint(Venter.Complaint detailedComplaint) {
this.detailedComplaint = detailedComplaint;
populateViews();
}
private void populateViews() {
try {
buttonVoteUp.setText("UpVote");
textViewUserName.setText(detailedComplaint.getComplaintCreatedBy().getUserName());
String time = DateTimeUtil.getDate(detailedComplaint.getComplaintReportDate().toString());
Log.i(TAG, " time: " + time);
textViewReportDate.setText(time);
textViewLocation.setText(detailedComplaint.getLocationDescription());
textViewDescription.setText(detailedComplaint.getDescription());
textViewStatus.setText(detailedComplaint.getStatus().toUpperCase());
if (detailedComplaint.getStatus().equalsIgnoreCase("Reported")) {
textViewStatus.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorRed)));
textViewStatus.setTextColor(getContext().getResources().getColor(R.color.primaryTextColor));
} else if (detailedComplaint.getStatus().equalsIgnoreCase("In Progress")) {
textViewStatus.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorSecondary)));
textViewStatus.setTextColor(getContext().getResources().getColor(R.color.secondaryTextColor));
} else if (detailedComplaint.getStatus().equalsIgnoreCase("Resolved")) {
textViewStatus.setBackgroundTintList(ColorStateList.valueOf(getContext().getResources().getColor(R.color.colorGreen)));
textViewStatus.setTextColor(getContext().getResources().getColor(R.color.secondaryTextColor));
}
textViewCommentLabel.setText("Comments (" + detailedComplaint.getComment().size() + ")");
textViewVoteUpLabel.setText("Up Votes (" + detailedComplaint.getUsersUpVoted().size() + ")");
addVotesToView(detailedComplaint);
addCommentsToView(detailedComplaint);
} catch (Exception e) {
e.printStackTrace();
}
List<String> tags = new ArrayList<>();
for (Venter.TagUri tagUri : detailedComplaint.getTags()) {
tags.add(tagUri.getTagUri());
}
String[] tagArray = tags.toArray(new String[tags.size()]);
tagView.addTags(tagArray);
mMapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(GoogleMap mGoogleMap) {
googleMap = mGoogleMap;
// For dropping a marker at a point on the Map
LatLng loc = new LatLng(detailedComplaint.getLatitude(), detailedComplaint.getLongitude());
if (loc != null) {
googleMap.addMarker(new MarkerOptions().position(loc).title(detailedComplaint.getLatitude().toString() + " , " + detailedComplaint.getLongitude().toString()).snippet(detailedComplaint.getLocationDescription()));
// For zooming automatically to the location of the marker
CameraPosition cameraPosition = new CameraPosition.Builder().target(loc).zoom(16).build();
googleMap.animateCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));
}
}
});
}
private void addCommentsToView(Venter.Complaint detailedComplaint) {
for (Venter.Comment comment : detailedComplaint.getComment())
commentList.add(comment);
commentListAdapter.setCommentList(commentList);
commentListAdapter.notifyDataSetChanged();
}
private void upVote() {
if (voteCount == 0) {
RetrofitInterface retrofitInterface = Utils.getRetrofitInterface();
retrofitInterface.upVote("sessionid=" + sId, cId).enqueue(new Callback<Venter.Complaint>() {
@Override
public void onResponse(Call<Venter.Complaint> call, Response<Venter.Complaint> response) {
if (response.isSuccessful()) {
Venter.Complaint complaint = response.body();
addVotesToView(complaint);
Toast.makeText(getActivity().getApplicationContext(), "You have Up Voted this complaint", Toast.LENGTH_SHORT).show();
voteCount++;
}
}
@Override
public void onFailure(Call<Venter.Complaint> call, Throwable t) {
Log.i(TAG, "failure in up vote: " + t.toString());
}
});
} else {
Toast.makeText(getActivity().getApplicationContext(), "You have already UpVoted this complaint", Toast.LENGTH_SHORT).show();
}
}
public void addVotesToView(Venter.Complaint detailedComplaint) {
layoutVotes.removeAllViews();
for (User users : detailedComplaint.getUsersUpVoted()) {
View voteView = inflater.inflate(R.layout.vote_up_card, null);
CircleImageView circleImageView = voteView.findViewById(R.id.circleImageViewUserUpVoteImage);
String profileUrl = users.getUserProfilePictureUrl();
if (profileUrl != null)
Picasso.get().load(profileUrl).into(circleImageView);
else
Picasso.get().load(R.drawable.baseline_account_circle_black_36).into(circleImageView);
TextView textViewName = voteView.findViewById(R.id.textViewUserUpVoteName);
textViewName.setText(users.getUserName());
layoutVotes.addView(voteView);
}
textViewVoteUpLabel.setText("Up Votes (" + detailedComplaint.getUsersUpVoted().size() + ")");
}
@Override
public void onResume() {
super.onResume();
mMapView.onResume();
}
@Override
public void onPause() {
super.onPause();
mMapView.onPause();
}
@Override
public void onDestroy() {
super.onDestroy();
mMapView.onDestroy();
}
@Override
public void onLowMemory() {
super.onLowMemory();
mMapView.onLowMemory();
}
}
\ No newline at end of file
app/src/main/java/app/insti/fragment/FileComplaintFragment.java
View file @ 143b9855
...@@ -72,7 +72,7 @@ import java.util.List; ...@@ -72,7 +72,7 @@ import java.util.List;
import app.insti.Constants; import app.insti.Constants;
import app.insti.CustomAutoCompleteTextView; import app.insti.CustomAutoCompleteTextView;
import app.insti.R; import app.insti.R;
import app.insti.TagClass; import app.insti.ComplaintTag;
import app.insti.Utils; import app.insti.Utils;
import app.insti.activity.MainActivity; import app.insti.activity.MainActivity;
import app.insti.adapter.ImageViewPagerAdapter; import app.insti.adapter.ImageViewPagerAdapter;
...@@ -111,10 +111,10 @@ public class FileComplaintFragment extends Fragment { ...@@ -111,10 +111,10 @@ public class FileComplaintFragment extends Fragment {
private String Name; private String Name;
private String Address; private String Address;
private List<String> Tags; private List<String> Tags;
private ArrayList<TagClass> tagList; private ArrayList<ComplaintTag> tagList;
private List<String> uploadedImagesUrl = new ArrayList<>(); private List<String> uploadedImagesUrl = new ArrayList<>();
private int cursor = 1; private int cursor = 1;
private List<TagClass> tagList2 = new ArrayList<>(); private List<ComplaintTag> tagList2 = new ArrayList<>();
private String base64Image; private String base64Image;
private ImageViewPagerAdapter imageViewPagerAdapter; private ImageViewPagerAdapter imageViewPagerAdapter;
...@@ -126,10 +126,10 @@ public class FileComplaintFragment extends Fragment { ...@@ -126,10 +126,10 @@ public class FileComplaintFragment extends Fragment {
View view; View view;
NestedScrollView nestedScrollView; NestedScrollView nestedScrollView;
private boolean GPSIsSetup = false; private boolean GPSIsSetup = false;
FusedLocationProviderClient mFusedLocationClient; private ProgressDialog progressDialog;
ProgressDialog progressDialog; private CollapsingToolbarLayout collapsing_toolbar;
CollapsingToolbarLayout collapsing_toolbar;
LinearLayout linearLayoutAnalyse; LinearLayout linearLayoutAnalyse;
private LinearLayout linearLayoutScrollTags;
public FileComplaintFragment() { public FileComplaintFragment() {
// Required empty public constructor // Required empty public constructor
...@@ -152,7 +152,6 @@ public class FileComplaintFragment extends Fragment { ...@@ -152,7 +152,6 @@ public class FileComplaintFragment extends Fragment {
@Override @Override
public void onCreate(@Nullable Bundle savedInstanceState) { public void onCreate(@Nullable Bundle savedInstanceState) {
mainactivity = this; mainactivity = this;
mFusedLocationClient = LocationServices.getFusedLocationProviderClient(getActivity());
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }
...@@ -170,8 +169,6 @@ public class FileComplaintFragment extends Fragment { ...@@ -170,8 +169,6 @@ public class FileComplaintFragment extends Fragment {
Bundle bundle = getArguments(); Bundle bundle = getArguments();
userId = bundle.getString(Constants.USER_ID); userId = bundle.getString(Constants.USER_ID);
Toast.makeText(getContext(), getString(R.string.initial_message_file_complaint), Toast.LENGTH_LONG).show();
prepareTags(); prepareTags();
progressDialog = new ProgressDialog(getContext()); progressDialog = new ProgressDialog(getContext());
...@@ -186,7 +183,7 @@ public class FileComplaintFragment extends Fragment { ...@@ -186,7 +183,7 @@ public class FileComplaintFragment extends Fragment {
collapsing_toolbar.setVisibility(View.GONE); collapsing_toolbar.setVisibility(View.GONE);
imageViewHolder.setLayoutParams(layoutParams); imageViewHolder.setLayoutParams(layoutParams);
Toolbar toolbar = getActivity().findViewById(R.id.toolbar); final Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Add Complaint"); toolbar.setTitle("Add Complaint");
nestedScrollView = view.findViewById(R.id.nested_scrollview); nestedScrollView = view.findViewById(R.id.nested_scrollview);
...@@ -203,6 +200,10 @@ public class FileComplaintFragment extends Fragment { ...@@ -203,6 +200,10 @@ public class FileComplaintFragment extends Fragment {
buttonAnalysis.setVisibility(View.INVISIBLE); buttonAnalysis.setVisibility(View.INVISIBLE);
buttonAnalysis.setVisibility(View.GONE); buttonAnalysis.setVisibility(View.GONE);
linearLayoutScrollTags = view.findViewById(R.id.linearLayoutScrollTags);
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);
tagsLayout = view.findViewById(R.id.tags_layout); tagsLayout = view.findViewById(R.id.tags_layout);
viewPager = view.findViewById(R.id.complaint_image_view_pager); viewPager = view.findViewById(R.id.complaint_image_view_pager);
...@@ -252,17 +253,18 @@ public class FileComplaintFragment extends Fragment { ...@@ -252,17 +253,18 @@ public class FileComplaintFragment extends Fragment {
editTextTags.addTextChangedListener(new TextWatcher() { editTextTags.addTextChangedListener(new TextWatcher() {
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { public void beforeTextChanged(CharSequence s, int start, int count, int after) {
//Before Text Changed
} }
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
linearLayoutScrollTags.setVisibility(View.VISIBLE);
setTags(s); setTags(s);
} }
@Override @Override
public void afterTextChanged(Editable s) { public void afterTextChanged(Editable s) {
//After Text Changed
} }
}); });
...@@ -274,6 +276,8 @@ public class FileComplaintFragment extends Fragment { ...@@ -274,6 +276,8 @@ public class FileComplaintFragment extends Fragment {
editTextTags.setText(""); editTextTags.setText("");
tagViewPopulate.addTags(new ArrayList<Tag>()); tagViewPopulate.addTags(new ArrayList<Tag>());
MainActivity.hideKeyboard(getActivity()); MainActivity.hideKeyboard(getActivity());
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);
} }
}); });
...@@ -283,6 +287,8 @@ public class FileComplaintFragment extends Fragment { ...@@ -283,6 +287,8 @@ public class FileComplaintFragment extends Fragment {
Tags = new ArrayList<>(); Tags = new ArrayList<>();
for (int i = 0; i < tagList2.size(); i++) { for (int i = 0; i < tagList2.size(); i++) {
Tags.add(tagList2.get(i).getName()); Tags.add(tagList2.get(i).getName());
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);
} }
addComplaint(); addComplaint();
} }
...@@ -356,7 +362,13 @@ public class FileComplaintFragment extends Fragment { ...@@ -356,7 +362,13 @@ public class FileComplaintFragment extends Fragment {
@Override @Override
public void onTagClick(Tag tag, int i) { public void onTagClick(Tag tag, int i) {
editTextTags.setText(tag.text); editTextTags.setText(tag.text);
editTextTags.setSelection(tag.text.length()); //to set cursor position editTextTags.setSelection(tag.text.length());
populateTags(editTextTags.getText().toString());
editTextTags.setText("");
tagViewPopulate.addTags(new ArrayList<Tag>());
MainActivity.hideKeyboard(getActivity());
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);//to set cursor position
} }
}); });
...@@ -410,6 +422,7 @@ public class FileComplaintFragment extends Fragment { ...@@ -410,6 +422,7 @@ public class FileComplaintFragment extends Fragment {
return false; return false;
} }
}); });
FusedLocationProviderClient mFusedLocationClient = LocationServices.getFusedLocationProviderClient(getActivity());
mFusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() { mFusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() {
@Override @Override
public void onSuccess(Location location) { public void onSuccess(Location location) {
...@@ -444,6 +457,7 @@ public class FileComplaintFragment extends Fragment { ...@@ -444,6 +457,7 @@ public class FileComplaintFragment extends Fragment {
} else { } else {
Log.i(TAG, "GPS enabled"); Log.i(TAG, "GPS enabled");
try { try {
FusedLocationProviderClient mFusedLocationClient = LocationServices.getFusedLocationProviderClient(getActivity());
mFusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() { mFusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() {
@Override @Override
public void onSuccess(Location location) { public void onSuccess(Location location) {
...@@ -463,6 +477,7 @@ public class FileComplaintFragment extends Fragment { ...@@ -463,6 +477,7 @@ public class FileComplaintFragment extends Fragment {
@Override @Override
public void onFailure(Exception e) { public void onFailure(Exception e) {
e.printStackTrace(); e.printStackTrace();
Toast.makeText(getContext(), "Something went wrong while getting your location \n"+ e, Toast.LENGTH_LONG).show();
} }
}); });
GPSIsSetup = true; GPSIsSetup = true;
...@@ -532,6 +547,7 @@ public class FileComplaintFragment extends Fragment { ...@@ -532,6 +547,7 @@ public class FileComplaintFragment extends Fragment {
MY_PERMISSIONS_REQUEST_LOCATION); MY_PERMISSIONS_REQUEST_LOCATION);
} else { } else {
try { try {
FusedLocationProviderClient mFusedLocationClient = LocationServices.getFusedLocationProviderClient(getActivity());
mFusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() { mFusedLocationClient.getLastLocation().addOnSuccessListener(new OnSuccessListener<Location>() {
@Override @Override
public void onSuccess(Location location) { public void onSuccess(Location location) {
...@@ -562,7 +578,7 @@ public class FileComplaintFragment extends Fragment { ...@@ -562,7 +578,7 @@ public class FileComplaintFragment extends Fragment {
private void populateTags(String cs) { private void populateTags(String cs) {
if (!(cs.isEmpty())) { if (!(cs.isEmpty())) {
tagList2.add(new TagClass(cs)); tagList2.add(new ComplaintTag(cs));
ArrayList<Tag> tags = new ArrayList<>(); ArrayList<Tag> tags = new ArrayList<>();
Tag tag; Tag tag;
for (int i = 0; i < tagList2.size(); i++) { for (int i = 0; i < tagList2.size(); i++) {
...@@ -573,26 +589,37 @@ public class FileComplaintFragment extends Fragment { ...@@ -573,26 +589,37 @@ public class FileComplaintFragment extends Fragment {
} }
tagView.addTags(tags); tagView.addTags(tags);
} else { } else {
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);
Toast.makeText(getContext(), "Please enter some tags", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "Please enter some tags", Toast.LENGTH_SHORT).show();
} }
} }
private void setTags(CharSequence cs) { private void setTags(CharSequence cs) {
int counter = 0;
if (!cs.toString().equals("")) { if (!cs.toString().equals("")) {
String text = cs.toString(); String text = cs.toString();
ArrayList<Tag> tags = new ArrayList<>(); ArrayList<Tag> tags = new ArrayList<>();
Tag tag; Tag tag;
for (int i = 0; i < tagList.size(); i++) { for (int i = 0; i < tagList.size(); i++) {
if (tagList.get(i).getName().toLowerCase().contains(text.toLowerCase())) { if (tagList.get(i).getName().toLowerCase().contains(text.toLowerCase())) {
linearLayoutScrollTags.setVisibility(View.VISIBLE);
tagsLayout.setVisibility(View.VISIBLE); tagsLayout.setVisibility(View.VISIBLE);
tag = new Tag(tagList.get(i).getName()); tag = new Tag(tagList.get(i).getName());
tag.radius = 10f; tag.radius = 10f;
tag.isDeletable = false; tag.isDeletable = false;
tags.add(tag); tags.add(tag);
counter++;
} }
} }
if (counter != 0) {
tagViewPopulate.addTags(tags); tagViewPopulate.addTags(tags);
} else { } else {
linearLayoutScrollTags.setVisibility(View.GONE);
}
} else {
linearLayoutScrollTags.setVisibility(View.INVISIBLE);
linearLayoutScrollTags.setVisibility(View.GONE);
tagViewPopulate.addTags(new ArrayList<Tag>()); tagViewPopulate.addTags(new ArrayList<Tag>());
return; return;
} }
...@@ -606,12 +633,11 @@ public class FileComplaintFragment extends Fragment { ...@@ -606,12 +633,11 @@ public class FileComplaintFragment extends Fragment {
}); });
} }
private void prepareTags() { private void prepareTags() {
tagList = new ArrayList<>(); tagList = new ArrayList<>();
try { try {
for (int i = 0; i < TagCategories.CATEGORIES.length; i++) { for (int i = 0; i < TagCategories.CATEGORIES.length; i++) {
tagList.add(new TagClass(TagCategories.CATEGORIES[i])); tagList.add(new ComplaintTag(TagCategories.CATEGORIES[i]));
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
...@@ -652,12 +678,12 @@ public class FileComplaintFragment extends Fragment { ...@@ -652,12 +678,12 @@ public class FileComplaintFragment extends Fragment {
Toast.makeText(getContext(), "Complaint successfully posted", Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), "Complaint successfully posted", Toast.LENGTH_LONG).show();
Bundle bundle = getArguments(); Bundle bundle = getArguments();
bundle.putString(Constants.USER_ID, userId); bundle.putString(Constants.USER_ID, userId);
ComplaintFragment complaintFragment = new ComplaintFragment(); ComplaintsFragment complaintsFragment = new ComplaintsFragment();
complaintFragment.setArguments(bundle); complaintsFragment.setArguments(bundle);
FragmentManager manager = getFragmentManager(); FragmentManager manager = getFragmentManager();
FragmentTransaction transaction = manager.beginTransaction(); FragmentTransaction transaction = manager.beginTransaction();
transaction.replace(R.id.framelayout_for_fragment, complaintFragment, complaintFragment.getTag()); transaction.replace(R.id.framelayout_for_fragment, complaintsFragment, complaintsFragment.getTag());
transaction.addToBackStack(complaintFragment.getTag()); transaction.addToBackStack(complaintsFragment.getTag());
manager.popBackStackImmediate("Complaint Fragment", FragmentManager.POP_BACK_STACK_INCLUSIVE); manager.popBackStackImmediate("Complaint Fragment", FragmentManager.POP_BACK_STACK_INCLUSIVE);
transaction.commit(); transaction.commit();
} }
...@@ -688,12 +714,12 @@ public class FileComplaintFragment extends Fragment { ...@@ -688,12 +714,12 @@ public class FileComplaintFragment extends Fragment {
Toast.makeText(getContext(), "Complaint successfully posted", Toast.LENGTH_LONG).show(); Toast.makeText(getContext(), "Complaint successfully posted", Toast.LENGTH_LONG).show();
Bundle bundle = getArguments(); Bundle bundle = getArguments();
bundle.putString(Constants.USER_ID, userId); bundle.putString(Constants.USER_ID, userId);
ComplaintFragment complaintFragment = new ComplaintFragment(); ComplaintsFragment complaintsFragment = new ComplaintsFragment();
complaintFragment.setArguments(bundle); complaintsFragment.setArguments(bundle);
FragmentManager manager = getFragmentManager(); FragmentManager manager = getFragmentManager();
FragmentTransaction transaction = manager.beginTransaction(); FragmentTransaction transaction = manager.beginTransaction();
transaction.replace(R.id.framelayout_for_fragment, complaintFragment, complaintFragment.getTag()); transaction.replace(R.id.framelayout_for_fragment, complaintsFragment, complaintsFragment.getTag());
transaction.addToBackStack(complaintFragment.getTag()); transaction.addToBackStack(complaintsFragment.getTag());
manager.popBackStackImmediate("Complaint Fragment", FragmentManager.POP_BACK_STACK_INCLUSIVE); manager.popBackStackImmediate("Complaint Fragment", FragmentManager.POP_BACK_STACK_INCLUSIVE);
transaction.commit(); transaction.commit();
} }
......
app/src/main/java/app/insti/fragment/RelevantComplaintsFragment.java 0 → 100644
View file @ 143b9855
package app.insti.fragment;
import android.app.Activity;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import java.util.List;
import app.insti.R;
import app.insti.adapter.ComplaintsAdapter;
import app.insti.api.model.Venter;
public class RelevantComplaintsFragment extends Fragment {
Activity activity;
ComplaintsAdapter relevantComplaintsAdapter;
RecyclerView recyclerViewRelevantComplaints;
private SwipeRefreshLayout swipeContainer;
private static String TAG = RelevantComplaintsFragment.class.getSimpleName();
private boolean isCalled = false;
private TextView error_message_relevant_complaints;
static String sID, uID;
public static RelevantComplaintsFragment getInstance(String sessionID, String userID) {
sID = sessionID;
uID = userID;
return new RelevantComplaintsFragment();
}
@Override
public void onStart() {
super.onStart();
swipeContainer.post(new Runnable() {
@Override
public void run() {
swipeContainer.setRefreshing(true);
callServerToGetRelevantComplaints();
}
});
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_relevant_complaints, container, false);
recyclerViewRelevantComplaints = (RecyclerView) view.findViewById(R.id.recyclerViewRelevantComplaints);
relevantComplaintsAdapter = new ComplaintsAdapter(getActivity(), sID, uID, ""); //Change userProfileUrl to the current user Profile Pic
swipeContainer = (SwipeRefreshLayout) view.findViewById(R.id.swipeContainer);
error_message_relevant_complaints = view.findViewById(R.id.error_message_relevant_complaints);
LinearLayoutManager llm = new LinearLayoutManager(activity);
recyclerViewRelevantComplaints.setLayoutManager(llm);
recyclerViewRelevantComplaints.setHasFixedSize(true);
recyclerViewRelevantComplaints.setAdapter(relevantComplaintsAdapter);
swipeContainer.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
callServerToGetRelevantComplaints();
}
});
swipeContainer.setColorSchemeResources(R.color.colorPrimary);
if (!isCalled) {
swipeContainer.post(new Runnable() {
@Override
public void run() {
swipeContainer.setRefreshing(true);
callServerToGetRelevantComplaints();
}
});
isCalled = true;
}
return view;
}
private void callServerToGetRelevantComplaints(){
}
private void initialiseRecyclerView(List<Venter.Complaint> list) {
relevantComplaintsAdapter.setcomplaintList(list);
relevantComplaintsAdapter.notifyDataSetChanged();
}
}
app/src/main/java/app/insti/utils/DateTimeUtil.java
View file @ 143b9855
...@@ -20,11 +20,17 @@ public class DateTimeUtil { ...@@ -20,11 +20,17 @@ public class DateTimeUtil {
long hours = TimeUnit.MILLISECONDS.toHours(now.getTime() - date.getTime()); long hours = TimeUnit.MILLISECONDS.toHours(now.getTime() - date.getTime());
if (seconds <= 0) { if (seconds <= 0) {
return time_ago = "now"; return time_ago = "now";
} else if (seconds < 60 && seconds > 0) { } else if (seconds == 1){
return time_ago = seconds + " second ago";
} else if (seconds < 60 && seconds > 1) {
return time_ago = seconds + " seconds ago"; return time_ago = seconds + " seconds ago";
} else if (minutes < 60 && minutes > 0) { } else if (minutes == 1) {
return time_ago = minutes + " 1 minute ago";
} else if (minutes < 60 && minutes > 1) {
return time_ago = minutes + " minutes ago"; return time_ago = minutes + " minutes ago";
} else if (hours < 24 && hours > 0) { } else if (hours == 1) {
return hours + " hour ago";
} else if (hours < 24 && hours > 1) {
return hours + " hours ago"; return hours + " hours ago";
} else { } else {
long days = Math.round(diff / (24.0 * 60 * 60 * 1000)); long days = Math.round(diff / (24.0 * 60 * 60 * 1000));
...@@ -32,12 +38,23 @@ public class DateTimeUtil { ...@@ -32,12 +38,23 @@ public class DateTimeUtil {
return "today"; return "today";
else if (days == 1) else if (days == 1)
return "yesterday"; return "yesterday";
else if (days == 1)
return days + " day ago";
else if (days < 14) else if (days < 14)
return days + " days ago"; return days + " days ago";
else if (days < 30) else if (days < 30)
if ((int) (days / 7) == 1)
return ((int) (days / 7)) + " week ago";
else
return ((int) (days / 7)) + " weeks ago"; return ((int) (days / 7)) + " weeks ago";
else if (days < 365) else if (days < 365)
if ((int) (days / 30) == 1)
return ((int) (days / 30)) + " month ago";
else
return ((int) (days / 30)) + " months ago"; return ((int) (days / 30)) + " months ago";
else
if ((int) (days / 365) == 1)
return ((int) (days / 365)) + " year ago";
else else
return ((int) (days / 365)) + " years ago"; return ((int) (days / 365)) + " years ago";
} }
......
app/src/main/java/app/insti/utils/GsonProvider.java deleted 100644 → 0
View file @ 149badff
package app.insti.utils;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
/**
* Created by Shivam Sharma on 13-08-2018.
*/
public class GsonProvider {
private static final Gson gsonInput = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").create();
private static final Gson gsonOutput = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").create();
public static Gson getGsonInput() {
return gsonInput;
}
public static Gson getGsonOutput() {
return gsonOutput;
}
}
\ No newline at end of file
app/src/main/res/drawable/baseline_send_24.xml 0 → 100644
View file @ 143b9855
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>
app/src/main/res/drawable/customborder.xml
View file @ 143b9855
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners android:radius="20dp"/> <corners android:radius="20dp"/>
<!--<padding android:left="10dp" android:right="10dp" android:top="10dp" android:bottom="10dp"/>--> <padding android:left="10dp" android:right="10dp"/>
<stroke android:width="1dp" android:color="@color/colorPrimary"/> <stroke android:width="1dp" android:color="@color/colorPrimary"/>
</shape> </shape>
\ No newline at end of file
app/src/main/res/layout/fragment_complaint.xml
View file @ 143b9855
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <?xml version="1.0" encoding="utf-8"?>
xmlns:tools="http://schemas.android.com/tools" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="app.insti.fragment.ComplaintFragment"> android:orientation="vertical">
<android.support.design.widget.CoordinatorLayout <android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_weight="1">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:id="@+id/appBar" android:id="@+id/appBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> android:theme="@style/Base.ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.design.widget.CollapsingToolbarLayout <android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar" android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:contentScrim="?attr/colorPrimary" app:contentScrim="@android:color/white"
android:background="@color/colorWhite"
app:layout_scrollFlags="scroll|exitUntilCollapsed"> app:layout_scrollFlags="scroll|exitUntilCollapsed">
<LinearLayout <LinearLayout
android:id="@+id/layoutTopCardViewHolder" android:id="@+id/image_holder_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="175dp" android:layout_height="2dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_collapseMode="parallax"> app:layout_collapseMode="parallax">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:layout_marginTop="30dp">
<LinearLayout <android.support.v4.view.ViewPager
android:id="@+id/complaint_image_view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"/>
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginTop="20dp"
android:orientation="vertical">
<TextView <me.relex.circleindicator.CircleIndicator
android:layout_width="wrap_content" android:id="@+id/indicator"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/venter_super_head"
android:textColor="@color/primaryTextColor"
android:textStyle="bold" />
<Button
android:id="@+id/buttonVentIssues"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="48dp"
android:layout_marginTop="10dp" app:ci_animator="@animator/scale_with_alpha"
android:background="@color/colorSecondary" app:ci_drawable="@drawable/selected_dot" />
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:text="@string/vent_your_issues_now"
android:textAllCaps="false"
android:textColor="@color/secondaryTextColor"
android:textSize="18sp" />
</LinearLayout>
</RelativeLayout> </RelativeLayout>
...@@ -78,18 +57,20 @@ ...@@ -78,18 +57,20 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom" android:layout_gravity="bottom"
app:tabIndicatorColor="@color/colorAccent" app:tabIndicatorColor="@color/colorPrimary"
style="@style/CustomTabLayout" android:background="@color/colorWhite"
android:background="?attr/colorPrimary" /> app:tabTextColor="@color/colorGray"
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
app:tabSelectedTextColor="#4a4a4a"/>
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/tab_viewpager" android:id="@+id/tab_viewpager_details"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
</FrameLayout> </LinearLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_complaint_details.xml
View file @ 143b9855
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:background="@android:color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.design.widget.CoordinatorLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:orientation="vertical"
android:paddingTop="10dp">
<android.support.design.widget.AppBarLayout <LinearLayout
android:id="@+id/appBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/Base.ThemeOverlay.AppCompat.Dark.ActionBar"> android:orientation="vertical"
android:padding="10dp">
<android.support.design.widget.CollapsingToolbarLayout <LinearLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:contentScrim="@android:color/white" android:orientation="horizontal">
android:background="@color/colorWhite"
app:layout_scrollFlags="scroll|exitUntilCollapsed"> <TextView
android:id="@+id/textViewUserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Username"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/image_holder_view" android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/textViewStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/customborder"
android:paddingHorizontal="10dp"
android:text="STATUS"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/textViewReportDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Report Date"
android:textColor="@android:color/darker_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/textViewLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location"
android:textColor="@android:color/darker_gray"
android:textSize="14sp" />
<View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dp" android:layout_height="10dp" />
android:orientation="vertical"
app:layout_collapseMode="parallax"> <TextView
<RelativeLayout android:id="@+id/textViewDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Description"
android:textColor="@android:color/black"
android:textSize="14sp" />
</LinearLayout>
<com.google.android.gms.maps.MapView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/google_map"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="200dp" />
<android.support.v4.view.ViewPager <LinearLayout
android:id="@+id/complaint_image_view_pager" android:id="@+id/linearLayoutTags"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical">
<me.relex.circleindicator.CircleIndicator <LinearLayout
android:id="@+id/indicator"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="wrap_content"
app:ci_animator="@animator/scale_with_alpha" android:padding="10dp">
app:ci_drawable="@drawable/selected_dot" />
</RelativeLayout> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tags"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout> </LinearLayout>
</android.support.design.widget.CollapsingToolbarLayout> <!--<com.cunoraz.tagview.TagView-->
<!--android:id="@+id/tag_group"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_margin="10dp"-->
<!--android:clickable="false"-->
<!--android:longClickable="false"/>-->
<android.support.design.widget.TabLayout <LinearLayout
android:id="@+id/sliding_tab_layout" android:id="@+id/tags_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:orientation="vertical"></LinearLayout>
app:tabIndicatorColor="@color/colorPrimary"
android:background="@color/colorWhite"
app:tabTextColor="@color/colorGray" </LinearLayout>
app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
app:tabSelectedTextColor="#4a4a4a"/> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp">
</android.support.design.widget.AppBarLayout> <TextView
android:id="@+id/comment_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
<android.support.v4.view.ViewPager <android.support.design.widget.CoordinatorLayout
android:id="@+id/tab_viewpager_details" android:id="@+id/layoutComments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerViewComments"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.CoordinatorLayout>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/> android:orientation="horizontal"
android:paddingHorizontal="10dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/comment_user_image"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:scaleType="centerCrop" />
<android.support.design.widget.TextInputLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="9"
android:paddingHorizontal="10dp"
app:hintTextAppearance="@style/edit_text_hint_apperarance">
<EditText
android:id="@+id/edit_comment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top"
android:hint="Enter Comment"
android:inputType="textMultiLine"
android:textColor="@android:color/black"
android:textColorHint="#4a4a4a"
android:textSize="14sp" />
</android.support.design.widget.TextInputLayout>
<ImageButton
android:id="@+id/send_comment"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/baseline_send_black_18" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/linearLayoutUpVotes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp">
<TextView
android:id="@+id/up_vote_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
<android.support.design.widget.CoordinatorLayout
android:id="@+id/layoutUpVotes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerViewUpVotes"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
</LinearLayout> </LinearLayout>
<!--<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp">
<TextView
android:id="@+id/up_vote_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutVotes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="horizontal"
android:padding="10dp"
android:weightSum="2">
<Button
android:id="@+id/buttonVoteUp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_weight="2"
android:background="@color/colorSecondary"
android:text="Upvote"
android:textColor="@color/secondaryTextColor" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/fragment_complaints.xml 0 → 100644
View file @ 143b9855
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="app.insti.fragment.ComplaintsFragment">
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.AppBarLayout
android:id="@+id/appBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<LinearLayout
android:id="@+id/layoutTopCardViewHolder"
android:layout_width="match_parent"
android:layout_height="175dp"
android:orientation="vertical"
app:layout_collapseMode="parallax">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="30dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:layout_marginTop="20dp"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/venter_super_head"
android:textColor="@color/primaryTextColor"
android:textStyle="bold" />
<Button
android:id="@+id/buttonVentIssues"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@color/colorSecondary"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:text="@string/vent_your_issues_now"
android:textAllCaps="false"
android:textColor="@color/secondaryTextColor"
android:textSize="18sp" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</android.support.design.widget.CollapsingToolbarLayout>
<android.support.design.widget.TabLayout
android:id="@+id/sliding_tab_layout"
android:layout_width="wrap_content"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="bottom"
app:tabIndicatorColor="@color/colorAccent"
style="@style/CustomTabLayout"
android:background="?attr/colorPrimary" />
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
android:id="@+id/tab_viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.design.widget.CoordinatorLayout>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_detailed_complaint.xml deleted 100644 → 0
View file @ 149badff
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingTop="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/textViewUserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Username"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/textViewStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/customborder"
android:paddingHorizontal="10dp"
android:text="STATUS"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/textViewReportDate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Report Date"
android:textColor="@android:color/darker_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/textViewLocation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Location"
android:textColor="@android:color/darker_gray"
android:textSize="14sp" />
<View
android:layout_width="match_parent"
android:layout_height="10dp" />
<TextView
android:id="@+id/textViewDescription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Description"
android:textColor="@android:color/black"
android:textSize="14sp" />
</LinearLayout>
<com.google.android.gms.maps.MapView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/google_map"
android:layout_width="match_parent"
android:layout_height="200dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Tags"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="7dp" />
<ScrollView
android:id="@+id/tags_laoyut"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/editText"
android:layout_marginLeft="6dp"
android:background="@android:color/white"
android:visibility="visible">
<com.cunoraz.tagview.TagView
android:id="@+id/tag_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp" />
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="7dp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp">
<TextView
android:id="@+id/comment_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
<android.support.design.widget.CoordinatorLayout
android:id="@+id/layoutComments"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerViewComments"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.support.design.widget.CoordinatorLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingHorizontal="10dp">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/comment_user_image"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_gravity="center"
android:scaleType="centerCrop" />
<android.support.design.widget.TextInputLayout xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="9"
android:paddingHorizontal="10dp"
app:hintTextAppearance="@style/edit_text_hint_apperarance">
<EditText
android:id="@+id/edit_comment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top"
android:hint="Enter Comment"
android:inputType="textMultiLine"
android:textColor="@android:color/black"
android:textColorHint="#4a4a4a"
android:textSize="14sp" />
</android.support.design.widget.TextInputLayout>
<ImageButton
android:id="@+id/send_comment"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="30dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:srcCompat="@android:drawable/ic_menu_send" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp">
<TextView
android:id="@+id/up_vote_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutVotes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="horizontal"
android:padding="10dp"
android:weightSum="2">
<Button
android:id="@+id/buttonVoteUp"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_weight="2"
android:background="@color/colorSecondary"
android:text="Upvote"
android:textColor="@color/secondaryTextColor" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
\ No newline at end of file
app/src/main/res/layout/fragment_file_complaint.xml
View file @ 143b9855
...@@ -251,6 +251,12 @@ ...@@ -251,6 +251,12 @@
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/linearLayoutScrollTags"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ScrollView <ScrollView
android:id="@+id/tags_layout" android:id="@+id/tags_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -268,6 +274,7 @@ ...@@ -268,6 +274,7 @@
</ScrollView> </ScrollView>
<View <View
android:id="@+id/viewTagsLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="17dp" /> android:layout_height="17dp" />
...@@ -275,6 +282,8 @@ ...@@ -275,6 +282,8 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
<RelativeLayout <RelativeLayout
......
app/src/main/res/layout/fragment_relevant_complaints.xml 0 → 100644
View file @ 143b9855
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".fragment.RelevantComplaintsFragment"
android:orientation="vertical">
<android.support.design.widget.CoordinatorLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ededed">
<TextView
android:id="@+id/error_message_relevant_complaints"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|center_vertical"
android:text="@string/error_message"
android:textColor="@color/secondaryTextColor"
android:visibility="invisible" />
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/swipeContainer"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/recyclerViewRelevantComplaints"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.design.widget.CoordinatorLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/vote_up_card.xml
View file @ 143b9855
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/cardViewUpVote"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:padding="10dp"> android:layout_margin="5dp"
android:padding="10dp"
app:cardUseCompatPadding="true"
app:cardBackgroundColor="@color/colorWhite"
app:cardCornerRadius="0dp">>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -15,6 +22,7 @@ ...@@ -15,6 +22,7 @@
android:paddingTop="4dp"> android:paddingTop="4dp">
<LinearLayout <LinearLayout
android:id="@+id/layoutUpVote"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="80dp" android:layout_height="80dp"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -49,4 +57,4 @@ ...@@ -49,4 +57,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v7.widget.CardView>
\ No newline at end of file \ No newline at end of file
app/src/main/res/values/colors.xml
View file @ 143b9855
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<color name="colorGray">#757575</color> <color name="colorGray">#757575</color>
<color name="colorWhite">#FFFFFF</color> <color name="colorWhite">#FFFFFF</color>
<color name="colorTagGreen">#AED581</color>
<color name="colorRed">#FF0000</color> <color name="colorRed">#FF0000</color>
<color name="colorGreen">#00FF00</color> <color name="colorGreen">#00FF00</color>
<!-- Map --> <!-- Map -->
......
app/src/main/res/values/strings.xml
View file @ 143b9855
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<string name="enter_suggestions_if_any">Enter Suggestions (if any)</string> <string name="enter_suggestions_if_any">Enter Suggestions (if any)</string>
<string name="no_complaints">No complaints at the moment</string> <string name="no_complaints">No complaints at the moment</string>
<string name="initial_message_file_complaint">Please provide the complaint description before submitting</string> <string name="initial_message_file_complaint">Please provide the complaint description before submitting</string>
<string name="getting_current_location">Getting current location. Please try after some time</string> <string name="getting_current_location">Getting current location.</string>
<string name="GPS_not_enables">GPS is not enabled!</string> <string name="GPS_not_enables">GPS is not enabled!</string>
<string name="no_permission">No permission!</string> <string name="no_permission">No permission!</string>
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment">Hello blank fragment</string>
......
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