You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ra...@apache.org on 2019/06/12 09:57:31 UTC

[fineract-cn-mobile] 02/03: Mifos Passcode dependancy added and refactor Kotlin code accordingly

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

commit 18b7659ab78841f3deb55ccab27945325c0211f2
Author: miPlodder <ac...@gmail.com>
AuthorDate: Wed Jun 12 00:07:24 2019 +0530

    Mifos Passcode dependancy added and refactor Kotlin code accordingly
---
 app/build.gradle                                                      | 2 ++
 .../apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt | 4 ++--
 .../apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt    | 4 ++--
 .../editcustomerpayroll/EditPayrollAllocationFragment.kt              | 2 +-
 .../customerpayroll/editcustomerpayroll/EditPayrollFragment.kt        | 2 +-
 .../org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt     | 4 ++--
 .../main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt  | 4 ++--
 app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt   | 4 ++--
 build.gradle                                                          | 1 +
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 80f820f..71788f4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -143,6 +143,8 @@ dependencies {
     //Material Stepper UI library
     implementation "com.stepstone.stepper:material-stepper:$materialStepperVersion"
 
+    implementation "com.mifos.mobile:mifos-passcode:$mifosPasscodeVersion"
+
     // Instrumentation test dependencies
     androidTestImplementation jUnit
     androidTestImplementation mockito
diff --git a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
index b5638c8..67c27d8 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
@@ -78,9 +78,9 @@ class AccountsFragment : FineractBaseFragment(), AccountContract.View, SwipeRefr
     }
 
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-        inflater?.inflate(R.menu.menu_account_search, menu)
+        inflater.inflate(R.menu.menu_account_search, menu)
         setUpSearchInterface(menu)
     }
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
index adf76a8..75c50be 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
@@ -97,9 +97,9 @@ class LedgerFragment : FineractBaseFragment(), LedgerContract.View,
                 R.drawable.ic_person_outline_black_24dp)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-        inflater?.inflate(R.menu.menu_ledger_search, menu)
+        inflater.inflate(R.menu.menu_ledger_search, menu)
         setUpSearchInterface(menu)
     }
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt
index 2da7041..3a03401 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt
@@ -45,7 +45,7 @@ class EditPayrollAllocationFragment : FineractBaseFragment(), Step,
                 }
     }
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is OnNavigationBarListener.Payroll) {
             listener = context
diff --git a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollFragment.kt
index 0decfcf..858291f 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollFragment.kt
@@ -38,7 +38,7 @@ class EditPayrollFragment : FineractBaseFragment(), Step {
         const val DATE_FORMAT = "dd MMM yyyy"
     }
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is OnNavigationBarListener.Payroll) {
             listener = context
diff --git a/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
index d06f30a..6115765 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/review/AddLoanReviewFragment.kt
@@ -44,12 +44,12 @@ class AddLoanReviewFragment : FineractBaseFragment(), Step {
     @Inject
     lateinit var debtCoSignerAdapter: LoanDebtIncomeAdapter
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is OnNavigationBarListener.ReviewLoan) {
             onNavigationBarListener = context
         } else {
-            throw RuntimeException(context!!.toString() + " must implement OnNavigationBarListener.ReviewLoan")
+            throw RuntimeException("$context must implement OnNavigationBarListener.ReviewLoan")
         }
     }
 
diff --git a/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt b/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
index b949b30..9a88929 100644
--- a/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
@@ -97,9 +97,9 @@ class TellerFragment : FineractBaseFragment(), TellerContract.View, SwipeRefresh
                 R.drawable.ic_person_outline_black_24dp)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-        inflater?.inflate(R.menu.menu_teller_search, menu)
+        inflater.inflate(R.menu.menu_teller_search, menu)
         setUpSearchInterface(menu)
     }
 
diff --git a/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt b/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
index 2c773e4..aa46396 100644
--- a/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
+++ b/app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
@@ -93,9 +93,9 @@ class ProductFragment : FineractBaseFragment(), ProductContract.View,
     }
 
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-        inflater?.inflate(R.menu.menu_product_search, menu)
+        inflater.inflate(R.menu.menu_product_search, menu)
         setUpSearchInterface(menu)
     }
 
diff --git a/build.gradle b/build.gradle
index cf2ace9..439d2ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,4 +68,5 @@ ext {
     roboElectricVersion = '3.1'
     circleImageviewVersion = '2.1.0'
     compressorVersion = '2.1.0'
+    mifosPasscodeVersion = '1.0.0'
 }