Merge pull request #65 from miPlodder/feat#robotofontaddition
feat# Roboto font added
diff --git a/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java b/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
index a467510..959758c 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
@@ -3,8 +3,10 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
+import android.os.Handler;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
+import android.support.design.widget.Snackbar;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
@@ -17,6 +19,7 @@
import org.apache.fineract.data.local.PreferencesHelper;
import org.apache.fineract.jobs.StartSyncJob;
import org.apache.fineract.ui.base.FineractBaseActivity;
+import org.apache.fineract.ui.base.Toaster;
import org.apache.fineract.ui.offline.CustomerPayloadFragment;
import org.apache.fineract.ui.online.accounting.ledgers.LedgerFragment;
import org.apache.fineract.ui.online.accounting.accounts.AccountsFragment;
@@ -51,6 +54,8 @@
@Inject
PreferencesHelper preferencesHelper;
+ private boolean isBackPressedOnce = false;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -140,12 +145,21 @@
@Override
public void onBackPressed() {
- DrawerLayout drawer = findViewById(R.id.drawer_layout);
- if (drawer.isDrawerOpen(GravityCompat.START)) {
- drawer.closeDrawer(GravityCompat.START);
- } else {
- super.onBackPressed();
+ if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
+ drawerLayout.closeDrawer(GravityCompat.START);
}
+ if (isBackPressedOnce) {
+ super.onBackPressed();
+ return;
+ }
+ this.isBackPressedOnce = true;
+ Toaster.show(drawerLayout, R.string.please_click_back_again_to_exit, Snackbar.LENGTH_SHORT);
+ new Handler().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ isBackPressedOnce = false;
+ }
+ }, 2000);
}
public void logout() {
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/fragment_form_customer_address.xml b/app/src/main/res/layout/fragment_form_customer_address.xml
index 75cbf74..80e6a48 100644
--- a/app/src/main/res/layout/fragment_form_customer_address.xml
+++ b/app/src/main/res/layout/fragment_form_customer_address.xml
@@ -63,7 +63,8 @@
android:id="@+id/et_city"
android:inputType="text"
android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ android:layout_width="match_parent"
+ android:digits="@string/restrict_a_zA_Z"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@@ -91,7 +92,8 @@
android:id="@+id/et_country"
android:inputType="text"
android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ android:layout_width="match_parent"
+ android:digits="@string/restrict_a_zA_Z"/>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
@@ -105,7 +107,8 @@
android:id="@+id/et_region"
android:inputType="text"
android:layout_height="wrap_content"
- android:layout_width="match_parent"/>
+ android:layout_width="match_parent"
+ android:digits="@string/restrict_a_zA_Z"/>
</android.support.design.widget.TextInputLayout>
</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_form_customer_details.xml b/app/src/main/res/layout/fragment_form_customer_details.xml
index 0965a90..0b0f7a6 100644
--- a/app/src/main/res/layout/fragment_form_customer_details.xml
+++ b/app/src/main/res/layout/fragment_form_customer_details.xml
@@ -48,6 +48,7 @@
android:hint="@string/required_account"
android:id="@+id/et_account"
android:inputType="text"
+ android:digits="@string/restrict_a_zA_Z0_9"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</android.support.design.widget.TextInputLayout>
@@ -62,6 +63,7 @@
android:hint="@string/required_first_name"
android:id="@+id/et_first_name"
android:inputType="text"
+ android:digits="@string/restrict_a_zA_Z"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</android.support.design.widget.TextInputLayout>
@@ -76,6 +78,7 @@
android:hint="@string/optional_middle_name"
android:id="@+id/et_middle_name"
android:inputType="text"
+ android:digits="@string/restrict_a_zA_Z"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</android.support.design.widget.TextInputLayout>
@@ -90,6 +93,7 @@
android:hint="@string/required_last_name"
android:id="@+id/et_last_name"
android:inputType="text"
+ android:digits="@string/restrict_a_zA_Z"
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</android.support.design.widget.TextInputLayout>
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="rajanmaurya154@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:checked="true"
- android:icon="@drawable/ic_customer_black_24dp"
android:id="@+id/item_customer"
- android:title="@string/customer"/>
-
- <item
android:checked="true"
android:icon="@drawable/ic_customer_black_24dp"
+ android:title="@string/customer" />
+
+ <item
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>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index be6386c..8744d5d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -387,6 +387,9 @@
<string name="please_wait">Please wait …</string>
<string name="logging_in">Logging in…</string>
+ <string name="restrict_a_zA_Z" translatable="false">abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
+ <string name="restrict_a_zA_Z0_9" translatable="false">abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890</string>
+
<string-array name="loan_application_steps">
<item>Loan details</item>
<item>Debt to income ratio</item>
@@ -496,4 +499,5 @@
<string name="customer_payloads">Customer Payloads</string>
<string name="email">Email</string>
<string name="logged_out_successfully">Logged out successfully.</string>
+ <string name="please_click_back_again_to_exit">Please click BACK again to exit</string>
</resources>
