Merge pull request #230 from sshivam95/nss

Maps version Patch for Android 9 and feedbacks from BETA version testing

app/src/main/AndroidManifest.xml

@@ -27,6 +27,8 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="@string/google_maps_api_key" />
 
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
         <!-- FCM styling -->
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"

app/src/main/java/app/insti/adapter/ImageViewPagerAdapter.java

@@ -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_black_48).resize(500,500).into(imageView);
 
         view.addView(imageLayout, 0);
         return imageLayout;

app/src/main/java/app/insti/fragment/ComplaintDetailsFragment.java

@@ -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

@@ -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/drawable/baseline_photo_24.xml

+<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="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>

app/src/main/res/layout/comments_card.xml

@@ -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

@@ -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">

app/src/main/res/layout/slidingimages_layout.xml

@@ -7,8 +7,8 @@
 
     <ImageView
         android:id="@+id/slidingImageView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:background="#00000000" />
 
 </LinearLayout>
\ No newline at end of file