Merge pull request #37 from district0/develop

Develop
district0 · Mar 5, 2018 · 34d6d92 · 34d6d92
2 parents fbb0606 + a6c8b08
commit 34d6d92
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 9 deletions.
diff --git a/zoomx/src/main/AndroidManifest.xml b/zoomx/src/main/AndroidManifest.xml
@@ -32,8 +32,8 @@
             android:theme="@style/ZoomXAppTheme" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
-            android:authorities="com.zoomx.zoomx"
+            android:name=".util.ZoomxFileProvider"
+            android:authorities="${applicationId}.zoomx.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

diff --git a/zoomx/src/main/java/com/zoomx/zoomx/ui/requestdetails/RequestDetailsFragment.java b/zoomx/src/main/java/com/zoomx/zoomx/ui/requestdetails/RequestDetailsFragment.java
@@ -22,6 +22,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.zoomx.zoomx.BuildConfig;
@@ -51,6 +52,7 @@ public class RequestDetailsFragment extends Fragment {
     private RequestDetailsViewModel viewModel;
     private RequestEntity mRequestEntity;
     private View view;
+    private RelativeLayout requestLayout, responseLayout;
 
 
     public static RequestDetailsFragment newInstance(int requestId) {
@@ -91,10 +93,9 @@ private void initUi(final RequestEntity requestEntity) {
         TextView codeTextView = view.findViewById(R.id.request_details_code_txt);
         TextView urlTextView = view.findViewById(R.id.request_details_url_txt);
         TextView dateTextView = view.findViewById(R.id.request_details_startDate_txt);
-        ImageView responseArrowImageView = view.findViewById(R.id.request_details_response_body_arrow_img);
-        ImageView requestArrowImageView = view.findViewById(R.id.request_details_request_body_arrow_img);
+        responseLayout = view.findViewById(R.id.request_details_response_layout);
+        requestLayout = view.findViewById(R.id.request_details_request_body_layout);
         RecyclerView recyclerView = view.findViewById(R.id.request_details_recycler_view);
-
         RecyclerView.LayoutManager mLayoutManager = new LinearLayoutManager(getContext());
         recyclerView.setLayoutManager(mLayoutManager);
         recyclerView.setNestedScrollingEnabled(false);
@@ -109,14 +110,14 @@ private void initUi(final RequestEntity requestEntity) {
         urlTextView.setText(requestEntity.getUrl());
         dateTextView.setText(FormatUtil.formatDate(requestEntity.getStartDate(), FormatUtil.DATE_FORMAT));
 
-        responseArrowImageView.setOnClickListener(new View.OnClickListener() {
+        responseLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showBody(requestEntity.getUrl(), requestEntity.getResponseBody());
             }
         });
 
-        requestArrowImageView.setOnClickListener(new View.OnClickListener() {
+        requestLayout.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 showBody(requestEntity.getUrl(), requestEntity.getRequestBody());

diff --git a/zoomx/src/main/java/com/zoomx/zoomx/util/ZoomxFileProvider.java b/zoomx/src/main/java/com/zoomx/zoomx/util/ZoomxFileProvider.java
@@ -0,0 +1,10 @@
+package com.zoomx.zoomx.util;
+
+import android.support.v4.content.FileProvider;
+
+/**
+ * Created by Ahmed Fathallah on 3/5/2018.
+ */
+
+public class ZoomxFileProvider extends FileProvider {
+}
diff --git a/zoomx/src/main/res/drawable/row_selector.xml b/zoomx/src/main/res/drawable/row_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/grey_500" android:state_focused="true" />
+    <item android:drawable="@color/grey_500" android:state_enabled="true" android:state_pressed="true" />
+    <item android:drawable="@color/white" />
+</selector>
diff --git a/zoomx/src/main/res/layout/request_details_fragment.xml b/zoomx/src/main/res/layout/request_details_fragment.xml
@@ -132,7 +132,9 @@
             android:id="@+id/request_details_response_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="10dp"
+            android:background="@drawable/row_selector"
+            android:clickable="true">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -161,7 +163,9 @@
             android:id="@+id/request_details_request_body_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp">
+            android:layout_marginTop="10dp"
+            android:background="@drawable/row_selector"
+            android:clickable="true">
 
             <TextView
                 android:layout_width="wrap_content"