Remove image fragment from collapsing toolbar in ComplainFragment, resolve codacy changes

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

@@ -3,6 +3,7 @@ package app.insti.fragment;
 import android.content.res.ColorStateList;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -13,6 +14,7 @@ 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;
@@ -30,11 +32,13 @@ import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import app.insti.R;
 import app.insti.Utils;
 import app.insti.activity.MainActivity;
 import app.insti.adapter.CommentsAdapter;
+import app.insti.adapter.ImageViewPagerAdapter;
 import app.insti.adapter.UpVotesAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.User;
@@ -43,6 +47,7 @@ import app.insti.api.request.CommentCreateRequest;
 import app.insti.utils.DateTimeUtil;
 import de.hdodenhof.circleimageview.CircleImageView;
 
+import me.relex.circleindicator.CircleIndicator;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -66,6 +71,7 @@ public class ComplaintDetailsFragment extends Fragment {
     private RecyclerView recyclerViewComments;
     private RecyclerView recyclerViewUpVotes;
     private Button buttonVoteUp;
+    private View mView;
 
     private static String sId, cId, uId, uProfileUrl;
     private CommentsAdapter commentListAdapter;
@@ -75,6 +81,7 @@ public class ComplaintDetailsFragment extends Fragment {
     private LinearLayout linearLayoutTags;
     private ScrollView layoutUpVotes;
     private NestedScrollView nestedScrollView;
+    private CircleIndicator circleIndicator;
 
     public static ComplaintDetailsFragment getInstance(String sessionid, String complaintid, String userid, String userProfileUrl) {
         sId = sessionid;
@@ -133,6 +140,8 @@ public class ComplaintDetailsFragment extends Fragment {
             }
         });
 
+        mView = view;
+
         return view;
     }
 
@@ -154,6 +163,12 @@ public class ComplaintDetailsFragment extends Fragment {
         imageButtonSend = view.findViewById(R.id.send_comment);
         circleImageViewCommentUserImage = view.findViewById(R.id.comment_user_image);
         buttonVoteUp = view.findViewById(R.id.buttonVoteUp);
+        circleIndicator  = view.findViewById(R.id.indicator);
+        LinearLayout imageViewHolder = view.findViewById(R.id.image_holder_view);
+        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams
+                (LinearLayout.LayoutParams.MATCH_PARENT,
+                        getResources().getDisplayMetrics().heightPixels / 2);
+        imageViewHolder.setLayoutParams(layoutParams);
     }
 
     public void setDetailedComplaint(Venter.Complaint detailedComplaint) {
@@ -189,6 +204,8 @@ public class ComplaintDetailsFragment extends Fragment {
             Picasso.get().load(uProfileUrl).placeholder(R.drawable.user_placeholder).into(circleImageViewCommentUserImage);
             addVotesToView(detailedComplaint);
             addCommentsToView(detailedComplaint);
+
+            initViewPagerForImages(detailedComplaint);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -330,6 +347,25 @@ 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 {
+                ImageViewPagerAdapter imageFragmentPagerAdapter = new ImageViewPagerAdapter(getChildFragmentManager(), detailedComplaint);
+                viewPager.setAdapter(imageFragmentPagerAdapter);
+                circleIndicator.setViewPager(viewPager);
+                imageFragmentPagerAdapter.registerDataSetObserver(circleIndicator.getDataSetObserver());
+                Objects.requireNonNull(viewPager.getAdapter()).notifyDataSetChanged();
+                synchronized (viewPager) {
+                    viewPager.notifyAll();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
@@ -14,7 +13,6 @@ import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import java.util.Objects;
 
@@ -25,7 +23,6 @@ import app.insti.adapter.ImageViewPagerAdapter;
 import app.insti.api.RetrofitInterface;
 import app.insti.api.model.User;
 import app.insti.api.model.Venter;
-import me.relex.circleindicator.CircleIndicator;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -37,23 +34,13 @@ public class ComplaintFragment extends Fragment {
     private ViewPager viewPager;
     private View mview;
     private String complaintId, sessionID, userId, userProfileUrl;
-    private CircleIndicator circleIndicator;
-    private AppBarLayout appBarLayout;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_complaint, container, false);
 
-        appBarLayout = view.findViewById(R.id.appBar);
-        LinearLayout imageViewHolder = view.findViewById(R.id.image_holder_view);
-        CollapsingToolbarLayout.LayoutParams layoutParams = new CollapsingToolbarLayout.LayoutParams
-                (CollapsingToolbarLayout.LayoutParams.MATCH_PARENT,
-                        getResources().getDisplayMetrics().heightPixels / 2);
-        imageViewHolder.setLayoutParams(layoutParams);
-
         slidingTabLayout = view.findViewById(R.id.sliding_tab_layout);
-        circleIndicator = view.findViewById(R.id.indicator);
         this.mview = view;
         return view;
     }
@@ -89,7 +76,6 @@ public class ComplaintFragment extends Fragment {
                             }
                         }
                     }
-                    initViewPagerForImages(complaint);
                     initTabViews(complaint);
                     //Make progress circle gone After loading
                     getActivity().findViewById(R.id.loadingPanel).setVisibility(View.GONE);
@@ -105,25 +91,6 @@ public class ComplaintFragment extends Fragment {
         });
     }
 
