From 9794f9bf8aa8644833cd711494ecc7d413e5a415 Mon Sep 17 00:00:00 2001 From: Laxya Pahuja Date: Sun, 19 Jan 2020 21:16:56 +0530 Subject: [PATCH] feat: redesign dashboard UI --- .../ui/mifos/dashboard/DashboardFragment.kt | 84 +-- .../RecentTransactionsFragment.kt | 1 - app/src/main/res/drawable/outline_button.png | Bin 0 -> 7170 bytes app/src/main/res/drawable/rounded_shape.xml | 14 + .../res/layout/content_fragment_dashboard.xml | 75 +++ .../main/res/layout/fragment_dashboard.xml | 629 +++--------------- .../res/layout/item_recent_transactions.xml | 83 ++- app/src/main/res/menu/menu_main.xml | 6 +- app/src/main/res/values/dimens.xml | 18 + app/src/main/res/values/strings.xml | 7 + app/src/main/res/values/styles.xml | 6 + 11 files changed, 282 insertions(+), 641 deletions(-) create mode 100644 app/src/main/res/drawable/outline_button.png create mode 100644 app/src/main/res/drawable/rounded_shape.xml create mode 100644 app/src/main/res/layout/content_fragment_dashboard.xml diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/dashboard/DashboardFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/dashboard/DashboardFragment.kt index 977343ff..38a430e4 100644 --- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/dashboard/DashboardFragment.kt +++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/dashboard/DashboardFragment.kt @@ -1,27 +1,21 @@ package org.mifos.mobile.cn.ui.mifos.dashboard -import android.content.Intent - import android.os.Bundle import android.view.* +import com.google.android.material.bottomsheet.BottomSheetBehavior import kotlinx.android.synthetic.main.fragment_dashboard.* import org.mifos.mobile.cn.data.models.customer.Customer import org.mifos.mobile.cn.R -import org.mifos.mobile.cn.enums.AccountType -import org.mifos.mobile.cn.ui.base.MifosBaseActivity import org.mifos.mobile.cn.ui.base.MifosBaseFragment -import org.mifos.mobile.cn.ui.mifos.customerAccounts.CustomerAccountFragment -import org.mifos.mobile.cn.ui.mifos.customerDetails.CustomerDetailsActivity -import org.mifos.mobile.cn.ui.mifos.loanApplication.loanActivity.LoanApplicationActivity import org.mifos.mobile.cn.ui.mifos.recentTransactions.RecentTransactionsFragment -import org.mifos.mobile.cn.ui.utils.ConstantKeys class DashboardFragment : MifosBaseFragment(), View.OnClickListener { private lateinit var rootView: View private lateinit var customer: Customer + private lateinit var sheetBehavior: BottomSheetBehavior<*> companion object { fun newInstance(): DashboardFragment { @@ -32,67 +26,51 @@ class DashboardFragment : MifosBaseFragment(), View.OnClickListener { } } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { rootView = inflater.inflate(R.layout.fragment_dashboard, container, false) setHasOptionsMenu(true) setToolbarTitle(getString(R.string.home)) + val ft = childFragmentManager.beginTransaction() + val rt = RecentTransactionsFragment() + ft.replace(R.id.fl_recentTransactions, rt) + ft.addToBackStack(null) + ft.commit() return rootView } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - ll_apply_for_loan.setOnClickListener(this) - ll_accounts.setOnClickListener(this) - ll_account_overview.setOnClickListener(this) - ll_recent_transactions.setOnClickListener(this) - } + sheetBehavior = BottomSheetBehavior.from(rt_bottom_sheet) + sheetBehavior.setBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() { + override fun onStateChanged(bottomSheet: View, newState: Int) { + // React to state change + when (newState) { + BottomSheetBehavior.STATE_HIDDEN -> { + } + BottomSheetBehavior.STATE_EXPANDED -> { + } + BottomSheetBehavior.STATE_COLLAPSED -> { + } + BottomSheetBehavior.STATE_HALF_EXPANDED -> { + } + BottomSheetBehavior.STATE_DRAGGING -> { + } + BottomSheetBehavior.STATE_SETTLING -> { + } + } + } - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - inflater.inflate(R.menu.menu_main, menu) - super.onCreateOptionsMenu(menu, inflater) + override fun onSlide(bottomSheet: View, slideOffset: Float) { + // React to dragging events + } + }) } override fun onClick(view: View) { when (view.id) { - R.id.ll_apply_for_loan -> { - applyForLoan() - } - R.id.ll_accounts -> { - openAccount() - } - R.id.ll_account_overview -> { - showCustomerDetails() - } - R.id.ll_recent_transactions -> { - showRecentTransactions() - } } } - private fun applyForLoan() { - val intent = Intent(activity, LoanApplicationActivity::class.java) - intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER, "customer_identifier") - startActivity(intent) - } - - private fun openAccount() { - (activity as MifosBaseActivity) - .replaceFragment(CustomerAccountFragment.newInstance(AccountType.DEPOSIT), - true, R.id.container) - } - private fun showCustomerDetails(){ - val intent = Intent(activity,CustomerDetailsActivity::class.java) - intent.putExtra(ConstantKeys.CUSTOMER_IDENTIFIER,"customer_identifier") - startActivity(intent) - - - } - private fun showRecentTransactions(){ - (activity as MifosBaseActivity) - .replaceFragment(RecentTransactionsFragment.Companion.newInstance(), - true,R.id.container) - } -} \ No newline at end of file +} diff --git a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/recentTransactions/RecentTransactionsFragment.kt b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/recentTransactions/RecentTransactionsFragment.kt index 743a3db2..981e9fb9 100644 --- a/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/recentTransactions/RecentTransactionsFragment.kt +++ b/app/src/main/kotlin/org/mifos/mobile/cn/ui/mifos/recentTransactions/RecentTransactionsFragment.kt @@ -62,7 +62,6 @@ SwipeRefreshLayout.OnRefreshListener{ } override fun showUserInterface() { - setToolbarTitle("Recent Transactions") val layoutManager = LinearLayoutManager(activity) layoutManager.orientation = RecyclerView.VERTICAL rvRecentTransactions.layoutManager = layoutManager diff --git a/app/src/main/res/drawable/outline_button.png b/app/src/main/res/drawable/outline_button.png new file mode 100644 index 0000000000000000000000000000000000000000..958105dc7802e8a8ecdaeb90fff74a695734d5c4 GIT binary patch literal 7170 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 + + + + + + + + diff --git a/app/src/main/res/layout/content_fragment_dashboard.xml b/app/src/main/res/layout/content_fragment_dashboard.xml new file mode 100644 index 00000000..148f7fb9 --- /dev/null +++ b/app/src/main/res/layout/content_fragment_dashboard.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index f3fd880e..3531dd34 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -1,573 +1,126 @@ - - - - - + + + + + + + android:layout_height="match_parent" + android:layout_alignParentBottom="true" + app:cardCornerRadius="@dimen/layout_corner_radius_50dp" + android:layout_marginBottom="@dimen/layout_padding_negative_50dp" + android:backgroundTint="@color/offwhite"> + android:layout_marginLeft="@dimen/layout_padding_30dp" + android:layout_marginRight="@dimen/layout_padding_30dp" + android:layout_marginTop="@dimen/layout_padding_30dp" > - - - - - - - - - + android:layout_height="wrap_content" + android:text="@string/recent_transactions" + android:textSize="@dimen/text_size_25sp" + android:fontFamily="@font/airbnb_cereal_book" + android:textStyle="bold"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="horizontal" + android:layout_marginTop="@dimen/layout_padding_10dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - + android:layout_height="wrap_content"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="@style/AppTheme.RoundedCornerMaterialButton" + app:cornerRadius="@dimen/layout_corner_radius_50dp" + android:text="@string/third_party" + android:textAllCaps="false" + android:backgroundTint="@color/white" + android:textColor="@color/violet" + android:layout_centerInParent="true" + android:fontFamily="@font/productsans"/> + + + + - - - + style="@style/AppTheme.RoundedCornerMaterialButton" + app:cornerRadius="@dimen/layout_corner_radius_50dp" + android:text="@string/self" + android:textAllCaps="false" + android:backgroundTint="@color/white" + android:textColor="@color/violet" + android:layout_centerInParent="true" + android:fontFamily="@font/productsans"/> - - - - - - - - - + - - - - - - - - - - - - - + - + - + - + diff --git a/app/src/main/res/layout/item_recent_transactions.xml b/app/src/main/res/layout/item_recent_transactions.xml index ae5d32af..efaece13 100644 --- a/app/src/main/res/layout/item_recent_transactions.xml +++ b/app/src/main/res/layout/item_recent_transactions.xml @@ -9,35 +9,33 @@ android:foreground="?android:attr/selectableItemBackground" android:orientation="vertical"> - - - + android:layout_height="@dimen/layout_padding_75dp" + android:orientation="horizontal" + app:cardCornerRadius="@dimen/layout_corner_radius_10dp" + android:layout_marginBottom="@dimen/layout_padding_10dp"> + android:paddingTop="@dimen/layout_padding_16dp" + android:paddingLeft="@dimen/layout_padding_24dp" + android:paddingStart="@dimen/layout_padding_24dp" + android:paddingRight="@dimen/layout_padding_24dp" + android:paddingEnd="@dimen/layout_padding_24dp"> + tools:text="CREDIT" + android:textSize="@dimen/text_size_20sp" + android:fontFamily="@font/productsans"/> + tools:text="2018-06-13T09:37:11.508Z" + android:visibility="gone"/> + tools:text="Message 0" + android:fontFamily="@font/productsans"/> - - + - + android:textSize="@dimen/text_size_30sp" + tools:text="@string/four_twenty_dollars" + android:layout_alignParentRight="true" + android:layout_marginRight="@dimen/layout_padding_24dp" + android:textStyle="bold" + android:textColor="@color/violet" + android:layout_centerInParent="true" + android:fontFamily="@font/airbnb_cereal_book"/> + + + android:paddingTop="@dimen/layout_padding_24dp" + android:visibility="gone"> - - - + - \ No newline at end of file + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index de968d86..a7f53ddc 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -2,8 +2,4 @@ - - \ 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..8c21cca0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -1,5 +1,7 @@ + -50dp + 0dp 2dp 4dp 8dp @@ -8,11 +10,13 @@ 10dp 15dp 16dp + 20dp 24dp 30dp 50dp 64dp 75dp + 16dp 16dp @@ -28,6 +32,9 @@ 16sp 18sp 20sp + 25sp + 30sp + 60sp 24sp 20sp @@ -49,4 +56,15 @@ 1dp 48dp + + 10dp + 50dp + + 25dp + 105dp + + 25dp + 38dp + 350dp + 450dp \ 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..f55719b1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,13 @@ Home Are you sure you want to logout? Cancel + Total Balance + $420 + Send + Receive + All + Third Party + Self diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2e27cfe8..6200081f 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -68,5 +68,11 @@ @dimen/layout_padding_7dp + +