From 7801e802120f8dc9d57b4e792fb68a5847623fa4 Mon Sep 17 00:00:00 2001 From: Laxya Pahuja Date: Sun, 12 Jan 2020 17:51:47 +0530 Subject: [PATCH] improve UI of accounts screen --- .../cn/ui/mifos/accounts/AccountsFragment.kt | 8 +- .../CustomerAccountFragment.kt | 26 ++- app/src/main/res/drawable/more_icon.png | Bin 0 -> 10046 bytes app/src/main/res/drawable/rounded_shape.xml | 13 ++ app/src/main/res/layout/fragment_accounts.xml | 3 +- .../res/layout/fragment_client_accounts.xml | 205 +++++++++++++++--- .../res/layout/fragment_view_scan_card.xml | 3 +- .../layout/item_customer_deposit_accounts.xml | 137 +++++++----- .../main/res/layout/item_customer_loans.xml | 150 ++++++++----- app/src/main/res/values/dimens.xml | 16 +- app/src/main/res/values/strings.xml | 1 + app/src/main/res/values/styles.xml | 3 + 12 files changed, 412 insertions(+), 153 deletions(-) create mode 100644 app/src/main/res/drawable/more_icon.png create mode 100644 app/src/main/res/drawable/rounded_shape.xml diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt index 66d67927..e6d25f6d 100644 --- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt +++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/accounts/AccountsFragment.kt @@ -1,14 +1,13 @@ package org.mifos.mobile.cn.ui.mifos.accounts import android.os.Bundle -import android.util.Log -import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler import kotlinx.android.synthetic.main.fragment_accounts.* +import kotlinx.android.synthetic.main.layout_exception_handler.* import org.mifos.mobile.cn.R import org.mifos.mobile.cn.data.models.accounts.deposit.DepositAccount import org.mifos.mobile.cn.data.models.accounts.loan.LoanAccount @@ -19,7 +18,6 @@ import org.mifos.mobile.cn.ui.base.MifosBaseFragment import org.mifos.mobile.cn.ui.utils.ConstantKeys import org.mifos.mobile.cn.ui.utils.Network import javax.inject.Inject -import kotlinx.android.synthetic.main.layout_sweet_exception_handler.* import org.mifos.mobile.cn.data.models.CheckboxStatus import org.mifos.mobile.cn.ui.base.OnItemClickListener import org.mifos.mobile.cn.ui.mifos.customerDepositDetails.CustomerDepositDetailsFragment @@ -115,8 +113,6 @@ class AccountsFragment : MifosBaseFragment(), AccountsContract.View, OnItemClick layoutManager.orientation = LinearLayoutManager.VERTICAL rv_accounts.layoutManager = layoutManager rv_accounts.setHasFixedSize(true) - rv_accounts.addItemDecoration(DividerItemDecoration(activity, - layoutManager.orientation)) btn_try_again.setOnClickListener { retry() } when (accountType) { @@ -265,4 +261,4 @@ class AccountsFragment : MifosBaseFragment(), AccountsContract.View, OnItemClick override fun hideProgress() { hideProgressBar() } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt index 36598fc8..f61597e7 100644 --- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt +++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/customerAccounts/CustomerAccountFragment.kt @@ -2,6 +2,7 @@ package org.mifos.mobile.cn.ui.mifos.customerAccounts import android.app.SearchManager import android.content.Context +import android.content.Intent import android.os.Bundle import androidx.viewpager.widget.ViewPager import androidx.appcompat.widget.SearchView @@ -19,6 +20,7 @@ import org.mifos.mobile.cn.ui.mifos.accounts.AccountsContract import org.mifos.mobile.cn.ui.mifos.accounts.AccountsFragment import org.mifos.mobile.cn.ui.mifos.accounts.AccountsPresenter import org.mifos.mobile.cn.ui.mifos.accountsFilter.AccountsFilterBottomSheet +import org.mifos.mobile.cn.ui.mifos.loanApplication.loanActivity.LoanApplicationActivity import org.mifos.mobile.cn.ui.utils.ConstantKeys import org.mifos.mobile.cn.ui.utils.StatusUtils import javax.inject.Inject @@ -93,6 +95,13 @@ class CustomerAccountFragment : MifosBaseFragment(), AccountsContract.View { AccountType.LOAN -> viewpager.currentItem = 1 } + deposit_toggle_btn.setOnClickListener { + viewpager.currentItem = 0 + } + loan_toggle_btn.setOnClickListener { + viewpager.currentItem = 1 + } + tabs.setupWithViewPager(viewpager) viewpager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrolled(position: Int, positionOffset: Float, @@ -157,12 +166,19 @@ class CustomerAccountFragment : MifosBaseFragment(), AccountsContract.View { override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { inflater?.inflate(R.menu.menu_account, menu) if (viewpager.currentItem == 1) { + loan_toggle_focus_btn.visibility = View.VISIBLE + deposit_toggle_focus_btn.visibility = View.GONE + iv_apply_for_loan.visibility = View.VISIBLE + applyForLoan() menu?.findItem(R.id.menu_filter_loan)?.isVisible = true menu?.findItem(R.id.menu_filter_deposit)?.isVisible = false menu?.findItem(R.id.menu_search_loan)?.isVisible = true menu?.findItem(R.id.menu_search_deposit)?.isVisible = false initSearch(menu!!, AccountType.LOAN) } else if (viewpager.currentItem == 0) { + deposit_toggle_focus_btn.visibility = View.VISIBLE + loan_toggle_focus_btn.visibility = View.GONE + iv_apply_for_loan.visibility = View.GONE menu?.findItem(R.id.menu_filter_loan)?.isVisible = false menu?.findItem(R.id.menu_filter_deposit)?.isVisible = true menu?.findItem(R.id.menu_search_deposit)?.isVisible = true @@ -173,6 +189,14 @@ class CustomerAccountFragment : MifosBaseFragment(), AccountsContract.View { } + private fun applyForLoan() { + iv_apply_for_loan.setOnClickListener(View.OnClickListener { + val intent = Intent(activity, LoanApplicationActivity::class.java) + intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, "customer_identifier") + startActivity(intent) + }) + } + override fun onOptionsItemSelected(item: MenuItem?): Boolean { when (item?.itemId) { R.id.menu_filter_loan -> showFilterDialog(AccountType.LOAN) @@ -267,4 +291,4 @@ class CustomerAccountFragment : MifosBaseFragment(), AccountsContract.View { (activity as MifosBaseActivity).setToolbarElevation() } -} \ No newline at end of file +} diff --git a/app/src/main/res/drawable/more_icon.png b/app/src/main/res/drawable/more_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..82f45f34ebf21491359d7d2e2e0fbcfb508a13aa GIT binary patch literal 10046 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 SYpMcJC!nWggsISQc=&%L&AW{N literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/rounded_shape.xml b/app/src/main/res/drawable/rounded_shape.xml new file mode 100644 index 00000000..44524075 --- /dev/null +++ b/app/src/main/res/drawable/rounded_shape.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml index 0d2e38cc..9616c68a 100644 --- a/app/src/main/res/layout/fragment_accounts.xml +++ b/app/src/main/res/layout/fragment_accounts.xml @@ -2,7 +2,6 @@ @@ -30,7 +29,9 @@ layout="@layout/layout_sweet_exception_handler" android:id="@+id/layout_error" android:visibility="gone"/> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_client_accounts.xml b/app/src/main/res/layout/fragment_client_accounts.xml index 70b5ceb5..e721cd3e 100644 --- a/app/src/main/res/layout/fragment_client_accounts.xml +++ b/app/src/main/res/layout/fragment_client_accounts.xml @@ -1,38 +1,187 @@ - + android:layout_height="match_parent" + android:background="@color/violet"> - + android:layout_height="@dimen/layout_padding_100dp"> - - + android:layout_centerVertical="true" + android:layout_marginLeft="@dimen/layout_padding_30dp" + android:fontFamily="@font/airbnb_cereal_book" + android:text="@string/accounts" + android:textColor="@color/white" + android:textSize="30sp" + android:textStyle="bold" /> - + + + - - - \ No newline at end of file + android:layout_marginTop="@dimen/layout_padding_100dp" + android:layout_marginBottom="@dimen/layout_padding_n40dp" + android:backgroundTint="@color/offwhite" + app:cardCornerRadius="@dimen/layout_dimen_40dp"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_view_scan_card.xml b/app/src/main/res/layout/fragment_view_scan_card.xml index c0184489..1be44413 100644 --- a/app/src/main/res/layout/fragment_view_scan_card.xml +++ b/app/src/main/res/layout/fragment_view_scan_card.xml @@ -13,7 +13,6 @@ android:layout_height="match_parent" android:layout_width="match_parent" android:scaleType="fitCenter" - android:visibility="visible" - /> + android:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_customer_deposit_accounts.xml b/app/src/main/res/layout/item_customer_deposit_accounts.xml index e9c65169..5d4a7bd7 100644 --- a/app/src/main/res/layout/item_customer_deposit_accounts.xml +++ b/app/src/main/res/layout/item_customer_deposit_accounts.xml @@ -1,76 +1,101 @@ - - + android:layout_height="@dimen/layout_padding_70dp" + android:layout_marginLeft="@dimen/layout_padding_20dp" + android:layout_marginRight="@dimen/layout_padding_20dp" + android:layout_marginBottom="@dimen/layout_padding_10dp" + android:backgroundTint="@color/white" + app:cardCornerRadius="@dimen/layout_corner_radius_10dp"> - + + + + + - - + android:orientation="horizontal"> - + android:layout_weight="1" + android:orientation="vertical" + android:paddingLeft="@dimen/layout_padding_10dp" + android:paddingTop="@dimen/layout_padding_12dp" + android:paddingRight="@dimen/layout_padding_24dp" + android:paddingBottom="@dimen/layout_padding_10dp"> + + + + + + + + + + + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginEnd="@dimen/layout_padding_24dp" + android:layout_marginRight="@dimen/layout_padding_24dp" + android:fontFamily="@font/airbnb_cereal_book" + android:textColor="@color/violet" + android:textSize="@dimen/text_size_25sp" + android:textStyle="bold" + tools:text="@string/thirty_dollars" /> - - - - - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_customer_loans.xml b/app/src/main/res/layout/item_customer_loans.xml index 1905331e..60440908 100644 --- a/app/src/main/res/layout/item_customer_loans.xml +++ b/app/src/main/res/layout/item_customer_loans.xml @@ -1,77 +1,111 @@ - - + android:layout_height="@dimen/layout_padding_70dp" + android:layout_marginLeft="@dimen/layout_padding_20dp" + android:layout_marginRight="@dimen/layout_padding_20dp" + android:layout_marginBottom="@dimen/layout_padding_10dp" + android:backgroundTint="@color/white" + app:cardCornerRadius="@dimen/layout_corner_radius_10dp"> - + + + + + + + android:orientation="horizontal"> - - - + android:layout_weight="1" + android:orientation="vertical" + android:paddingLeft="@dimen/layout_padding_10dp" + android:paddingTop="@dimen/layout_padding_12dp" + android:paddingRight="@dimen/layout_padding_24dp" + android:paddingBottom="@dimen/layout_padding_10dp"> + + + + + + + + + + + + + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginEnd="@dimen/layout_padding_24dp" + android:layout_marginRight="@dimen/layout_padding_24dp" + android:fontFamily="@font/airbnb_cereal_book" + android:textColor="@color/violet" + android:textSize="@dimen/text_size_25sp" + android:textStyle="bold" + tools:text="@string/thirty_dollars" /> - - - - - + - \ No newline at end of file + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index bf778ce8..77f31a9c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,18 +1,27 @@ + -40dp + 0dp 2dp 4dp 8dp 5dp 7dp 10dp + 12dp 15dp 16dp + 20dp 24dp + 25dp 30dp 50dp 64dp + 70dp 75dp + 100dp + 130dp + 16dp 16dp @@ -25,9 +34,12 @@ 12sp 18sp 14sp + 15sp 16sp 18sp 20sp + 25sp + 35sp 24sp 20sp @@ -46,7 +58,9 @@ 40dp 14dp 14dp + 40dp + 10dp 1dp 48dp - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd45a34e..650d2de8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,6 +50,7 @@ support@mifos.org 8000000000 Contact Us + $30 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2e27cfe8..70357779 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -68,5 +68,8 @@ @dimen/layout_padding_7dp +