Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

add functionality of search view close using back button #160

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

add functionality of search view close using back button #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/src/main/java/org/apache/fineract/ui/base/FineractBaseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.SearchView;
import androidx.fragment.app.Fragment;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
Expand All @@ -18,6 +19,7 @@ public class FineractBaseFragment extends Fragment {
private BaseActivityCallback callback;
private ProgressBarHandler progressBarHandler;
private FineractUIErrorHandler fineractUIErrorHandler;
public SearchView baseSearchView;

@Override
public void onCreate(Bundle savedInstanceState) {
Expand Down Expand Up @@ -94,4 +96,8 @@ public void onDetach() {
callback = null;
}

public void closeSearchView() {
baseSearchView.setIconified(true);
}

}
50 changes: 41 additions & 9 deletions app/src/main/java/org/apache/fineract/ui/online/DashboardActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.fineract.data.local.PreferencesHelper;
import org.apache.fineract.jobs.StartSyncJob;
import org.apache.fineract.ui.base.FineractBaseActivity;
import org.apache.fineract.ui.base.FineractBaseFragment;
import org.apache.fineract.ui.base.Toaster;
import org.apache.fineract.ui.offline.CustomerPayloadFragment;
import org.apache.fineract.ui.online.accounting.ledgers.LedgerFragment;
Expand Down Expand Up @@ -60,6 +61,8 @@ public class DashboardActivity extends FineractBaseActivity implements

private boolean isBackPressedOnce = false;

private FineractBaseFragment baseFragment;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand All @@ -77,6 +80,10 @@ protected void onCreate(Bundle savedInstanceState) {
}
}

public void assignBaseFragment(FineractBaseFragment baseFragment) {
this.baseFragment = baseFragment;
}

public void setupNavigationBar() {
navigationView.setNavigationItemSelectedListener(this);

Expand Down Expand Up @@ -112,36 +119,54 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {

switch (item.getItemId()) {
case R.id.item_dashboard:
replaceFragment(DashboardFragment.newInstance(), true, R.id.container);
DashboardFragment dashboardFragment = DashboardFragment.newInstance();
replaceFragment(dashboardFragment, true, R.id.container);
assignBaseFragment(dashboardFragment.newInstance());
break;
case R.id.item_roles:
replaceFragment(RolesFragment.newInstance(), true, R.id.container);
RolesFragment rolesFragment = RolesFragment.newInstance();
replaceFragment(rolesFragment, true, R.id.container);
assignBaseFragment(rolesFragment);
break;
case R.id.item_customer:
replaceFragment(CustomersFragment.newInstance(), true, R.id.container);
CustomersFragment customersFragment = CustomersFragment.newInstance();
replaceFragment(customersFragment, true, R.id.container);
assignBaseFragment(customersFragment);
break;
case R.id.item_customer_payload:
replaceFragment(CustomerPayloadFragment.newInstance(), true,
CustomerPayloadFragment payloadFragment =
CustomerPayloadFragment.newInstance();
replaceFragment(payloadFragment, true,
R.id.container);
break;
case R.id.item_product:
replaceFragment(ProductFragment.Companion.newInstance(), true,
ProductFragment productFragment = ProductFragment.Companion.newInstance();
replaceFragment(productFragment, true,
R.id.container);
assignBaseFragment(productFragment);
break;
case R.id.item_logout:
logout();
break;
case R.id.item_ledger:
replaceFragment(LedgerFragment.Companion.newInstance(), true, R.id.container);
LedgerFragment ledgerFragment = LedgerFragment.Companion.newInstance();
replaceFragment(ledgerFragment, true, R.id.container);
assignBaseFragment(ledgerFragment);
break;
case R.id.item_accounts:
replaceFragment(AccountsFragment.Companion.newInstance(), true, R.id.container);
AccountsFragment accountsFragment = AccountsFragment.Companion.newInstance();
replaceFragment(accountsFragment, true, R.id.container);
assignBaseFragment(accountsFragment);
break;
case R.id.item_teller:
replaceFragment(TellerFragment.Companion.newInstance(), true, R.id.container);
TellerFragment tellerFragment = TellerFragment.Companion.newInstance();
replaceFragment(tellerFragment, true, R.id.container);
assignBaseFragment(tellerFragment);
break;
case R.id.item_groups:
replaceFragment(GroupListFragment.Companion.newInstance(), true, R.id.container);
GroupListFragment groupListFragment = GroupListFragment.Companion.newInstance();
replaceFragment(groupListFragment, true, R.id.container);
assignBaseFragment(groupListFragment);
}

drawerLayout.closeDrawer(GravityCompat.START);
Expand All @@ -151,6 +176,13 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {

@Override
public void onBackPressed() {
if (baseFragment != null &&
baseFragment.baseSearchView != null &&
!baseFragment.baseSearchView.isIconified()) {
baseFragment.closeSearchView();
return;
}

if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
drawerLayout.closeDrawer(GravityCompat.START);
return;
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/apache/fineract/ui/online/accounting/accounts/AccountsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ class AccountsFragment : FineractBaseFragment(), AccountContract.View, SwipeRefr
}
})

baseSearchView = searchView
}

override fun searchedAccount(accounts: List<Account>) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/apache/fineract/ui/online/accounting/ledgers/LedgerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class LedgerFragment : FineractBaseFragment(), LedgerContract.View,
}
})

