[fineract-cn-mobile] branch development updated: Feat #FINCN-202 - Adds support for editing loan details.
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 09de0e3 Feat #FINCN-202 - Adds support for editing loan details.
09de0e3 is described below
commit 09de0e3508b7e0cd5c13c4e2c8fb01bdd72cbeb8
Author: jawid1
AuthorDate: Wed Mar 4 16:29:55 2020 +0530
Feat #FINCN-202 - Adds support for editing loan details.
---
.../data/datamanager/api/DataManagerLoans.java | 13 ++-
.../fineract/data/models/loan/AccountAssignment.kt | 5 +-
.../fineract/data/models/loan/LoanAccount.kt | 8 +-
.../fineract/data/models/loan/LoanParameters.kt| 18 ++--
.../apache/fineract/data/services/LoanService.java | 9 +-
.../ui/adapters/LoanApplicationStepAdapter.java| 20 +++-
.../loanaccountlist/LoanAccountsFragment.java | 6 +-
.../loanapplication/BaseFragmentDebtIncome.java| 4 +-
.../loanapplication/LoanApplicationAction.kt | 6 ++
.../loanapplication/LoanDebtIncomeFragment.java| 47 -
.../loanactivity/LoanApplicationActivity.java | 51 +++--
.../loanactivity/LoanApplicationContract.java | 4 +
.../loanactivity/LoanApplicationPresenter.java | 34 +-
.../loancosigner/LoanCoSignerFragment.java | 33 +-
.../loancosigner/LoanCoSignerPresenter.java| 5 +-
.../loandetails/LoanDetailsContract.java | 4 +-
.../loandetails/LoanDetailsFragment.java | 114 ++---
.../loandetails/LoanDetailsPresenter.java | 16 ++-
.../loandetails/CustomerLoanDetailsFragment.java | 34 --
.../ui/online/review/AddLoanReviewFragment.kt | 3 +-
.../org/apache/fineract/utils/ConstantKeys.java| 7 +-
app/src/main/res/values/strings.xml| 2 +
app/src/main/resources/loanAccount.json| 8 +-
23 files changed, 378 insertions(+), 73 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerLoans.java
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerLoans.java
index e641d7f..4efdfa2 100644
---
a/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerLoans.java
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerLoans.java
@@ -17,7 +17,7 @@ import io.reactivex.functions.Function;
/**
* @author Rajan Maurya
- * On 07/07/17.
+ * On 07/07/17.
*/
@Singleton
public class DataManagerLoans extends FineractBaseDataManager {
@@ -27,7 +27,7 @@ public class DataManagerLoans extends FineractBaseDataManager
{
@Inject
public DataManagerLoans(BaseApiManager baseApiManager, PreferencesHelper
preferencesHelper,
-DataManagerAuth dataManagerAuth) {
+DataManagerAuth dataManagerAuth) {
super(dataManagerAuth, preferencesHelper);
this.baseApiManager = baseApiManager;
this.preferencesHelper = preferencesHelper;
@@ -78,4 +78,13 @@ public class DataManagerLoans extends
FineractBaseDataManager {
return authenticatedCompletableApi(baseApiManager.getLoanApi()
.createLoan(productIdentifier, loanAccount));
}
+
+public Completable updateLoan(
+String productIdentifier,
+LoanAccount loanAccount,
+String caseIdentifier) {
+return authenticatedCompletableApi(
+baseApiManager.getLoanApi().
+updateLoan(productIdentifier, caseIdentifier,
loanAccount));
+}
}
diff --git
a/app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.kt
b/app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.kt
index 4a9e876..043d882 100644
---
a/app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.kt
+++
b/app/src/main/java/org/apache/fineract/data/models/loan/AccountAssignment.kt
@@ -1,13 +1,16 @@
package org.apache.fineract.data.models.loan
+import android.os.Parcelable
import com.google.gson.annotations.SerializedName
+import kotlinx.android.parcel.Parcelize
/**
* @author Rajan Maurya
* On 09/07/17.
*/
+@Parcelize
data class AccountAssignment (
@SerializedName("designator") var designator: String? = null,
@SerializedName("accountIdentifier") var accountIdentifier: String? = null,
@SerializedName("ledgerIdentifier") var ledgerIdentifier: String? = null
-)
\ No newline at end of file
+):Parcelable
\ No newline at end of file
diff --git
a/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.kt
b/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.kt
index b1daa84..c7dd13f 100644
--- a/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount.kt
+++ b/app/src/main/java/org/apache/fineract/data/models/loan/LoanAccount
[fineract-cn-mobile] branch development updated: Feat: implements the splash screen in right and better way
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 6d3f7e0 Feat: implements the splash screen in right and better way 6d3f7e0 is described below commit 6d3f7e012c5eb903bb6cf479c72bbe35de1bb1d5 Author: jawid1 AuthorDate: Sun Apr 12 14:53:46 2020 +0530 Feat: implements the splash screen in right and better way --- app/src/main/AndroidManifest.xml | 4 +--- .../org/apache/fineract/ui/online/SplashActivity.kt | 19 --- .../fineract/ui/online/launcher/LauncherActivity.java | 3 ++- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8d259e..bad499e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -35,7 +35,7 @@ @@ -43,8 +43,6 @@ - -
[fineract-cn-mobile] branch development updated: Fix #FINCN-199 - Drawer layout is transparent with status bar
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 6647060 Fix #FINCN-199 - Drawer layout is transparent with status bar 6647060 is described below commit 664706000c5a46435d835cac3198c9b97849ec60 Author: jawid1 AuthorDate: Wed Feb 26 23:36:21 2020 +0530 Fix #FINCN-199 - Drawer layout is transparent with status bar --- app/src/main/AndroidManifest.xml | 3 ++- app/src/main/res/values/styles.xml | 7 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 08702c3..f8d259e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,7 +51,8 @@ android:name=".ui.online.login.LoginActivity" android:windowSoftInputMode="adjustResize" /> - + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9f078be..60e4631 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,4 +1,4 @@ - +http://schemas.android.com/tools";> @@ -13,6 +13,11 @@ <item name="android:fontFamily">@font/roboto</item> + +<item name="android:statusBarColor" tools:targetApi="lollipop"> +@android:color/transparent +</item> +
[fineract-cn-mobile] 01/02: initialize couchbaseLite, implement group & customers and add UI tests
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 86c910ab44f65ca8fed3e19689d4924334bd533b
Author: jawidMuhammadi
AuthorDate: Fri Aug 7 14:49:14 2020 +0530
initialize couchbaseLite, implement group & customers and add UI tests
---
app/build.gradle | 10 +-
.../creategroup/CreateGroupActivityAndroidTest.kt | 115 +
.../grouplist/GroupListFragmentAndroidTest.kt | 54
.../org/apache/fineract/FineractApplication.java | 2 +
.../apache/fineract/couchbase/CouchbaseDatabase.kt | 72 +++
.../org/apache/fineract/couchbase/DocumentType.kt | 10 ++
.../org/apache/fineract/couchbase/Replicate.java | 69 +++
.../fineract/couchbase/SynchronizationManager.kt | 112 +
.../java/org/apache/fineract/data/models/Group.kt | 6 +-
.../fineract/data/models/customer/Customer.kt | 46 +++
.../org/apache/fineract/data/remote/BaseUrl.java | 1 +
.../apache/fineract/ui/adapters/GroupsAdapter.kt | 4 +-
.../customeractivity/CreateCustomerPresenter.java | 89 +-
.../FormCustomerAddressFragment.java | 18 +--
.../customerdetails/CustomerDetailsFragment.java | 31 +++--
.../customerdetails/CustomerDetailsPresenter.java | 50 ++--
.../customers/customerlist/CustomersFragment.java | 35 +++---
.../customers/customerlist/CustomersPresenter.java | 136 +
.../CustomerTasksBottomSheetContract.java | 5 +-
.../CustomerTasksBottomSheetFragment.java | 20 ++-
.../CustomerTasksBottomSheetPresenter.java | 70 ++-
.../groups/creategroup/CreateGroupActivity.kt | 6 +-
.../online/groups/grouplist/GroupListFragment.kt | 24 ++--
.../ui/online/groups/grouplist/GroupViewModel.kt | 64 +++---
.../groups/grouplist/GroupViewModelFactory.kt | 11 +-
.../grouptasks/GroupTasksBottomSheetFragment.kt| 4 +-
.../java/org/apache/fineract/utils/Constants.kt| 4 +
.../java/org/apache/fineract/utils/DateUtils.java | 3 +-
.../java/org/apache/fineract/utils/GsonUtils.kt| 31 +
app/src/main/resources/groups.json | 3 +-
.../fineract/online/CustomerPresenterTest.kt | 97 ---
app/sync-gateway-config.json | 19 +++
build.gradle | 8 +-
33 files changed, 817 insertions(+), 412 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 0c7f303..5dbcc83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,6 +71,9 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
+kotlinOptions {
+jvmTarget = JavaVersion.VERSION_1_8
+}
}
dependencies {
@@ -157,6 +160,9 @@ dependencies {
implementation
"org.jetbrains.kotlinx:kotlinx-coroutines-core:$version_kotlin_coroutines"
implementation
"org.jetbrains.kotlinx:kotlinx-coroutines-android:$version_kotlin_coroutines"
+//couchbase
+implementation "com.couchbase.lite:couchbase-lite-android:$couchbase"
+
// Instrumentation test dependencies
androidTestImplementation jUnit
@@ -173,6 +179,9 @@ dependencies {
androidTestImplementation
"androidx.test.espresso:espresso-core:$espressoVersion"
androidTestImplementation "androidx.test:runner:$runnerVersion"
androidTestImplementation "androidx.test:rules:$rulesVersion"
+androidTestImplementation "androidx.test.ext:junit:$extJunit"
+androidTestImplementation
"androidx.test.espresso:espresso-core:$espressoCore"
+androidTestImplementation "androidx.test.espresso:espresso-contrib:
$espressonContribute"
// Unit tests dependencies
testImplementation jUnit
@@ -182,7 +191,6 @@ dependencies {
testImplementation "org.hamcrest:hamcrest-library:$hamcrestVersion"
testImplementation "org.hamcrest:hamcrest-integration:$hamcrestVersion"
testImplementation "org.robolectric:robolectric:$roboElectricVersion"
-
}
// Log out test results to console
diff --git
a/app/src/androidTest/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivityAndroidTest.kt
b/app/src/androidTest/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivityAndroidTest.kt
new file mode 100644
index 000..83441ad
--- /dev/null
+++
b/app/src/androidTest/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivityAndroidTest.kt
@@ -0,0 +1,115 @@
+package org.apache.fineract.ui.online.groups.creategroup
+
+import android.content.Intent
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+
[fineract-cn-mobile] branch development updated (592099e -> b7a5530)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from 592099e : new 86c910a initialize couchbaseLite, implement group & customers and add UI tests new b7a5530 Delete sync-gateway-config.json The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: app/build.gradle | 10 +- .../creategroup/CreateGroupActivityAndroidTest.kt | 115 + .../grouplist/GroupListFragmentAndroidTest.kt | 54 .../org/apache/fineract/FineractApplication.java | 2 + .../apache/fineract/couchbase/CouchbaseDatabase.kt | 72 +++ .../org/apache/fineract/couchbase/DocumentType.kt | 10 ++ .../org/apache/fineract/couchbase/Replicate.java | 69 +++ .../fineract/couchbase/SynchronizationManager.kt | 112 + .../java/org/apache/fineract/data/models/Group.kt | 6 +- .../fineract/data/models/customer/Customer.kt | 46 +++ .../org/apache/fineract/data/remote/BaseUrl.java | 1 + .../apache/fineract/ui/adapters/GroupsAdapter.kt | 4 +- .../customeractivity/CreateCustomerPresenter.java | 89 +- .../FormCustomerAddressFragment.java | 18 +-- .../customerdetails/CustomerDetailsFragment.java | 31 +++-- .../customerdetails/CustomerDetailsPresenter.java | 50 ++-- .../customers/customerlist/CustomersFragment.java | 35 +++--- .../customers/customerlist/CustomersPresenter.java | 136 + .../CustomerTasksBottomSheetContract.java | 5 +- .../CustomerTasksBottomSheetFragment.java | 20 ++- .../CustomerTasksBottomSheetPresenter.java | 70 ++- .../groups/creategroup/CreateGroupActivity.kt | 6 +- .../online/groups/grouplist/GroupListFragment.kt | 24 ++-- .../ui/online/groups/grouplist/GroupViewModel.kt | 64 +++--- .../groups/grouplist/GroupViewModelFactory.kt | 11 +- .../grouptasks/GroupTasksBottomSheetFragment.kt| 4 +- .../java/org/apache/fineract/utils/Constants.kt| 4 + .../java/org/apache/fineract/utils/DateUtils.java | 3 +- .../java/org/apache/fineract/utils/GsonUtils.kt| 31 + app/src/main/resources/groups.json | 3 +- .../fineract/online/CustomerPresenterTest.kt | 97 --- build.gradle | 8 +- 32 files changed, 798 insertions(+), 412 deletions(-) create mode 100644 app/src/androidTest/java/org/apache/fineract/ui/online/groups/creategroup/CreateGroupActivityAndroidTest.kt create mode 100644 app/src/androidTest/java/org/apache/fineract/ui/online/groups/grouplist/GroupListFragmentAndroidTest.kt create mode 100644 app/src/main/java/org/apache/fineract/couchbase/CouchbaseDatabase.kt create mode 100644 app/src/main/java/org/apache/fineract/couchbase/DocumentType.kt create mode 100644 app/src/main/java/org/apache/fineract/couchbase/Replicate.java create mode 100644 app/src/main/java/org/apache/fineract/couchbase/SynchronizationManager.kt create mode 100644 app/src/main/java/org/apache/fineract/utils/GsonUtils.kt delete mode 100644 app/src/test/java/org/apache/fineract/online/CustomerPresenterTest.kt
[fineract-cn-mobile] 02/02: Delete sync-gateway-config.json
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 b7a55308f7e6525c82cf6f74c986321dc4ae
Author: Ahmad Jawid Muhammadi <49963168+jawidmuhamm...@users.noreply.github.com>
AuthorDate: Sun Sep 13 13:08:06 2020 +0530
Delete sync-gateway-config.json
---
app/sync-gateway-config.json | 19 ---
1 file changed, 19 deletions(-)
diff --git a/app/sync-gateway-config.json b/app/sync-gateway-config.json
deleted file mode 100644
index b3f7592..000
--- a/app/sync-gateway-config.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "interface":"0.0.0.0:4984",
- "log": ["*"],
- "databases": {
-"fineract-cn": {
- "server": "ws://localhost:8091/",
- "bucket": "fineract-cn-mobile",
- "username": "fineract-cn",
- "password": "password",
- "enable_shared_bucket_access": true,
- "import_docs": true,
- "num_index_replicas": 0,
- "users": {
-"GUEST": { "disabled": false, "admin_channels": ["*"] },
- "sync_gateway": {"password": "password"}
- }
-}
- }
-}
\ No newline at end of file
[fineract-cn-mobile] branch development updated (2af08b0 -> 5610a15)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from 2af08b0 Passcode Functionality completed add 5610a15 :art: Text Style change to Navigation Drawer No new revisions were added by this update. Summary of changes: app/src/main/res/layout/layout_nav_header.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[fineract-cn-mobile] 01/03: Splash Screen Added
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 7577dfa5b16ead63a09aad880ce9f5f109f59ef8
Author: miPlodder
AuthorDate: Mon Jun 10 00:32:32 2019 +0530
Splash Screen Added
---
app/src/main/AndroidManifest.xml | 5 +++--
.../org/apache/fineract/ui/online/SplashActivity.kt| 18 ++
app/src/main/res/drawable/splash_background.xml| 10 ++
app/src/main/res/values/styles.xml | 10 +++---
4 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7bc67e3..dfb8082 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,14 +31,15 @@
android:resource="@xml/filepaths" />
-
+
-
+
+
diff --git a/app/src/main/java/org/apache/fineract/ui/online/SplashActivity.kt
b/app/src/main/java/org/apache/fineract/ui/online/SplashActivity.kt
new file mode 100644
index 000..a336dc0
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/SplashActivity.kt
@@ -0,0 +1,18 @@
+package org.apache.fineract.ui.online
+
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.apache.fineract.ui.online.launcher.LauncherActivity
+
+/*
+ * Created by saksham on 09/June/2019
+*/
+
+class SplashActivity : AppCompatActivity() {
+
+override fun onCreate(savedInstanceState: Bundle?) {
+super.onCreate(savedInstanceState)
+startActivity(Intent(this, LauncherActivity::class.java))
+}
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_background.xml
b/app/src/main/res/drawable/splash_background.xml
new file mode 100644
index 000..0a9b68a
--- /dev/null
+++ b/app/src/main/res/drawable/splash_background.xml
@@ -0,0 +1,10 @@
+
+http://schemas.android.com/apk/res/android";>
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index a467772..9f078be 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -36,14 +36,14 @@
-
<item name="android:textSize">17sp</item>
<item name="android:textColor">@color/colorPrimaryText</item>
-
-
+
+
+
<item name="android:layout_height">wrap_content</item>
@@ -64,4 +64,8 @@
<item name="colorAccent">@color/colorAccent</item>
+
+<item
name="android:windowBackground">@drawable/splash_background</item>
+
+
[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
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 v
[fineract-cn-mobile] 03/03: Passcode Functionality completed
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 2af08b06f0393d4dc9d9bbf00173acbaaa851d4b
Author: miPlodder
AuthorDate: Wed Jun 12 06:53:23 2019 +0530
Passcode Functionality completed
---
app/src/main/AndroidManifest.xml | 10 +++--
.../org/apache/fineract/FineractApplication.java | 2 +
.../fineract/ui/base/FineractBaseActivity.java | 11 +-
.../apache/fineract/ui/online/PassCodeActivity.kt | 44 ++
.../apache/fineract/ui/online/SplashActivity.kt| 1 +
.../ui/online/launcher/LauncherActivity.java | 25
.../ui/online/launcher/LauncherContract.java | 4 +-
.../fineract/ui/online/login/LoginActivity.java| 8 +++-
8 files changed, 89 insertions(+), 16 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dfb8082..d28cf45 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,14 +31,18 @@
android:resource="@xml/filepaths" />
-
+
-
+
+
+
-
+
diff --git a/app/src/main/java/org/apache/fineract/FineractApplication.java
b/app/src/main/java/org/apache/fineract/FineractApplication.java
index f9bd6a4..de32205 100644
--- a/app/src/main/java/org/apache/fineract/FineractApplication.java
+++ b/app/src/main/java/org/apache/fineract/FineractApplication.java
@@ -5,6 +5,7 @@ import android.content.Context;
import com.crashlytics.android.Crashlytics;
import com.evernote.android.job.JobManager;
+import com.mifos.mobile.passcode.utils.ForegroundChecker;
import com.raizlabs.android.dbflow.config.FlowManager;
import org.apache.fineract.injection.component.ApplicationComponent;
@@ -35,6 +36,7 @@ public class FineractApplication extends Application {
instance = this;
Fabric.with(this, new Crashlytics());
FlowManager.init(this);
+ForegroundChecker.init(this);
}
public static Context getContext() {
diff --git
a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
index f40b697..e4d953e 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
@@ -6,18 +6,20 @@ import android.os.Bundle;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
-import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
+import com.mifos.mobile.passcode.BasePassCodeActivity;
+
import org.apache.fineract.FineractApplication;
import org.apache.fineract.R;
import org.apache.fineract.injection.component.ActivityComponent;
import org.apache.fineract.injection.component.ConfigPersistentComponent;
import org.apache.fineract.injection.component.DaggerConfigPersistentComponent;
import org.apache.fineract.injection.module.ActivityModule;
+import org.apache.fineract.ui.online.PassCodeActivity;
import java.util.HashMap;
import java.util.Map;
@@ -29,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong;
* creation of Dagger components and makes sure that instances of
ConfigPersistentComponent survive
* across configuration changes.
*/
-public class FineractBaseActivity extends AppCompatActivity implements
BaseActivityCallback {
+public class FineractBaseActivity extends BasePassCodeActivity implements
BaseActivityCallback {
private static final String KEY_ACTIVITY_ID = "KEY_ACTIVITY_ID";
private static final AtomicLong NEXT_ID = new AtomicLong(0);
@@ -187,4 +189,9 @@ public class FineractBaseActivity extends AppCompatActivity
implements BaseActiv
public int stackCount() {
return getSupportFragmentManager().getBackStackEntryCount();
}
+
+@Override
+public Class getPassCodeClass() {
+return PassCodeActivity.class;
+}
}
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/PassCodeActivity.kt
b/app/src/main/java/org/apache/fineract/ui/online/PassCodeActivity.kt
new file mode 100644
index 000..9cbbf84
--- /dev/null
+++ b/app/src/main/java/org/apache/fineract/ui/online/PassCodeActivity.kt
@@ -0,0 +1,44 @@
+package org.apache.fineract.ui.online
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.PersistableBundle
+import android.view.View
+import com.mifos.mobile.passcode.MifosPassCodeActivity
+import com.mifos.mobile.passcode.utils.EncryptionUtil
+impor
[fineract-cn-mobile] branch development updated (f930faf -> 2af08b0)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from f930faf Merge pull request #66 from miPlodder/migration new 7577dfa Splash Screen Added new 18b7659 Mifos Passcode dependancy added and refactor Kotlin code accordingly new 2af08b0 Passcode Functionality completed The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 11 -- .../org/apache/fineract/FineractApplication.java | 2 + .../fineract/ui/base/FineractBaseActivity.java | 11 +- .../apache/fineract/ui/online/PassCodeActivity.kt | 44 ++ .../apache/fineract/ui/online/SplashActivity.kt| 19 ++ .../online/accounting/accounts/AccountsFragment.kt | 4 +- .../ui/online/accounting/ledgers/LedgerFragment.kt | 4 +- .../EditPayrollAllocationFragment.kt | 2 +- .../editcustomerpayroll/EditPayrollFragment.kt | 2 +- .../ui/online/launcher/LauncherActivity.java | 25 .../ui/online/launcher/LauncherContract.java | 4 +- .../fineract/ui/online/login/LoginActivity.java| 8 +++- .../ui/online/review/AddLoanReviewFragment.kt | 4 +- .../fineract/ui/online/teller/TellerFragment.kt| 4 +- .../apache/fineract/ui/product/ProductFragment.kt | 4 +- app/src/main/res/drawable/splash_background.xml| 10 + app/src/main/res/values/styles.xml | 10 +++-- build.gradle | 1 + 19 files changed, 140 insertions(+), 31 deletions(-) create mode 100644 app/src/main/java/org/apache/fineract/ui/online/PassCodeActivity.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/SplashActivity.kt create mode 100644 app/src/main/res/drawable/splash_background.xml
[fineract-cn-mobile] branch development updated (9bdc83f -> f930faf)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from 9bdc83f Merge pull request #65 from miPlodder/feat#robotofontaddition new d862031 Migration to AndroidX new 19f3113 FINCN-158: App Crash on clicking Customer Image fixed new 9b3ca12 FINCN:159 - Pressing back button twice issue fixed new b677198 FINCN-160 : Searching fixed in Product Fragment new 8b6fb36 FINCN-161: Inconsistency in Nav Drawer on clicking View Customer fixed new ad8f29a FINCN-162: Corrected Back button behavior and minor class refactoring to Lambda new 74fbc7c FINCN-163: Fixed Dashboard Item on Nav Drawer selection issue new f930faf Merge pull request #66 from miPlodder/migration The 261 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml| 4 +- app/build.gradle | 87 -- .../apache/fineract/ExampleInstrumentedTest.java | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../fineract/data/local/PreferencesHelper.java | 2 +- .../data/remote/ConnectivityInterceptor.java | 2 +- .../fineract/data/remote/FineractInterceptor.java | 2 +- .../fineract/jobs/CreationUpdationCustomerJob.java | 2 +- .../apache/fineract/jobs/FineractJobCreator.java | 4 +- .../org/apache/fineract/jobs/JobsReceiver.java | 2 +- .../org/apache/fineract/jobs/StartSyncJob.java | 2 +- .../apache/fineract/ui/adapters/AccountsAdapter.kt | 4 +- .../fineract/ui/adapters/BeneficiaryAdapter.java | 2 +- .../adapters/BeneficiaryAutoCompleteAdapter.java | 2 +- .../ui/adapters/CreateCustomerStepAdapter.java | 6 +- .../ui/adapters/CreateDepositStepAdapter.java | 6 +- .../adapters/CreateIdentificationStepAdapter.java | 6 +- .../ui/adapters/CustomerActivitiesAdapter.java | 2 +- .../fineract/ui/adapters/CustomerAdapter.java | 4 +- .../ui/adapters/CustomerDepositAdapter.java| 4 +- .../ui/adapters/DebtIncomeReportAdapter.java | 2 +- .../fineract/ui/adapters/EditPayrollStepAdapter.kt | 2 +- .../ui/adapters/IdentificationAdapter.java | 2 +- .../ui/adapters/IdentificationScanAdapter.java | 2 +- .../apache/fineract/ui/adapters/LedgerAdapter.kt | 4 +- .../ui/adapters/LoanAccountListAdapter.java| 4 +- .../ui/adapters/LoanApplicationStepAdapter.java| 6 +- .../ui/adapters/LoanDebtIncomeAdapter.java | 2 +- .../ui/adapters/PayrollAllocationAdapter.kt| 2 +- .../ui/adapters/PlannedPaymentAdapter.java | 4 +- .../apache/fineract/ui/adapters/ProductAdapter.kt | 2 +- .../apache/fineract/ui/adapters/RolesAdapter.java | 2 +- .../apache/fineract/ui/adapters/TellerAdapter.kt | 4 +- .../fineract/ui/adapters/ViewPagerAdapter.java | 6 +- .../ui/base/EndlessRecyclerViewScrollListener.java | 8 +- .../fineract/ui/base/FineractBaseActivity.java | 10 +-- .../FineractBaseBottomSheetDialogFragment.java | 4 +- .../fineract/ui/base/FineractBaseFragment.java | 6 +- .../java/org/apache/fineract/ui/base/Toaster.java | 8 +- .../ui/offline/CustomerPayloadFragment.java| 10 +-- .../fineract/ui/online/DashboardActivity.java | 70 + .../online/accounting/accounts/AccountsFragment.kt | 9 ++- .../ui/online/accounting/ledgers/LedgerFragment.kt | 9 ++- .../FormCustomerContactFragment.java | 6 +- .../FormCustomerDetailsFragment.java | 6 +- .../FormCustomerAddressFragment.java | 6 +- .../CustomerActivitiesFragment.java| 8 +- .../customerdetails/CustomerDetailsFragment.java | 12 +-- .../customers/customerlist/CustomersFragment.java | 14 ++-- .../EditPayrollAllocationFragment.kt | 5 +- .../EditPayrollBottomSheet.kt | 2 +- .../customerprofile/CustomerProfileActivity.java | 7 +- .../EditCustomerProfileBottomSheet.java| 6 +- .../CustomerTasksBottomSheetFragment.java | 8 +- .../ui/online/dashboard/DashboardFragment.java | 8 +- .../DepositOnNavigationBarListener.java| 2 +- .../FormDepositOverviewFragment.java | 8 +- .../FormDepositAssignProductFragment.java | 12 +-- .../DepositAccountDetailsFragment.java | 6 +- .../DepositAccountsFragment.java | 6 +- .../FormIdentificationDetailsFragment.java | 6 +- .../FormOverViewIdentificationFragment.java| 4 +- .../IdentificationDetailsFragment.java | 6 +- .../IdentificationsFragment.java
[fineract-cn-mobile] branch development updated: feat# Roboto font added
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 f644253 feat# Roboto font added
new 9bdc83f Merge pull request #65 from miPlodder/feat#robotofontaddition
f644253 is described below
commit f644253ab99a07dd3e7a79d257bea7a4559b55f5
Author: miPlodder
AuthorDate: Sun Jun 2 15:29:18 2019 +0530
feat# Roboto font added
---
app/src/main/AndroidManifest.xml| 3 +++
app/src/main/res/font/roboto.xml| 7 +++
app/src/main/res/values/font_certs.xml | 17 +
app/src/main/res/values/preloaded_fonts.xml | 6 ++
app/src/main/res/values/styles.xml | 1 +
build.gradle| 2 +-
6 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c33a494..390c12c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,9 @@
+
\ No newline at end of file
diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml
new file mode 100644
index 000..2641caf
--- /dev/null
+++ b/app/src/main/res/font/roboto.xml
@@ -0,0 +1,7 @@
+
+http://schemas.android.com/apk/res-auto";
+app:fontProviderAuthority="com.google.android.gms.fonts"
+app:fontProviderPackage="com.google.android.gms"
+app:fontProviderQuery="Roboto"
+app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+
diff --git a/app/src/main/res/values/font_certs.xml
b/app/src/main/res/values/font_certs.xml
new file mode 100644
index 000..d2226ac
--- /dev/null
+++ b/app/src/main/res/values/font_certs.xml
@@ -0,0 +1,17 @@
+
+
+
+@array/com_google_android_gms_fonts_certs_dev
+@array/com_google_android_gms_fonts_certs_prod
+
+
+
+
MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9p
[...]
+
+
+
+
+
MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW
[...]
+
+
+
diff --git a/app/src/main/res/values/preloaded_fonts.xml
b/app/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 000..037620b
--- /dev/null
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,6 @@
+
+
+
+@font/roboto
+
+
diff --git a/app/src/main/res/values/styles.xml
b/app/src/main/res/values/styles.xml
index 04553d5..a467772 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,7 @@
@style/AppTheme.Button
@style/AppTheme.Button
@style/AppTheme.Text
+@font/roboto
diff --git a/build.gradle b/build.gradle
index 1b8a7d1..8543208 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,7 +31,7 @@ task clean(type: Delete) {
ext {
// Sdk and tools
-minSdkVersion = 15
+minSdkVersion = 16
targetSdkVersion = 27
compileSdkVersion = 27
buildToolsVersion = '27.0.3'
[fineract-cn-mobile] branch development updated: fix: Restricted text characters in Mobile fields
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 2af4c39 fix: Restricted text characters in Mobile fields new 66ecb79 Merge pull request #61 from miPlodder/softkeyboard 2af4c39 is described below commit 2af4c390ccfd1689a3405af9bf95bdee6510b8cb Author: abhijitramesh AuthorDate: Fri Feb 1 00:35:20 2019 +0530 fix: Restricted text characters in Mobile fields --- app/src/main/res/layout/fragment_form_customer_address.xml | 9 ++--- app/src/main/res/layout/fragment_form_customer_details.xml | 4 app/src/main/res/values/strings.xml| 3 +++ 3 files changed, 13 insertions(+), 3 deletions(-) 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:layout_width="match_parent" +android:digits="@string/restrict_a_zA_Z"/> +android:layout_width="match_parent" +android:digits="@string/restrict_a_zA_Z"/> 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"/> @@ -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"/> @@ -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"/> @@ -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"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index be6386c..6aab32d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -387,6 +387,9 @@ Please wait … Logging in… +abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ +abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890 + Loan details Debt to income ratio
[fineract-cn-mobile] branch development updated: FINCN-138: Added Icons to Drawer
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 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 000..91cae22 --- /dev/null +++ b/app/src/main/res/drawable/ic_book_black_24dp.xml @@ -0,0 +1,9 @@ +http://schemas.android.com/apk/res/android"; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24.0" +android:viewportHeight="24.0"> + + \ 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 000..7a2fd1e --- /dev/null +++ b/app/src/main/res/drawable/ic_business_center_black_24dp.xml @@ -0,0 +1,9 @@ +http://schemas.android.com/apk/res/android"; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24.0" +android:viewportHeight="24.0"> + + \ 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 000..005d783 --- /dev/null +++ b/app/src/main/res/drawable/ic_products_black_24dp.xml @@ -0,0 +1,12 @@ + +http://schemas.android.com/apk/res/android"; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24" +android:viewportHeight="24"> + + + + \ 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 000..70f9684 --- /dev/null +++ b/app/src/main/res/drawable/ic_supervisor_account_black_24dp.xml @@ -0,0 +1,9 @@ +http://schemas.android.com/apk/res/android"; +android:width="24dp" +android:height="24dp" +android:viewportWidth="24.0" +android:viewportHeight="24.0"> + + \ 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"/> 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 @@ http://schemas.android.com/apk/res/android";> +android:id="@+id/group1" +android:checkableBehavior="single"> +android:title="@string/dashboard" /> +android:title="@string/roles_and_permissions" /> +android:title="@string/customer" /> +android:checked="true" +android:icon="@drawable/ic_business_center_black_24dp" +android:title=&quo
[fineract-cn-mobile] branch development updated: Exit feature on Dashboard pressing back button twice
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 fd578e5 Exit feature on Dashboard pressing back button twice
new c7097ef Merge pull request #64 from miPlodder/fix-PR#34
fd578e5 is described below
commit fd578e5c36f80e2ea47778d6957cc896356a2ad0
Author: miPlodder
AuthorDate: Sun Jun 2 12:50:04 2019 +0530
Exit feature on Dashboard pressing back button twice
---
.../fineract/ui/online/DashboardActivity.java | 22 ++
app/src/main/res/values/strings.xml| 1 +
2 files changed, 19 insertions(+), 4 deletions(-)
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 @@ package org.apache.fineract.ui.online;
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.R;
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 @@ public class DashboardActivity extends FineractBaseActivity
implements
@Inject
PreferencesHelper preferencesHelper;
+private boolean isBackPressedOnce = false;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -140,12 +145,21 @@ public class DashboardActivity extends
FineractBaseActivity implements
@Override
public void onBackPressed() {
-DrawerLayout drawer = findViewById(R.id.drawer_layout);
-if (drawer.isDrawerOpen(GravityCompat.START)) {
-drawer.closeDrawer(GravityCompat.START);
-} else {
+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/values/strings.xml
b/app/src/main/res/values/strings.xml
index be6386c..9961375 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -496,4 +496,5 @@
Customer Payloads
Email
Logged out successfully.
+Please click BACK again to
exit
[fineract-cn-mobile] branch development updated (123e0ca -> d877b17)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from 123e0ca feat: added toast showing log out status new 81ff3f4 feat: payroll configurations of customer new 0a4b13b feat : update payroll new d877b17 Merge pull request #60 from miPlodder/payroll The 245 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/fineract/FakeJsonName.java | 2 + .../org/apache/fineract/FakeRemoteDataSource.java | 6 + app/src/main/AndroidManifest.xml | 39 ++-- .../data/datamanager/api/DataManagerPayroll.kt | 30 +++ .../data/models/payroll/PayrollAllocation.kt | 13 ++ .../data/models/payroll/PayrollConfiguration.kt| 16 ++ .../fineract/data/remote/BaseApiManager.java | 9 +- .../org/apache/fineract/data/remote/EndPoints.java | 1 + .../fineract/data/services/PayrollService.kt | 22 +++ .../injection/component/ActivityComponent.java | 17 +- .../injection/component/ApplicationComponent.java | 2 + .../fineract/ui/adapters/EditPayrollStepAdapter.kt | 31 +++ .../ui/adapters/PayrollAllocationAdapter.kt| 70 +++ .../customerdetails/CustomerDetailsFragment.java | 9 + .../customers/customerpayroll/PayrollActivity.kt | 19 ++ .../customers/customerpayroll/PayrollContract.kt | 24 +++ .../customers/customerpayroll/PayrollFragment.kt | 121 .../customers/customerpayroll/PayrollPresenter.kt | 47 + .../editcustomerpayroll/EditPayrollActivity.kt | 92 + .../EditPayrollAllocationFragment.kt | 133 + .../editcustomerpayroll/EditPayrollContract.kt | 18 ++ .../editcustomerpayroll/EditPayrollFragment.kt | 145 ++ .../editcustomerpayroll/EditPayrollPresenter.kt| 40 .../editcustomerpayroll/OnNavigationBarListener.kt | 15 ++ .../EditPayrollBottomSheet.kt | 84 .../OnBottomSheetDialogListener.kt | 11 ++ .../editpayrollbottomsheet/PayrollSource.kt| 8 + .../org/apache/fineract/utils/ConstantKeys.java| 1 + ...eate_customer.xml => activity_edit_payroll.xml} | 0 ...l => bottom_sheet_edit_payroll_allocations.xml} | 77 .../main/res/layout/fragment_customer_details.xml | 45 + ...tomer_address.xml => fragment_edit_payroll.xml} | 83 .../layout/fragment_edit_payroll_allocation.xml| 25 +++ app/src/main/res/layout/fragment_payroll.xml | 215 + ...debt_income.xml => item_payroll_allocation.xml} | 87 + app/src/main/res/values/strings.xml| 17 ++ app/src/main/resources/payrollConfiguration.json | 19 ++ 37 files changed, 1459 insertions(+), 134 deletions(-) create mode 100644 app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerPayroll.kt create mode 100644 app/src/main/java/org/apache/fineract/data/models/payroll/PayrollAllocation.kt create mode 100644 app/src/main/java/org/apache/fineract/data/models/payroll/PayrollConfiguration.kt create mode 100644 app/src/main/java/org/apache/fineract/data/services/PayrollService.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/adapters/EditPayrollStepAdapter.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/adapters/PayrollAllocationAdapter.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/PayrollActivity.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/PayrollContract.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/PayrollFragment.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/PayrollPresenter.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollActivity.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollAllocationFragment.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollContract.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollFragment.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/EditPayrollPresenter.kt create mode 100644 app/src/main/java/org/apache/fineract/ui/online/customers/customerpayroll/editcustomerpayroll/OnNavigationBarList
[fineract-cn-mobile] branch development updated: feat: added toast showing log out status
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 123e0ca feat: added toast showing log out status
123e0ca is described below
commit 123e0ca1ee3badc5130d71d2c4ea412580ade1e9
Author: abhijitramesh
AuthorDate: Mon Mar 4 02:24:56 2019 +0530
feat: added toast showing log out status
---
.../java/org/apache/fineract/ui/online/DashboardActivity.java| 9 +++--
app/src/main/res/values/strings.xml | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
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 836c146..a467510 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
@@ -11,6 +11,7 @@ import android.support.v7.app.ActionBarDrawerToggle;
import android.view.Gravity;
import android.view.MenuItem;
import android.view.View;
+import android.widget.Toast;
import org.apache.fineract.R;
import org.apache.fineract.data.local.PreferencesHelper;
@@ -34,7 +35,7 @@ import butterknife.ButterKnife;
/**
* @author Rajan Maurya
- * On 19/06/17.
+ * On 19/06/17.
*/
public class DashboardActivity extends FineractBaseActivity implements
NavigationView.OnNavigationItemSelectedListener {
@@ -139,7 +140,7 @@ public class DashboardActivity extends FineractBaseActivity
implements
@Override
public void onBackPressed() {
-DrawerLayout drawer = findViewById(R.id.drawer_layout);
+DrawerLayout drawer = findViewById(R.id.drawer_layout);
if (drawer.isDrawerOpen(GravityCompat.START)) {
drawer.closeDrawer(GravityCompat.START);
} else {
@@ -162,6 +163,10 @@ public class DashboardActivity extends
FineractBaseActivity implements
LauncherActivity.class);
startActivity(intent);
finish();
+Toast.makeText(DashboardActivity.this,
+R.string.logged_out_successfully,
Toast.LENGTH_SHORT)
+.show();
+
}
})
.setNegativeButton(getString(R.string.dialog_action_cancel))
diff --git a/app/src/main/res/values/strings.xml
b/app/src/main/res/values/strings.xml
index e0c98c9..966b861 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -478,4 +478,5 @@
No documents to show.
add documents
Customer Payloads
Email
+Logged out successfully.
[fineract-cn-mobile] branch development updated: feat: unit test
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 10a2baa feat: unit test
10a2baa is described below
commit 10a2baa26309ece5780363a49925977a0ec8b45b
Author: Mohak
AuthorDate: Tue Aug 7 07:21:15 2018 +0530
feat: unit test
---
.../online/accounting/ledgers/LedgerPresenter.kt | 5 +-
.../customers/customerlist/CustomersPresenter.java | 2 -
.../IdentificationsPresenter.java | 2 +-
.../fineract/ui/online/login/LoginPresenter.java | 44 +-
.../ui/online/roles/roleslist/RolesPresenter.java | 2 +-
.../apache/fineract/online/AccountPresenterTest.kt | 85 +++
.../fineract/online/CustomerPresenterTest.kt | 97 ++
.../fineract/online/IdentificationPresenterTest.kt | 90
.../apache/fineract/online/LedgerPresenterTest.kt | 85 +++
.../fineract/online/LoanAccountPresenterTest.kt| 96 +
.../apache/fineract/online/LoginPresenterTest.kt | 76 +
.../apache/fineract/online/RolesPresenterTest.kt | 82 ++
.../fineract/util/RxSchedulersOverrideRule.kt | 47 +++
.../org.mockito.plugins.MockMaker | 1 +
14 files changed, 685 insertions(+), 29 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
index dde25b3..361bc51 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
@@ -60,15 +60,12 @@ class LedgerPresenter @Inject
constructor(@ApplicationContext context: Context,
override fun searchLedger(ledgerList: List, identifier: String) {
checkViewAttached()
-
mvpView.searchedLedger(Observable.fromIterable(ledgerList)
-.filter(object: Predicate {
+.filter(object : Predicate {
override fun test(ledger: Ledger): Boolean {
return ledger.identifier?.toLowerCase()
?.contains(identifier.toLowerCase()).toString().toBoolean()
}
}).toList().blockingGet())
}
-
-
}
\ No newline at end of file
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
index 5466c7f..398b615 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersPresenter.java
@@ -1,7 +1,6 @@
package org.apache.fineract.ui.online.customers.customerlist;
import android.content.Context;
-import android.util.Log;
import org.apache.fineract.R;
import org.apache.fineract.data.datamanager.contracts.ManagerCustomer;
@@ -85,7 +84,6 @@ public class CustomersPresenter extends
BasePresenter
@Override
public void onError(Throwable throwable) {
-Log.d("mytag", throwable.toString());
getMvpView().hideProgressbar();
if (loadmore) {
getMvpView().showMessage(
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
index dd7f3b6..1e6bd61 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
@@ -33,7 +33,7 @@ public class IdentificationsPresenter extends
BasePresenter
@@ -78,28 +78,30 @@ public class LoginPresenter extends
BasePresenter
getMvpView().hideProgressDialog();
if (throwable instanceof NoConnectivityException) {
getMvpView().showNoInternetConnection();
-}
-
-MifosError mifosError = new MifosError();
-Converter errorConverter =
-
retrofit.responseBodyConverter(MifosError.class, new Annotation[0]);
-if (throwable instanceof HttpException) {
-HttpException httpException = (HttpException)
throwable;
-Respons
[fineract-cn-mobile] branch development updated: feat: list and search products
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 cceb879 feat: list and search products
cceb879 is described below
commit cceb879db74ade5c110a611fd4c6b5b5866f7d1c
Author: Mohak
AuthorDate: Fri Jul 27 12:12:29 2018 +0530
feat: list and search products
---
.../java/org/apache/fineract/FakeJsonName.java | 2 +-
.../org/apache/fineract/FakeRemoteDataSource.java | 15 +-
.../data/datamanager/api/DataManagerProduct.kt | 30
.../apache/fineract/data/models/product/Product.kt | 33 ++--
.../fineract/data/models/product/ProductPage.kt| 6 +-
.../fineract/data/remote/BaseApiManager.java | 7 +
.../fineract/data/services/ProductService.kt | 18 +++
.../injection/component/ActivityComponent.java | 4 +
.../injection/component/ApplicationComponent.java | 2 +
.../apache/fineract/ui/adapters/ProductAdapter.kt | 60
.../ui/offline/CustomerPayloadFragment.java| 5 +-
.../fineract/ui/online/DashboardActivity.java | 5 +
.../customers/customerlist/CustomersFragment.java | 24 +--
.../customers/customerlist/CustomersPresenter.java | 43 +++---
.../customerprofile/CustomerProfileActivity.java | 15 +-
.../apache/fineract/ui/product/ProductContract.kt | 31
.../apache/fineract/ui/product/ProductFragment.kt | 170 +
.../apache/fineract/ui/product/ProductPresenter.kt | 80 ++
app/src/main/res/layout/fragment_product.xml | 27
app/src/main/res/layout/item_product.xml | 69 +
app/src/main/res/menu/menu_navigation_drawer.xml | 6 +
app/src/main/res/menu/menu_product_search.xml | 12 ++
app/src/main/res/values/strings.xml| 2 +
app/src/main/resources/productPage.json| 119 +--
24 files changed, 707 insertions(+), 78 deletions(-)
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 2e6951b..7667b38 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -22,4 +22,4 @@ public class FakeJsonName {
public static final String TELLER = "teller.json";
public static final String PRODUCT_PAGE = "productPage.json";
public static final String PRODUCT_DEFINITION = "productDefinition.json";
-}
+}
\ No newline at end of file
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index 3baa40a..f7e 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -82,6 +82,12 @@ public class FakeRemoteDataSource {
public static PlannedPaymentPage getPlannedPaymentPage() {
return testDataFactory.getObjectTypePojo(PlannedPaymentPage.class,
FakeJsonName.PLANNED_PAYMENT_PAGE);
+
+}
+
+public static ProductPage getProductPage() {
+return testDataFactory.getObjectTypePojo(ProductPage.class,
+FakeJsonName.PRODUCT_PAGE);
}
public static LedgerPage getLedgerPage() {
@@ -97,13 +103,8 @@ public class FakeRemoteDataSource {
}, FakeJsonName.TELLER);
}
-public static ProductPage getProductPage() {
-return testDataFactory.getObjectTypePojo(ProductPage.class,
-FakeJsonName.PRODUCT_PAGE);
-}
-
public static List getProductDefinition() {
-return testDataFactory.getListTypePojo(new
TypeToken>() {
-}, FakeJsonName.PRODUCT_DEFINITION);
+return testDataFactory.getListTypePojo(new
TypeToken>() {
+}, FakeJsonName.PRODUCT_DEFINITION);
}
}
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerProduct.kt
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerProduct.kt
new file mode 100644
index 000..4f49f35
--- /dev/null
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerProduct.kt
@@ -0,0 +1,30 @@
+package org.apache.fineract.data.datamanager.api
+
+import io.reactivex.Observable
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Function
+import org.apache.fineract.data.local.PreferencesHelper
+import org.apache.fineract.data.remote.BaseApiManager
+import javax.inject.Inject
+import org.apache.fineract.FakeRemoteDataSource
+import org.apache.fineract.data.models.product.Product
+import org.apache.fineract.data.models.product.ProductPage
+import javax.inject.Singleton
+
+@Singleton
+class DataManagerProduct @Inject constructor
[fineract-cn-mobile] branch development updated: feat: added sweet-error library
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 ab40f44 feat: added sweet-error library
ab40f44 is described below
commit ab40f44e55eb35382af515c6024465e8dec91c07
Author: abhijitramesh
AuthorDate: Fri Jan 25 18:16:43 2019 +0530
feat: added sweet-error library
---
.../fineract/ui/offline/CustomerPayloadFragment.java | 5 +++--
.../online/customers/customerlist/CustomersFragment.java | 15 ++-
.../customerprofile/CustomerProfileActivity.java | 12 +---
app/src/main/res/layout/activity_customer_profile.xml | 4
app/src/main/res/layout/fragment_roles_list.xml | 5 -
5 files changed, 30 insertions(+), 11 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
b/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
index c5a1a03..7658094 100644
---
a/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/offline/CustomerPayloadFragment.java
@@ -85,11 +85,12 @@ public class CustomerPayloadFragment extends
FineractBaseFragment implements
@Override
public void showNoInternetConnection() {
-
+
sweetUIErrorHandler.showSweetNoInternetUI(swipeRefreshLayout,layoutError);
}
@Override
public void showError(String message) {
-
+sweetUIErrorHandler.showSweetCustomErrorUI(message,
+R.drawable.ic_error_black_24dp,swipeRefreshLayout,layoutError);
}
}
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
index 36e0edf..54a97f8 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
@@ -144,11 +144,13 @@ public class CustomersFragment extends
FineractBaseFragment implements Customers
@Override
public void onRefresh() {
customerPresenter.fetchCustomers(0, false);
+sweetUIErrorHandler.hideSweetErrorLayoutUI(rvCustomers,layoutError);
}
@OnClick(R.id.btn_try_again)
void onRetry() {
customerPresenter.fetchCustomers(0, false);
+sweetUIErrorHandler.hideSweetErrorLayoutUI(rvCustomers,layoutError);
}
@Override
@@ -162,7 +164,7 @@ public class CustomersFragment extends FineractBaseFragment
implements Customers
swipeRefreshLayout.setColorSchemeColors(getActivity()
.getResources().getIntArray(R.array.swipeRefreshColors));
swipeRefreshLayout.setOnRefreshListener(this);
-
+sweetUIErrorHandler = new SweetUIErrorHandler(getActivity(),rootView);
}
@OnClick(R.id.fab_add_customer)
@@ -190,8 +192,8 @@ public class CustomersFragment extends FineractBaseFragment
implements Customers
@Override
public void showEmptyCustomers(String message) {
showRecyclerView(false);
-showFineractEmptyUI(getString(R.string.customers),
getString(R.string.customer),
-R.drawable.ic_customer_black_24dp);
+
sweetUIErrorHandler.showSweetCustomErrorUI(getString(R.string.customer),
+
getString(Integer.parseInt(message)),R.drawable.ic_customer_black_24dp,rvCustomers,layoutError);
}
@Override
@@ -229,15 +231,18 @@ public class CustomersFragment extends
FineractBaseFragment implements Customers
public void showNoInternetConnection() {
showRecyclerView(false);
showFineractNoInternetUI();
+
sweetUIErrorHandler.showSweetNoInternetUI(swipeRefreshLayout,layoutError);
}
@Override
public void showError(String message) {
if (customerAdapter.getItemCount() != 0) {
-showMessage(getString(R.string.error_failed_to_refresh_customers));
+sweetUIErrorHandler.showSweetCustomErrorUI(message,
+
R.drawable.ic_error_black_24dp,swipeRefreshLayout,layoutError);
} else {
showRecyclerView(false);
-showFineractErrorUI(getString(R.string.customers));
+
sweetUIErrorHandler.showSweetCustomErrorUI(getString(R.string.customers),
+
R.drawable.ic_error_black_24dp,swipeRefreshLayout,layoutError);
}
}
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerprofile/CustomerProfileActivity.java
index bed1d69..7bed36d 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers
[fineract-cn-mobile] branch development updated (2d7a842 -> 3c46d94)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from 2d7a842 feat: added malayalam translation new e873556 feat: Fixed Action Bar slides in LoginActivity new 3c46d94 fix: ActionBar slides in LoginActivity The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[fineract-cn-mobile] 02/02: fix: ActionBar slides in LoginActivity
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 3c46d9468e7e42f6cc2119f0d572f1c986ba3493 Author: abhijitramesh AuthorDate: Tue May 28 01:02:45 2019 +0530 fix: ActionBar slides in LoginActivity --- app/src/main/AndroidManifest.xml | 3 ++- .../main/java/org/apache/fineract/ui/online/login/LoginActivity.java | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index abbc4f0..5b46b52 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,8 @@ - + diff --git a/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java index 96b153f..9956991 100644 --- a/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java +++ b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java @@ -3,7 +3,6 @@ package org.apache.fineract.ui.online.login; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; -import android.view.WindowManager; import android.widget.EditText; import android.widget.Toast; @@ -51,7 +50,6 @@ public class LoginActivity extends FineractBaseActivity implements LoginContract loginPresenter.attachView(this); setActionBarTitle(getString(R.string.fineract_account)); preferencesHelper.clear(); - getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } @OnClick(R.id.btn_login)
[fineract-cn-mobile] 01/02: feat: Fixed Action Bar slides in LoginActivity
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 e873556bcb95c758e6eda368bfd2c2f12c7d18ee Author: abhijitramesh AuthorDate: Fri Jan 18 20:34:19 2019 +0530 feat: Fixed Action Bar slides in LoginActivity --- .../main/java/org/apache/fineract/ui/online/login/LoginActivity.java| 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java index 9956991..96b153f 100644 --- a/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java +++ b/app/src/main/java/org/apache/fineract/ui/online/login/LoginActivity.java @@ -3,6 +3,7 @@ package org.apache.fineract.ui.online.login; import android.content.Intent; import android.os.Bundle; import android.text.TextUtils; +import android.view.WindowManager; import android.widget.EditText; import android.widget.Toast; @@ -50,6 +51,7 @@ public class LoginActivity extends FineractBaseActivity implements LoginContract loginPresenter.attachView(this); setActionBarTitle(getString(R.string.fineract_account)); preferencesHelper.clear(); + getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); } @OnClick(R.id.btn_login)
[fineract-cn-mobile] branch development updated: feat: added malayalam translation
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 2d7a842 feat: added malayalam translation 2d7a842 is described below commit 2d7a842f24f0a66ead3de7831c5a61afe3063284 Author: abhijitramesh AuthorDate: Thu Jan 17 21:41:21 2019 +0530 feat: added malayalam translation feat: added malayalam translation --- app/src/main/res/values-ml-rIN/strings.xml | 310 + 1 file changed, 310 insertions(+) diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml new file mode 100644 index 000..3052c13 --- /dev/null +++ b/app/src/main/res/values-ml-rIN/strings.xml @@ -0,0 +1,310 @@ + + +Fineract 2.0 +ദയവായി നിങ്ങളുടെ യോഗ്യതാപത്രങ്ങൾ നൽകുക +വാടകക്കാരന് +ഹിനറാക്റ്റ +യൂസ൪നയി൦ +പാസ്വേഡ് +ലോഗി൯ +ഹിനറാക്റ്റ അക്കൗണ്ട +സ്വാഗതം +ഇന്റർനെറ്റ് കണ്ടെത്തിയില്ല, നിങ്ങളുടെ കണക്ഷൻ പരിശോധിക്കുക +അല്ലെങ്കിൽ വീണ്ടും ശ്രമിക്കുക +തെറ്റായ യൂസ൪നയി൦ അല്ലെങ്കിൽ പാസ്വേഡ് +ഉപഭോക്താവ് +ഡാഷ്ബോർഡ് +ഡ്രോയർ തുറക്കുക +ഡ്രോയർ അടയ്ക്കുക +ഉപഭോക്താക്കൾ +സാമ്പത്തിക ഉൽപ്പന്നങ്ങൾ +വായ്പ അക്കൗണ്ടുകൾ കൈകാര്യം ചെയ്യുക +വായ്പ അക്കൗണ്ടുകൾ +ലോൺ അക്കൗണ്ട് +നിക്ഷേപ അക്കൗണ്ടുകൾ +റോളുകൾ / അനുമതികൾ +ഡെപ്പോസിറ്റ് അക്കൗണ്ടുകൾ കൈകാര്യം ചെയ്യുക +ബന്ധപ്പെടാനുള്ള വിവരങ്ങൾ +വിലാസം +നിലവിലെ സ്റ്റാറ്റസ് +മാനേജ്മെന്റ് +തിരിച്ചറിയൽ കാർഡുകൾ +തിരിച്ചറിയൽ കാർഡ് +തിരിച്ചറിയൽ കാർഡുകൾ കാണുക +ടാസ്കുകൾ +ഉപഭോക്താവിന്റെ സ്ഥിതി മാറ്റുക +പ്രവർത്തനങ്ങൾ +സമീപകാല പ്രവർത്തനങ്ങൾ +ജന്മദിനം +അസൈൻഡ് എംപ്ലോയീ: +അസൈൻഡ് എംപ്ലോയീ:%1$s +നിർണ്ണയിച്ചിട്ടില്ല +ബന്ധപ്പെടേണ്ട വിവരങ്ങളൊന്നും ലഭ്യമല്ല +ഉപഭോക്തൃ പട്ടിക ശൂന്യമാണ് +ഉപഭോക്തൃ വായ്പകളുടെ പട്ടിക +പ്ലാനിംഗ് പേയ്മെന്റ് ലിസ്റ്റ് ശൂന്യമാണ് +കൂടുതൽ ഉപഭോക്താവ് ലഭ്യമല്ല +കൂടുതൽ വായ്പകളൊന്നും ലഭ്യമല്ല +കൂടുതൽ ആസൂത്രിത പേയ്മെന്റ് ലഭ്യമല്ല +അക്കൗണ്ട് ഐഡന്റിഫയർ +അവസാനം പരിഷ്ക്കരിച്ചത് +അവസാനമായി പരിഷ്ക്കരിച്ചത് +വായ്പയുടെ വായ്പ +വിശദാംശങ്ങൾ +പ്രധാന തുക +പേയ്മെന്റ് സൈക്കിൾ +കാലാവധി +പ്ലാൻ ചെയ്ത പേമെന്റ് +ആസൂത്രിത പേയ്മെന്റ് +പേയ്മെന്റുകൾ കാണുക +കടത്തിന്റെ വരുമാനം റിപ്പോർട്ട് +കടം വരുമാനം റിപ്പോർട്ട് കാണുക +ഉപഭോക്താവിന്റെ വായ്പ അനുവദിച്ചു +ഈ വായ്പ സജീവമാക്കുന്നതിന് നിങ്ങൾ വിതരണം ചെയ്യണം +ഓരോന്നും വീതം %1$d %2$s ആ സമയത്ത് %3$d ദിവസം +ഓരോന്നും വീതം %1$d %2$s ആ സമയത്ത് %3$s ഓരോന്നും വീതം %1$d %2$s ആ സമയത്ത് %3$s ദിവസം +ഓരോന്നും വീതം %1$d %2$s ആ സമയത്ത് %3$s ഓരോന്നും വീതം %1$d %2$s ആ സമയത്ത് %3$s %4$s +ഓരോന്നും വീതം %1$d %2$s സമയത്ത് %3$s +ഓരോന്നും വീതം %1$d %2$s സമയത്ത് %3$s ദിവസത്തിൽ %4$s +ഓരോന്നും വീതം %1$d %2$s സമയത്ത് %3$s %4$s അകത്ത് %5$s +സെർവറിൽ നിന്ന് ഡാറ്റ ലഭ്യമാകുമ്പോൾ ദയവായി കാത്തിരിക്കുക, അത് പൂർത്തിയാകുമ്പോൾ നിങ്ങളെ അപ്ഡേറ്റ് ചെയ്യും +സമന്വയിപ്പിക്കാൻ ഉപഭോക്താക്കൾ ഇല്ല +അക്കൗണ്ട് +ബാലൻസ് +ഗുണഭോക്താക്കൾ +ഡെപ്പോസിറ്റ് അക്കൗണ്ട് +ഡെപ്പോസിറ്റ് ഉൽപ്പന്നം +പ്രിൻസിപ്പൽ ശേഷിക്കുന്നു +ലോഡ് പേയ്മെന്റ് +ചെറിയ പേര് +ഓരോ വീതം തിരിച്ചടക്കുക +തുക +വിവരണം +ഉൽപ്പന്നങ്ങൾ +ലെഡ്ജർ +അക്കൗണ്ടുകൾ +ദിവസം +അകത്ത് +ആവശ്യമാണ് +കടം ചേർക്കുക +പ്രമാണം ചേർക്കുക +വരുമാനം കൂട്ടിച്ചേർക്കുക +റദ്ദാക്കുക +കടകൾ (മൊത്തം:% 1 $ s) +വരുമാനം (മൊത്തം:% 1 $ s) +കാണിക്കാൻ കടപ്പുകളൊന്നുമില്ല. കടം ചേർക്കുക +കാണിക്കാൻ വരുമാനം ഇല്ല. വരുമാനം കൂട്ടിച്ചേർക്കുക +അനുപാതം:% 1 $ s +കടം എഡിറ്റുചെയ്യുക +വായ്പ എഡിറ്റുചെയ്യുക +വരുമാനം എഡിറ്റുചെയ്യുക +കടം വരുമാനം +പേര് +ബ്രൌസ് ചെയ്യുക... +ഉപഭോക്താവിനെ ലഭ്യമാക്കൽ ദയവായി കാത്തിരിക്കുക ... +വായ്പ സൃഷ്ടിക്കുന്നു കാത്തിരിക്കൂ… +ഉപഭോക്താവിനെ അപ്ഡേറ്റുചെയ്യുന്നത് ദയവായി കാത്തിരിക്കുക ... +ഉപഭോക്താവിനെ സൃഷ്ടിക്കുന്നത് ദയവായി കാത്തിരിക്കുക ... +തിരിച്ചറിയൽ കാർഡ് സൃഷ്ടിക്കുന്നത് കാത്തിരിക്കുക +തിരിച്ചറിയൽ കാർഡ് അപ്ഡേറ്റുചെയ്യുന്നത് കാത്തിരിക്കുക ... +ഡെപ്പോസിറ്റ് അക്കൗണ്ട് സൃഷ്ടിക്കുന്നത് കാത്തിരിക്കുക ... +ഡെപ്പോസിറ്റ് അക്കൗണ്ട് അപ്ഡേറ്റുചെയ്യുന്നത് ദയവായി കാത്തിരിക്കുക ... +മേല് +ആ സമയത്ത് +അംഗമാണോ? +ഉപഭോക്താവിനെ സൃഷ്ടിക്കുക +ഉപഭോക്താവിനെ എഡിറ്റുചെയ്യുക +പുതിയ ഐഡന്റിഫിക്കേഷൻ സൃഷ്ടിക്കുക +പുതിയ നിക്ഷേപം സൃഷ്ടിക്കുക +കാലികമാക്കുക അപ്ഡേറ്റ് +ഐഡന്റിഫിക്കേഷൻ എഡിറ്റുചെയ്യുക +തനത്, ആവശ്യമുള്ളത് +നിങ്ങളുടെ ഓഫീസുകൾക്കായി ഉപഭോക്താവിനെ സൃഷ്ടിക്കുക / എഡിറ്റുചെയ്യുക +ഉപഭോക്താവിനെ കാണുക +പുതിയ ഉപഭോക്താവിനെ സൃഷ്ടിക്കുക +ലോക്ക് ചെയ്യുക +അടയ്ക്കുക +സജീവമാക്കുക +അൺലോക്കുചെയ്യുക +വീണ്ടും തുറക്കുക +ഈ ഉപഭോക്താവിനെ% 1 $ s ചെയ്യുന്നതിന് മുമ്പ് ദയവായി ഇനിപ്പറയുന്ന ടാസ്ക്കുകൾ പരിശോധിക്കുക +നില അപ്ഡേറ്റുചെയ്യുന്നു +ടാസ്ക് വിജയകരമായി അപ്ഡേറ്റുചെയ്തു +കടത്തിന്റെ വരുമാന അനുപാതം കാണുക +നൽകിയ ആൾ:% 1 $ s
[fineract-cn-mobile] branch development updated: feat: search customer
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 df7c062 feat: search customer
df7c062 is described below
commit df7c062623562a85699d365c8bf5fb1f7b6c0a97
Author: Mohak
AuthorDate: Fri Jun 22 12:56:07 2018 +0530
feat: search customer
---
.../customers/customerlist/CustomersContract.java | 4 +
.../customers/customerlist/CustomersFragment.java | 96 +++-
.../customers/customerlist/CustomersPresenter.java | 27 ++
app/src/main/res/layout/fragment_customer_list.xml | 93 +++
app/src/main/res/menu/menu_customer.xml| 12 +++
app/src/main/res/values/strings.xml| 5 ++
app/src/main/resources/customerPage.json | 100 -
7 files changed, 314 insertions(+), 23 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
index f4464d9..740b44d 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersContract.java
@@ -28,6 +28,8 @@ public interface CustomersContract {
void hideProgressbar();
void showMessage(String message);
+
+void searchCustomerList(Customer searchedCustomer);
}
interface Presenter {
@@ -37,5 +39,7 @@ public interface CustomersContract {
void fetchCustomers(Integer pageIndex, Integer size);
void showCustomers(List customers);
+
+void searchCustomerOnline(String query);
}
}
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
index 9aa2e19..36e0edf 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
@@ -2,15 +2,26 @@ package org.apache.fineract.ui.online.customers.customerlist;
import static android.app.Activity.RESULT_OK;
+import android.app.SearchManager;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.transition.TransitionManager;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+import android.text.TextUtils;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
import com.github.therajanmaurya.sweeterror.SweetUIErrorHandler;
@@ -28,6 +39,7 @@ import
org.apache.fineract.ui.online.customers.customerdetails.CustomerDetailsAc
import org.apache.fineract.utils.ConstantKeys;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
@@ -38,7 +50,7 @@ import butterknife.OnClick;
/**
* @author Rajan Maurya
- * On 20/06/17.
+ * On 20/06/17.
*/
public class CustomersFragment extends FineractBaseFragment implements
CustomersContract.View,
SwipeRefreshLayout.OnRefreshListener, OnItemClickListener {
@@ -65,6 +77,21 @@ public class CustomersFragment extends FineractBaseFragment
implements Customers
@Inject
PreferencesHelper preferencesHelper;
+@BindView(R.id.rb_offline)
+RadioButton rbOffline;
+
+@BindView(R.id.rb_online)
+RadioButton rbOnline;
+
+@BindView(R.id.rg_search)
+RadioGroup rgSearch;
+
+@BindView(R.id.coordinator)
+CoordinatorLayout coordinator;
+
+@BindView(R.id.ll_search)
+LinearLayout llSearch;
+
private List customers;
private Integer detailsCustomerPosition;
private boolean isNewCustomer = false;
@@ -81,6 +108,7 @@ public class CustomersFragment extends FineractBaseFragment
implements Customers
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
customers = new ArrayList<>();
+setHasOptionsMenu(true);
}
@Override
@@ -193,6 +221,11 @@ public class CustomersFragment extends
FineractBaseFragment implements Customers
}
@Override
+public void searchCustomerList(Customer cu
[fineract-cn-mobile] branch development updated: Placed google repository as first priority
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 f84be44 Placed google repository as first priority
f84be44 is described below
commit f84be44c1fb8709e8136250bfd6d1ac6d8b60122
Author: Rajavamsi11
AuthorDate: Thu Jan 31 23:46:05 2019 +0530
Placed google repository as first priority
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 26fe9b3..1b8a7d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,8 @@ buildscript {
allprojects {
repositories {
-jcenter()
google()
+jcenter()
maven { url 'https://maven.fabric.io/public' }
maven { url "https://www.jitpack.io"; }
}
[fineract-cn-mobile] branch development updated: refactor: Added dependencies version in root project
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 c5a4a4d refactor: Added dependencies version in root project
c5a4a4d is described below
commit c5a4a4db8acf335751cb0484fd1415dc0c459087
Author: Rajavamsi11
AuthorDate: Thu Jan 31 22:44:53 2019 +0530
refactor: Added dependencies version in root project
---
app/build.gradle | 16
build.gradle | 7 +++
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index ae52f98..5ffb247 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -70,7 +70,7 @@ android {
dependencies {
def daggerCompiler =
"com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
-def jUnit = "junit:junit:4.12"
+def jUnit = "junit:junit:$rootProject.junitVersion"
def mockito = "org.mockito:mockito-core:$rootProject.mockitoVersion"
// Support Dependencies
@@ -88,7 +88,7 @@ dependencies {
//android-job
implementation "com.evernote:android-job:$androidJobVersion"
-implementation 'com.github.therajanmaurya:Sweet-Error:1.0.0'
+implementation
"com.github.therajanmaurya:Sweet-Error:$rootProject.sweetErrorVersion"
implementation
"com.android.support:support-v4:$rootProject.supportLibraryVersion"
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflowVersion}"
@@ -110,8 +110,8 @@ dependencies {
implementation
"com.squareup.okhttp3:logging-interceptor:$rootProject.okHttp3Version"
//Glide for loading the images
-implementation 'com.github.bumptech.glide:glide:3.7.0'
-implementation 'de.hdodenhof:circleimageview:2.1.0'
+implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
+implementation
"de.hdodenhof:circleimageview:$rootProject.circleImageviewVersion"
// Dagger 2 Dependencies
implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
@@ -130,13 +130,13 @@ dependencies {
}
//Sticky header RecyclerView
-implementation 'org.zakariya.stickyheaders:stickyheaders:0.7.6'
+implementation
"org.zakariya.stickyheaders:stickyheaders:$rootProject.sticyHeaderVersion"
// Compressor for Image Compression
-implementation 'id.zelory:compressor:2.1.0'
+implementation "id.zelory:compressor:$rootProject.compressorVersion"
//Material Stepper UI library
-implementation 'com.stepstone.stepper:material-stepper:3.3.0'
+implementation
"com.stepstone.stepper:material-stepper:$rootProject.materialStepperVersion"
// Instrumentation test dependencies
androidTestImplementation jUnit
@@ -161,7 +161,7 @@ dependencies {
testImplementation
"org.hamcrest:hamcrest-core:$rootProject.hamcrestVersion"
testImplementation
"org.hamcrest:hamcrest-library:$rootProject.hamcrestVersion"
testImplementation
"org.hamcrest:hamcrest-integration:$rootProject.hamcrestVersion"
-testImplementation 'org.robolectric:robolectric:3.1'
+testImplementation
"org.robolectric:robolectric:$rootProject.roboElectricVersion"
}
diff --git a/build.gradle b/build.gradle
index 911d980..26fe9b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,4 +61,11 @@ ext {
runnerVersion = '0.5'
rulesVersion = '0.5'
espressoVersion = '3.0.2'
+sweetErrorVersion = '1.0.0'
+glideVersion = '3.7.0'
+materialStepperVersion = '3.3.0'
+sticyHeaderVersion = '0.7.6'
+roboElectricVersion = '3.1'
+circleImageviewVersion = '2.1.0'
+compressorVersion = '2.1.0'
}
[fineract-cn-mobile] branch development updated: style: Removed Hardcoded strings
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 ff7cdfe style: Removed Hardcoded strings ff7cdfe is described below commit ff7cdfe9778c319990047d0fe2956fc96ad57f63 Author: Rajavamsi11 AuthorDate: Thu Jan 31 21:13:55 2019 +0530 style: Removed Hardcoded strings --- app/src/main/res/layout/layout_nav_header.xml | 4 ++-- app/src/main/res/values/strings.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/layout_nav_header.xml b/app/src/main/res/layout/layout_nav_header.xml index 6032fdc..dee0f4e 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="Rajan Maurya" +android:text="@string/username" 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="rajanmaurya...@gmail.com"/> +android:text="@string/email"/> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5d3f569..c969f51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -470,4 +470,5 @@ Documents(Total: 0) No documents to show. add documents Customer Payloads +Email
[fineract-cn-mobile] branch development updated: docs: Improved pull request template
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 6489ad6 docs: Improved pull request template
6489ad6 is described below
commit 6489ad69fe9cba5b90917ef8d95cf727b9a2b97c
Author: Rajavamsi11
AuthorDate: Thu Jan 31 21:41:46 2019 +0530
docs: Improved pull request template
---
.github/PULL_REQUEST_TEMPLATE.md | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8307603..0f7ebfe 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,9 +1,15 @@
-Please make sure these boxes are checked before submitting your pull request -
thanks!
+Fixes #Issue_number
+
+Please Add Screenshots If any UI changes.
+
+Please Add Summary of what changes you have made and if possible provide
links.(Optional)
-Fixes #{Issue Number}
+Please make sure these boxes are checked before submitting your pull request -
thanks!
- [ ] Apply the `AndroidStyle.xml` style template to your code in Android
Studio.
-- [ ] Run the unit tests with `./gradlew check` to make sure you didn't break
anything
+- [ ] Run the unit tests with `./gradlew check` to make sure you didn't break
anything.
+
+- [ ] If you have multiple commits please combine them into one commit by
squashing them.
+
-- [ ] If you have multiple commits please combine them into one commit by
squashing them.
\ No newline at end of file
[fineract-cn-mobile] branch development updated (d02e9af -> a10ef92)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from d02e9af Fix #143: Country name error fixed on Edit Customer new ebff7e8 FINCN-147: Search not working in Ledger, Accounts, Tellers new 3646fa2 Fixed .travis.yml new e6fc440 FINCN#150: Scrollbar not available for Loan Accounts new bca0f71 FINCN-151 : Filters fixed in Identification Cards new a10ef92 FINCN-152: Added filters for Loan Accounts The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .travis.yml| 4 +- .../online/accounting/accounts/AccountContract.kt | 4 +- .../online/accounting/accounts/AccountsFragment.kt | 8 ++-- .../accounting/accounts/AccountsPresenter.kt | 30 +- .../ui/online/accounting/ledgers/LedgerContract.kt | 4 +- .../ui/online/accounting/ledgers/LedgerFragment.kt | 9 ++--- .../online/accounting/ledgers/LedgerPresenter.kt | 31 +- .../IdentificationsContract.java | 4 +- .../IdentificationsFragment.java | 9 ++--- .../IdentificationsPresenter.java | 32 --- .../loanaccountlist/LoanAccountsContract.java | 4 ++ .../loanaccountlist/LoanAccountsFragment.java | 47 ++ .../loanaccountlist/LoanAccountsPresenter.java | 14 +++ .../fineract/ui/online/teller/TellerContract.kt| 4 +- .../fineract/ui/online/teller/TellerFragment.kt| 8 ++-- .../fineract/ui/online/teller/TellerPresenter.kt | 32 +-- .../main/res/layout/fragment_customer_loans.xml| 3 +- app/src/main/res/menu/menu_loan_account_search.xml | 10 + app/src/main/res/values/strings.xml| 1 + 19 files changed, 140 insertions(+), 118 deletions(-) create mode 100644 app/src/main/res/menu/menu_loan_account_search.xml
[fineract-cn-mobile] 03/05: FINCN#150: Scrollbar not available for Loan Accounts
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 e6fc44007dda02acfa750fbe419544f3ddd0cbd0 Author: miPlodder AuthorDate: Thu May 2 00:15:44 2019 +0530 FINCN#150: Scrollbar not available for Loan Accounts --- app/src/main/res/layout/fragment_customer_loans.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_customer_loans.xml b/app/src/main/res/layout/fragment_customer_loans.xml index 3ca9ff1..507bd0d 100644 --- a/app/src/main/res/layout/fragment_customer_loans.xml +++ b/app/src/main/res/layout/fragment_customer_loans.xml @@ -16,7 +16,8 @@ android:layout_height="0dp" android:layout_marginBottom="@dimen/layout_padding_30dp" android:layout_weight="1" -android:layout_width="wrap_content"/> +android:layout_width="wrap_content" +android:scrollbars="vertical"/>
[fineract-cn-mobile] 04/05: FINCN-151 : Filters fixed in Identification Cards
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 bca0f71d05357c68a2947981abdd34e4702349bf
Author: miPlodder
AuthorDate: Sun May 5 15:21:45 2019 +0530
FINCN-151 : Filters fixed in Identification Cards
---
.../IdentificationsContract.java | 4 +--
.../IdentificationsFragment.java | 9 +++---
.../IdentificationsPresenter.java | 32 ++
3 files changed, 14 insertions(+), 31 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
index 5127e53..4812a3f 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
@@ -27,13 +27,13 @@ public interface IdentificationsContract {
void showMessage(String message);
-void searchIdentificationList(Identification identification);
+void searchedIdentifications(List identification);
}
interface Presenter {
void fetchIdentifications(String customerIdentifier);
-void searchIdentifications(String identifier, String number);
+void searchIdentifications(List identificationList,
String query);
}
}
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
index fa7613e..c9e2193 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
@@ -29,7 +29,6 @@ import
org.apache.fineract.ui.online.identification.identificationdetails.Identi
import org.apache.fineract.utils.ConstantKeys;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.inject.Inject;
@@ -175,8 +174,8 @@ public class IdentificationsFragment extends
FineractBaseFragment implements
}
@Override
-public void searchIdentificationList(Identification identification) {
-
identificationAdapter.setIdentifications(Collections.singletonList(identification));
+public void searchedIdentifications(List identification) {
+identificationAdapter.setIdentifications(identification);
}
@Override
@@ -209,7 +208,7 @@ public class IdentificationsFragment extends
FineractBaseFragment implements
searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
{
@Override
public boolean onQueryTextSubmit(String query) {
-
identificationsPresenter.searchIdentifications(customerIdentifier, query);
+
identificationsPresenter.searchIdentifications(identifications, query);
return false;
}
@@ -218,7 +217,7 @@ public class IdentificationsFragment extends
FineractBaseFragment implements
if (TextUtils.isEmpty(newText)) {
identificationAdapter.setIdentifications(identifications);
}
-
+
identificationsPresenter.searchIdentifications(identifications, newText);
return false;
}
});
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
index ed7d8e2..dd7f3b6 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsPresenter.java
@@ -13,8 +13,10 @@ import java.util.List;
import javax.inject.Inject;
+import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.functions.Predicate;
import io.reactivex.observers.DisposableObserver;
import io.reactivex.schedulers.Schedulers;
@@ -83,33 +85,15 @@ public class IdentificationsPresenter extends
BasePresenter identificationList,
final String query) {
checkViewAttached();
-getMvpView().showProgressbar();
-
-
compositeDisposable.add(dataManagerCustomer.searchIdentifications(identifier,
number)
-.subscribeOn(Schedulers.io())
-.observeOn
[fineract-cn-mobile] 02/05: Fixed .travis.yml
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 3646fa28cb107e634b63db0d7457d8fe5cfaf707 Author: miPlodder AuthorDate: Tue Apr 30 04:37:58 2019 +0530 Fixed .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54d5c81..4f3f4ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ cache: false sudo: required env: global: -- ANDROID_API_LEVEL=26 -- ANDROID_BUILD_TOOLS_VERSION=26.0.2 +- ANDROID_API_LEVEL=27 +- ANDROID_BUILD_TOOLS_VERSION=27.0.3 - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default) android:
[fineract-cn-mobile] 05/05: FINCN-152: Added filters for Loan Accounts
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 a10ef92e0d1c6175d79d84c69a8eb13f589bf044
Author: miPlodder
AuthorDate: Sun May 5 19:45:42 2019 +0530
FINCN-152: Added filters for Loan Accounts
---
.../loanaccountlist/LoanAccountsContract.java | 4 ++
.../loanaccountlist/LoanAccountsFragment.java | 47 ++
.../loanaccountlist/LoanAccountsPresenter.java | 14 +++
app/src/main/res/menu/menu_loan_account_search.xml | 10 +
app/src/main/res/values/strings.xml| 1 +
5 files changed, 76 insertions(+)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
index 3d55a5b..89cd040 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsContract.java
@@ -28,10 +28,14 @@ public interface LoanAccountsContract {
void showProgressbar();
void hideProgressbar();
+
+void searchedLoanAccounts(List loanAccountList);
}
interface Presenter {
+void searchLoanAccounts(List loanAccountList, String
query);
+
void fetchCustomerLoanAccounts(String customerIdentifier, Integer
pageIndex,
Boolean loadmore);
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
index f9aca09..34a97dd 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
@@ -1,12 +1,18 @@
package org.apache.fineract.ui.online.loanaccounts.loanaccountlist;
+import android.app.SearchManager;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+import android.text.TextUtils;
import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -86,6 +92,7 @@ public class LoanAccountsFragment extends
FineractBaseFragment implements LoanAc
setToolbarTitle(getString(R.string.loan_accounts));
showUserInterface();
+setHasOptionsMenu(true);
return rootView;
}
@@ -213,4 +220,44 @@ public class LoanAccountsFragment extends
FineractBaseFragment implements LoanAc
public void onItemLongPress(View childView, int position) {
}
+
+@Override
+public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+super.onCreateOptionsMenu(menu, inflater);
+inflater.inflate(R.menu.menu_loan_account_search, menu);
+setUpSearchInterface(menu);
+}
+
+private void setUpSearchInterface(Menu menu) {
+SearchManager searchManager = (SearchManager) getActivity().
+getSystemService(Context.SEARCH_SERVICE);
+
+SearchView searchView = (SearchView)
menu.findItem(R.id.loan_account_search)
+.getActionView();
+
searchView.setSearchableInfo(searchManager.getSearchableInfo(getActivity()
+.getComponentName()));
+
+searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
{
+@Override
+public boolean onQueryTextSubmit(String query) {
+customerLoansPresenter.searchLoanAccounts(loanAccounts, query);
+return false;
+}
+
+@Override
+public boolean onQueryTextChange(String newText) {
+if (TextUtils.isEmpty(newText)) {
+searchedLoanAccounts(loanAccounts);
+}
+customerLoansPresenter.searchLoanAccounts(loanAccounts,
newText);
+return false;
+}
+});
+
+}
+
+@Override
+public void searchedLoanAccounts(List loanAccountList) {
+customerLoanAdapter.setCustomerLoanAccounts(loanAccountList);
+}
}
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsPresenter.java
index 7135ff7..88ceb65 100644
---
a/app/src/main/java/org/apache/fineract
[fineract-cn-mobile] 01/05: FINCN-147: Search not working in Ledger, Accounts, Tellers
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 ebff7e8fb21378323d2f841aadb60a26fc1e461a
Author: miPlodder
AuthorDate: Mon Apr 29 16:07:24 2019 +0530
FINCN-147: Search not working in Ledger, Accounts, Tellers
---
.../online/accounting/accounts/AccountContract.kt | 4 +--
.../online/accounting/accounts/AccountsFragment.kt | 8 +++---
.../accounting/accounts/AccountsPresenter.kt | 30 ++--
.../ui/online/accounting/ledgers/LedgerContract.kt | 4 +--
.../ui/online/accounting/ledgers/LedgerFragment.kt | 9 +++---
.../online/accounting/ledgers/LedgerPresenter.kt | 31 ++---
.../fineract/ui/online/teller/TellerContract.kt| 4 ++-
.../fineract/ui/online/teller/TellerFragment.kt| 8 +++---
.../fineract/ui/online/teller/TellerPresenter.kt | 32 ++
9 files changed, 46 insertions(+), 84 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountContract.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountContract.kt
index 3fab8a6..9491718 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountContract.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountContract.kt
@@ -19,7 +19,7 @@ interface AccountContract {
fun hideProgressbar()
-fun searchedAccount(account: Account)
+fun searchedAccount(accounts: List)
}
@@ -28,6 +28,6 @@ interface AccountContract {
fun getAccountsPage()
-fun searchAccount(query: String)
+fun searchAccount(account: List, query: String)
}
}
\ No newline at end of file
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 a195fe3..891ec82 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
@@ -92,7 +92,7 @@ class AccountsFragment : FineractBaseFragment(),
AccountContract.View, SwipeRefr
searchView?.setOnQueryTextListener(object :
SearchView.OnQueryTextListener {
override fun onQueryTextSubmit(query: String): Boolean {
-accountsPresenter.searchAccount(query)
+accountsPresenter.searchAccount(accountList, query)
return false
}
@@ -101,16 +101,16 @@ class AccountsFragment : FineractBaseFragment(),
AccountContract.View, SwipeRefr
showRecyclerView(true)
accountsAdapter.setAccountsList(accountList)
}
-
+accountsPresenter.searchAccount(accountList, newText)
return false
}
})
}
-override fun searchedAccount(account: Account) {
+override fun searchedAccount(accounts: List) {
showRecyclerView(true)
-accountsAdapter.setAccountsList(Collections.singletonList(account))
+accountsAdapter.setAccountsList(accounts)
}
override fun onRefresh() {
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
index 295f2dd..d8e6116 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
@@ -1,8 +1,10 @@
package org.apache.fineract.ui.online.accounting.accounts
import android.content.Context
+import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.functions.Predicate
import io.reactivex.observers.DisposableObserver
import io.reactivex.schedulers.Schedulers
import org.apache.fineract.R
@@ -55,31 +57,17 @@ class AccountsPresenter @Inject
constructor(@ApplicationContext context: Context
}))
}
-override fun searchAccount(query: String) {
+override fun searchAccount(account: List, query: String) {
checkViewAttached()
-mvpView.showProgressbar()
-
-compositeDisposable.add(dataManagerAccounting
-.findAccount(query)
-.subscribeOn(Schedulers.io())
-.observeOn(AndroidSchedulers.mainThread())
-.subscribeWith(object : DisposableObserver() {
-override fun onComplete() {
-
+mvpView.searchedAccount(Observable.fromIterable(account)
+.filter(object: Predicate {
+override fun test(account
[fineract-cn-mobile] branch development updated: Fix #143: Country name error fixed on Edit Customer
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 d02e9af Fix #143: Country name error fixed on Edit Customer
d02e9af is described below
commit d02e9af4bb9ddbc1eaf8a0fe93934c3f79c397ed
Author: miPlodder
AuthorDate: Sun Mar 31 15:53:56 2019 +0530
Fix #143: Country name error fixed on Edit Customer
---
.../createcustomer/formcustomeraddress/FormCustomerAddressFragment.java | 1 +
app/src/main/resources/customer.json| 2 +-
app/src/main/resources/customerPage.json| 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
index eccffc9..dbccffc 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/customers/createcustomer/formcustomeraddress/FormCustomerAddressFragment.java
@@ -241,6 +241,7 @@ public class FormCustomerAddressFragment extends
FineractBaseFragment implements
@Override
public void showCounties(List countries) {
+validateCountry();
this.countries = countries.toArray(new String[0]);
ArrayAdapter customerAdapter = new
ArrayAdapter<>(getActivity(),
android.R.layout.simple_list_item_1, this.countries);
diff --git a/app/src/main/resources/customer.json
b/app/src/main/resources/customer.json
index 837a272..31529fe 100644
--- a/app/src/main/resources/customer.json
+++ b/app/src/main/resources/customer.json
@@ -20,7 +20,7 @@
"region": "region",
"postalCode": "postalCode",
"countryCode": "countryCode",
-"country": "country"
+"country": "India"
},
"contactDetails": [
{
diff --git a/app/src/main/resources/customerPage.json
b/app/src/main/resources/customerPage.json
index ec149ea..59f3aa3 100644
--- a/app/src/main/resources/customerPage.json
+++ b/app/src/main/resources/customerPage.json
@@ -22,7 +22,7 @@
"region": "region",
"postalCode": "postalCode",
"countryCode": "countryCode",
-"country": "country"
+"country": "India"
},
"contactDetails": [
{
[fineract-cn-mobile] branch development updated: feat : added review screens
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 b0e674d feat : added review screens
b0e674d is described below
commit b0e674d9819adf9431590e5643211138e0b87c08
Author: Mohak
AuthorDate: Mon Jun 11 21:49:05 2018 +0530
feat : added review screens
---
.../java/org/apache/fineract/FakeJsonName.java | 2 +
.../org/apache/fineract/FakeRemoteDataSource.java | 12 +
.../data/datamanager/api/DataManagerCustomer.java | 18 +-
.../data/datamanager/api/DataManagerDeposit.java | 11 +-
.../data/datamanager/api/DataManagerLoans.java | 10 +-
.../injection/component/ActivityComponent.java | 5 +-
.../ui/adapters/CreateCustomerStepAdapter.java | 3 +
.../ui/adapters/LoanApplicationStepAdapter.java| 3 +
.../ui/adapters/LoanDebtIncomeAdapter.java | 17 +
.../FormCustomerDetailsFragment.java | 2 +-
.../createcustomer/OnNavigationBarListener.java| 3 +
.../customeractivity/CreateCustomerActivity.java | 5 +
.../FormOverViewIdentificationFragment.java| 32 +-
.../loanapplication/OnNavigationBarListener.java | 10 +-
.../loanactivity/LoanApplicationActivity.java | 24 +-
.../loandetails/LoanDetailsFragment.java | 3 +-
.../ui/online/review/AddLoanReviewFragment.kt | 278 +
.../review/CreateCustomerReviewFragment.java | 249
app/src/main/res/drawable/review_circle_bg.xml | 11 +
.../main/res/layout/fragment_add_loan_review.xml | 431 +
.../res/layout/fragment_create_customer_review.xml | 315 +++
.../res/layout/fragment_form_deposit_overview.xml | 50 +--
.../fragment_form_overview_identification.xml | 126 +++---
app/src/main/res/values/dimens.xml | 3 +-
app/src/main/res/values/strings.xml| 11 +-
app/src/main/res/values/styles_text.xml| 23 ++
app/src/main/res/values/styles_view.xml| 17 +
app/src/main/resources/productDefinition.json | 34 ++
app/src/main/resources/productPage.json| 39 ++
29 files changed, 1596 insertions(+), 151 deletions(-)
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index d8f1f46..2e6951b 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -20,4 +20,6 @@ public class FakeJsonName {
public static final String LEDGER_PAGE = "ledgerPage.json";
public static final String ACCOUNT_PAGE = "accountsPage.json";
public static final String TELLER = "teller.json";
+public static final String PRODUCT_PAGE = "productPage.json";
+public static final String PRODUCT_DEFINITION = "productDefinition.json";
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index 70ccafb..3baa40a 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -11,9 +11,11 @@ import org.apache.fineract.data.models.customer.CustomerPage;
import org.apache.fineract.data.models.customer.identification.Identification;
import org.apache.fineract.data.models.customer.identification.ScanCard;
import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.deposit.ProductDefinition;
import org.apache.fineract.data.models.loan.LoanAccount;
import org.apache.fineract.data.models.loan.LoanAccountPage;
import org.apache.fineract.data.models.payment.PlannedPaymentPage;
+import org.apache.fineract.data.models.product.ProductPage;
import org.apache.fineract.data.models.rolesandpermission.Role;
import org.apache.fineract.data.models.teller.Teller;
@@ -94,4 +96,14 @@ public class FakeRemoteDataSource {
return testDataFactory.getListTypePojo(new TypeToken>() {
}, FakeJsonName.TELLER);
}
+
+public static ProductPage getProductPage() {
+return testDataFactory.getObjectTypePojo(ProductPage.class,
+FakeJsonName.PRODUCT_PAGE);
+}
+
+public static List getProductDefinition() {
+return testDataFactory.getListTypePojo(new
TypeToken>() {
+}, FakeJsonName.PRODUCT_DEFINITION);
+}
}
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerCustomer.java
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerCustomer.java
index 61827c4..8a716a7 100644
---
a/app/src/main/java/org/apache/fineract/data/datamanager/api/Data
[fineract-cn-mobile] branch development updated: FINCN-145: App crash fixed due to StickyHeader Library bug
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 cfbbb1e FINCN-145: App crash fixed due to StickyHeader Library bug
cfbbb1e is described below
commit cfbbb1e6a728c5d4fbf9a87762b2a0b90adb8b7f
Author: miPlodder
AuthorDate: Tue Apr 9 20:22:08 2019 +0530
FINCN-145: App crash fixed due to StickyHeader Library bug
---
.../org/apache/fineract/ui/adapters/PlannedPaymentAdapter.java| 8
1 file changed, 8 insertions(+)
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..a14f0f2 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
@@ -128,6 +128,14 @@ public class PlannedPaymentAdapter extends
SectioningAdapter {
}
@Override
+public GhostHeaderViewHolder onCreateGhostHeaderViewHolder(ViewGroup
parent) {
+final View ghostView = new View(parent.getContext());
+ghostView.setLayoutParams(new
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ViewGroup.LayoutParams.WRAP_CONTENT));
+return new GhostHeaderViewHolder(ghostView);
+}
+
+@Override
public int getNumberOfSections() {
return sections.size();
}
[fineract-cn-mobile] branch development updated: style: removed redundant type casting
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 d8ecd73 style: removed redundant type casting
d8ecd73 is described below
commit d8ecd7312ae803d664f143e6647a3e64060c6445
Author: abhijitramesh
AuthorDate: Wed Jan 16 19:11:51 2019 +0530
style: removed redundant type casting
---
.../main/java/org/apache/fineract/ui/base/FineractBaseActivity.java | 2 +-
app/src/main/java/org/apache/fineract/ui/base/Toaster.java| 4 ++--
.../main/java/org/apache/fineract/ui/online/DashboardActivity.java| 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
index a29cd90..7052ee8 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/FineractBaseActivity.java
@@ -43,7 +43,7 @@ public class FineractBaseActivity extends AppCompatActivity
implements BaseActiv
@Override
public void setContentView(int layoutResID) {
super.setContentView(layoutResID);
-toolbar = (Toolbar) findViewById(R.id.toolbar);
+toolbar = findViewById(R.id.toolbar);
if (toolbar != null) {
setSupportActionBar(toolbar);
}
diff --git a/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
index ebff14b..70f6f28 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
@@ -22,7 +22,7 @@ public class Toaster {
public static void show(View view, String text, int duration) {
final Snackbar snackbar = Snackbar.make(view, text, duration);
View sbView = snackbar.getView();
-TextView textView = (TextView)
sbView.findViewById(android.support.design.R.id
+TextView textView = sbView.findViewById(android.support.design.R.id
.snackbar_text);
textView.setTextColor(Color.WHITE);
textView.setTextSize(12);
@@ -38,7 +38,7 @@ public class Toaster {
public static void showProgressMessage(View view, String text, int
duration) {
final Snackbar snackbar = Snackbar.make(view, text, duration);
View sbView = snackbar.getView();
-TextView textView = (TextView)
sbView.findViewById(android.support.design.R.id
+TextView textView = sbView.findViewById(android.support.design.R.id
.snackbar_text);
textView.setTextColor(Color.WHITE);
textView.setTextSize(12);
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 6c00694..5ed6fd9 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
@@ -134,7 +134,7 @@ public class DashboardActivity extends FineractBaseActivity
implements
@Override
public void onBackPressed() {
-DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+DrawerLayout drawer = findViewById(R.id.drawer_layout);
if (drawer.isDrawerOpen(GravityCompat.START)) {
drawer.closeDrawer(GravityCompat.START);
} else {
[fineract-cn-mobile] branch development created (now d879863)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. at d879863 fix: onCreateViewHolder overrides nothing No new revisions were added by this update.
[fineract-cn-mobile] branch development updated: fix: onCreateViewHolder overrides nothing
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 d879863 fix: onCreateViewHolder overrides nothing
d879863 is described below
commit d8798632bc81be0108cc76708924095a2f4837ec
Author: abhijitramesh
AuthorDate: Tue Dec 11 22:30:55 2018 +0530
fix: onCreateViewHolder overrides nothing
---
app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt | 2 +-
app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt | 2 +-
app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
b/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
index 784603a..f7f5f44 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
@@ -20,7 +20,7 @@ class AccountsAdapter @Inject constructor(@ApplicationContext
val context: Conte
var accounts: List = ArrayList()
-override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int):
ViewHolder {
+override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
ViewHolder {
val view =
LayoutInflater.from(parent?.context).inflate(R.layout.item_account, parent,
false)
return ViewHolder(view)
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
b/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
index dccd522..310fc75 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
@@ -20,7 +20,7 @@ class LedgerAdapter @Inject constructor(@ApplicationContext
val context: Context
private var ledgers: List = ArrayList()
-override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int):
ViewHolder {
+override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
ViewHolder {
val view =
LayoutInflater.from(parent?.context).inflate(R.layout.item_ledger, parent,
false)
return ViewHolder(view)
diff --git a/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
b/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
index 7eb2015..ead8b3b 100644
--- a/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
+++ b/app/src/main/java/org/apache/fineract/ui/adapters/TellerAdapter.kt
@@ -21,7 +21,7 @@ class TellerAdapter @Inject constructor(@ApplicationContext
val context: Context
var tellers: List = ArrayList()
-override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int):
ViewHolder {
+override fun onCreateViewHolder(parent: ViewGroup, viewType: Int):
ViewHolder {
val view =
LayoutInflater.from(parent?.context).inflate(R.layout.item_teller,
parent, false)
return ViewHolder(view)
[fineract-cn-mobile] branch development updated: style: removed hard_coaded strings
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 3011644 style: removed hard_coaded strings
3011644 is described below
commit 3011644fa9ccbb99df3611955e5e5996d4f94479
Author: abhijitramesh
AuthorDate: Wed Jan 16 18:42:27 2019 +0530
style: removed hard_coaded strings
---
app/src/main/java/org/apache/fineract/ui/base/Toaster.java | 3 ++-
.../loanaccounts/loandetails/CustomerLoanDetailsFragment.java | 2 +-
app/src/main/res/layout/fragment_loan_document.xml | 6 +++---
app/src/main/res/menu/menu_navigation_drawer.xml| 2 +-
app/src/main/res/values/strings.xml | 5 +
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
index 611057f..ebff14b 100644
--- a/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
+++ b/app/src/main/java/org/apache/fineract/ui/base/Toaster.java
@@ -7,6 +7,7 @@ import android.view.View;
import android.widget.TextView;
import org.apache.fineract.FineractApplication;
+import org.apache.fineract.R;
public class Toaster {
@@ -25,7 +26,7 @@ public class Toaster {
.snackbar_text);
textView.setTextColor(Color.WHITE);
textView.setTextSize(12);
-snackbar.setAction("OK", new View.OnClickListener() {
+snackbar.setAction(R.string.OK, new View.OnClickListener() {
@Override
public void onClick(View view) {
snackbar.dismiss();
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
index bd4f291..97bdcd1 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/loanaccounts/loandetails/CustomerLoanDetailsFragment.java
@@ -272,7 +272,7 @@ public class CustomerLoanDetailsFragment extends
FineractBaseFragment implements
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_loan_account_edit:
-Toaster.show(rootView, "Under construction");
+Toaster.show(rootView, R.string.Under_construction);
return true;
default:
return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/layout/fragment_loan_document.xml
b/app/src/main/res/layout/fragment_loan_document.xml
index 6a901fc..485b18e 100644
--- a/app/src/main/res/layout/fragment_loan_document.xml
+++ b/app/src/main/res/layout/fragment_loan_document.xml
@@ -54,13 +54,13 @@
android:layout_marginStart="@dimen/layout_padding_16dp"
android:layout_marginTop="@dimen/layout_padding_16dp"
android:layout_width="wrap_content"
-android:text="Documents(Total: 0)"/>
+android:text="@string/Documents"/>
@@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:padding="@dimen/layout_padding_24dp"
-android:text="No documents to show. add documents"
+
android:text="@string/no_documents_to_show_add_documents"
android:textSize="@dimen/text_small"
android:visibility="visible"/>
diff --git a/app/src/main/res/menu/menu_navigation_drawer.xml
b/app/src/main/res/menu/menu_navigation_drawer.xml
index d32c652..6b9b605 100644
--- a/app/src/main/res/menu/menu_navigation_drawer.xml
+++ b/app/src/main/res/menu/menu_navigation_drawer.xml
@@ -27,7 +27,7 @@
android:checked="true"
android:icon="@drawable/ic_customer_black_24dp"
android:id="@+id/item_customer_payload"
-android:title="Customer Payloads"/>
+android:title="@string/customer_payloads"/>
Hello blank fragment
+Under construction
+OK
+Documents(Total: 0)
+No documents to show.
add documents
+Customer Payloads
[fineract-cn-mobile] branch development updated: docs:fixed broken links in readme.md
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 dcaab58 docs:fixed broken links in readme.md dcaab58 is described below commit dcaab582fcd314804bf9c3a90a4cff757a29a1de Author: abhijitramesh AuthorDate: Thu Dec 13 14:15:45 2018 +0530 docs:fixed broken links in readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c53572b..531ca06 100644 --- a/README.md +++ b/README.md @@ -28,4 +28,4 @@ We love Pull Requests, Bug Reports, ideas, code reviews or any other kind of pos ### Commit Style Guide - We have set of [Commit Style Guidelines](https://github.com/apache/fineract-cn-mobile/COMMIT_STYLE.md) and [Contribution Guidelines](https://github.com/apache/fineract-cn-mobile/CONTRIBUTING.md). We follow these guideline to track the every change, any bug fixes, any enhancement and any new feature addition. We also suggest you to follow these guidelines to help us manage every commit. + We have set of [Commit Style Guidelines](https://github.com/apache/fineract-cn-mobile/blob/development/.github/COMMIT_STYLE.md) and [Contribution Guidelines](https://github.com/apache/fineract-cn-mobile/blob/development/.github/CONTRIBUTING.md). We follow these guideline to track the every change, any bug fixes, any enhancement and any new feature addition. We also suggest you to follow these guidelines to help us manage every commit.
[fineract-cn-mobile] branch development updated: Chore: Update Build tools and support library version with other libraries
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 95ab8a8 Chore: Update Build tools and support library version with
other libraries
95ab8a8 is described below
commit 95ab8a80e243a9aeadddc7218e68852d830ce4dd
Author: therajanmaurya
AuthorDate: Thu Sep 20 15:35:27 2018 +0530
Chore: Update Build tools and support library version with other libraries
---
app/build.gradle | 9 ++---
build.gradle | 25 +
gradle/wrapper/gradle-wrapper.properties | 2 +-
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index fc40ba3..ae52f98 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -81,6 +81,8 @@ dependencies {
implementation
"com.android.support.test.espresso:espresso-idling-resource:$rootProject.espressoVersion"
implementation
"com.android.support:support-annotations:$rootProject.supportLibraryVersion"
+// Kotlin Dependencies
+implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
//android-job
@@ -88,7 +90,7 @@ dependencies {
implementation 'com.github.therajanmaurya:Sweet-Error:1.0.0'
-implementation 'com.android.support:support-v4:26.1.0'
+implementation
"com.android.support:support-v4:$rootProject.supportLibraryVersion"
kapt "com.github.Raizlabs.DBFlow:dbflow-processor:${dbflowVersion}"
implementation "com.github.Raizlabs.DBFlow:dbflow-core:${dbflowVersion}"
implementation "com.github.Raizlabs.DBFlow:dbflow:${dbflowVersion}"
@@ -97,6 +99,7 @@ dependencies {
// Rx Dependencies
implementation "io.reactivex.rxjava2:rxjava:$rootProject.rxjavaVersion"
implementation
"io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
+implementation "io.reactivex.rxjava2:rxkotlin:$rootProject.rxKotlinVersion"
// Square Dependencies
implementation
"com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
@@ -112,7 +115,7 @@ dependencies {
// Dagger 2 Dependencies
implementation "com.google.dagger:dagger:$rootProject.daggerVersion"
-provided 'org.glassfish:javax.annotation:10.0-b28' //Required by Dagger2
+compileOnly 'org.glassfish:javax.annotation:10.0-b28' //Required by Dagger2
kapt daggerCompiler
//testkapt daggerCompiler
//androidTestkapt daggerCompiler
@@ -123,7 +126,7 @@ dependencies {
// Fabric Crashlytics Dependencies
implementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') {
-transitive = true;
+transitive = true
}
//Sticky header RecyclerView
diff --git a/build.gradle b/build.gradle
index 6c67ab7..911d980 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
// Top-level build file where you can add configuration options common to all
sub-projects/modules.
buildscript {
-ext.kotlinVersion = '1.2.41'
+ext.kotlinVersion = '1.2.70'
repositories {
google()
jcenter()
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
-classpath 'com.android.tools.build:gradle:3.0.1'
+classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'io.fabric.tools:gradle:1.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
// NOTE: Do not place your application dependencies here; they belong
@@ -32,23 +32,24 @@ task clean(type: Delete) {
ext {
// Sdk and tools
minSdkVersion = 15
-targetSdkVersion = 26
-compileSdkVersion = 26
-buildToolsVersion = '26.0.2'
+targetSdkVersion = 27
+compileSdkVersion = 27
+buildToolsVersion = '27.0.3'
// App dependencies
-supportLibraryVersion = '27.0.2'
+supportLibraryVersion = '27.1.1'
daggerVersion = '2.5'
-retrofitVersion = '2.3.0'
-okHttp3Version = '3.8.0'
+retrofitVersion = '2.4.0'
+okHttp3Version = '3.11.0'
butterKnifeVersion = '8.5.1'
// rxjava dependencies
-rxjavaVersion = '2.0.1'
-rxandroidVersion = '2.0.1'
+rxjavaVersion = '2.2.1'
+rxandroidVersion = '2.0.2'
+rxKotlinVersion = '2.2.0'
//android-job
-androidJobVersion = '1.2.5'
+androidJobVersion = '1.2.6'
//db-flow
dbflowVer
[fineract-cn-mobile] branch development updated: Fix customerDetails and Account Section crash
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 7b44bf3 Fix customerDetails and Account Section crash
7b44bf3 is described below
commit 7b44bf3776287760ee57cda29842c29be63e651e
Author: dilpreet96
AuthorDate: Sat Sep 15 14:52:24 2018 +0530
Fix customerDetails and Account Section crash
---
.../fineract/ui/online/DashboardActivity.java | 1 +
.../accounting/accounts/AccountsPresenter.kt | 9 +++-
.../customerdetails/CustomerDetailsContract.java | 2 +-
.../customerdetails/CustomerDetailsFragment.java | 49 +-
.../customerdetails/CustomerDetailsPresenter.java | 2 +-
5 files changed, 58 insertions(+), 5 deletions(-)
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 c3c401e..6c00694 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
@@ -121,6 +121,7 @@ public class DashboardActivity extends FineractBaseActivity
implements
break;
case R.id.item_accounts:
replaceFragment(AccountsFragment.Companion.newInstance(),
true, R.id.container);
+break;
case R.id.item_teller:
replaceFragment(TellerFragment.Companion.newInstance(), true,
R.id.container);
break;
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
index 870335d..295f2dd 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
@@ -19,6 +19,10 @@ class AccountsPresenter @Inject
constructor(@ApplicationContext context: Context
val compositeDisposable: CompositeDisposable = CompositeDisposable()
+override fun attachView(mvpView: AccountContract.View?) {
+super.attachView(mvpView)
+}
+
override fun getAccountsPage() {
checkViewAttached()
mvpView.showProgressbar()
@@ -78,5 +82,8 @@ class AccountsPresenter @Inject
constructor(@ApplicationContext context: Context
}))
}
-
+override fun detachView() {
+super.detachView()
+compositeDisposable.clear()
+}
}
\ No newline at end of file
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
index 43076ee..7da80c0 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/customers/customerdetails/CustomerDetailsContract.java
@@ -14,7 +14,7 @@ public interface CustomerDetailsContract {
void showUserInterface();
-void savedCustomerDataForSyncing();
+void showCustomerDetails(Customer customer);
void showContactDetails(ContactDetail contactDetail);
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 ce85e2e..9336e5f 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
@@ -16,6 +16,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import org.apache.fineract.R;
+import org.apache.fineract.data.models.customer.Address;
import org.apache.fineract.data.models.customer.ContactDetail;
import org.apache.fineract.data.models.customer.Customer;
import org.apache.fineract.ui.base.FineractBaseActivity;
@@ -223,8 +224,52 @@ public class CustomerDetailsFragment extends
FineractBaseFragment
}
@Override
-public void savedCustomerDataForSyncing() {
-getActivity().finish();
+public void showCustomerDetails(Customer customer) {
+this.customer = customer;
+clCustomerDetails.setVisibility(View.VISIBLE);
+layoutError.setVisibility(View.GONE);
+
+loadCustomerPortrait();
+
+tvCurrentStatus.setText(customer.getCurrentState().name());
+StatusUtils.setCustomerStatusIcon(customer.getCurrentState(),
+ivCurrentStatus, getActivity());
+
+Address address = customer.getAddress
[fineract-cn-mobile] branch development updated: feat : list and search tellers
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 6f9edbe feat : list and search tellers
6f9edbe is described below
commit 6f9edbef2398ba055b3598ba306983c79b6462de
Author: Mohak
AuthorDate: Tue Jul 10 12:40:57 2018 +0530
feat : list and search tellers
---
.../java/org/apache/fineract/FakeJsonName.java | 1 +
.../org/apache/fineract/FakeRemoteDataSource.java | 5 +
.../fineract/data/datamanager/DataManagerTeller.kt | 30
.../apache/fineract/data/models/teller/Teller.kt | 44 ++
.../fineract/data/remote/BaseApiManager.java | 7 +
.../org/apache/fineract/data/remote/EndPoints.java | 1 +
.../fineract/data/services/TellersService.kt | 17 +++
.../injection/component/ActivityComponent.java | 3 +
.../injection/component/ApplicationComponent.java | 2 +
.../apache/fineract/ui/adapters/TellerAdapter.kt | 67 +
.../fineract/ui/online/DashboardActivity.java | 4 +
.../fineract/ui/online/teller/TellerContract.kt| 29
.../fineract/ui/online/teller/TellerFragment.kt| 167 +
.../fineract/ui/online/teller/TellerPresenter.kt | 80 ++
.../org/apache/fineract/utils/StatusUtils.java | 25 ++-
app/src/main/res/layout/fragment_teller.xml| 24 +++
app/src/main/res/layout/item_teller.xml| 76 ++
app/src/main/res/menu/menu_navigation_drawer.xml | 5 +
app/src/main/res/menu/menu_teller_search.xml | 12 ++
app/src/main/res/values/strings.xml| 3 +
app/src/main/resources/teller.json | 74 +
21 files changed, 675 insertions(+), 1 deletion(-)
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 29c2de8..d8f1f46 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -19,4 +19,5 @@ public class FakeJsonName {
public static final String ROLES = "role.json";
public static final String LEDGER_PAGE = "ledgerPage.json";
public static final String ACCOUNT_PAGE = "accountsPage.json";
+public static final String TELLER = "teller.json";
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index c510bc1..70ccafb 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -15,6 +15,7 @@ import org.apache.fineract.data.models.loan.LoanAccount;
import org.apache.fineract.data.models.loan.LoanAccountPage;
import org.apache.fineract.data.models.payment.PlannedPaymentPage;
import org.apache.fineract.data.models.rolesandpermission.Role;
+import org.apache.fineract.data.models.teller.Teller;
import java.util.List;
@@ -89,4 +90,8 @@ public class FakeRemoteDataSource {
return testDataFactory.getObjectTypePojo(AccountPage.class,
FakeJsonName.ACCOUNT_PAGE);
}
+public static List getTeller() {
+return testDataFactory.getListTypePojo(new TypeToken>() {
+}, FakeJsonName.TELLER);
+}
}
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerTeller.kt
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerTeller.kt
new file mode 100644
index 000..898ad3b
--- /dev/null
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerTeller.kt
@@ -0,0 +1,30 @@
+package org.apache.fineract.data.datamanager
+
+import io.reactivex.Observable
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Function
+import org.apache.fineract.data.local.PreferencesHelper
+import org.apache.fineract.data.models.teller.Teller
+import org.apache.fineract.data.remote.BaseApiManager
+import javax.inject.Inject
+import org.apache.fineract.FakeRemoteDataSource
+import org.apache.fineract.data.datamanager.api.DataManagerAuth
+import org.apache.fineract.data.datamanager.api.FineractBaseDataManager
+import javax.inject.Singleton
+
+@Singleton
+class DataManagerTeller @Inject constructor(val baseManagerApi: BaseApiManager,
+dataManagerAuth: DataManagerAuth,
+val preferencesHelper:
PreferencesHelper)
+: FineractBaseDataManager(dataManagerAuth, preferencesHelper) {
+
+fun getTellers(): Observable> =
+
baseManagerApi.tellerService.getTellerList(preferencesHelper.tenantIdentifier)
+.onErrorResumeNext(Function>>
+{ Observable.just(FakeRemoteDataSou
[fineract-cn-mobile] branch development updated: fix: move files to .github
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 9664b79 fix: move files to .github 9664b79 is described below commit 9664b7980ad2f30ed1616758c81dda3d095882ea Author: Mohak AuthorDate: Fri Jul 27 17:00:00 2018 +0530 fix: move files to .github --- COMMIT_STYLE.md => .github/COMMIT_STYLE.md | 0 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/COMMIT_STYLE.md b/.github/COMMIT_STYLE.md similarity index 100% rename from COMMIT_STYLE.md rename to .github/COMMIT_STYLE.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md
[fineract-cn-mobile] branch development updated: fix: visibilty issue in ledger
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 6ed81b6 fix: visibilty issue in ledger
6ed81b6 is described below
commit 6ed81b6ee207720eef6b97151bceab45244586ea
Author: Mohak
AuthorDate: Fri Aug 3 22:53:50 2018 +0530
fix: visibilty issue in ledger
---
.../apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
index 5086b40..3b9e5a4 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
+++
b/app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
@@ -39,9 +39,9 @@ class LedgerPresenter @Inject constructor(@ApplicationContext
context: Context,
if (ledgerPage.ledgers != null) {
if (ledgerPage.ledgers.isEmpty()) {
-mvpView.showLedgers(ledgerPage.ledgers)
-} else {
mvpView.showEmptyLedgers()
+} else {
+mvpView.showLedgers(ledgerPage.ledgers)
}
}
[fineract-cn-mobile] 01/02: feat: list and search ledger
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 3432194ca2ea29cee805c678fa98a6f0741f4f17
Author: Mohak
AuthorDate: Tue Jul 17 11:28:34 2018 +0530
feat: list and search ledger
---
.../java/org/apache/fineract/FakeJsonName.java | 1 +
.../org/apache/fineract/FakeRemoteDataSource.java | 6 +
.../data/datamanager/DataManagerAccounting.kt | 31
.../fineract/data/models/accounts/AccountType.kt | 21 +++
.../apache/fineract/data/models/accounts/Ledger.kt | 25 +++
.../fineract/data/models/accounts/LedgerPage.kt| 9 ++
.../fineract/data/remote/BaseApiManager.java | 8 +-
.../org/apache/fineract/data/remote/EndPoints.java | 1 +
.../fineract/data/services/AccountingService.kt| 19 +++
.../injection/component/ActivityComponent.java | 45 +++---
.../injection/component/ApplicationComponent.java | 2 +
.../apache/fineract/ui/adapters/LedgerAdapter.kt | 65
.../fineract/ui/online/DashboardActivity.java | 4 +
.../ui/online/accounting/ledgers/LedgerContract.kt | 32
.../ui/online/accounting/ledgers/LedgerFragment.kt | 168 +
.../online/accounting/ledgers/LedgerPresenter.kt | 87 +++
.../org/apache/fineract/utils/StatusUtils.java | 28
app/src/main/res/layout/fragment_ledger.xml| 26
app/src/main/res/layout/item_ledger.xml| 76 ++
app/src/main/res/menu/menu_ledger_search.xml | 12 ++
app/src/main/res/menu/menu_navigation_drawer.xml | 7 +
app/src/main/res/values/strings.xml| 3 +
app/src/main/resources/ledgerPage.json | 62
23 files changed, 720 insertions(+), 18 deletions(-)
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 441ae48..95a3bdd 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -17,4 +17,5 @@ public class FakeJsonName {
public static final String LOAN_ACCOUNT = "loanAccount.json";
public static final String PLANNED_PAYMENT_PAGE =
"plannedPaymentPage.json";
public static final String ROLES = "role.json";
+public static final String LEDGER_PAGE = "ledgerPage.json";
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index 01f6bb3..02611f9 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -3,6 +3,7 @@ package org.apache.fineract;
import com.google.gson.reflect.TypeToken;
import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.data.models.accounts.LedgerPage;
import org.apache.fineract.data.models.customer.Command;
import org.apache.fineract.data.models.customer.Customer;
import org.apache.fineract.data.models.customer.CustomerPage;
@@ -78,4 +79,9 @@ public class FakeRemoteDataSource {
return testDataFactory.getObjectTypePojo(PlannedPaymentPage.class,
FakeJsonName.PLANNED_PAYMENT_PAGE);
}
+
+public static LedgerPage getLedgerPage() {
+return testDataFactory.getObjectTypePojo(LedgerPage.class,
FakeJsonName.LEDGER_PAGE);
+}
+
}
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
new file mode 100644
index 000..8d96cc6
--- /dev/null
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
@@ -0,0 +1,31 @@
+package org.apache.fineract.data.datamanager
+
+import io.reactivex.Observable
+import io.reactivex.ObservableSource
+import io.reactivex.functions.Function
+import org.apache.fineract.data.local.PreferencesHelper
+import org.apache.fineract.data.remote.BaseApiManager
+import javax.inject.Inject
+import org.apache.fineract.FakeRemoteDataSource
+import org.apache.fineract.data.datamanager.api.DataManagerAuth
+import org.apache.fineract.data.datamanager.api.FineractBaseDataManager
+import org.apache.fineract.data.models.accounts.Ledger
+import org.apache.fineract.data.models.accounts.LedgerPage
+import javax.inject.Singleton
+
+@Singleton
+class DataManagerAccounting @Inject constructor(val baseManagerApi:
BaseApiManager,
+dataManagerAuth:
DataManagerAuth,
+val preferencesHelper:
PreferencesHelper)
+: FineractBaseDataManager(dataManagerAuth, preferencesHelper) {
+
+fun fetchLedgers(): Observable =
+baseM
[fineract-cn-mobile] 02/02: feat : search and list accounts
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 27c51d62b73490d9420a9c07c6867b8abcd7034f
Author: Mohak
AuthorDate: Thu Jul 19 13:34:30 2018 +0530
feat : search and list accounts
---
.../java/org/apache/fineract/FakeJsonName.java | 1 +
.../org/apache/fineract/FakeRemoteDataSource.java | 5 +
.../data/datamanager/DataManagerAccounting.kt | 14 ++
.../fineract/data/models/accounts/Account.kt | 39 +
.../fineract/data/models/accounts/AccountPage.kt | 9 ++
.../fineract/data/services/AccountingService.kt| 8 +
.../injection/component/ActivityComponent.java | 3 +
.../apache/fineract/ui/adapters/AccountsAdapter.kt | 66
.../fineract/ui/online/DashboardActivity.java | 4 +
.../online/accounting/accounts/AccountContract.kt | 33
.../online/accounting/accounts/AccountsFragment.kt | 166 +
.../accounting/accounts/AccountsPresenter.kt | 82 ++
app/src/main/res/layout/fragment_accounts.xml | 26
app/src/main/res/layout/item_account.xml | 76 ++
app/src/main/res/menu/menu_account_search.xml | 12 ++
app/src/main/res/menu/menu_navigation_drawer.xml | 5 +
app/src/main/res/values/strings.xml| 2 +
app/src/main/resources/accountsPage.json | 94
18 files changed, 645 insertions(+)
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 95a3bdd..29c2de8 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -18,4 +18,5 @@ public class FakeJsonName {
public static final String PLANNED_PAYMENT_PAGE =
"plannedPaymentPage.json";
public static final String ROLES = "role.json";
public static final String LEDGER_PAGE = "ledgerPage.json";
+public static final String ACCOUNT_PAGE = "accountsPage.json";
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index 02611f9..c510bc1 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -4,6 +4,7 @@ import com.google.gson.reflect.TypeToken;
import org.apache.fineract.data.models.Authentication;
import org.apache.fineract.data.models.accounts.LedgerPage;
+import org.apache.fineract.data.models.accounts.AccountPage;
import org.apache.fineract.data.models.customer.Command;
import org.apache.fineract.data.models.customer.Customer;
import org.apache.fineract.data.models.customer.CustomerPage;
@@ -84,4 +85,8 @@ public class FakeRemoteDataSource {
return testDataFactory.getObjectTypePojo(LedgerPage.class,
FakeJsonName.LEDGER_PAGE);
}
+public static AccountPage getAccountPage() {
+return testDataFactory.getObjectTypePojo(AccountPage.class,
FakeJsonName.ACCOUNT_PAGE);
+}
+
}
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
index 8d96cc6..ed1304d 100644
---
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
@@ -9,6 +9,8 @@ import javax.inject.Inject
import org.apache.fineract.FakeRemoteDataSource
import org.apache.fineract.data.datamanager.api.DataManagerAuth
import org.apache.fineract.data.datamanager.api.FineractBaseDataManager
+import org.apache.fineract.data.models.accounts.Account
+import org.apache.fineract.data.models.accounts.AccountPage
import org.apache.fineract.data.models.accounts.Ledger
import org.apache.fineract.data.models.accounts.LedgerPage
import javax.inject.Singleton
@@ -28,4 +30,16 @@ class DataManagerAccounting @Inject constructor(val
baseManagerApi: BaseApiManag
baseManagerApi.accountingService.findLedger(identifier)
.onErrorResumeNext(Function>
{
Observable.just(FakeRemoteDataSource.getLedgerPage()!!.ledgers!![0]) })
+
+fun getAccounts(): Observable =
+baseManagerApi.accountingService.fetchAccounts()
+.onErrorResumeNext(Function>
+{ Observable.just(FakeRemoteDataSource.getAccountPage()) })
+
+
+fun findAccount(identifier: String): Observable =
+baseManagerApi.accountingService.findAccount(identifier)
+.onErrorResumeNext(Function>
+{
Observable.just(FakeRemoteDataSource.getAccountPage()!!.accounts!![0]) })
+
}
\ No newli
[fineract-cn-mobile] branch development updated (f228af6 -> 27c51d6)
This is an automated email from the ASF dual-hosted git repository.
rajanmaurya154 pushed a change to branch development
in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git.
from f228af6 fix: gradle check
new 3432194 feat: list and search ledger
new 27c51d6 feat : search and list accounts
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/fineract/FakeJsonName.java | 2 +
.../org/apache/fineract/FakeRemoteDataSource.java | 11 ++
.../data/datamanager/DataManagerAccounting.kt | 45 ++
.../fineract/data/models/accounts/Account.kt | 39 +
.../fineract/data/models/accounts/AccountPage.kt | 9 ++
.../fineract/data/models/accounts/AccountType.kt | 21 +++
.../apache/fineract/data/models/accounts/Ledger.kt | 25 +++
.../fineract/data/models/accounts/LedgerPage.kt| 9 ++
.../fineract/data/remote/BaseApiManager.java | 8 +-
.../org/apache/fineract/data/remote/EndPoints.java | 1 +
.../fineract/data/services/AccountingService.kt| 27
.../injection/component/ActivityComponent.java | 48 +++---
.../injection/component/ApplicationComponent.java | 2 +
.../apache/fineract/ui/adapters/AccountsAdapter.kt | 66
.../apache/fineract/ui/adapters/LedgerAdapter.kt | 65
.../fineract/ui/online/DashboardActivity.java | 8 +
.../online/accounting/accounts/AccountContract.kt | 33
.../online/accounting/accounts/AccountsFragment.kt | 166
.../accounting/accounts/AccountsPresenter.kt | 82 ++
.../ui/online/accounting/ledgers/LedgerContract.kt | 32
.../ui/online/accounting/ledgers/LedgerFragment.kt | 168 +
.../online/accounting/ledgers/LedgerPresenter.kt | 87 +++
.../org/apache/fineract/utils/StatusUtils.java | 28
...stomer_activities.xml => fragment_accounts.xml} | 6 +-
...customer_activities.xml => fragment_ledger.xml} | 6 +-
.../{item_customer_loans.xml => item_account.xml} | 54 +++
.../{item_customer_loans.xml => item_ledger.xml} | 54 +++
...fication_search.xml => menu_account_search.xml} | 4 +-
...ification_search.xml => menu_ledger_search.xml} | 4 +-
app/src/main/res/menu/menu_navigation_drawer.xml | 12 ++
app/src/main/res/values/strings.xml| 5 +
app/src/main/resources/accountsPage.json | 94
app/src/main/resources/ledgerPage.json | 62
33 files changed, 1201 insertions(+), 82 deletions(-)
create mode 100644
app/src/main/java/org/apache/fineract/data/datamanager/DataManagerAccounting.kt
create mode 100644
app/src/main/java/org/apache/fineract/data/models/accounts/Account.kt
create mode 100644
app/src/main/java/org/apache/fineract/data/models/accounts/AccountPage.kt
create mode 100644
app/src/main/java/org/apache/fineract/data/models/accounts/AccountType.kt
create mode 100644
app/src/main/java/org/apache/fineract/data/models/accounts/Ledger.kt
create mode 100644
app/src/main/java/org/apache/fineract/data/models/accounts/LedgerPage.kt
create mode 100644
app/src/main/java/org/apache/fineract/data/services/AccountingService.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/adapters/AccountsAdapter.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/adapters/LedgerAdapter.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountContract.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsPresenter.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerContract.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
create mode 100644
app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerPresenter.kt
copy app/src/main/res/layout/{fragment_customer_activities.xml =>
fragment_accounts.xml} (81%)
copy app/src/main/res/layout/{fragment_customer_activities.xml =>
fragment_ledger.xml} (81%)
copy app/src/main/res/layout/{item_customer_loans.xml => item_account.xml}
(78%)
copy app/src/main/res/layout/{item_customer_loans.xml => item_ledger.xml} (78%)
copy app/src/main/res/menu/{menu_identification_search.xml =>
menu_account_search.xml} (75%)
copy app/src/main/res/menu/{menu_identification_search.xml =>
menu_ledger_search.xml} (75%)
create mode 100644 app/src/main/resources/accountsPage.json
create mode 100644 app/src/main/resources/ledgerPage.json
[fineract-cn-mobile] branch development updated: fix: gradle check
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 f228af6 fix: gradle check
f228af6 is described below
commit f228af6f1904987553963eb207f3d9e88b19cc51
Author: Mohak
AuthorDate: Fri Jul 27 12:47:26 2018 +0530
fix: gradle check
---
app/src/main/java/org/apache/fineract/FineractApplication.java | 2 --
.../apache/fineract/data/datamanager/api/DataManagerCustomer.java | 4 ++--
.../data/local/database/helpers/DatabaseHelperCustomer.java | 6 ++
.../java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java | 4 ++--
app/src/main/java/org/apache/fineract/jobs/JobsReceiver.java| 1 -
.../org/apache/fineract/ui/offline/CustomerPayloadFragment.java | 2 +-
.../online/customers/customerdetails/CustomerDetailsFragment.java | 1 -
.../ui/online/customers/customerlist/CustomersFragment.java | 1 -
8 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/org/apache/fineract/FineractApplication.java
b/app/src/main/java/org/apache/fineract/FineractApplication.java
index f639213..f9bd6a4 100644
--- a/app/src/main/java/org/apache/fineract/FineractApplication.java
+++ b/app/src/main/java/org/apache/fineract/FineractApplication.java
@@ -10,10 +10,8 @@ import com.raizlabs.android.dbflow.config.FlowManager;
import org.apache.fineract.injection.component.ApplicationComponent;
import org.apache.fineract.injection.component.DaggerApplicationComponent;
import org.apache.fineract.injection.module.ApplicationModule;
-import org.apache.fineract.jobs.StartSyncJob;
import javax.inject.Inject;
-import javax.inject.Singleton;
import io.fabric.sdk.android.Fabric;
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerCustomer.java
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerCustomer.java
index ac50ed7..61827c4 100644
---
a/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerCustomer.java
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/api/DataManagerCustomer.java
@@ -53,7 +53,7 @@ public class DataManagerCustomer extends
FineractBaseDataManager implements Mana
Throwable throwable) throws Exception {
return
Observable.just(FakeRemoteDataSource.getCustomerPage());
}
-});
+});
}
public Observable fetchCustomer(String identifier) {
@@ -66,7 +66,7 @@ public class DataManagerCustomer extends
FineractBaseDataManager implements Mana
Throwable throwable) throws Exception {
return
Observable.just(FakeRemoteDataSource.getCustomer());
}
-});
+});
}
public Completable updateCustomer(String customerIdentifier, Customer
customer) {
diff --git
a/app/src/main/java/org/apache/fineract/data/local/database/helpers/DatabaseHelperCustomer.java
b/app/src/main/java/org/apache/fineract/data/local/database/helpers/DatabaseHelperCustomer.java
index 09a79ed..4e76947 100644
---
a/app/src/main/java/org/apache/fineract/data/local/database/helpers/DatabaseHelperCustomer.java
+++
b/app/src/main/java/org/apache/fineract/data/local/database/helpers/DatabaseHelperCustomer.java
@@ -1,5 +1,7 @@
package org.apache.fineract.data.local.database.helpers;
+import static com.raizlabs.android.dbflow.sql.language.SQLite.select;
+
import com.google.gson.Gson;
import
org.apache.fineract.data.local.database.syncmodels.customer.CustomerPayload;
@@ -17,12 +19,8 @@ import javax.inject.Singleton;
import io.reactivex.Completable;
import io.reactivex.Observable;
-import io.reactivex.ObservableEmitter;
-import io.reactivex.ObservableOnSubscribe;
import io.reactivex.ObservableSource;
-import static com.raizlabs.android.dbflow.sql.language.SQLite.select;
-
@Singleton
public class DatabaseHelperCustomer {
diff --git
a/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
b/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
index 4828992..c73e2b7 100644
---
a/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
+++
b/app/src/main/java/org/apache/fineract/jobs/CreationUpdationCustomerJob.java
@@ -52,13 +52,13 @@ public class CreationUpdationCustomerJob extends Job {
databaseHelper.fetchCustomerPayload()
.flatMap(new Function,
ObservableSource>() {
@Override
-public ObservableSource apply(List
customers) throws Exception {
+public ObservableSource apply(List
customers) {
ret
[fineract-cn-mobile] branch development updated: fix: Exception in loan details
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 bde4b08 fix: Exception in loan details bde4b08 is described below commit bde4b082d89b8500c4252841932de4c48638479d Author: Mohak AuthorDate: Tue Jun 12 20:38:57 2018 +0530 fix: Exception in loan details --- app/src/main/res/layout/fragment_loan_details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/layout/fragment_loan_details.xml b/app/src/main/res/layout/fragment_loan_details.xml index c8b05d7..fc8e2bc 100644 --- a/app/src/main/res/layout/fragment_loan_details.xml +++ b/app/src/main/res/layout/fragment_loan_details.xml @@ -125,7 +125,7 @@
[fineract-cn-mobile] branch development updated: feat: Image compression before upload
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 d3d3eb9 feat: Image compression before upload
d3d3eb9 is described below
commit d3d3eb9a8c3b648054289672bd7b5c24e03e490b
Author: Mohak
AuthorDate: Tue Jun 19 18:33:01 2018 +0530
feat: Image compression before upload
---
app/build.gradle | 3 ++
.../UploadIdentificationCardBottomSheet.java | 52 --
.../UploadIdentificationCardContract.java | 4 --
app/src/main/res/xml/filepaths.xml | 2 +-
4 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index bc98fd0..fc40ba3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -129,6 +129,9 @@ dependencies {
//Sticky header RecyclerView
implementation 'org.zakariya.stickyheaders:stickyheaders:0.7.6'
+// Compressor for Image Compression
+implementation 'id.zelory:compressor:2.1.0'
+
//Material Stepper UI library
implementation 'com.stepstone.stepper:material-stepper:3.3.0'
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
index 86180fa..2779125 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/identification/uploadidentificationscan/UploadIdentificationCardBottomSheet.java
@@ -8,7 +8,7 @@ import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
+import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
@@ -16,6 +16,7 @@ import android.support.annotation.NonNull;
import android.support.design.widget.BottomSheetBehavior;
import android.support.design.widget.BottomSheetDialog;
import android.support.design.widget.TextInputLayout;
+import android.support.v4.content.FileProvider;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
@@ -32,7 +33,6 @@ import org.apache.fineract.utils.ValidateIdentifierUtil;
import org.apache.fineract.utils.ValidationUtil;
import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
import javax.inject.Inject;
@@ -40,10 +40,11 @@ import javax.inject.Inject;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
+import id.zelory.compressor.Compressor;
/**
* @author Rajan Maurya
- * On 01/08/17.
+ * On 01/08/17.
*/
public class UploadIdentificationCardBottomSheet extends
FineractBaseBottomSheetDialogFragment
implements UploadIdentificationCardContract.View, TextWatcher {
@@ -73,10 +74,12 @@ public class UploadIdentificationCardBottomSheet extends
FineractBaseBottomSheet
@Inject
UploadIdentificationCardPresenter uploadIdentificationCardPresenter;
+private Compressor imageCompressor;
+
View rootView;
private BottomSheetBehavior behavior;
-private File cachePath;
+private File cameraImage, compressedImage;
private String customerIdentifier;
private String identificationNumber;
@@ -92,6 +95,7 @@ public class UploadIdentificationCardBottomSheet extends
FineractBaseBottomSheet
behavior = BottomSheetBehavior.from((View) rootView.getParent());
((FineractBaseActivity)
getActivity()).getActivityComponent().inject(this);
uploadIdentificationCardPresenter.attachView(this);
+imageCompressor = new Compressor(getActivity());
ButterKnife.bind(this, rootView);
showUserInterface();
@@ -112,7 +116,7 @@ public class UploadIdentificationCardBottomSheet extends
FineractBaseBottomSheet
uploadIdentificationCardPresenter.uploadIdentificationCardScan(customerIdentifier,
identificationNumber,
etIdentifier.getText().toString().trim(),
-etDescription.getText().toString().trim(), cachePath);
+etDescription.getText().toString().trim(),
compressedImage);
}
}
@@ -138,8 +142,22 @@ public class UploadIdentificationCardBottomSheet extends
FineractBaseBottomSheet
@Override
public void openCamera() {
+
Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+
if
(takePictureIntent.resolveActivity(getActivity().getPackageManager()) != null) {
+
+cameraImage = new File(get
[fineract-cn-mobile] branch development updated: feat: Sync feature for customer and customer details
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 738da55 feat: Sync feature for customer and customer details
738da55 is described below
commit 738da55d5b8ac986a63ceb5692ed04c15b1dc864
Author: dilpreet96
AuthorDate: Fri May 25 22:16:59 2018 +0530
feat: Sync feature for customer and customer details
---
app/build.gradle | 55 ++
app/src/main/AndroidManifest.xml | 6 ++
.../org/apache/fineract/FineractApplication.java | 11 ++
.../{ => api}/DataManagerAnonymous.java| 2 +-
.../datamanager/{ => api}/DataManagerAuth.java | 2 +-
.../datamanager/{ => api}/DataManagerCustomer.java | 25 +++--
.../datamanager/{ => api}/DataManagerDeposit.java | 5 +-
.../{ => api}/DataManagerIndividualLending.java| 2 +-
.../datamanager/{ => api}/DataManagerLoans.java| 2 +-
.../datamanager/{ => api}/DataManagerRoles.java| 2 +-
.../{ => api}/FineractBaseDataManager.java | 2 +-
.../datamanager/contracts/ManagerCustomer.java | 53 ++
.../datamanager/database/DbManagerCustomer.java| 115 +
.../apache/fineract/data/local/PreferenceKey.java | 2 +
.../fineract/data/local/PreferencesHelper.java | 16 +++
.../fineract/data/local/database/AppDatabase.kt| 11 ++
.../database/helpers/DatabaseHelperCustomer.java | 110
.../syncmodels/customer/CustomerPayload.kt | 14 +++
.../fineract/data/models/customer/Address.kt | 12 ++-
.../fineract/data/models/customer/ContactDetail.kt | 13 ++-
.../fineract/data/models/customer/Customer.kt | 68
.../fineract/data/models/customer/DateOfBirth.kt | 11 +-
.../injection/component/ActivityComponent.java | 4 +
.../injection/component/ApplicationComponent.java | 26 +++--
.../fineract/injection/module/JobsModule.java | 47 +
.../fineract/jobs/CreationUpdationCustomerJob.java | 90
.../apache/fineract/jobs/FineractJobCreator.java | 33 ++
.../org/apache/fineract/jobs/JobsReceiver.java | 59 +++
.../org/apache/fineract/jobs/StartSyncJob.java | 95 +
.../adapters/BeneficiaryAutoCompleteAdapter.java | 2 +-
.../fineract/ui/adapters/CustomerAdapter.java | 15 ++-
.../ui/offline/CustomerPayloadContract.java| 22
.../ui/offline/CustomerPayloadFragment.java| 95 +
.../ui/offline/CustomerPayloadPresenter.java | 70 +
.../fineract/ui/online/DashboardActivity.java | 11 ++
.../customeractivity/CreateCustomerPresenter.java | 13 +--
.../FormCustomerAddressPresenter.java | 2 +-
.../CustomerActivitiesPresenter.java | 2 +-
.../customerdetails/CustomerDetailsContract.java | 2 +-
.../customerdetails/CustomerDetailsFragment.java | 48 +
.../customerdetails/CustomerDetailsPresenter.java | 9 +-
.../customers/customerlist/CustomersFragment.java | 23 +++--
.../customers/customerlist/CustomersPresenter.java | 11 +-
.../EditCustomerProfilePresenter.java | 2 +-
.../CustomerTasksBottomSheetPresenter.java | 2 +-
.../CreateDepositPresenter.java| 2 +-
.../FormDepositAssignProductPresenter.java | 2 +-
.../DepositAccountDetailsPresenter.java| 2 +-
.../DepositAccountsPresenter.java | 2 +-
.../CreateIdentificationPresenter.java | 2 +-
.../IdentificationDetailsPresenter.java| 2 +-
.../IdentificationsPresenter.java | 2 +-
.../UploadIdentificationCardPresenter.java | 2 +-
.../ui/online/launcher/LauncherPresenter.java | 2 +-
.../loanaccountlist/LoanAccountsPresenter.java | 2 +-
.../loanactivity/LoanApplicationPresenter.java | 2 +-
.../loancosigner/LoanCoSignerPresenter.java| 2 +-
.../loandetails/LoanDetailsPresenter.java | 2 +-
.../loandetails/CustomerLoanDetailsPresenter.java | 2 +-
.../plannedpayment/PlannedPaymentPresenter.java| 2 +-
.../fineract/ui/online/login/LoginPresenter.java | 2 +-
.../ui/online/roles/roleslist/RolesPresenter.java | 2 +-
app/src/main/res/layout/fragment_customer_list.xml | 2 +-
...omer_list.xml => fragment_customer_payload.xml} | 15 +--
app/src/main/res/menu/menu_navigation_drawer.xml | 6 ++
app/src/main/res/values/strings.xml| 5 +
build.gradle | 9 +-
gradle.properties | 2 +-
68 files changed, 1115 insertions(+), 180 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 884ac3
[fineract-cn-mobile] branch development updated: feat: search identification
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 f9b01d3 feat: search identification
f9b01d3 is described below
commit f9b01d3634f66dd34609ba671e38aa7b65bbe53a
Author: Mohak
AuthorDate: Fri Jun 29 19:17:43 2018 +0530
feat: search identification
---
.../data/datamanager/DataManagerCustomer.java | 17 +++-
.../fineract/data/services/CustomerService.java| 4 ++
.../IdentificationsContract.java | 4 ++
.../IdentificationsFragment.java | 49 ++
.../IdentificationsPresenter.java | 34 ++-
.../main/res/menu/menu_identification_search.xml | 12 ++
app/src/main/res/values/strings.xml| 4 ++
app/src/main/resources/identification.json | 36 ++--
8 files changed, 154 insertions(+), 6 deletions(-)
diff --git
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
index c2357a2..9b9665a 100644
---
a/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
+++
b/app/src/main/java/org/apache/fineract/data/datamanager/DataManagerCustomer.java
@@ -101,8 +101,7 @@ public class DataManagerCustomer extends
FineractBaseDataManager {
return authenticatedObservableApi(baseApiManager.getCustomerApi()
.fetchIdentification(customerIdentifier))
.onErrorResumeNext(
-new Function>>
-() {
+new Function>> () {
@Override
public ObservableSource>
apply(
Throwable throwable)
@@ -112,6 +111,20 @@ public class DataManagerCustomer extends
FineractBaseDataManager {
});
}
+public Observable searchIdentifications(String identifier,
String number) {
+return authenticatedObservableApi(baseApiManager.getCustomerApi()
+.searchIdentification(identifier, number))
+.onErrorResumeNext(
+new Function>() {
+@Override
+public ObservableSource apply(
+Throwable throwable) throws Exception {
+return Observable.just(FakeRemoteDataSource
+.getIdentifications().get(0));
+}
+});
+}
+
public Completable createIdentificationCard(String identifier,
Identification identification) {
return authenticatedCompletableApi(baseApiManager.getCustomerApi()
.createIdentificationCard(identifier, identification));
diff --git
a/app/src/main/java/org/apache/fineract/data/services/CustomerService.java
b/app/src/main/java/org/apache/fineract/data/services/CustomerService.java
index c548f62..493e38c 100644
--- a/app/src/main/java/org/apache/fineract/data/services/CustomerService.java
+++ b/app/src/main/java/org/apache/fineract/data/services/CustomerService.java
@@ -62,6 +62,10 @@ public interface CustomerService {
Observable> fetchIdentification(
@Path("identifier") String identifier);
+@GET(EndPoints.API_CUSTOMER_PATH +
"/customers/{identifier}/identifications/{number}")
+Observable searchIdentification(
+@Path("identifier") String identifier, @Path("number") String
number);
+
@POST(EndPoints.API_CUSTOMER_PATH +
"/customers/{identifier}/identifications")
Completable createIdentificationCard(@Path("identifier") String identifier,
@Body Identification identification);
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
index c38030c..5127e53 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/identification/identificationlist/IdentificationsContract.java
@@ -26,10 +26,14 @@ public interface IdentificationsContract {
void showEmptyIdentifications();
void showMessage(String message);
+
+void searchIdentificationList(Identification identification);
}
interface Presenter {
void fetchIdentifications(String customerIdentifier);
+
+void searchIdentifications
[fineract-cn-mobile] branch development updated: fix: toolbar title on Dashboard Fragment
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 6740612 fix: toolbar title on Dashboard Fragment
6740612 is described below
commit 674061241a1b30cbb1c46ceb220bf6462d5794b7
Author: Mohak
AuthorDate: Mon Jun 11 13:55:59 2018 +0530
fix: toolbar title on Dashboard Fragment
---
.../java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
index 030d84c..345b730 100644
---
a/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
+++
b/app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
@@ -40,6 +40,7 @@ public class DashboardFragment extends FineractBaseFragment {
@Nullable Bundle savedInstanceState) {
rootView = inflater.inflate(R.layout.fragment_dashboard, container,
false);
ButterKnife.bind(this, rootView);
+setToolbarTitle(getString(R.string.dashboard));
return rootView;
}
--
To stop receiving notification emails like this one, please contact
rajanmaurya...@apache.org.
[fineract-cn-mobile] branch development updated (014e03d -> 5b5ad3a)
This is an automated email from the ASF dual-hosted git repository. rajanmaurya154 pushed a change to branch development in repository https://gitbox.apache.org/repos/asf/fineract-cn-mobile.git. from 014e03d refractor: Convert java models to kotlin data models new 88899c9 feat : fake database layer new 5b5ad3a feat : integrated fake database layer The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: app/build.gradle | 3 + .../java/org/apache/fineract/FakeJsonName.java | 11 .../org/apache/fineract/FakeRemoteDataSource.java | 70 ++ .../fineract/data/datamanager/DataManagerAuth.java | 13 +++- .../data/datamanager/DataManagerCustomer.java | 55 +++-- .../data/datamanager/DataManagerDeposit.java | 27 - .../datamanager/DataManagerIndividualLending.java | 15 - .../data/datamanager/DataManagerLoans.java | 23 ++- .../data/datamanager/DataManagerRoles.java | 13 +++- app/src/main/resources/authentication.json | 7 +++ app/src/main/resources/command.json| 8 +++ app/src/main/resources/customer.json | 46 ++ app/src/main/resources/customerPage.json | 52 app/src/main/resources/depositAccount.json | 13 app/src/main/resources/identification.json | 16 + app/src/main/resources/loanAccount.json| 55 + app/src/main/resources/loanAccountPage.json| 60 +++ app/src/main/resources/plannedPaymentPage.json | 23 +++ app/src/main/resources/role.json | 28 + app/src/main/resources/scanCard.json | 6 ++ 20 files changed, 532 insertions(+), 12 deletions(-) create mode 100644 app/src/main/resources/authentication.json create mode 100644 app/src/main/resources/command.json create mode 100644 app/src/main/resources/customer.json create mode 100644 app/src/main/resources/customerPage.json create mode 100644 app/src/main/resources/depositAccount.json create mode 100644 app/src/main/resources/identification.json create mode 100644 app/src/main/resources/loanAccount.json create mode 100644 app/src/main/resources/loanAccountPage.json create mode 100644 app/src/main/resources/plannedPaymentPage.json create mode 100644 app/src/main/resources/role.json create mode 100644 app/src/main/resources/scanCard.json -- To stop receiving notification emails like this one, please contact rajanmaurya...@apache.org.
[fineract-cn-mobile] 01/02: feat : fake database layer
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 88899c9efed66c5a1fea7c30bc0c72bc6f00bb0c
Author: Mohak
AuthorDate: Sun May 6 14:48:56 2018 +0530
feat : fake database layer
---
app/build.gradle| 3 +++
app/src/commonTest/java/org/apache/fineract/FakeJsonName.java | 2 ++
.../commonTest/java/org/apache/fineract/FakeRemoteDataSource.java | 6 ++
app/src/main/resources/customer.json| 3 +++
4 files changed, 14 insertions(+)
diff --git a/app/build.gradle b/app/build.gradle
index 8c5b410..884ac3a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,6 +39,9 @@ android {
test {
java.srcDir commonTestDir
}
+main {
+java.srcDir commonTestDir
+}
}
// Always show the result of every unit test, even if it passes.
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 0c4e7b8..3b13ebe 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -6,4 +6,6 @@ package org.apache.fineract;
*/
public class FakeJsonName {
+public static final String CUSTOMER = "customer.json";
+
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index 4f92f80..87c3451 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -1,5 +1,7 @@
package org.apache.fineract;
+import org.apache.fineract.data.models.customer.Customer;
+
/**
* FakeRemoteDataSource is reading the local json files into the java object
using gson.
* Created by Rajan Maurya on 25/6/17.
@@ -8,4 +10,8 @@ public class FakeRemoteDataSource {
private static TestDataFactory testDataFactory = new TestDataFactory();
+public static Customer getCustomer() {
+return testDataFactory.getObjectTypePojo(Customer.class,
+FakeJsonName.CUSTOMER);
+}
}
diff --git a/app/src/main/resources/customer.json
b/app/src/main/resources/customer.json
new file mode 100644
index 000..0e0dcd2
--- /dev/null
+++ b/app/src/main/resources/customer.json
@@ -0,0 +1,3 @@
+{
+
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
rajanmaurya...@apache.org.
[fineract-cn-mobile] 02/02: feat : integrated fake database layer
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 5b5ad3a60f3f5dd135f8447509f3f54c9fcd18d8
Author: Mohak
AuthorDate: Sat May 19 17:00:27 2018 +0530
feat : integrated fake database layer
---
.../java/org/apache/fineract/FakeJsonName.java | 11 +++-
.../org/apache/fineract/FakeRemoteDataSource.java | 64 ++
.../fineract/data/datamanager/DataManagerAuth.java | 13 -
.../data/datamanager/DataManagerCustomer.java | 55 +--
.../data/datamanager/DataManagerDeposit.java | 27 -
.../datamanager/DataManagerIndividualLending.java | 15 -
.../data/datamanager/DataManagerLoans.java | 23 +++-
.../data/datamanager/DataManagerRoles.java | 13 -
app/src/main/resources/authentication.json | 7 +++
app/src/main/resources/command.json| 8 +++
app/src/main/resources/customer.json | 45 ++-
app/src/main/resources/customerPage.json | 52 ++
app/src/main/resources/depositAccount.json | 13 +
app/src/main/resources/identification.json | 16 ++
app/src/main/resources/loanAccount.json| 55 +++
app/src/main/resources/loanAccountPage.json| 60
app/src/main/resources/plannedPaymentPage.json | 23
app/src/main/resources/role.json | 28 ++
app/src/main/resources/scanCard.json | 6 ++
19 files changed, 520 insertions(+), 14 deletions(-)
diff --git a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
index 3b13ebe..441ae48 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeJsonName.java
@@ -7,5 +7,14 @@ package org.apache.fineract;
public class FakeJsonName {
public static final String CUSTOMER = "customer.json";
-
+public static final String AUTHENTICATION = "authentication.json";
+public static final String CUSTOMER_PAGE = "customerPage.json";
+public static final String LOAN_ACCOUNT_PAGE = "loanAccountPage.json";
+public static final String DEPOSIT_ACCOUNTS = "depositAccount.json";
+public static final String IDENTIFICATIONS = "identification.json";
+public static final String SCAN_CARDS = "scanCard.json";
+public static final String CUSTOMER_COMMANDS = "command.json";
+public static final String LOAN_ACCOUNT = "loanAccount.json";
+public static final String PLANNED_PAYMENT_PAGE =
"plannedPaymentPage.json";
+public static final String ROLES = "role.json";
}
diff --git
a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
index 87c3451..01f6bb3 100644
--- a/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
+++ b/app/src/commonTest/java/org/apache/fineract/FakeRemoteDataSource.java
@@ -1,6 +1,20 @@
package org.apache.fineract;
+import com.google.gson.reflect.TypeToken;
+
+import org.apache.fineract.data.models.Authentication;
+import org.apache.fineract.data.models.customer.Command;
import org.apache.fineract.data.models.customer.Customer;
+import org.apache.fineract.data.models.customer.CustomerPage;
+import org.apache.fineract.data.models.customer.identification.Identification;
+import org.apache.fineract.data.models.customer.identification.ScanCard;
+import org.apache.fineract.data.models.deposit.DepositAccount;
+import org.apache.fineract.data.models.loan.LoanAccount;
+import org.apache.fineract.data.models.loan.LoanAccountPage;
+import org.apache.fineract.data.models.payment.PlannedPaymentPage;
+import org.apache.fineract.data.models.rolesandpermission.Role;
+
+import java.util.List;
/**
* FakeRemoteDataSource is reading the local json files into the java object
using gson.
@@ -14,4 +28,54 @@ public class FakeRemoteDataSource {
return testDataFactory.getObjectTypePojo(Customer.class,
FakeJsonName.CUSTOMER);
}
+
+public static Authentication getAuth() {
+return testDataFactory.getObjectTypePojo(Authentication.class,
+FakeJsonName.AUTHENTICATION);
+}
+
+public static CustomerPage getCustomerPage() {
+return testDataFactory.getObjectTypePojo(CustomerPage.class,
+FakeJsonName.CUSTOMER_PAGE);
+}
+
+public static List getRoles() {
+return testDataFactory.getListTypePojo(new TypeToken>() {
+}, FakeJsonName.ROLES);
+}
+
+public static LoanAccountPage getloanAccountPage() {
+return testDataFactory.getObjectT
[fineract-cn-mobile] branch development updated: refractor: Convert java models to kotlin data models
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 014e03d refractor: Convert java models to kotlin data models 014e03d is described below commit 014e03dc6b624669dd8961df67ae4c5515c68448 Author: dilpreet96 AuthorDate: Sat May 19 18:05:13 2018 +0530 refractor: Convert java models to kotlin data models --- .DS_Store | Bin 0 -> 6148 bytes app/build.gradle | 14 +- .../fineract/data/models/Authentication.java | 107 - .../apache/fineract/data/models/Authentication.kt | 19 ++ .../org/apache/fineract/data/models/State.java | 13 - .../java/org/apache/fineract/data/models/State.kt | 13 + .../fineract/data/models/customer/Address.java | 113 - .../fineract/data/models/customer/Address.kt | 15 ++ .../fineract/data/models/customer/Command.java | 65 - .../fineract/data/models/customer/Command.kt | 28 +++ .../data/models/customer/ContactDetail.java| 117 - .../fineract/data/models/customer/ContactDetail.kt | 37 +++ .../fineract/data/models/customer/Country.java | 44 .../fineract/data/models/customer/Country.kt | 14 ++ .../fineract/data/models/customer/Customer.java| 266 - .../fineract/data/models/customer/Customer.kt | 53 .../data/models/customer/CustomerPage.java | 38 --- .../fineract/data/models/customer/CustomerPage.kt | 9 + .../fineract/data/models/customer/DateOfBirth.java | 70 -- .../fineract/data/models/customer/DateOfBirth.kt | 12 + .../data/models/customer/Translations.java | 15 -- .../fineract/data/models/customer/Translations.kt | 15 ++ .../customer/identification/ExpirationDate.java| 75 -- .../customer/identification/ExpirationDate.kt | 16 ++ .../customer/identification/Identification.java| 150 .../customer/identification/Identification.kt | 22 ++ .../models/customer/identification/ScanCard.java | 67 -- .../models/customer/identification/ScanCard.kt | 16 ++ .../fineract/data/models/deposit/Charge.java | 78 -- .../apache/fineract/data/models/deposit/Charge.kt | 12 + .../fineract/data/models/deposit/Currency.java | 45 .../fineract/data/models/deposit/Currency.kt | 10 + .../data/models/deposit/DepositAccount.java| 133 --- .../fineract/data/models/deposit/DepositAccount.kt | 45 .../data/models/deposit/InterestPayable.java | 13 - .../data/models/deposit/InterestPayable.kt | 13 + .../data/models/deposit/ProductDefinition.java | 146 --- .../data/models/deposit/ProductDefinition.kt | 30 +++ .../apache/fineract/data/models/deposit/Term.java | 43 .../apache/fineract/data/models/deposit/Term.kt| 34 +++ .../fineract/data/models/deposit/TimeUnit.java | 9 - .../fineract/data/models/deposit/TimeUnit.kt | 9 + .../apache/fineract/data/models/deposit/Type.java | 11 - .../apache/fineract/data/models/deposit/Type.kt| 11 + .../fineract/data/models/error/MifosError.java | 107 - .../fineract/data/models/error/MifosError.kt | 20 ++ .../data/models/loan/AccountAssignment.java| 45 .../fineract/data/models/loan/AccountAssignment.kt | 13 + .../data/models/loan/CreditWorthinessFactor.java | 64 - .../data/models/loan/CreditWorthinessFactor.kt | 16 ++ .../data/models/loan/CreditWorthinessSnapshot.java | 94 .../data/models/loan/CreditWorthinessSnapshot.kt | 21 ++ .../fineract/data/models/loan/LoanAccount.java | 136 --- .../fineract/data/models/loan/LoanAccount.kt | 64 + .../fineract/data/models/loan/LoanAccountPage.java | 52 .../fineract/data/models/loan/LoanAccountPage.kt | 14 ++ .../fineract/data/models/loan/LoanParameters.java | 69 -- .../fineract/data/models/loan/LoanParameters.kt| 17 ++ .../fineract/data/models/loan/PaymentCycle.java| 55 - .../fineract/data/models/loan/PaymentCycle.kt | 16 ++ .../fineract/data/models/loan/TermRange.java | 32 --- .../apache/fineract/data/models/loan/TermRange.kt | 12 + .../fineract/data/models/payment/ChargeName.java | 28 --- .../fineract/data/models/payment/ChargeName.kt | 13 + .../data/models/payment/CostComponent.java | 28 --- .../fineract/data/models/payment/CostComponent.kt | 13 + .../data/models/payment/PlannedPayment.java| 49 .../fineract/data/models/payment/PlannedPayment.kt | 15 ++ .../data/models/payment/PlannedPaymentPage.java| 50 .../data/models/payment/PlannedPaymentPage.kt | 15 ++ .../fineract/data/models/prod
[fineract-cn-mobile] branch development updated: docs: Update Readme
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 85dcc5a docs: Update Readme 85dcc5a is described below commit 85dcc5a060d60999779b4fa46bb63771a9e8deda Author: dilpreet96 AuthorDate: Mon May 7 23:46:37 2018 +0530 docs: Update Readme --- COMMIT_STYLE.md | 42 + CONTRIBUTING.md | 72 + README.md | 25 +--- 3 files changed, 136 insertions(+), 3 deletions(-) diff --git a/COMMIT_STYLE.md b/COMMIT_STYLE.md new file mode 100644 index 000..13598a9 --- /dev/null +++ b/COMMIT_STYLE.md @@ -0,0 +1,42 @@ +# Git Commit Message Style Guide + +## Commit Messages + +### Message Structure +A commit messages consists of three distinct parts separated by a blank line: the title, an optional body and an optional footer. The layout looks like this: + +type: subject + +body + +footer + +*** + +The title consists of the type of the message and subject. + +### The Type +The type is contained within the title and can be one of these types: + +* **feat:** a new feature +* **fix:** a bug fix +* **docs:** changes to documentation +* **style:** formatting, missing semi colons, etc; no code change +* **refactor:** refactoring production code +* **test:** adding tests, refactoring test; no production code change +* **chore:** updating build tasks, package manager configs, etc; no production code change + +### The Subject +Subjects should be no greater than 50 characters, should begin with a capital letter and do not end with a period. + +Use an imperative tone to describe what a commit does, rather than what it did. For example, use change; not changed or changes. + +### The Body +Not all commits are complex enough to warrant a body, therefore it is optional and only used when a commit requires a bit of explanation and context. Use the body to explain the what and why of a commit, not the how. + +When writing a body, the blank line between the title and the body is required and you should limit the length of each line to no more than 72 characters. + +### The Footer +The footer is optional and is used to reference issue tracker IDs. + +*** \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000..b6aecd4 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,72 @@ +# Contribute to Apache Fineract CN Android Client + +This guide details how to use issues and pull requests to improve Apache Fineract CN Android Client. + +## Configure remotes + +When a repository is cloned, it has a default remote called `origin` that points to your fork on GitHub, not the original repository it was forked from. To keep track of the original repository, you should add another remote named `upstream`: + +The easiest way is to use the https url: + +`git remote add upstream https://github.com/apache/fineract-cn-mobile.git` + +or if you have ssh set up you can use that url instead: + +`git remote add upstream g...@github.com:apache/fineract-cn-mobile.git` + +### Issue tracker guidelines + +**[Search](https://github.com/apache/fineract-cn-mobile/search?q=&ref=cmdform&type=Issues)** for similar entries before submitting your own, there's a good chance somebody else had the same issue or feature request. Show your support with `:+1:` and/or join the discussion. Please submit issues in the following format and feature requests in a similar format: + +1. **Summary:** Summarize your issue in one sentence (what goes wrong, what did you expect to happen) +2. **Steps to reproduce:** How can we reproduce the issue? +3. **Expected behavior:** What did you expect the app to do? +4. **Observed behavior:** What did you see instead? Describe your issue in detail here. +5. **Device and Android version:** What make and model device (e.g., Samsung Galaxy S3) did you encounter this on? What Android version (e.g., Android 4.0 Ice Cream Sandwich) are you running? Is it the stock version from the manufacturer or a custom ROM? +5. **Screenshots:** Can be created by pressing the Volume Down and Power Button at the same time on Android 4.0 and higher. +6. **Possible fixes**: If you can, link to the line of code that might be responsible for the problem. + +## Pull requests + +We welcome pull requests with fixes and improvements to Self-Service Android Application code, tests, and/or documentation. The features we would really like a pull request for are [open issues with the enhancements label](https://github.com/openMF/self-service-app/issues?labels=enhancement&page=1&state=open). + +### Pull request guidelines + +If you can, please submit a pull request with the fix or improvements including tests. + +* Fork the project on GitHub +* Cr