-    private void initViewPagerForImages(Venter.Complaint detailedComplaint) {
-
-        viewPager = mview.findViewById(R.id.complaint_image_view_pager);
-        if (viewPager != null) {
-            try {
-                ImageViewPagerAdapter imageFragmentPagerAdapter = new ImageViewPagerAdapter(getChildFragmentManager(), detailedComplaint);
-                viewPager.setAdapter(imageFragmentPagerAdapter);
-                circleIndicator.setViewPager(viewPager);
-                imageFragmentPagerAdapter.registerDataSetObserver(circleIndicator.getDataSetObserver());
-                Objects.requireNonNull(viewPager.getAdapter()).notifyDataSetChanged();
-                synchronized (viewPager) {
-                    viewPager.notifyAll();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     private void initTabViews(final Venter.Complaint detailedComplaint) {
         try {
             if (detailedComplaint != null) {
@@ -192,10 +159,4 @@ public class ComplaintFragment extends Fragment {
             e.printStackTrace();
         }
     }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        appBarLayout.setExpanded(true);
-    }
 }
\ No newline at end of file

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

@@ -41,12 +41,6 @@ public class ImageFragment extends BaseFragment {
         View view = inflater.inflate(R.layout.fragment_image, container, false);
         ImageView imageView = view.findViewById(R.id.imageView);
         Picasso.get().load(image).into(imageView);
-        imageView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-            }
-        });
         return view;
     }
 }
\ No newline at end of file

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

@@ -16,53 +16,16 @@
             android:layout_height="wrap_content"
             android:theme="@style/Base.ThemeOverlay.AppCompat.Dark.ActionBar">
 
-            <android.support.design.widget.CollapsingToolbarLayout
-                android:id="@+id/collapsing_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/colorWhite"
-                app:contentScrim="@android:color/white"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <LinearLayout
-                    android:id="@+id/image_holder_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="2dp"
-                    android:orientation="vertical"
-                    app:layout_collapseMode="parallax">
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent">
-
-                        <android.support.v4.view.ViewPager
-                            android:id="@+id/complaint_image_view_pager"
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent" />
-
-                        <me.relex.circleindicator.CircleIndicator
-                            android:id="@+id/indicator"
-                            android:layout_width="match_parent"
-                            android:layout_height="48dp"
-                            app:ci_animator="@animator/scale_with_alpha"
-                            app:ci_drawable="@drawable/selected_dot" />
-
-                    </RelativeLayout>
-
-                </LinearLayout>
-
-            </android.support.design.widget.CollapsingToolbarLayout>
-
             <android.support.design.widget.TabLayout
                 android:id="@+id/sliding_tab_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="?attr/actionBarSize"
                 android:layout_gravity="bottom"
-                android:background="@color/colorWhite"
                 app:tabIndicatorColor="@color/colorPrimary"
-                app:tabSelectedTextColor="#4a4a4a"
+                android:background="@color/colorWhite"
+                app:tabTextColor="@color/colorGray"
                 app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
-                app:tabTextColor="@color/colorGray" />
+                app:tabSelectedTextColor="#4a4a4a"/>
 
         </android.support.design.widget.AppBarLayout>
 

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

@@ -10,10 +10,36 @@
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="2dp"
         android:orientation="vertical"
         android:paddingTop="10dp">
 
+        <LinearLayout
+            android:id="@+id/image_holder_view"
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <android.support.v4.view.ViewPager
+                    android:id="@+id/complaint_image_view_pager"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"/>
+
+                <me.relex.circleindicator.CircleIndicator
+                    android:id="@+id/indicator"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp"
+                    app:ci_animator="@animator/scale_with_alpha"
+                    app:ci_drawable="@drawable/selected_dot" />
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"