From 5258bfaa59ad3d5983c9dda468bb7fdea0f844d8 Mon Sep 17 00:00:00 2001
From: Vatsal <patelvatsalb21@gmail.com>
Date: Sun, 18 Apr 2021 11:57:10 +0530
Subject: [PATCH] fix 321: Improved icons and text in Loan details & review

---
 .../fineract/ui/online/review/AddLoanReviewFragment.kt   | 2 +-
 app/src/main/res/drawable/ic_amount_black_24dp.xml       | 6 ++++++
 app/src/main/res/drawable/ic_report_graph_black_24dp.xml | 5 +++++
 app/src/main/res/drawable/ic_show_chart_black_24dp.xml   | 9 ---------
 .../main/res/layout/fragment_customer_loan_details.xml   | 6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_amount_black_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_report_graph_black_24dp.xml
 delete mode 100644 app/src/main/res/drawable/ic_show_chart_black_24dp.xml

diff --git a/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
index 61157658..b8130166 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
@@ -129,7 +129,7 @@ class AddLoanReviewFragment : FineractBaseFragment(), Step {
         tvShortName.text = loanAccount?.identifier
         tvPrincipalAmount.text = loanParameters?.maximumBalance.toString()
         tvTerm.text = loanParameters?.termRange?.maximum.toString()
-        tvTermUnitType.text = loanParameters?.termRange?.temporalUnit
+        tvTermUnitType.text = loanParameters?.termRange?.temporalUnit?.toLowerCase()
         tvRepay.text = loanParameters?.paymentCycle?.period.toString()
         tvRepayUnitType.text = repayUnit
 
diff --git a/app/src/main/res/drawable/ic_amount_black_24dp.xml b/app/src/main/res/drawable/ic_amount_black_24dp.xml
new file mode 100644
index 00000000..c94f8dc6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_amount_black_24dp.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="511.969"
+    android:viewportWidth="511.969" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="m426.523,283.917 l-76.444,-119.836c10.831,-5.692 18.24,-17.05 18.24,-30.112 0,-14.297 -8.875,-26.553 -21.402,-31.57l23.158,-80.964c0.999,-3.493 0.025,-7.252 -2.543,-9.821 -15.405,-15.404 -40.469,-15.404 -55.874,0 -3.685,3.685 -8.584,5.714 -13.795,5.714s-10.11,-2.029 -13.818,-5.738l-0.049,-0.049c-15.35,-15.352 -40.371,-15.395 -55.783,-0.091l-0.287,0.286c-7.607,7.553 -19.962,7.531 -27.541,-0.049l-0.073,-0.073c-15.405,-15.404 -40.469,-15.404 -55.874,0 -2.57,2.571 -3.543,6.333 -2.542,9.828l23.208,80.938c-12.554,5.004 -21.453,17.273 -21.453,31.59 0,13.062 7.408,24.42 18.24,30.112l-76.445,119.835c-29.574,46.36 -31.448,102.826 -5.013,151.045s75.047,77.007 130.038,77.007h91.026c54.99,0 103.602,-28.788 130.038,-77.007 26.435,-48.219 24.562,-104.685 -5.012,-151.045zM186.169,25.756 L186.242,25.829c15.352,15.351 40.372,15.393 55.783,0.091l0.287,-0.286c7.606,-7.553 19.961,-7.531 27.564,0.072l0.049,0.049c15.405,15.404 40.469,15.404 55.874,0 6.268,-6.268 15.775,-7.371 23.183,-3.309l-22.172,77.523h-141.59l-22.23,-77.524c7.408,-4.061 16.912,-2.956 23.179,3.311zM413.998,425.348c-22.87,41.716 -64.926,66.622 -112.5,66.622h-91.026c-47.574,0 -89.63,-24.905 -112.5,-66.622 -22.87,-41.716 -21.249,-90.566 4.336,-130.675l80.825,-126.704h27.852c5.523,0 10,-4.477 10,-10s-4.477,-10 -10,-10h-33.334c-7.72,0 -14,-6.28 -14,-14s6.28,-14 14,-14h0.033,156.634c7.72,0 14,6.28 14,14s-6.28,14 -14,14h-33.333c-5.523,0 -10,4.477 -10,10s4.477,10 10,10h27.851l80.826,126.704c25.585,40.108 27.206,88.958 4.336,130.675z"/>
+    <path android:fillColor="#FF000000" android:pathData="m273.615,326.579c-2.509,-0.887 -5.07,-1.81 -7.63,-2.769v-45.322c6.78,1.995 11.308,5.23 11.5,5.37 4.399,3.295 10.64,2.421 13.964,-1.966 3.335,-4.402 2.47,-10.674 -1.932,-14.01 -0.587,-0.445 -9.885,-7.347 -23.532,-9.96v-9.952c0,-5.523 -4.477,-10 -10,-10s-10,4.477 -10,10v9.88c-1.694,0.325 -3.411,0.736 -5.151,1.259 -14.074,4.229 -24.594,16.265 -27.455,31.411 -2.611,13.83 1.82,27.169 11.564,34.811 5.288,4.147 11.895,7.934 21.042,11.956v57.996c-7.875,-0.498 -13.143,-2.29 -21.925,-8.035 -4.621,-3.025 -10.82,-1.728 -13.843,2.894 -3.024,4.622 -1.728,10.819 2.894,13.843 12.806,8.377 21.477,10.75 32.874,11.311v10.341c0,5.523 4.477,10 10,10s10,-4.477 10,-10v-11.38c21.414,-4.69 33.938,-22.559 36.748,-39.275 3.673,-21.854 -7.756,-40.853 -29.118,-48.403zM237.286,309.593c-3.844,-3.015 -5.474,-8.902 -4.254,-15.363 1.122,-5.942 5.12,-13.107 12.953,-15.758v36.623c-3.288,-1.753 -6.255,-3.585 -8.699,-5.502zM283.009,371.665c-1.44,8.565 -7.221,17.649 -17.025,21.663v-48.239c0.326,0.116 0.635,0.229 0.965,0.346 17.929,6.337 16.826,21.679 16.06,26.23z"/>
+    <path android:fillColor="#FF000000" android:pathData="m255.985,167.969c2.63,0 5.21,-1.07 7.07,-2.93s2.93,-4.44 2.93,-7.07 -1.07,-5.21 -2.93,-7.07 -4.44,-2.93 -7.07,-2.93 -5.21,1.07 -7.07,2.93 -2.93,4.44 -2.93,7.07 1.07,5.21 2.93,7.07 4.439,2.93 7.07,2.93z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_report_graph_black_24dp.xml b/app/src/main/res/drawable/ic_report_graph_black_24dp.xml
new file mode 100644
index 00000000..b25c048a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_report_graph_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="300"
+    android:viewportWidth="300" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#010101" android:pathData="M271.324,84.793c-4.436,-3.971 -11.622,-3.981 -16.072,-0.028l-86.284,76.732l-24.937,-22.265c-4.439,-3.96 -11.628,-3.964 -16.067,0L26.828,229.539c-4.439,3.961 -4.439,10.387 0,14.348c2.216,1.981 5.125,2.972 8.034,2.972c2.905,0 5.818,-0.99 8.034,-2.972l93.102,-83.129l24.92,22.248c4.436,3.961 11.607,3.964 16.054,0.017l94.317,-83.879C275.736,95.19 275.752,88.764 271.324,84.793z"/>
+    <path android:fillColor="#010101" android:pathData="M265.16,77.539h-71.051c-5.233,0 -9.475,4.24 -9.475,9.473c0,5.233 4.241,9.475 9.475,9.475h61.578v61.581c0,5.229 4.24,9.475 9.474,9.475c5.232,0 9.474,-4.245 9.474,-9.478V87.012C274.635,81.779 270.394,77.539 265.16,77.539z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_show_chart_black_24dp.xml b/app/src/main/res/drawable/ic_show_chart_black_24dp.xml
deleted file mode 100644
index 550bdf1e..00000000
--- a/app/src/main/res/drawable/ic_show_chart_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3.5,18.49l6,-6.01 4,4L22,6.92l-1.41,-1.41 -7.09,7.97 -4,-4L2,16.99z"/>
-</vector>
diff --git a/app/src/main/res/layout/fragment_customer_loan_details.xml b/app/src/main/res/layout/fragment_customer_loan_details.xml
index 7ce43f19..e77fad2d 100644
--- a/app/src/main/res/layout/fragment_customer_loan_details.xml
+++ b/app/src/main/res/layout/fragment_customer_loan_details.xml
@@ -15,7 +15,7 @@
         android:id="@+id/ncv_customer_loan_details"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
-        android:visibility="invisible"
+        android:visibility="visible"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
@@ -121,7 +121,7 @@
                                 android:layout_gravity="center"
                                 android:layout_height="35dp"
                                 android:layout_width="35dp"
-                                app:srcCompat="@drawable/ic_account_balance_black_24dp"/>
+                                app:srcCompat="@drawable/ic_amount_black_24dp"/>
 
                             <LinearLayout
                                 android:layout_height="wrap_content"
@@ -467,7 +467,7 @@
                                 android:layout_gravity="center"
                                 android:layout_height="35dp"
                                 android:layout_width="35dp"
-                                app:srcCompat="@drawable/ic_show_chart_black_24dp"/>
+                                app:srcCompat="@drawable/ic_report_graph_black_24dp"/>
 
                             <LinearLayout
                                 android:layout_height="wrap_content"