From 0be83e1c82be03bb88c31f798e12e273d10cea31 Mon Sep 17 00:00:00 2001 From: batbrain7 Date: Fri, 5 Jan 2018 23:15:02 +0530 Subject: [PATCH] Added Roboto Font to the Appss --- app/src/main/AndroidManifest.xml | 4 ++++ .../fineract/ui/adapters/CustomerAdapter.java | 2 ++ .../ui/adapters/PlannedPaymentAdapter.java | 1 - .../CustomerDetailsFragment.java | 1 - app/src/main/res/font/roboto.xml | 7 ++++++ app/src/main/res/layout/activity_login.xml | 5 ++++ .../layout/bottom_sheet_add_debt_income.xml | 11 ++++++--- .../res/layout/bottom_sheet_add_document.xml | 7 ++++++ .../bottom_sheet_edit_customer_profile.xml | 11 +++++++++ .../res/layout/bottom_sheet_task_list.xml | 8 +++++++ ..._sheet_upload_identification_scan_card.xml | 7 ++++++ .../fragment_customer_deposit_details.xml | 21 +++++++++++++---- .../res/layout/fragment_customer_details.xml | 23 +++++++++++++++++++ .../layout/fragment_customer_loan_details.xml | 22 ++++++++++++++++++ .../main/res/layout/fragment_dashboard.xml | 4 ++++ .../layout/fragment_debt_income_report.xml | 6 +++++ .../layout/fragment_form_customer_address.xml | 5 ++++ .../layout/fragment_form_customer_contact.xml | 3 +++ .../layout/fragment_form_customer_details.xml | 6 +++++ .../fragment_form_deposit_assign_product.xml | 2 ++ .../layout/fragment_form_deposit_overview.xml | 4 ++++ .../fragment_form_identification_details.xml | 4 ++++ .../fragment_form_overview_identification.xml | 4 ++++ .../fragment_identification_details.xml | 10 ++++++++ .../res/layout/fragment_loan_co_signer.xml | 2 ++ .../fragment_loan_debt_income_ratio.xml | 7 ++++++ .../main/res/layout/fragment_loan_details.xml | 10 ++++++++ .../res/layout/fragment_loan_document.xml | 3 +++ .../res/layout/fragment_planned_payment.xml | 1 + app/src/main/res/layout/item_beneficiary.xml | 1 + app/src/main/res/layout/item_customer.xml | 2 ++ .../res/layout/item_customer_activities.xml | 2 ++ .../layout/item_customer_deposit_accounts.xml | 4 ++++ .../main/res/layout/item_customer_loans.xml | 4 ++++ .../res/layout/item_debt_income_report.xml | 2 ++ .../layout/item_header_planned_payment.xml | 2 ++ .../main/res/layout/item_identification.xml | 3 +++ .../layout/item_identification_scan_card.xml | 2 ++ .../main/res/layout/item_loan_debt_income.xml | 4 ++++ .../main/res/layout/item_panned_payment.xml | 2 ++ app/src/main/res/layout/item_roles.xml | 1 + .../main/res/layout/layout_alert_message.xml | 2 ++ .../main/res/layout/layout_bottom_content.xml | 1 + .../layout/layout_collapsing_header_view.xml | 2 ++ app/src/main/res/layout/layout_error.xml | 1 + .../res/layout/layout_exception_handler.xml | 8 +++++++ app/src/main/res/layout/layout_nav_header.xml | 2 ++ app/src/main/res/values/font_certs.xml | 17 ++++++++++++++ app/src/main/res/values/preloaded_fonts.xml | 6 +++++ 49 files changed, 260 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/font/roboto.xml create mode 100644 app/src/main/res/values/font_certs.xml create mode 100644 app/src/main/res/values/preloaded_fonts.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b3a7b2e..a4c2f73 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,6 +70,10 @@ + + \ No newline at end of file diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java index 772f313..8997738 100644 --- a/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java +++ b/app/src/main/java/org/apache/fineract/ui/adapters/CustomerAdapter.java @@ -51,6 +51,7 @@ public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { @Override public void onBindViewHolder(ViewHolder holder, int position) { Customer customer = customers.get(position); + holder.tvCustomerName.setText(context.getString(R.string.customer_name, customer.getGivenName(), customer.getSurname() )); @@ -62,6 +63,7 @@ public void onBindViewHolder(ViewHolder holder, int position) { context.getString(R.string.not_assigned))); } + ImageLoaderUtils imageLoaderUtils = new ImageLoaderUtils(context); imageLoaderUtils.loadImage(imageLoaderUtils.buildCustomerPortraitImageUrl( customer.getIdentifier()), holder.ivCustomerImage, diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java b/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java index ac4c045..bd5d232 100644 --- a/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java +++ b/app/src/main/java/org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java @@ -188,7 +188,6 @@ public void onBindHeaderViewHolder(SectioningAdapter.HeaderViewHolder viewHolder } hvh.tvRemainingPrincipal.setText(context.getString(R.string.remaining_principal) + context.getString(R.string.colon) + section.remainingPrincipal); - hvh.updateSectionCollapseToggle(isSectionCollapsed(sectionIndex)); } } diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java index fcf3d2a..40f294c 100644 --- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java +++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsFragment.java @@ -138,7 +138,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, ButterKnife.bind(this, rootView); initializeFineractUIErrorHandler(getActivity(), rootView); customerDetailsPresenter.attachView(this); - showUserInterface(); return rootView; diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml new file mode 100644 index 0000000..2641caf --- /dev/null +++ b/app/src/main/res/font/roboto.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 707c1b9..47d116c 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -34,6 +34,7 @@ @@ -56,6 +57,7 @@ android:drawableStart="@drawable/ic_tenant_black_24dp" android:drawablePadding="@dimen/layout_padding_8dp" android:hint="@string/tenant" + android:fontFamily="@font/roboto" android:id="@+id/et_tenant" android:inputType="text" android:layout_height="wrap_content" @@ -73,6 +75,7 @@ android:drawableStart="@drawable/ic_person_black_24dp" android:drawablePadding="@dimen/layout_padding_8dp" android:hint="@string/username" + android:fontFamily="@font/roboto" android:id="@+id/et_username" android:inputType="text" android:layout_height="wrap_content" @@ -92,6 +95,7 @@ android:drawablePadding="@dimen/layout_padding_8dp" android:hint="@string/password" android:id="@+id/et_password" + android:fontFamily="@font/roboto" android:inputType="textPassword" android:layout_height="wrap_content" android:layout_width="match_parent"/> @@ -104,6 +108,7 @@ android:id="@+id/btn_login" android:layout_gravity="center" android:layout_height="wrap_content" + android:fontFamily="@font/roboto" android:layout_marginTop="@dimen/layout_padding_15dp" android:layout_width="match_parent" android:text="@string/login" diff --git a/app/src/main/res/layout/bottom_sheet_add_debt_income.xml b/app/src/main/res/layout/bottom_sheet_add_debt_income.xml index 9f80100..c2aa4a0 100644 --- a/app/src/main/res/layout/bottom_sheet_add_debt_income.xml +++ b/app/src/main/res/layout/bottom_sheet_add_debt_income.xml @@ -17,16 +17,17 @@ + android:textStyle="bold" /> @@ -63,6 +65,7 @@ @@ -92,6 +96,7 @@ android:id="@+id/tv_document_name" android:layout_height="match_parent" android:layout_width="match_parent" + android:fontFamily="@font/roboto" android:textSize="@dimen/text_medium" android:paddingTop="@dimen/layout_padding_4dp" tools:text="This is the description"/> @@ -117,6 +122,7 @@ android:layout_gravity="center" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_padding_16dp" + android:fontFamily="@font/roboto" android:layout_marginRight="@dimen/layout_padding_16dp" android:layout_width="wrap_content" android:text="@string/cancel" @@ -127,6 +133,7 @@ android:layout_gravity="center" android:layout_height="wrap_content" android:layout_width="wrap_content" + android:fontFamily="@font/roboto" android:text="@string/add_document" android:textAllCaps="false" /> diff --git a/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml b/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml index 66ab690..b7c49f7 100644 --- a/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml +++ b/app/src/main/res/layout/bottom_sheet_edit_customer_profile.xml @@ -41,6 +41,7 @@ android:layout_width="match_parent" android:padding="@dimen/layout_padding_16dp" android:text="@string/customer_image" + android:fontFamily="@font/roboto" android:textColor="@color/gray_dark" android:textStyle="bold"/> @@ -82,6 +83,7 @@ android:layout_gravity="center" android:layout_height="wrap_content" android:layout_width="wrap_content" + android:fontFamily="@font/roboto" android:paddingTop="@dimen/layout_padding_8dp" android:text="@string/camera" android:textSize="@dimen/text_medium"/> @@ -114,6 +116,7 @@ android:layout_gravity="center" android:layout_height="wrap_content" android:layout_width="wrap_content" + android:fontFamily="@font/roboto" android:paddingTop="@dimen/layout_padding_8dp" android:text="@string/gallery" android:textSize="@dimen/text_medium"/> @@ -144,6 +147,7 @@ @@ -190,6 +195,7 @@ android:id="@+id/tv_select_file" android:layout_width="match_parent" android:layout_height="match_parent" + android:fontFamily="@font/roboto" android:gravity="center" android:textStyle="bold" android:layout_marginTop="@dimen/layout_padding_4dp" @@ -197,6 +203,7 @@ android:text="@string/edit_selected_file"/> @@ -147,6 +151,7 @@ android:id="@+id/tv_sub_header" android:layout_height="match_parent" android:layout_width="match_parent" + android:fontFamily="@font/roboto" android:paddingTop="@dimen/layout_padding_8dp" android:text="@string/please_verify_following_task" android:textSize="@dimen/text_size_12sp"/> @@ -164,6 +169,7 @@ diff --git a/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml b/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml index 0efb1bf..096c53e 100644 --- a/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml +++ b/app/src/main/res/layout/bottom_sheet_upload_identification_scan_card.xml @@ -29,6 +29,7 @@ android:layout_height="match_parent" android:layout_width="match_parent" android:paddingBottom="@dimen/layout_padding_30dp" + android:fontFamily="@font/roboto" android:paddingLeft="@dimen/layout_padding_24dp" android:paddingRight="@dimen/layout_padding_24dp" android:paddingStart="@dimen/layout_padding_24dp" @@ -48,6 +49,7 @@ android:hint="@string/identifier" android:id="@+id/et_identifier" android:inputType="text" + android:fontFamily="@font/roboto" android:layout_height="match_parent" android:layout_width="match_parent"/> @@ -63,6 +65,7 @@ @@ -107,6 +111,7 @@ android:drawableLeft="@drawable/ic_folder_black_24dp" android:drawableStart="@drawable/ic_folder_black_24dp" android:id="@+id/btn_browse_document" + android:fontFamily="@font/roboto" android:layout_height="wrap_content" android:layout_weight=".3" android:layout_width="wrap_content" @@ -134,6 +139,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/layout_padding_16dp" android:layout_marginRight="@dimen/layout_padding_16dp" + android:fontFamily="@font/roboto" android:layout_weight=".5" android:layout_width="wrap_content" android:text="@string/cancel" @@ -142,6 +148,7 @@