baseSearchView = searchView
}

override fun searchedLedger(ledgers: List<Ledger>) {
Expand Down
2 changes: 2 additions & 0 deletions ...src/main/java/org/apache/fineract/ui/online/customers/customerlist/CustomersFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@ public boolean onClose() {
return false;
}
});

baseSearchView = searchView;
}

private void findCustomer(String query) {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/org/apache/fineract/ui/online/dashboard/DashboardFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
@OnClick(R.id.btn_view_customer)
void viewCustomer() {
((DashboardActivity) getActivity()).setNavigationViewSelectedItem(R.id.item_customer);
((DashboardActivity) getActivity()).replaceFragment(CustomersFragment.newInstance(),
CustomersFragment customersFragment = CustomersFragment.newInstance();
((DashboardActivity) getActivity()).replaceFragment(customersFragment,
true,
R.id.container);
((DashboardActivity) getActivity()).assignBaseFragment(customersFragment);
}

@OnClick(R.id.btn_create_customer)
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/org/apache/fineract/ui/online/groups/grouplist/GroupListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ class GroupListFragment : FineractBaseFragment(), OnItemClickListener {
return true
}
})

baseSearchView = searchView
}

override fun onItemClick(childView: View?, position: Int) {
Expand Down
23 changes: 20 additions & 3 deletions .../apache/fineract/ui/online/identification/identificationlist/IdentificationsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import org.apache.fineract.R;
import org.apache.fineract.ui.base.FineractBaseActivity;
import org.apache.fineract.ui.base.FineractBaseFragment;
import org.apache.fineract.utils.ConstantKeys;

/**
Expand All @@ -13,17 +14,33 @@

public class IdentificationsActivity extends FineractBaseActivity {

private FineractBaseFragment baseFragment;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar_container);

String identifier = getIntent().getExtras().getString(ConstantKeys.CUSTOMER_IDENTIFIER);
IdentificationsFragment identificationsFragment =
IdentificationsFragment.newInstance(identifier);
replaceFragment(identificationsFragment, false, R.id.container);
assignBaseFragment(identificationsFragment);

replaceFragment(IdentificationsFragment.newInstance(identifier), false,
R.id.container);
showBackButton();
}

private void assignBaseFragment(FineractBaseFragment baseFragment) {
this.baseFragment = baseFragment;
}

showBackButton();
@Override
public void onBackPressed() {
if (baseFragment.baseSearchView != null &&
!baseFragment.baseSearchView.isIconified()) {
baseFragment.closeSearchView();
return;
}
super.onBackPressed();
}
}
1 change: 1 addition & 0 deletions .../apache/fineract/ui/online/identification/identificationlist/IdentificationsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ public boolean onQueryTextChange(String newText) {
}
});

baseSearchView = searchView;
}

@Override
Expand Down
21 changes: 20 additions & 1 deletion ...java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import org.apache.fineract.R;
import org.apache.fineract.ui.base.FineractBaseActivity;
import org.apache.fineract.ui.base.FineractBaseFragment;
import org.apache.fineract.utils.ConstantKeys;

/**
Expand All @@ -12,14 +13,32 @@
*/
public class LoanAccountsActivity extends FineractBaseActivity {

private FineractBaseFragment baseFragment;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_toolbar_container);

String identifier = getIntent().getExtras().getString(ConstantKeys.CUSTOMER_IDENTIFIER);
replaceFragment(LoanAccountsFragment.newInstance(identifier), false, R.id.container);
LoanAccountsFragment loanAccountsFragment = LoanAccountsFragment.newInstance(identifier);
replaceFragment(loanAccountsFragment, false, R.id.container);
assignBaseFragment(loanAccountsFragment);

showBackButton();
}

private void assignBaseFragment(FineractBaseFragment baseFragment) {
this.baseFragment = baseFragment;
}

@Override
public void onBackPressed() {
if (baseFragment.baseSearchView != null &&
!baseFragment.baseSearchView.isIconified()) {
baseFragment.closeSearchView();
return;
}
super.onBackPressed();
}
}
1 change: 1 addition & 0 deletions ...java/org/apache/fineract/ui/online/loanaccounts/loanaccountlist/LoanAccountsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ public boolean onQueryTextChange(String newText) {
}
});

baseSearchView = searchView;
}

@Override
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/apache/fineract/ui/online/teller/TellerFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ class TellerFragment : FineractBaseFragment(), TellerContract.View, SwipeRefresh
}
})

baseSearchView = searchView
}

override fun searchedTeller(tellers: List<Teller>) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/apache/fineract/ui/product/ProductFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ class ProductFragment : FineractBaseFragment(), ProductContract.View,
}
})

baseSearchView = searchView
}

override fun showEmptyProduct() {
Expand Down