Added folder search

pull/169/head
M66B 6 years ago
parent 15832792d0
commit 90035b4dd7

@ -839,6 +839,19 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
diff.dispatchUpdatesTo(this); diff.dispatchUpdatesTo(this);
} }
public int search(String query, int result) {
int pos = 0;
if (!TextUtils.isEmpty(query))
for (int i = 0; i < items.size(); i++)
if (items.get(i).getDisplayName(context).toLowerCase().contains(query.toLowerCase())) {
pos = i;
if (--result < 0)
break;
}
return pos;
}
private List<TupleFolderEx> getHierarchical(List<TupleFolderEx> parents, int indentation) { private List<TupleFolderEx> getHierarchical(List<TupleFolderEx> parents, int indentation) {
List<TupleFolderEx> result = new ArrayList<>(); List<TupleFolderEx> result = new ArrayList<>();

@ -22,8 +22,13 @@ package eu.faircode.email;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -37,6 +42,8 @@ import java.util.List;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
public class FragmentDialogFolder extends FragmentDialogBase { public class FragmentDialogFolder extends FragmentDialogBase {
private int result = 0;
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@ -46,11 +53,13 @@ public class FragmentDialogFolder extends FragmentDialogBase {
final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_folder_select, null); final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_folder_select, null);
final TextView tvNoFolder = dview.findViewById(R.id.tvNoFolder); final TextView tvNoFolder = dview.findViewById(R.id.tvNoFolder);
final EditText etSearch = dview.findViewById(R.id.etSearch);
final ImageButton ibNext = dview.findViewById(R.id.ibNext);
final RecyclerView rvFolder = dview.findViewById(R.id.rvFolder); final RecyclerView rvFolder = dview.findViewById(R.id.rvFolder);
final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait); final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
rvFolder.setHasFixedSize(false); rvFolder.setHasFixedSize(false);
LinearLayoutManager llm = new LinearLayoutManager(getContext()); final LinearLayoutManager llm = new LinearLayoutManager(getContext());
rvFolder.setLayoutManager(llm); rvFolder.setLayoutManager(llm);
final AdapterFolder adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(), final AdapterFolder adapter = new AdapterFolder(getContext(), getViewLifecycleOwner(),
@ -67,6 +76,38 @@ public class FragmentDialogFolder extends FragmentDialogBase {
rvFolder.setAdapter(adapter); rvFolder.setAdapter(adapter);
etSearch.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
result = 0;
String query = s.toString().toLowerCase();
int pos = adapter.search(query, result);
llm.scrollToPositionWithOffset(pos, 0);
ibNext.setEnabled(!TextUtils.isEmpty(query));
}
@Override
public void afterTextChanged(Editable s) {
}
});
ibNext.setEnabled(false);
ibNext.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
result++;
String query = etSearch.getText().toString();
int pos = adapter.search(query, result);
llm.scrollToPositionWithOffset(pos, 0);
if (pos == adapter.search(query, result + 1))
result = 0;
}
});
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("account", account); args.putLong("account", account);

@ -2,7 +2,8 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:padding="12dp">
<TextView <TextView
android:id="@+id/tvNoFolder" android:id="@+id/tvNoFolder"
@ -16,16 +17,37 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/etSearch"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:hint="@string/title_search"
app:layout_constraintEnd_toStartOf="@+id/ibNext"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageButton
android:id="@+id/ibNext"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:padding="6dp"
app:layout_constraintBottom_toBottomOf="@+id/etSearch"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/etSearch"
app:srcCompat="@drawable/baseline_fast_forward_24" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvFolder" android:id="@+id/rvFolder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="12dp" android:layout_marginTop="6dp"
android:scrollbarStyle="outsideOverlay" android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical" android:scrollbars="vertical"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/etSearch" />
<eu.faircode.email.ContentLoadingProgressBar <eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/pbWait" android:id="@+id/pbWait"

Loading…
Cancel
Save