Skip to content

I
InstiApp
Commit 90bdb968 authored by preetamozarde3's avatar preetamozarde3 Committed by Varun Patil
Browse files
Options

fix(venter): Fix improper layouts in File Complaint (#282) 

* Add Creator Image in Complaint card

* Image upload bug fix

* Reverting the change made to complaint card
parent 2c3e0998
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 73 deletions
app/src/main/java/app/insti/fragment/FileComplaintFragment.java
View file @ 90bdb968
...@@ -16,7 +16,6 @@ import android.os.Bundle; ...@@ -16,7 +16,6 @@ import android.os.Bundle;
import android.provider.MediaStore; import android.provider.MediaStore;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.material.appbar.CollapsingToolbarLayout;
import androidx.core.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentManager;
...@@ -125,7 +124,6 @@ public class FileComplaintFragment extends Fragment { ...@@ -125,7 +124,6 @@ public class FileComplaintFragment extends Fragment {
private NestedScrollView nestedScrollView; private NestedScrollView nestedScrollView;
private boolean GPSIsSetup = false; private boolean GPSIsSetup = false;
private ProgressDialog progressDialog; private ProgressDialog progressDialog;
private CollapsingToolbarLayout collapsing_toolbar;
private LinearLayout linearLayoutAnalyse; private LinearLayout linearLayoutAnalyse;
private LinearLayout linearLayoutScrollTags; private LinearLayout linearLayoutScrollTags;
private boolean userAddedTag = false; private boolean userAddedTag = false;
...@@ -135,7 +133,9 @@ public class FileComplaintFragment extends Fragment { ...@@ -135,7 +133,9 @@ public class FileComplaintFragment extends Fragment {
private TextView error_message_me; private TextView error_message_me;
private SwipeRefreshLayout swipeContainer; private SwipeRefreshLayout swipeContainer;
private boolean isCalled = false; private boolean isCalled = false;
private LinearLayout linearLayoutNestedScrollView; private LinearLayout place_holder_image;
private LinearLayout image_holder_view;
private LinearLayout linearLayoutAll;
@Override @Override
public void onDestroyView() { public void onDestroyView() {
...@@ -177,7 +177,9 @@ public class FileComplaintFragment extends Fragment { ...@@ -177,7 +177,9 @@ public class FileComplaintFragment extends Fragment {
progressDialog = new ProgressDialog(getContext()); progressDialog = new ProgressDialog(getContext());
swipeContainer = view.findViewById(R.id.swipeContainer); swipeContainer = view.findViewById(R.id.swipeContainer);
error_message_me = view.findViewById(R.id.error_message_me); error_message_me = view.findViewById(R.id.error_message_me);
linearLayoutNestedScrollView = view.findViewById(R.id.linearLayoutNestedScrollView); linearLayoutAll = view.findViewById(R.id.linearLayoutAll);
place_holder_image = view.findViewById(R.id.place_holder_image);
image_holder_view = view.findViewById(R.id.image_holder_view);
final Toolbar toolbar = getActivity().findViewById(R.id.toolbar); final Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("Add Complaint"); toolbar.setTitle("Add Complaint");
initviews(view); initviews(view);
...@@ -288,15 +290,6 @@ public class FileComplaintFragment extends Fragment { ...@@ -288,15 +290,6 @@ public class FileComplaintFragment extends Fragment {
} }
private void initviews(View view) { private void initviews(View view) {
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);
collapsing_toolbar = view.findViewById(R.id.collapsing_toolbar);
collapsing_toolbar.setVisibility(View.GONE);
nestedScrollView = view.findViewById(R.id.nested_scrollview); nestedScrollView = view.findViewById(R.id.nested_scrollview);
linearLayoutAnalyse = view.findViewById(R.id.layoutAnalyse); linearLayoutAnalyse = view.findViewById(R.id.layoutAnalyse);
...@@ -654,14 +647,14 @@ public class FileComplaintFragment extends Fragment { ...@@ -654,14 +647,14 @@ public class FileComplaintFragment extends Fragment {
tagList.add(complaintTag); tagList.add(complaintTag);
} }
swipeContainer.setRefreshing(false); swipeContainer.setRefreshing(false);
linearLayoutNestedScrollView.setVisibility(View.VISIBLE); linearLayoutAll.setVisibility(View.VISIBLE);
error_message_me.setVisibility(View.GONE); error_message_me.setVisibility(View.GONE);
getMapReady(); getMapReady();
} else { } else {
error_message_me.setVisibility(View.VISIBLE); error_message_me.setVisibility(View.VISIBLE);
error_message_me.setText(getString(R.string.no_complaints)); error_message_me.setText(getString(R.string.no_complaints));
swipeContainer.setRefreshing(false); swipeContainer.setRefreshing(false);
linearLayoutNestedScrollView.setVisibility(View.GONE); linearLayoutAll.setVisibility(View.GONE);
} }
} }
@Override @Override
...@@ -669,13 +662,13 @@ public class FileComplaintFragment extends Fragment { ...@@ -669,13 +662,13 @@ public class FileComplaintFragment extends Fragment {
Log.i(TAG, "failure in getting Tags: " + t.toString()); Log.i(TAG, "failure in getting Tags: " + t.toString());
swipeContainer.setRefreshing(false); swipeContainer.setRefreshing(false);
error_message_me.setVisibility(View.VISIBLE); error_message_me.setVisibility(View.VISIBLE);
linearLayoutNestedScrollView.setVisibility(View.GONE); linearLayoutAll.setVisibility(View.GONE);
} }
}); });
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
swipeContainer.setRefreshing(false); swipeContainer.setRefreshing(false);
linearLayoutNestedScrollView.setVisibility(View.GONE); linearLayoutAll.setVisibility(View.GONE);
} }
} }
...@@ -851,7 +844,8 @@ public class FileComplaintFragment extends Fragment { ...@@ -851,7 +844,8 @@ public class FileComplaintFragment extends Fragment {
Bundle bundle = data.getExtras(); Bundle bundle = data.getExtras();
Bitmap bitmap = (Bitmap) bundle.get("data"); Bitmap bitmap = (Bitmap) bundle.get("data");
base64Image = convertImageToString(bitmap); base64Image = convertImageToString(bitmap);
collapsing_toolbar.setVisibility(View.VISIBLE); place_holder_image.setVisibility(View.GONE);
image_holder_view.setVisibility(View.VISIBLE);
sendImage(); sendImage();
} else if (resultCode == Activity.RESULT_OK && requestCode == RESULT_LOAD_IMAGE && data != null) { } else if (resultCode == Activity.RESULT_OK && requestCode == RESULT_LOAD_IMAGE && data != null) {
...@@ -866,7 +860,8 @@ public class FileComplaintFragment extends Fragment { ...@@ -866,7 +860,8 @@ public class FileComplaintFragment extends Fragment {
String picturePath = cursor.getString(columnIndex); String picturePath = cursor.getString(columnIndex);
cursor.close(); cursor.close();
base64Image = convertImageToString(getScaledBitmap(picturePath, 800, 800)); base64Image = convertImageToString(getScaledBitmap(picturePath, 800, 800));
collapsing_toolbar.setVisibility(View.VISIBLE); place_holder_image.setVisibility(View.GONE);
image_holder_view.setVisibility(View.VISIBLE);
sendImage(); sendImage();
} }
} }
...@@ -903,7 +898,8 @@ public class FileComplaintFragment extends Fragment { ...@@ -903,7 +898,8 @@ public class FileComplaintFragment extends Fragment {
if (viewPager != null) { if (viewPager != null) {
try { try {
imageViewPagerAdapter = new ImageViewPagerAdapter(getActivity(), uploadedImagesUrl); imageViewPagerAdapter = new ImageViewPagerAdapter(getActivity(), uploadedImagesUrl);
collapsing_toolbar.setVisibility(View.VISIBLE); place_holder_image.setVisibility(View.GONE);
image_holder_view.setVisibility(View.VISIBLE);
viewPager.setAdapter(imageViewPagerAdapter); viewPager.setAdapter(imageViewPagerAdapter);
indicator.setViewPager(viewPager); indicator.setViewPager(viewPager);
imageViewPagerAdapter.registerDataSetObserver(indicator.getDataSetObserver()); imageViewPagerAdapter.registerDataSetObserver(indicator.getDataSetObserver());
......
app/src/main/res/layout/fragment_file_complaint.xml
View file @ 90bdb968
...@@ -13,27 +13,60 @@ ...@@ -13,27 +13,60 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_weight="1">
<TextView
android:id="@+id/error_message_me"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|center_vertical"
android:text="@string/error_message"
android:textColor="?attr/themeColorInverse"
android:visibility="gone" />
<com.google.android.material.appbar.AppBarLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/appBar" android:id="@+id/swipeContainer"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:theme="@style/Widget.AppCompat.ActionBar">
<com.google.android.material.appbar.CollapsingToolbarLayout <LinearLayout
android:id="@+id/collapsing_toolbar" android:id="@+id/linearLayoutAll"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@color/colorWhite" android:orientation="vertical"
app:contentScrim="@android:color/white" android:visibility="gone">
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scrollview"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:id="@+id/linearLayoutNestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/place_holder_image"
android:layout_height="150dp"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/baseline_photo_black_48"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/image_holder_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="2dp" android:id="@+id/image_holder_view"
android:layout_height="150dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_collapseMode="parallax"> android:visibility="gone"
android:paddingBottom="10dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -46,6 +79,7 @@ ...@@ -46,6 +79,7 @@
<me.relex.circleindicator.CircleIndicator <me.relex.circleindicator.CircleIndicator
android:id="@+id/indicator" android:id="@+id/indicator"
android:paddingBottom="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
app:ci_animator="@animator/scale_with_alpha" app:ci_animator="@animator/scale_with_alpha"
...@@ -56,41 +90,6 @@ ...@@ -56,41 +90,6 @@
</LinearLayout> </LinearLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<TextView
android:id="@+id/error_message_me"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|center_vertical"
android:text="@string/error_message"
android:textColor="?attr/themeColorInverse"
android:visibility="gone" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.core.widget.NestedScrollView
android:id="@+id/nested_scrollview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:id="@+id/linearLayoutNestedScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="20dp"
android:orientation="vertical"
android:visibility="gone">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -306,7 +305,7 @@ ...@@ -306,7 +305,7 @@
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/layout_buttons" android:id="@+id/layout_buttons"
...@@ -338,6 +337,8 @@ ...@@ -338,6 +337,8 @@
</RelativeLayout> </RelativeLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
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