Commit 2e958339 authored by Preetam Ozarde's avatar Preetam Ozarde

Make minor changes

parent 7ea2d422
...@@ -71,7 +71,7 @@ public class ImageViewPagerAdapter extends PagerAdapter { ...@@ -71,7 +71,7 @@ public class ImageViewPagerAdapter extends PagerAdapter {
if (images.size() != 0) if (images.size() != 0)
Picasso.get().load(images.get(position)).into(imageView); Picasso.get().load(images.get(position)).into(imageView);
else else
Picasso.get().load(R.drawable.baseline_photo_size_select_actual_black_48).resize(500,500).into(imageView); Picasso.get().load(R.drawable.baseline_photo_size_select_actual_black_48).into(imageView);
view.addView(imageLayout, 0); view.addView(imageLayout, 0);
return imageLayout; return imageLayout;
......
...@@ -324,7 +324,6 @@ public class ComplaintDetailsFragment extends Fragment { ...@@ -324,7 +324,6 @@ public class ComplaintDetailsFragment extends Fragment {
} }
private void addTagsToView(Venter.Complaint detailedComplaint) { private void addTagsToView(Venter.Complaint detailedComplaint) {
for (Venter.TagUri tagUri : detailedComplaint.getTags()) { for (Venter.TagUri tagUri : detailedComplaint.getTags()) {
TextView textViewTags = new TextView(getContext()); TextView textViewTags = new TextView(getContext());
...@@ -332,7 +331,12 @@ public class ComplaintDetailsFragment extends Fragment { ...@@ -332,7 +331,12 @@ public class ComplaintDetailsFragment extends Fragment {
LinearLayout.LayoutParams.WRAP_CONTENT); LinearLayout.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(10,10,10,10); layoutParams.setMargins(10,10,10,10);
textViewTags.setLayoutParams(layoutParams); textViewTags.setLayoutParams(layoutParams);
if(tagUri.getTagUri().contains("(U)")) {
String tag = tagUri.getTagUri().replace("(U)", "");
textViewTags.setText(tag);
}else {
textViewTags.setText(tagUri.getTagUri()); textViewTags.setText(tagUri.getTagUri());
}
textViewTags.setBackgroundResource(R.drawable.customborder); textViewTags.setBackgroundResource(R.drawable.customborder);
textViewTags.setPadding(30,25,30,25); textViewTags.setPadding(30,25,30,25);
int fontDp = 4; int fontDp = 4;
...@@ -347,7 +351,6 @@ public class ComplaintDetailsFragment extends Fragment { ...@@ -347,7 +351,6 @@ public class ComplaintDetailsFragment extends Fragment {
} }
private void initViewPagerForImages(Venter.Complaint detailedComplaint) { private void initViewPagerForImages(Venter.Complaint detailedComplaint) {
ViewPager viewPager = mView.findViewById(R.id.complaint_image_view_pager); ViewPager viewPager = mView.findViewById(R.id.complaint_image_view_pager);
if (viewPager != null) { if (viewPager != null) {
try { try {
......
...@@ -654,17 +654,17 @@ public class FileComplaintFragment extends Fragment { ...@@ -654,17 +654,17 @@ public class FileComplaintFragment extends Fragment {
} }
private void addComplaint() { private void addComplaint() {
final String complaint = "Complaint: " + descriptionAutoCompleteTextview.getText().toString(); final String complaint = "Complaint: \n" + descriptionAutoCompleteTextview.getText().toString();
final String suggestion; final String suggestion;
final String locationDetails; final String locationDetails;
Log.i(TAG, "Suggestion: " + editTextSuggestions.getText().toString()); Log.i(TAG, "\nSuggestion: " + editTextSuggestions.getText().toString());
if (!(editTextSuggestions.getText().toString().isEmpty())) { if (!(editTextSuggestions.getText().toString().isEmpty())) {
suggestion = "\nSuggestion: " + editTextSuggestions.getText().toString(); suggestion = "\n\nSuggestion: \n" + editTextSuggestions.getText().toString();
} else { } else {
suggestion = ""; suggestion = "";
} }
if (!(editTextLocationDetails.getText().toString().isEmpty())) { if (!(editTextLocationDetails.getText().toString().isEmpty())) {
locationDetails = "\nLocation Details: " + editTextLocationDetails.getText().toString(); locationDetails = "\n\nLocation Details: \n" + editTextLocationDetails.getText().toString();
} else { } else {
locationDetails = ""; locationDetails = "";
} }
......
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
app:cardBackgroundColor="@color/colorWhite" app:cardBackgroundColor="@color/colorWhite"
app:cardCornerRadius="0dp"> app:cardCornerRadius="0dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="5dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -20,9 +26,9 @@ ...@@ -20,9 +26,9 @@
<de.hdodenhof.circleimageview.CircleImageView <de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/circleImageViewUserImage" android:id="@+id/circleImageViewUserImage"
android:layout_width="60dp" android:layout_width="40dp"
android:layout_height="60dp" android:layout_height="40dp"
android:layout_gravity="center" android:layout_gravity="top"
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
<LinearLayout <LinearLayout
...@@ -48,10 +54,9 @@ ...@@ -48,10 +54,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Time of Comment" /> android:text="Time of Comment" />
<LinearLayout </LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content" </LinearLayout>
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/textViewComment" android:id="@+id/textViewComment"
...@@ -60,12 +65,11 @@ ...@@ -60,12 +65,11 @@
android:ellipsize="end" android:ellipsize="end"
android:scrollHorizontally="true" android:scrollHorizontally="true"
android:text="Comment" android:text="Comment"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="@android:color/black"
android:textSize="16sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView> </android.support.v7.widget.CardView>
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
app:layout_scrollFlags="scroll|exitUntilCollapsed"> app:layout_scrollFlags="scroll|exitUntilCollapsed">
<LinearLayout <LinearLayout
android:id="@+id/image_holder_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/image_holder_view"
android:layout_height="2dp" android:layout_height="2dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_collapseMode="parallax"> app:layout_collapseMode="parallax">
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/complaint_image_view_pager" android:id="@+id/complaint_image_view_pager"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="match_parent" /> android:layout_height="wrap_content" />
<me.relex.circleindicator.CircleIndicator <me.relex.circleindicator.CircleIndicator
android:id="@+id/indicator" android:id="@+id/indicator"
...@@ -77,6 +77,7 @@ ...@@ -77,6 +77,7 @@
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:id="@+id/linearLayoutDescription"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="5dp" android:paddingHorizontal="5dp"
......
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