Mifos Passcode dependancy added and refactor Kotlin code accordingly

apache · Jun 12, 2019 · 18b7659 · 18b7659
1 parent 7577dfa
commit 18b7659
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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/.../ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt b/.../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/...e/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollFragment.kt b/...e/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
@@ -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
@@ -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
@@ -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
@@ -68,4 +68,5 @@ ext {
     roboElectricVersion = '3.1'
     circleImageviewVersion = '2.1.0'
     compressorVersion = '2.1.0'
+    mifosPasscodeVersion = '1.0.0'
 }