Merge remote-tracking branch 'origin/nss' into nss

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

 package app.insti.adapter;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.util.Log;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.v4.view.PagerAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import app.insti.R;
 import app.insti.api.model.Venter;
-import app.insti.fragment.AddImageFragment;
-import app.insti.fragment.ImageFragment;
 
 /**
  * Created by Shivam Sharma on 25-09-2018.
  */
 
-public class ImageViewPagerAdapter extends FragmentPagerAdapter {
+public class ImageViewPagerAdapter extends PagerAdapter {
 
-    private static final String TAG = ImageViewPagerAdapter.class.getSimpleName();
     private List<String> images = new ArrayList<>();
+    public Context context;
+    public LayoutInflater inflater;
 
-    public ImageViewPagerAdapter(FragmentManager fragmentManager, List<String> images) {
-        super(fragmentManager);
+    public ImageViewPagerAdapter(Context context, List<String> images)
+    {
+        this.context = context;
         this.images = images;
+        inflater= (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
-    public ImageViewPagerAdapter(FragmentManager fragmentManager, Venter.Complaint detailedComplaint){
-        super(fragmentManager);
-        images.addAll(detailedComplaint.getImages());
+    public ImageViewPagerAdapter(Context context, Venter.Complaint detailedComplaint)
+    {
+        this.context = context;
+        inflater= (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+        for (String image: detailedComplaint.getImages()){
+            images.add(image);
+        }
     }
 
     @Override
     public int getCount() {
         if (images.size() == 0)
             return 1;
-        return images.size();
+        else
+            return images.size();
     }
 
     @Override
-    public Fragment getItem(int position) {
-        Log.i(TAG, "images = " + images.size());
-        Log.i(TAG, "size = " + getCount());
-        Log.i(TAG, "pos = " + position);
-
-        if (images.size() == 0){
-            Log.i(TAG,"calling 1");
-            return new AddImageFragment();
-        }else {
-            Log.i(TAG,"calling 2");
-            return ImageFragment.newInstance(images.get(position));
-        }
+    public boolean isViewFromObject(@NonNull View view, @NonNull Object o) {
+        return view.equals(o);
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        container.removeView((View) object);
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup view, int position)
+    {
+        View imageLayout = inflater.inflate(R.layout.slidingimages_layout, view, false);
+        assert imageLayout != null;
+        final ImageView imageView = imageLayout.findViewById(R.id.slidingImageView);
+
+        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);
+
+        view.addView(imageLayout, 0);
+        return imageLayout;
     }
 }
\ No newline at end of file

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

-package app.insti.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import app.insti.R;
-
-/**
- * Created by Shivam Sharma on 25-09-2018.
- */
-
-public class AddImageFragment extends BaseFragment {
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_add_image, container, false);
-        return view;
-    }
-}

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

@@ -14,7 +14,6 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
@@ -352,7 +351,7 @@ public class ComplaintDetailsFragment extends Fragment {
         ViewPager viewPager = mView.findViewById(R.id.complaint_image_view_pager);
         if (viewPager != null) {
             try {
-                ImageViewPagerAdapter imageFragmentPagerAdapter = new ImageViewPagerAdapter(getChildFragmentManager(), detailedComplaint);
+                ImageViewPagerAdapter imageFragmentPagerAdapter = new ImageViewPagerAdapter(getActivity(), detailedComplaint);
                 viewPager.setAdapter(imageFragmentPagerAdapter);
                 circleIndicator.setViewPager(viewPager);
                 imageFragmentPagerAdapter.registerDataSetObserver(circleIndicator.getDataSetObserver());

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

@@ -19,7 +19,6 @@ import java.util.Objects;
 import app.insti.R;
 import app.insti.Utils;
 import app.insti.adapter.ComplaintDetailsPagerAdapter;
-import app.insti.adapter.ImageViewPagerAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.User;
 import app.insti.api.model.Venter;

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

@@ -851,7 +851,7 @@ public class FileComplaintFragment extends Fragment {
 
         if (viewPager != null) {
             try {
-                imageViewPagerAdapter = new ImageViewPagerAdapter(getFragmentManager(), uploadedImagesUrl);
+                imageViewPagerAdapter = new ImageViewPagerAdapter(getActivity(), uploadedImagesUrl);
                 collapsing_toolbar.setVisibility(View.VISIBLE);
                 viewPager.setAdapter(imageViewPagerAdapter);
                 indicator.setViewPager(viewPager);

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

-package app.insti.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-
-import com.squareup.picasso.Picasso;
-
-import app.insti.R;
-
-public class ImageFragment extends BaseFragment {
-
-    private static final String TAG = ImageFragment.class.getSimpleName();
-    private String image;
-
-    public static ImageFragment newInstance(String image) {
-        ImageFragment fragment = new ImageFragment();
-        Bundle args = new Bundle();
-        args.putString("image", image);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        Log.i(TAG, "getArguments in ImageFragment" + getArguments());
-        if (getArguments() != null) {
-            image = getArguments().getString("image");
-        }
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_image, container, false);
-        ImageView imageView = view.findViewById(R.id.imageView);
-        Picasso.get().load(image).into(imageView);
-        return view;
-    }
-}
\ No newline at end of file

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

-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center">
-
-    <ImageView
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:src="@drawable/baseline_photo_size_select_actual_black_48"
-        android:id="@+id/image_view_image"/>
-
-</LinearLayout>
\ No newline at end of file

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

@@ -6,7 +6,7 @@
     android:gravity="center">
 
     <ImageView
-        android:id="@+id/imageView"
+        android:id="@+id/slidingImageView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#00000000" />