From 1862f7dfee1baacfe3a85deba4a42786e3a60172 Mon Sep 17 00:00:00 2001 From: Yash Khare Date: Mon, 17 Aug 2020 00:50:00 +0530 Subject: [PATCH] Enhance UI of user and client profile sections --- visionppi/app/build.gradle | 1 + .../client_profile/ClientProfileActivity.kt | 20 +- .../ui/user_profile/UserProfileActivity.kt | 2 +- .../src/main/res/drawable-anydpi/ic_bene.xml | 11 + .../src/main/res/drawable-anydpi/ic_dob.xml | 11 + .../src/main/res/drawable-anydpi/ic_phone.xml | 11 + .../src/main/res/drawable-hdpi/ic_bene.png | Bin 0 -> 313 bytes .../app/src/main/res/drawable-hdpi/ic_dob.png | Bin 0 -> 239 bytes .../src/main/res/drawable-hdpi/ic_phone.png | Bin 0 -> 333 bytes .../src/main/res/drawable-mdpi/ic_bene.png | Bin 0 -> 198 bytes .../app/src/main/res/drawable-mdpi/ic_dob.png | Bin 0 -> 135 bytes .../src/main/res/drawable-mdpi/ic_phone.png | Bin 0 -> 258 bytes .../src/main/res/drawable-xhdpi/ic_bene.png | Bin 0 -> 351 bytes .../src/main/res/drawable-xhdpi/ic_dob.png | Bin 0 -> 216 bytes .../src/main/res/drawable-xhdpi/ic_phone.png | Bin 0 -> 404 bytes .../src/main/res/drawable-xxhdpi/ic_bene.png | Bin 0 -> 491 bytes .../src/main/res/drawable-xxhdpi/ic_dob.png | Bin 0 -> 279 bytes .../src/main/res/drawable-xxhdpi/ic_phone.png | Bin 0 -> 570 bytes .../app/src/main/res/drawable/background.xml | 6 + .../res/layout/activity_client_profile.xml | 283 +++++++++------- .../main/res/layout/activity_user_profile.xml | 302 +++++++++++------- visionppi/app/src/main/res/values/colors.xml | 1 + visionppi/app/src/main/res/values/strings.xml | 2 +- 23 files changed, 399 insertions(+), 251 deletions(-) create mode 100644 visionppi/app/src/main/res/drawable-anydpi/ic_bene.xml create mode 100644 visionppi/app/src/main/res/drawable-anydpi/ic_dob.xml create mode 100644 visionppi/app/src/main/res/drawable-anydpi/ic_phone.xml create mode 100644 visionppi/app/src/main/res/drawable-hdpi/ic_bene.png create mode 100644 visionppi/app/src/main/res/drawable-hdpi/ic_dob.png create mode 100644 visionppi/app/src/main/res/drawable-hdpi/ic_phone.png create mode 100644 visionppi/app/src/main/res/drawable-mdpi/ic_bene.png create mode 100644 visionppi/app/src/main/res/drawable-mdpi/ic_dob.png create mode 100644 visionppi/app/src/main/res/drawable-mdpi/ic_phone.png create mode 100644 visionppi/app/src/main/res/drawable-xhdpi/ic_bene.png create mode 100644 visionppi/app/src/main/res/drawable-xhdpi/ic_dob.png create mode 100644 visionppi/app/src/main/res/drawable-xhdpi/ic_phone.png create mode 100644 visionppi/app/src/main/res/drawable-xxhdpi/ic_bene.png create mode 100644 visionppi/app/src/main/res/drawable-xxhdpi/ic_dob.png create mode 100644 visionppi/app/src/main/res/drawable-xxhdpi/ic_phone.png create mode 100644 visionppi/app/src/main/res/drawable/background.xml diff --git a/visionppi/app/build.gradle b/visionppi/app/build.gradle index 85efea3..7b87fd4 100644 --- a/visionppi/app/build.gradle +++ b/visionppi/app/build.gradle @@ -54,6 +54,7 @@ dependencies { implementation 'androidx.navigation:navigation-ui:2.1.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0' implementation 'androidx.navigation:navigation-ui-ktx:2.1.0' + implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' def lifecycle_version = "2.2.0" def kotlin_version="1.3.72" diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt index 7b05f8c..dc85194 100644 --- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt +++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/client_profile/ClientProfileActivity.kt @@ -4,10 +4,9 @@ import android.content.Intent import android.os.Bundle import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import androidx.databinding.DataBindingUtil +import kotlinx.android.synthetic.main.activity_client_profile.* import kotlinx.android.synthetic.main.toolbar.* import org.mifos.visionppi.R -import org.mifos.visionppi.databinding.ActivityClientProfileBinding import org.mifos.visionppi.objects.Client import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity @@ -17,12 +16,10 @@ import org.mifos.visionppi.ui.new_survey.NewPPISurveyActivity class ClientProfileActivity : AppCompatActivity() , ClientProfileMVPView { - lateinit var binding: ActivityClientProfileBinding - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = DataBindingUtil.setContentView(this, R.layout.activity_client_profile) + setContentView(R.layout.activity_client_profile) val clientDetails = intent.getParcelableExtra("client") as Client setClientDetails(clientDetails) @@ -30,17 +27,18 @@ class ClientProfileActivity : AppCompatActivity() , ClientProfileMVPView { val actionBar = supportActionBar actionBar?.title = "Client Profile" - binding.newSurveyBtn.setOnClickListener { + new_survey_btn.setOnClickListener { val intent= Intent(applicationContext, NewPPISurveyActivity::class.java) startActivity(intent) } } override fun setClientDetails(client : Client) { - binding.clientIdValue.text = client.entityId.toString() - binding.clientNameValue.text = client.entityName - binding.accountNoValue.text = client.entityAccountNo - binding.mobileNoValue.text = client.entityMobileNo - binding.clientTypeValue.text = client.entityType + uname.text = client.entityName + clientIdValue.text = client.entityId.toString() + clientNameValue.text = client.entityName + accountNoValue.text = client.entityAccountNo + mobileNoValue.text = client.entityMobileNo + clientTypeValue.text = client.entityType } override fun showToastMessage(string: String) { diff --git a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt index 75b3dc9..783bd2b 100644 --- a/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt +++ b/visionppi/app/src/main/java/org/mifos/visionppi/ui/user_profile/UserProfileActivity.kt @@ -37,12 +37,12 @@ class UserProfileActivity : Fragment(), UserProfileMVPView{ override fun getUserDetails() { user = mUserProfilePresenter.fetchUserDetails(requireActivity(), requireContext()) - Log.d("HAHA", user.toString()) setUserDetails() } override fun setUserDetails() { + uname.text = user.username username_value.text = user.username user_id_value.text = user.userId.toString() office_name_value.text = user.officeName diff --git a/visionppi/app/src/main/res/drawable-anydpi/ic_bene.xml b/visionppi/app/src/main/res/drawable-anydpi/ic_bene.xml new file mode 100644 index 0000000..0a93e70 --- /dev/null +++ b/visionppi/app/src/main/res/drawable-anydpi/ic_bene.xml @@ -0,0 +1,11 @@ + + + diff --git a/visionppi/app/src/main/res/drawable-anydpi/ic_dob.xml b/visionppi/app/src/main/res/drawable-anydpi/ic_dob.xml new file mode 100644 index 0000000..e9fedc1 --- /dev/null +++ b/visionppi/app/src/main/res/drawable-anydpi/ic_dob.xml @@ -0,0 +1,11 @@ + + + diff --git a/visionppi/app/src/main/res/drawable-anydpi/ic_phone.xml b/visionppi/app/src/main/res/drawable-anydpi/ic_phone.xml new file mode 100644 index 0000000..77914cf --- /dev/null +++ b/visionppi/app/src/main/res/drawable-anydpi/ic_phone.xml @@ -0,0 +1,11 @@ + + + diff --git a/visionppi/app/src/main/res/drawable-hdpi/ic_bene.png b/visionppi/app/src/main/res/drawable-hdpi/ic_bene.png new file mode 100644 index 0000000000000000000000000000000000000000..2f9ea258025eacb69b090455a802cd4b57ecb414 GIT binary patch literal 313 zcmV-90mlA`P))&8ij&J6BI3o99uYY8e&S~bH2e~_$#~sob2cD4c1od00000 LNkvXXu0mjfW|k1|%Oc%$NbBwt2cZhE&{2PLS|AaO8-~-7{y- zu(vqAX*6p;c;(6!@r(mL0&E-EZ_PRQP$4-vSuo*3R8y1q3B5K+mZZZ?b3=L#%Xlly z?w;VE(m3l^;;feqza7gSanF^qvSJf!jr>t`_)O!0#e7nw0T jTWGjV$>Nux1Or2lpPARn*(ZE~K49>4^>bP0l+XkKNv~gv literal 0 HcmV?d00001 diff --git a/visionppi/app/src/main/res/drawable-hdpi/ic_phone.png b/visionppi/app/src/main/res/drawable-hdpi/ic_phone.png new file mode 100644 index 0000000000000000000000000000000000000000..319be0a8e800ab47cf43bd7db8a00435459fbb34 GIT binary patch literal 333 zcmV-T0kZyyP){5Qd#QyLNUh7=^mJHgi}1gR8S^=l&_u}op2LvnJP&r77HkG~zL&G#eU`Z4dUc%DUi7Yc=r44m18 z*>~d6t}_z0sW91H0}4H6Q&@riBjHR&*nAZxy1iz^fow3b8cL9IGOfKA#%s-=1JMkh^codDE!F5q zc*xW3k~53*B>(*{`b=Ne8BaLJQYmZ6Uk!qox^wI%fukp^6C<_rvnKA+w1boBcjpu-qEUHx3vIVCg!08LOu_y7O^ literal 0 HcmV?d00001 diff --git a/visionppi/app/src/main/res/drawable-mdpi/ic_dob.png b/visionppi/app/src/main/res/drawable-mdpi/ic_dob.png new file mode 100644 index 0000000000000000000000000000000000000000..b32607202799879198144299bc09e3aa31f2653a GIT binary patch literal 135 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjex5FlAr-fh6C^kil9G&sTQZl< zGZSMFT_G(kz5SrbtSLJ>xnYRI+(D5A;QyV iL20Y=ZLP^+3=BJc-u>R#(Yyj^GJ~h9pUXO@geCwbg)KY) literal 0 HcmV?d00001 diff --git a/visionppi/app/src/main/res/drawable-mdpi/ic_phone.png b/visionppi/app/src/main/res/drawable-mdpi/ic_phone.png new file mode 100644 index 0000000000000000000000000000000000000000..c12f4c7bfbde8c7e5e7a6d1dc36a1e65a3f47698 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjCp}#pLn>}1CrGd^VMtDX93?C~ zdFF{5SFT)X$P!y1&A0Wy^lNq=3zo4SeIdqhG;2i~|nmT8RNhEx9)HQAH;J#Zh zK_Yar)&=p%fWx;}!b93ay zQ$pz~-g7Pn%V-E6GExq(I|BsmPd0Ji6bhK*(9EA_5o)A%B6NdARCQeslN1W3=J~{C*Ih!CFgtd{l2mn zv5yLVeoOed>xc6x0j1}Aq;%@tcK6;nnk2g5dgia>O=3WM{_s9{r!N6yV1Vfif-BdF w%e)KssdbLz-S^jO>&lR|Q%$qq3o$1b@Lh1*)s|FVdQ&MBb@01(JcuK)l5 literal 0 HcmV?d00001 diff --git a/visionppi/app/src/main/res/drawable-xhdpi/ic_phone.png b/visionppi/app/src/main/res/drawable-xhdpi/ic_phone.png new file mode 100644 index 0000000000000000000000000000000000000000..18674c24aae1697c150076eb4e788ef077cbfb5a GIT binary patch literal 404 zcmV;F0c-w=P)Ky zYCuT@&_OE^D@zOjsf8Tc%trE^L>k=!i?|cn%tGowZ15J1M%dt&Xao_w0dRn5Trpz> zJ%7S2H;ydy&{-hYBDFuJGt+B#s4Tb!JVYuDu#!4c$PLAdl4T44BZ@@is zk`ASl`M$OkO|@-%CO@(#Q8)_X>KQZot(K*qAJ2RsSYlnjV(g}uUY<$Mg&ZTt=BBT1j!CXx zN`4gmnn7sm=Vs2|Ak5W1q}Er*<+is?ht&G&4`kouM^U8G-(q^Tp#v})r&Rh|Os{L` z0BqAhTYrlw_J|Rw^f4&4LFV@Dl&4tt(o>9wG_QFI#jO^pcaP-nu1gI~{VYwAW7jTL zHT7wCWZE$6MoD)H4Ko#e0000OF9r5Z)4ZGb9$vo}6Ss-_8$vO?}(5 z<&eUdiGiG#R^@>$k@M4`|bOg z3;U(1|NN6v#^zX?@R9o0_9p*SftOoIj&m;+P5r1Fb=r|^qY;BJ2!k*PgD?n#{;fd( h0000000025&o81A3jt_cy-EN8002ovPDHLkV1jOu<)#1t literal 0 HcmV?d00001 diff --git a/visionppi/app/src/main/res/drawable-xxhdpi/ic_dob.png b/visionppi/app/src/main/res/drawable-xxhdpi/ic_dob.png new file mode 100644 index 0000000000000000000000000000000000000000..cb3c1e47919e403f0fce39cbc0ded777a83c600f GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!_dH!3Ln>~)z2nGrSV4gG!kS`P z(+l&~T6*N)=F;8aA%0co${zl_!)KCJ6bw%*DeYA|_QNLX6(b9WfP%x{E1Pp~>$ZIO z5qcm)`}?HothP$~jJcf8IJCasU^3D5>kMg~9JK3v-{;t!;g^fQiNvxl|K-aL(%Hbk z$i%{NL89G%?_5a`6D~%WVZt}z{Stdl#W&)+Chh#s`y^<+=BoMgm@?){YJR`=CAqO^ k_gR*y)hq9XDHWx~H9wAh=vA|E5zwa$p00i_>zopr0Jd6TUH||9 literal 0 HcmV?d00001 diff --git a/visionppi/app/src/main/res/drawable-xxhdpi/ic_phone.png b/visionppi/app/src/main/res/drawable-xxhdpi/ic_phone.png new file mode 100644 index 0000000000000000000000000000000000000000..2b5b3f5085ccf20cb2fedf6d2113a5002398c58b GIT binary patch literal 570 zcmV-A0>%A_P)l5xPzpGK(kx0i+;ds9a5&X0YB-Z9 zdPIAJAw9gRZ?6Vuq9KYHQ3N0IM3L@;X^4tO`z55BXJ3R=dqq*=+Fct+Ux=cz%%bfB zEr8@2k?8^Hm2OXmY5zuV+EmqC&3!;(_)$nml(tn>eH`w##Mj`bswefNd3Te*(;Ovz zphEzo^6r~mTnmZW`lT~rOUp#r_hfzUCe1l7vUHym=zeZLRh9EXG%n2fs)68)ALenS zbQ`~F_6|6^oLS=D%o2#X$!-B>mqT5)!f=KldNNc>yRG2tcIwS;CZAk0-3rd`#{z|a zZ_p2Dl5!mYdHP8qhD6m*-db;J0mvh2_P-0%p}PVEYReL@X1JYFk34D%GuPN_O6^X& z!&ovevg)ekc6GC69R@5Q2!bF8f*_gx0g + + \ No newline at end of file diff --git a/visionppi/app/src/main/res/layout/activity_client_profile.xml b/visionppi/app/src/main/res/layout/activity_client_profile.xml index 80d66fb..f29125b 100644 --- a/visionppi/app/src/main/res/layout/activity_client_profile.xml +++ b/visionppi/app/src/main/res/layout/activity_client_profile.xml @@ -1,154 +1,200 @@ - - - - + + + + - - - - + android:layout_width="match_parent" + app:contentScrim="?attr/colorPrimary" + app:layout_scrollFlags="scroll|exitUntilCollapsed" + app:titleEnabled="false"> + + + + + android:textSize="32sp" + android:textColor="@android:color/black" + android:layout_marginBottom="10dp" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + android:text="@string/medium_text" + android:id="@+id/uname"/> + - + - + + - + - + - + + + + android:layout_height="match_parent" + android:layout_width="match_parent" + android:orientation="vertical" + android:padding="16dp"> + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:text="Client ID" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Small" + android:textColor="@color/primary"/> - + android:gravity="center" + android:id="@+id/clientIdValue" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingTop="4dp" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + tools:text="@string/medium_text"/> - - - + android:layout_width="match_parent"/> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/default_margin" + android:layout_width="wrap_content" + android:text="Client Name" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Small" + android:textColor="@color/primary"/> - + android:gravity="center" + android:id="@+id/clientNameValue" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingTop="4dp" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + tools:text="@string/medium_text"/> - - - + android:layout_width="match_parent"/> - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/default_margin" + android:layout_width="wrap_content" + android:text="Account Number" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Small" + android:textColor="@color/primary"/> - + android:gravity="center" + android:id="@+id/accountNoValue" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingTop="4dp" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + tools:text="@string/medium_text"/> - - - + android:layout_width="match_parent"/> - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/default_margin" + android:layout_width="wrap_content" + android:text="Mobile No" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Small" + android:textColor="@color/primary"/> - + android:gravity="center" + android:id="@+id/mobileNoValue" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:paddingTop="4dp" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium" + tools:text="@string/medium_text"/> - + android:layout_width="match_parent"/> - + + + -