ui changes in client_details fragment.

openMF · Jun 23, 2021 · a879031 · a879031
1 parent 310c2f2
commit a879031
Show file tree

Hide file tree

Showing 21 changed files with 112 additions and 54 deletions.
diff --git a/...-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargePresenter.kt b/...-android/src/main/java/com/mifos/mifosxdroid/online/clientcharge/ClientChargePresenter.kt
@@ -42,7 +42,7 @@ class ClientChargePresenter @Inject constructor(private val mDataManagerCharge:
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showFetchingErrorCharges(MFErrorParser
                                         .parseError(errorMessage)

diff --git a/...fos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetPresenter.kt b/...fos/mifosxdroid/online/collectionsheetindividual/NewIndividualCollectionSheetPresenter.kt
@@ -49,7 +49,7 @@ class NewIndividualCollectionSheetPresenter @Inject internal constructor(private
                         mvpView!!.showProgressbar(false)
                         if (e is HttpException) {
                             try {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showError(MFErrorParser.parseError(errorMessage)
                                         .errors[0].defaultUserMessage)
@@ -84,7 +84,7 @@ class NewIndividualCollectionSheetPresenter @Inject internal constructor(private
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showError(MFErrorParser.parseError(errorMessage)
                                         .errors[0].defaultUserMessage)
@@ -113,7 +113,7 @@ class NewIndividualCollectionSheetPresenter @Inject internal constructor(private
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showError(MFErrorParser.parseError(errorMessage)
                                         .errors[0].defaultUserMessage)

diff --git a/...roid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsPresenter.kt b/...roid/online/collectionsheetindividualdetails/IndividualCollectionSheetDetailsPresenter.kt
@@ -47,7 +47,7 @@ class IndividualCollectionSheetDetailsPresenter @Inject internal constructor(pri
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showError(MFErrorParser.parseError(errorMessage)
                                         .errors[0].defaultUserMessage)

diff --git a/...id/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientPresenter.kt b/...id/src/main/java/com/mifos/mifosxdroid/online/createnewclient/CreateNewClientPresenter.kt
@@ -122,7 +122,7 @@ class CreateNewClientPresenter @Inject constructor(private val mDataManagerClien
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showMessage(MFErrorParser.parseError(errorMessage)
                                         .errors[0].defaultUserMessage)

diff --git a/...ain/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalPresenter.kt b/...ain/java/com/mifos/mifosxdroid/online/loanaccountapproval/LoanAccountApprovalPresenter.kt
@@ -40,7 +40,7 @@ class LoanAccountApprovalPresenter @Inject constructor(private val mDataManager:
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showLoanApproveFailed(
                                         MFErrorParser.parseError(errorMessage)

diff --git a/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargePresenter.kt b/mifosng-android/src/main/java/com/mifos/mifosxdroid/online/loancharge/LoanChargePresenter.kt
@@ -39,7 +39,7 @@ class LoanChargePresenter @Inject constructor(private val mDataManager: DataMana
                         mvpView!!.showProgressbar(false)
                         try {
                             if (e is HttpException) {
-                                val errorMessage = e.response().errorBody()
+                                val errorMessage = e.response().errorBody()!!
                                         .string()
                                 mvpView!!.showFetchingError(MFErrorParser
                                         .parseError(errorMessage)

diff --git a/mifosng-android/src/main/res/drawable/table_row_round_bg.xml b/mifosng-android/src/main/res/drawable/table_row_round_bg.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape= "rectangle">
+    <stroke android:width="1dp" android:color="@color/primary_dark"/>
+    <corners android:radius="2dp"/>
+</shape>
diff --git a/mifosng-android/src/main/res/layout/fragment_client_details.xml b/mifosng-android/src/main/res/layout/fragment_client_details.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_marginStart="@dimen/default_padding"
     android:layout_marginEnd="@dimen/default_padding"
     android:id="@+id/rl_client">
@@ -20,27 +20,25 @@
                     android:layout_marginTop="@dimen/marginItemsInSectionSmall"
                     android:layout_gravity="center">
 
+
                     <com.mifos.mifosxdroid.views.CircularImageView
                         android:id="@+id/iv_clientImage"
                         style="@style/ClientImage"
-                        android:layout_gravity="center"/>
+                        android:layout_gravity="center"
+                        tools:src="@drawable/ic_launcher"/>
 
                     <ProgressBar
                         android:id="@+id/pb_imageProgressBar"
                         style="@style/ProgressBar.Base"
                         android:layout_gravity="center"/>
 
                 </FrameLayout>
-
-                <TextView
-                    android:id="@+id/tv_fullName"
-                    style="@style/TextView.Client"
-                    android:layout_marginBottom="@dimen/marginItemsInSectionSmall"
-                    android:layout_marginTop="@dimen/marginItemsInSectionSmall"
-                    android:layout_gravity="center"/>
-
             </LinearLayout>
 
+            <TextView
+                android:id="@+id/tv_fullName"
+                style="@style/TextView.Client"
+                tools:text="Client Name" />
 
             <TableLayout
                 android:id="@+id/tbl_clientDetails"
@@ -56,7 +54,8 @@
 
                     <TextView
                         android:id="@+id/tv_accountNumber"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="000000325"/>
                 </TableRow>
 
                 <TableRow
@@ -69,7 +68,8 @@
 
                     <TextView
                         android:id="@+id/tv_externalId"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="ID-123"/>
                 </TableRow>
 
                 <TableRow
@@ -82,7 +82,8 @@
 
                     <TextView
                         android:id="@+id/tv_activationDate"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="Nov 16, 2016"/>
                 </TableRow>
 
                 <TableRow
@@ -95,7 +96,8 @@
 
                     <TextView
                         android:id="@+id/tv_office"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="GROUP AD"/>
                 </TableRow>
 
                 <TableRow
@@ -108,7 +110,8 @@
 
                     <TextView
                         android:id="@+id/tv_mobile_no"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="1234567890"/>
                 </TableRow>
 
                 <TableRow
@@ -121,7 +124,8 @@
 
                     <TextView
                         android:id="@+id/tv_group"
-                        style="@style/TextView.Row.Value"/>
+                        style="@style/TextView.Row.Value"
+                        tools:text="foodies"/>
                 </TableRow>
 
                 <TableRow
@@ -158,24 +162,44 @@
 
             </TableLayout>
 
+            <LinearLayout style="@style/LinearLayout.Width"
+                android:layout_marginTop="22dp"
+                android:layout_marginBottom="12dp">
+                <TextView
+                    android:id="@+id/tv_accountHeader"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/accounts"
+                    android:textStyle="bold"
+                    />
+                <View
+                    android:id="@+id/line2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="2dp"
+                    android:background="@color/primary"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="6dp"
+                    android:layout_marginStart="6dp"
+                    android:layout_marginTop="2dp"/>
+            </LinearLayout>
+
             <include
                 android:id="@+id/account_accordion_section_loans"
                 layout="@layout/view_account_accordion_section"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"/>
+                android:layout_height="wrap_content" />
 
             <include
                 android:id="@+id/account_accordion_section_savings"
                 layout="@layout/view_account_accordion_section"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
             <include
                 android:id="@+id/account_accordion_section_recurring"
                 layout="@layout/view_account_accordion_section"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
     </ScrollView>
@@ -188,12 +212,12 @@
         android:visibility="gone"
         android:orientation="horizontal">
 
-       <Button
-           android:id="@+id/btn_activate_client"
-           android:layout_width="match_parent"
-           android:layout_height="50dp"
-           android:text="@string/activate_client"
-           android:background="@color/accent" />
+        <Button
+            android:id="@+id/btn_activate_client"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:text="@string/activate_client"
+            android:background="@color/accent" />
     </LinearLayout>
 
-</RelativeLayout>
+</RelativeLayout>
diff --git a/mifosng-android/src/main/res/layout/view_account_accordion_section.xml b/mifosng-android/src/main/res/layout/view_account_accordion_section.xml
@@ -2,7 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="10dp">
+    android:layout_marginTop="10dp"
+    android:paddingBottom="12dp">
 
     <com.joanzapata.iconify.widget.IconTextView
         android:id="@+id/tv_toggle_accounts_icon"
@@ -13,15 +14,19 @@
         android:layout_margin="4dp"
         android:text="{md-add-circle-outline}"
         android:textColor="@color/secondary_text"
-        android:textSize="20sp" />
+        android:textSize="20sp"
+        android:layout_alignParentStart="true" />
 
 
     <TextView
         android:id="@+id/tv_toggle_accounts"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/tv_toggle_accounts_icon"
-        android:text="@string/savingAccounts" />
+        android:text="@string/savingAccounts"
+        android:layout_toEndOf="@id/tv_toggle_accounts_icon"
+        android:layout_marginLeft="12dp"
+        android:layout_marginStart="12dp" />
 
     <TextView
         android:id="@+id/tv_count_accounts"
@@ -37,7 +42,7 @@
         android:layout_width="wrap_content"
         android:layout_height="1dp"
         android:layout_below="@id/tv_toggle_accounts"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="8dp"
         android:background="@color/primary" />
 
     <ListView

diff --git a/mifosng-android/src/main/res/values-ca/strings.xml b/mifosng-android/src/main/res/values-ca/strings.xml
@@ -163,4 +163,7 @@
     <string name="lang_changed">S\'ha canviat l\'idioma</string>
     <string name="lang_change_description">Seleccioneu l\'idioma en què voleu veure l\'aplicació</string>
     <string name="dark_mode">mode fosc</string>
+
+    <string name="accounts">Comptes</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-en/strings.xml b/mifosng-android/src/main/res/values-en/strings.xml
@@ -187,6 +187,7 @@
     <string name="product_name">Product Name</string>
     <string name="valid">Valid</string>
     <string name="surveyEmpty">This Survey is Empty</string>
+    <string name="accounts">Accounts</string>
 
 
 </resources>
diff --git a/mifosng-android/src/main/res/values-es/strings.xml b/mifosng-android/src/main/res/values-es/strings.xml
@@ -163,4 +163,7 @@
     <string name="lang_changed">Idioma cambiado</string>
     <string name="lang_change_description">Seleccione el idioma en el que desea ver la aplicación</string>
     <string name="dark_mode">modo oscuro</string>
+
+    <string name="accounts">cuenta</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-fr/strings.xml b/mifosng-android/src/main/res/values-fr/strings.xml
@@ -610,4 +610,6 @@
     <string name="lang_change_description">Sélectionnez la langue dans laquelle vous souhaitez afficher l\'application</string>
     <string name="dark_mode">mode sombre</string>
 
+    <string name="accounts">Compte</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-hi/strings.xml b/mifosng-android/src/main/res/values-hi/strings.xml
@@ -614,6 +614,7 @@
     <string name="collectionsheet_submit_success">कलेक्शन शीट सफलतापूर्वक जमा कर दी गई</string>
     <string name="individual_collection_sheet">व्यक्तिगत कलेक्शन शीट</string>
     <string name="due_collection">कलेक्शन का देय</string>
+    <string name="accounts">खाता</string>
 
     !-- About App -->
     <string name="about_app">फील्ड ऑफिसर एप्लीकेशन एक एप्लीकेशन है बैंक स्टाफ फील्ड ऑफिसर के लिए विकसित किया गया

diff --git a/mifosng-android/src/main/res/values-kn/strings.xml b/mifosng-android/src/main/res/values-kn/strings.xml
@@ -593,4 +593,7 @@
     <string name="lang_changed">ಭಾಷೆ ಬದಲಾಗಿದೆ</string>
     <string name="lang_change_description">ನೀವು ಅಪ್ಲಿಕೇಶನ್ ವೀಕ್ಷಿಸಲು ಬಯಸುವ ಭಾಷೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
     <string name="dark_mode">ಡಾರ್ಕ್ ಮೋಡ್</string>
+
+    <string name="accounts">ಖಾತೆ</string>
+
 </resources>
diff --git a/mifosng-android/src/main/res/values-sw/strings.xml b/mifosng-android/src/main/res/values-sw/strings.xml
@@ -722,6 +722,7 @@
     <string name="failed_to_load_db_clients">Upakio wa wateja wa hifadhidata umefeli</string>
     <string name="failed_to_load_db_groups">Upakio wa makundi ya hifadhidata umefeli</string>
     <string name="browse">Vinjari</string>
+    <string name="accounts">akaunti</string>
 
     <!-- Language -->
     <string name="language">Lugha</string>

diff --git a/mifosng-android/src/main/res/values-zh/strings.xml b/mifosng-android/src/main/res/values-zh/strings.xml
@@ -711,6 +711,7 @@
     <string name="incorrect_passcode">密码错误</string>
     <string name="incorrect_passcode_more_than_three">您已经输错三次密码了，请再次尝试</string>
     <string name="error_passcode">密码应该是4位数</string>
+    <string name="accounts">帳戶</string>
 
     <!-- Language -->
     <string name="language">语</string>