This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a commit to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git
The following commit(s) were added to refs/heads/development by this push: new c0235f8 FINCN-138: Added Icons to Drawer new c0bbd66 Merge pull request #63 from miPlodder/FINCN-138 c0235f8 is described below commit c0235f889ed0c59898774dc36c5e017dba62c074 Author: miPlodder <academic.ra...@gmail.com> AuthorDate: Sun Jun 2 12:13:49 2019 +0530 FINCN-138: Added Icons to Drawer --- app/src/main/res/drawable/ic_book_black_24dp.xml | 9 ++++ .../res/drawable/ic_business_center_black_24dp.xml | 9 ++++ .../main/res/drawable/ic_products_black_24dp.xml | 12 +++++ .../drawable/ic_supervisor_account_black_24dp.xml | 9 ++++ app/src/main/res/layout/layout_nav_header.xml | 4 +- app/src/main/res/menu/menu_navigation_drawer.xml | 51 +++++++++++----------- app/src/main/res/values/dimens.xml | 2 +- 7 files changed, 67 insertions(+), 29 deletions(-) diff --git a/app/src/main/res/drawable/ic_book_black_24dp.xml b/app/src/main/res/drawable/ic_book_black_24dp.xml new file mode 100644 index 0000000..91cae22 --- /dev/null +++ b/app/src/main/res/drawable/ic_book_black_24dp.xml @@ -0,0 +1,9 @@ +<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="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z" /> +</vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_business_center_black_24dp.xml b/app/src/main/res/drawable/ic_business_center_black_24dp.xml new file mode 100644 index 0000000..7a2fd1e --- /dev/null +++ b/app/src/main/res/drawable/ic_business_center_black_24dp.xml @@ -0,0 +1,9 @@ +<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="M10,16v-1L3.01,15L3,19c0,1.11 0.89,2 2,2h14c1.11,0 2,-0.89 2,-2v-4h-7v1h-4zM20,7h-4.01L15.99,5l-2,-2h-4l-2,2v2L4,7c-1.1,0 -2,0.9 -2,2v3c0,1.11 0.89,2 2,2h6v-2h4v2h6c1.1,0 2,-0.9 2,-2L22,9c0,-1.1 -0.9,-2 -2,-2zM14,7h-4L10,5h4v2z" /> +</vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_products_black_24dp.xml b/app/src/main/res/drawable/ic_products_black_24dp.xml new file mode 100644 index 0000000..005d783 --- /dev/null +++ b/app/src/main/res/drawable/ic_products_black_24dp.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path android:pathData="M0 0h24v24H0z" /> + <path + android:fillColor="#000000" + android:pathData="M17.21 9l-4.38-6.56c-0.19-0.28-0.51-0.42-0.83-0.42-0.32 0-0.64 0.14 -0.83 0.43 L6.79 9H2c-0.55 0-1 0.45-1 1 0 0.09 0.01 0.18 0.04 0.27l2.54 9.27c0.23 0.84 1 1.46 1.92 1.46h13c0.92 0 1.69-0.62 1.93-1.46l2.54-9.27L23 10c0-0.55-0.45-1-1-1h-4.79zM9 9l3-4.4L15 9H9zm3 8c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" /> +</vector> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_supervisor_account_black_24dp.xml b/app/src/main/res/drawable/ic_supervisor_account_black_24dp.xml new file mode 100644 index 0000000..70f9684 --- /dev/null +++ b/app/src/main/res/drawable/ic_supervisor_account_black_24dp.xml @@ -0,0 +1,9 @@ +<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="M16.5,12c1.38,0 2.49,-1.12 2.49,-2.5S17.88,7 16.5,7C15.12,7 14,8.12 14,9.5s1.12,2.5 2.5,2.5zM9,11c1.66,0 2.99,-1.34 2.99,-3S10.66,5 9,5C7.34,5 6,6.34 6,8s1.34,3 3,3zM16.5,14c-1.83,0 -5.5,0.92 -5.5,2.75L11,19h11v-2.25c0,-1.83 -3.67,-2.75 -5.5,-2.75zM9,13c-2.33,0 -7,1.17 -7,3.5L2,19h7v-2.25c0,-0.85 0.33,-2.34 2.37,-3.47C10.5,13.1 9.66,13 9,13z" /> +</vector> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_nav_header.xml b/app/src/main/res/layout/layout_nav_header.xml index dee0f4e..6032fdc 100644 --- a/app/src/main/res/layout/layout_nav_header.xml +++ b/app/src/main/res/layout/layout_nav_header.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:paddingTop="@dimen/nav_header_vertical_spacing" - android:text="@string/username" + android:text="Rajan Maurya" android:textColor="@color/white" android:textAppearance="@style/TextAppearance.AppCompat.Body1"/> @@ -33,6 +33,6 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:textColor="@color/white" - android:text="@string/email"/> + android:text="rajanmaurya...@gmail.com"/> </LinearLayout> diff --git a/app/src/main/res/menu/menu_navigation_drawer.xml b/app/src/main/res/menu/menu_navigation_drawer.xml index 6c1f261..e42f38f 100644 --- a/app/src/main/res/menu/menu_navigation_drawer.xml +++ b/app/src/main/res/menu/menu_navigation_drawer.xml @@ -2,65 +2,64 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <group - android:checkableBehavior="single" - android:id="@+id/group1"> + android:id="@+id/group1" + android:checkableBehavior="single"> <item + android:id="@+id/item_dashboard" android:checked="true" android:icon="@drawable/ic_dashboard_black_24dp" - android:id="@+id/item_dashboard" - android:title="@string/dashboard"/> + android:title="@string/dashboard" /> <item + android:id="@+id/item_roles" android:checked="true" android:icon="@drawable/ic_lock_black_24dp" - android:id="@+id/item_roles" - android:title="@string/roles_and_permissions"/> + android:title="@string/roles_and_permissions" /> <item + android:id="@+id/item_customer" android:checked="true" android:icon="@drawable/ic_customer_black_24dp" - android:id="@+id/item_customer" - android:title="@string/customer"/> + android:title="@string/customer" /> <item - android:checked="true" - android:icon="@drawable/ic_customer_black_24dp" android:id="@+id/item_customer_payload" - android:title="@string/customer_payloads"/> + android:checked="true" + android:icon="@drawable/ic_business_center_black_24dp" + android:title="@string/customer_payloads" /> <item - android:checked="true" - android:icon="@drawable/ic_customer_black_24dp" android:id="@+id/item_ledger" - android:title="@string/ledger"/> + android:checked="true" + android:icon="@drawable/ic_book_black_24dp" + android:title="@string/ledger" /> <item - android:checked="true" - android:icon="@drawable/ic_customer_black_24dp" android:id="@+id/item_accounts" - android:title="@string/accounts"/> - <item android:checked="true" - android:icon="@drawable/ic_customer_black_24dp" + android:icon="@drawable/ic_account_balance_black_24dp" + android:title="@string/accounts" /> + <item android:id="@+id/item_teller" - android:title="@string/teller"/> + android:checked="true" + android:icon="@drawable/ic_supervisor_account_black_24dp" + android:title="@string/teller" /> <item - android:checked="true" - android:icon="@drawable/ic_customer_black_24dp" android:id="@+id/item_product" - android:title="@string/products"/> + android:checked="true" + android:icon="@drawable/ic_products_black_24dp" + android:title="@string/products" /> </group> - <group - android:id="@+id/group2"> + <group android:id="@+id/group2"> <item android:id="@+id/item_logout" android:icon="@drawable/ic_input_black_24dp" - android:title="@string/logout"/> + android:title="@string/logout" /> </group> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 43d83a8..78fa8ad 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -35,7 +35,7 @@ <dimen name="text_small">14sp</dimen> <dimen name="nav_header_vertical_spacing">16dp</dimen> - <dimen name="nav_header_height">160dp</dimen> + <dimen name="nav_header_height">180dp</dimen> <dimen name="default_margin">8dp</dimen>