Skip to content

I
InstiApp
Commit 2e958339 authored by Preetam Ozarde's avatar Preetam Ozarde
Browse files
Options

Make minor changes

parent 7ea2d422
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 45 deletions
app/src/main/java/app/insti/adapter/ImageViewPagerAdapter.java
View file @ 2e958339
......@@ -71,7 +71,7 @@ public class ImageViewPagerAdapter extends PagerAdapter {
if (images.size() != 0)
Picasso.get().load(images.get(position)).into(imageView);
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);
return imageLayout;
......
app/src/main/java/app/insti/fragment/ComplaintDetailsFragment.java
View file @ 2e958339
......@@ -324,7 +324,6 @@ public class ComplaintDetailsFragment extends Fragment {
}
private void addTagsToView(Venter.Complaint detailedComplaint) {
for (Venter.TagUri tagUri : detailedComplaint.getTags()) {
TextView textViewTags = new TextView(getContext());
......@@ -332,7 +331,12 @@ public class ComplaintDetailsFragment extends Fragment {
LinearLayout.LayoutParams.WRAP_CONTENT);
layoutParams.setMargins(10,10,10,10);
textViewTags.setLayoutParams(layoutParams);
textViewTags.setText(tagUri.getTagUri());
if(tagUri.getTagUri().contains("(U)")) {
String tag = tagUri.getTagUri().replace("(U)", "");
textViewTags.setText(tag);
}else {
textViewTags.setText(tagUri.getTagUri());
}
textViewTags.setBackgroundResource(R.drawable.customborder);
textViewTags.setPadding(30,25,30,25);
int fontDp = 4;
......@@ -347,7 +351,6 @@ public class ComplaintDetailsFragment extends Fragment {
}
private void initViewPagerForImages(Venter.Complaint detailedComplaint) {
ViewPager viewPager = mView.findViewById(R.id.complaint_image_view_pager);
if (viewPager != null) {
try {
......
app/src/main/java/app/insti/fragment/FileComplaintFragment.java
View file @ 2e958339
......@@ -654,17 +654,17 @@ public class FileComplaintFragment extends Fragment {
}
private void addComplaint() {
final String complaint = "Complaint: " + descriptionAutoCompleteTextview.getText().toString();
final String complaint = "Complaint: \n" + descriptionAutoCompleteTextview.getText().toString();
final String suggestion;
final String locationDetails;
Log.i(TAG, "Suggestion: " + editTextSuggestions.getText().toString());
Log.i(TAG, "\nSuggestion: " + editTextSuggestions.getText().toString());
if (!(editTextSuggestions.getText().toString().isEmpty())) {
suggestion = "\nSuggestion: " + editTextSuggestions.getText().toString();
suggestion = "\n\nSuggestion: \n" + editTextSuggestions.getText().toString();
} else {
suggestion = "";
}
if (!(editTextLocationDetails.getText().toString().isEmpty())) {
locationDetails = "\nLocation Details: " + editTextLocationDetails.getText().toString();
locationDetails = "\n\nLocation Details: \n" + editTextLocationDetails.getText().toString();
} else {
locationDetails = "";
}
......
app/src/main/res/layout/comments_card.xml
View file @ 2e958339
......@@ -15,57 +15,61 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="5dp"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/circleImageViewUserImage"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_gravity="center"
android:scaleType="centerCrop" />
android:orientation="vertical"
android:padding="5dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_weight="3"
android:orientation="vertical">
<TextView
android:id="@+id/textViewUserComment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="User Name"
android:textColor="@android:color/black"
android:textSize="18sp" />
android:padding="5dp"
android:orientation="horizontal">
<TextView
android:id="@+id/textViewTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Time of Comment" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/circleImageViewUserImage"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="top"
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_gravity="center_vertical"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_weight="3"
android:orientation="vertical">
<TextView
android:id="@+id/textViewComment"
android:id="@+id/textViewUserComment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="User Name"
android:textColor="@android:color/black"
android:textSize="18sp" />
<TextView
android:id="@+id/textViewTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:scrollHorizontally="true"
android:text="Comment"
android:textSize="16sp" />
android:text="Time of Comment" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/textViewComment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:scrollHorizontally="true"
android:text="Comment"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:textColor="@android:color/black"
android:textSize="16sp" />
</LinearLayout>
</android.support.v7.widget.CardView>
app/src/main/res/layout/fragment_file_complaint.xml
View file @ 2e958339
......@@ -28,8 +28,8 @@
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<LinearLayout
android:id="@+id/image_holder_view"
android:layout_width="match_parent"
android:id="@+id/image_holder_view"
android:layout_height="2dp"
android:orientation="vertical"
app:layout_collapseMode="parallax">
......@@ -40,8 +40,8 @@
<android.support.v4.view.ViewPager
android:id="@+id/complaint_image_view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<me.relex.circleindicator.CircleIndicator
android:id="@+id/indicator"
......@@ -77,6 +77,7 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/linearLayoutDescription"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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