Commit a64b37ec authored by Preetam Ozarde's avatar Preetam Ozarde

Updated Minor Issues

parent 143b9855
......@@ -43,8 +43,8 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
private Context context;
private LayoutInflater inflater;
private String sessionId, userId;
Activity activity;
TextView textViewCommentLabel;
private Activity activity;
private TextView textViewCommentLabel;
private Fragment fragment;
private List<Venter.Comment> commentList = new ArrayList<>();
......@@ -136,6 +136,12 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
}
});
break;
default:
clipboardManager = (ClipboardManager) context.getSystemService(context.CLIPBOARD_SERVICE);
clipData = ClipData.newPlainText("Text Copied", textViewComment.getText().toString());
clipboardManager.setPrimaryClip(clipData);
Toast.makeText(context, "Comment Copied", Toast.LENGTH_SHORT).show();
}
return true;
}
......
......@@ -14,8 +14,8 @@ import app.insti.fragment.ComplaintDetailsFragment;
public class ComplaintDetailsPagerAdapter extends FragmentPagerAdapter {
Venter.Complaint detailedComplaint;
Context context;
private Venter.Complaint detailedComplaint;
private Context context;
private String sessionid, complaintid, userid, userProfileUrl;
public ComplaintDetailsPagerAdapter(FragmentManager fm, Venter.Complaint detailedComplaint, Context context, String sessionid, String complaintid, String userid, String userProfileUrl) {
......
......@@ -15,7 +15,7 @@ import app.insti.fragment.ComplaintsMeFragment;
public class ComplaintFragmentViewPagerAdapter extends FragmentStatePagerAdapter {
Context context;
private Context context;
private String userID, sessionID, userProfileUrl;
public ComplaintFragmentViewPagerAdapter(FragmentManager fm, Context context, String userID, String sessionID, String userProfileUrl) {
......
......@@ -20,7 +20,7 @@ public class ImageViewPagerAdapter extends FragmentPagerAdapter {
private static final String TAG = ImageViewPagerAdapter.class.getSimpleName();
private List<String> images = new ArrayList<>();
Venter.Complaint detailedComplaint;
private Venter.Complaint detailedComplaint;
public ImageViewPagerAdapter(FragmentManager fragmentManager, List<String> images) {
super(fragmentManager);
......
......@@ -24,13 +24,13 @@ public class UpVotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
private static final String TAG = CommentsAdapter.class.getSimpleName();
Context context;
private Context context;
private LayoutInflater inflater;
String sessionId, userId;
Activity activity;
TextView textViewUserUpVoteName;
private String sessionId, userId;
private Activity activity;
private TextView textViewUserUpVoteName;
private Fragment fragment;
LinearLayout layoutUpVote;
private LinearLayout layoutUpVote;
private List<User> userList = new ArrayList<>();
......
package app.insti.api;
import android.app.Activity;
import android.content.Context;
import android.util.Log;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.MapView;
......
......@@ -4,9 +4,6 @@ import android.support.annotation.NonNull;
import com.google.gson.annotations.SerializedName;
import java.util.List;
import app.insti.api.model.User;
import app.insti.interfaces.Browsable;
/**
* Created by Shivam Sharma on 04-09-2018.
*/
......@@ -14,11 +11,10 @@ import app.insti.interfaces.Browsable;
public class Venter {
public static class Complaint{
@NonNull
@SerializedName("id")
private String complaintID;
@SerializedName("created_by")
User complaintCreatedBy;
private User complaintCreatedBy;
@SerializedName("description")
private String description;
@SerializedName("report_date")
......@@ -163,11 +159,10 @@ public class Venter {
}
public static class TagUri {
@NonNull
@SerializedName("id")
String id;
private String id;
@SerializedName("tag_uri")
String tagUri;
private String tagUri;
@NonNull
public String getId() {
......@@ -189,15 +184,14 @@ public class Venter {
public static class Comment {
@NonNull
@SerializedName("id")
String id;
private String id;
@SerializedName("time")
String time;
private String time;
@SerializedName("text")
String text;
private String text;
@SerializedName("commented_by")
User commented_by;
private User commented_by;
@NonNull
public String getId() {
......
......@@ -46,8 +46,6 @@ public class ComplaintDetailsFragment extends Fragment {
private final String TAG = ComplaintDetailsFragment.class.getSimpleName();
private Venter.Complaint detailedComplaint;
private MapView mMapView;
private GoogleMap googleMap;
private TextView textViewUserName;
private TextView textViewReportDate;
private TextView textViewLocation;
......@@ -69,8 +67,8 @@ public class ComplaintDetailsFragment extends Fragment {
private List<Venter.Comment> commentList;
private List<User> upVotesList;
private LinearLayout linearLayoutTags;
TextView textViewUserUpVoteName;
List<String> tagsList;
private TextView textViewUserUpVoteName;
private List<String> tagsList;
public static ComplaintDetailsFragment getInstance(String sessionid, String complaintid, String userid, String userProfileUrl) {
sId = sessionid;
......@@ -189,7 +187,7 @@ public class ComplaintDetailsFragment extends Fragment {
mMapView.getMapAsync(new OnMapReadyCallback() {
@Override
public void onMapReady(GoogleMap mGoogleMap) {
googleMap = mGoogleMap;
GoogleMap googleMap = mGoogleMap;
// For dropping a marker at a point on the Map
LatLng loc = new LatLng(detailedComplaint.getLatitude(), detailedComplaint.getLongitude());
......
......@@ -21,16 +21,12 @@ import app.insti.adapter.ComplaintFragmentViewPagerAdapter;
public class ComplaintsFragment extends BaseFragment {
String userID, userProfileUrl;
Context context;
Button buttonVentIssues;
ViewPager viewPager;
private String userID, userProfileUrl;
private Context context;
private Button buttonVentIssues;
private ViewPager viewPager;
private TabLayout slidingTabLayout;
CollapsingToolbarLayout collapsingToolbarLayout;
public ComplaintsFragment() {
// Required empty public constructor
}
private CollapsingToolbarLayout collapsingToolbarLayout;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
......@@ -116,12 +112,12 @@ public class ComplaintsFragment extends BaseFragment {
@Override
public void onTabUnselected(TabLayout.Tab tab) {
//On Tab Unselected
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
//On Tab Reselected
}
});
......
......@@ -24,15 +24,15 @@ import retrofit2.Response;
public class ComplaintsHomeFragment extends Fragment {
Activity activity;
ComplaintsAdapter homeListAdapter;
RecyclerView recyclerViewHome;
private Activity activity;
private ComplaintsAdapter homeListAdapter;
private RecyclerView recyclerViewHome;
private SwipeRefreshLayout swipeContainer;
private static String TAG = ComplaintsHomeFragment.class.getSimpleName();
private boolean isCalled = false;
private TextView error_message_home;
static String sID, uID, uProfileUrl;
private static String sID, uID, uProfileUrl;
public static ComplaintsHomeFragment getInstance(String sessionID, String userID, String userProfileUrl) {
sID = sessionID;
......
......@@ -26,7 +26,7 @@ public class ComplaintsMeFragment extends Fragment {
private static String uID, sID, uProfileUrl;
private Activity activity;
RecyclerView recyclerViewMe;
private RecyclerView recyclerViewMe;
private ComplaintsAdapter meListAdapter;
private TextView error_message_me;
private SwipeRefreshLayout swipeContainer;
......
......@@ -90,6 +90,7 @@ import retrofit2.Response;
import static app.insti.Constants.MY_PERMISSIONS_REQUEST_LOCATION;
import static app.insti.Constants.MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE;
import static app.insti.Constants.REQUEST_CAMERA_INT_ID;
import static app.insti.Constants.RESULT_LOAD_IMAGE;
public class FileComplaintFragment extends Fragment {
......@@ -97,44 +98,36 @@ public class FileComplaintFragment extends Fragment {
private static final String TAG = FileComplaintFragment.class.getSimpleName();
private static FileComplaintFragment mainactivity;
private Button buttonSubmit;
private ImageButton imageActionButton;
private CustomAutoCompleteTextView autoCompleteTextView;
private EditText editTextSuggestions;
private EditText editTextTags;
private EditText editTextLocationDetails;
private MapView mMapView;
GoogleMap googleMap;
private GoogleMap googleMap;
private TagView tagView;
private TagView tagViewPopulate;
private ScrollView tagsLayout;
private LatLng Location;
private String Name;
private String Address;
private List<String> Tags;
private ArrayList<ComplaintTag> tagList;
private List<String> uploadedImagesUrl = new ArrayList<>();
private int cursor = 1;
private List<ComplaintTag> tagList2 = new ArrayList<>();
private String base64Image;
private ImageViewPagerAdapter imageViewPagerAdapter;
private ViewPager viewPager;
private CircleIndicator indicator;
private Button buttonAnalysis;
private RelativeLayout layout_buttons;
String userId;
View view;
NestedScrollView nestedScrollView;
private String userId;
private View view;
private NestedScrollView nestedScrollView;
private boolean GPSIsSetup = false;
private ProgressDialog progressDialog;
private CollapsingToolbarLayout collapsing_toolbar;
LinearLayout linearLayoutAnalyse;
private LinearLayout linearLayoutAnalyse;
private LinearLayout linearLayoutScrollTags;
public FileComplaintFragment() {
// Required empty public constructor
}
public static FileComplaintFragment getMainActivity() {
return mainactivity;
}
......@@ -196,7 +189,7 @@ public class FileComplaintFragment extends Fragment {
buttonSubmit.setVisibility(View.INVISIBLE);
buttonSubmit.setVisibility(View.GONE);
buttonAnalysis = view.findViewById(R.id.button_analysis);
Button buttonAnalysis = view.findViewById(R.id.button_analysis);
buttonAnalysis.setVisibility(View.INVISIBLE);
buttonAnalysis.setVisibility(View.GONE);
......@@ -209,7 +202,7 @@ public class FileComplaintFragment extends Fragment {
viewPager = view.findViewById(R.id.complaint_image_view_pager);
indicator = view.findViewById(R.id.indicator);
imageActionButton = view.findViewById(R.id.fabButton);
ImageButton imageActionButton = view.findViewById(R.id.fabButton);
imageActionButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -320,7 +313,7 @@ public class FileComplaintFragment extends Fragment {
@Override
public void onPlaceSelected(com.google.android.gms.location.places.Place place) {
Location = place.getLatLng();
Name = place.getName().toString();
String Name = place.getName().toString();
Address = place.getAddress().toString();
updateMap(Location, Name, Address, cursor); //on selecting the place will automatically shows the Details on the map.
cursor++;
......@@ -529,6 +522,8 @@ public class FileComplaintFragment extends Fragment {
case LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE:
Toast.makeText(getContext(), getString(R.string.GPS_not_enables), Toast.LENGTH_LONG).show();
break;
default:
Toast.makeText(getContext(), getString(R.string.GPS_not_enables), Toast.LENGTH_LONG).show();
}
}
}
......@@ -784,7 +779,7 @@ public class FileComplaintFragment extends Fragment {
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (resultCode == Activity.RESULT_OK && requestCode == Constants.REQUEST_CAMERA_INT_ID && data != null) {
if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CAMERA_INT_ID && data != null) {
progressDialog.setIndeterminate(true);
progressDialog.setCancelable(false);
progressDialog.show();
......@@ -794,7 +789,7 @@ public class FileComplaintFragment extends Fragment {
collapsing_toolbar.setVisibility(View.VISIBLE);
sendImage();
} else if (resultCode == Activity.RESULT_OK && requestCode == Constants.RESULT_LOAD_IMAGE && data != null) {
} else if (resultCode == Activity.RESULT_OK && requestCode == RESULT_LOAD_IMAGE && data != null) {
progressDialog.setIndeterminate(true);
progressDialog.setCancelable(false);
progressDialog.show();
......
......@@ -16,7 +16,7 @@ public class ImageFragment extends BaseFragment {
private static final String TAG = ImageFragment.class.getSimpleName();
private String image;
int indexChosen;
private int indexChosen;
public static ImageFragment newInstance(String image, int index) {
ImageFragment fragment = new ImageFragment();
......
......@@ -19,15 +19,12 @@ import app.insti.api.model.Venter;
public class RelevantComplaintsFragment extends Fragment {
Activity activity;
ComplaintsAdapter relevantComplaintsAdapter;
RecyclerView recyclerViewRelevantComplaints;
private Activity activity;
private ComplaintsAdapter relevantComplaintsAdapter;
private 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;
private static String sID, uID;
public static RelevantComplaintsFragment getInstance(String sessionID, String userID) {
sID = sessionID;
......@@ -60,7 +57,7 @@ public class RelevantComplaintsFragment extends Fragment {
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);
TextView error_message_relevant_complaints = view.findViewById(R.id.error_message_relevant_complaints);
LinearLayoutManager llm = new LinearLayoutManager(activity);
recyclerViewRelevantComplaints.setLayoutManager(llm);
......@@ -92,7 +89,7 @@ public class RelevantComplaintsFragment extends Fragment {
}
private void callServerToGetRelevantComplaints(){
//Get Relevant Complaints from Server
}
private void initialiseRecyclerView(List<Venter.Complaint> list) {
......
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