Skip to content

Fix: Improve spacing and styling for 'Try Indexed Search' button #4388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: release/4.0
Choose a base branch
from
Open

Fix: Improve spacing and styling for 'Try Indexed Search' button #4388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b8c023
Fix: Improve spacing and styling for 'Try Indexed Search' button
ajay020 Apr 15, 2025
c73581f
Fix: revert accidental formatting changes and adjusted button padding…
ajay020 Apr 19, 2025
331b246
Fixed UI alignment: placed text and button at opposite ends, adjusted…
ajay020 Apr 22, 2025
c565f6c
adjusted button padding with text try indexed search
ajay020 Apr 22, 2025
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
32 changes: 13 additions & 19 deletions app/src/main/java/com/amaze/filemanager/ui/views/appbar/SearchView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
import android.widget.Toast;

import androidx.appcompat.widget.AppCompatButton;
Expand Down Expand Up @@ -99,7 +100,8 @@ public class SearchView {

private final AppCompatTextView recentHintTV;
private final AppCompatTextView searchResultsHintTV;
private final AppCompatTextView deepSearchTV;
private final AppCompatButton deepSearchButton;
private final LinearLayout deepSearchContainer;

private final ChipGroup recentChipGroup;
private final RecyclerView recyclerView;
Expand Down Expand Up @@ -143,7 +145,8 @@ public SearchView(final AppBar appbar, MainActivity mainActivity) {
recentChipGroup = mainActivity.findViewById(R.id.searchRecentItemsChipGroup);
recentHintTV = mainActivity.findViewById(R.id.searchRecentHintTV);
searchResultsHintTV = mainActivity.findViewById(R.id.searchResultsHintTV);
deepSearchTV = mainActivity.findViewById(R.id.searchDeepSearchTV);
deepSearchButton = mainActivity.findViewById(R.id.tryDeepSearchButton);
deepSearchContainer = mainActivity.findViewById(R.id.deepSearchContainer);
recyclerView = mainActivity.findViewById(R.id.searchRecyclerView);
searchResultsSortHintTV = mainActivity.findViewById(R.id.searchResultsSortHintTV);
searchResultsSortButton = mainActivity.findViewById(R.id.searchResultsSortButton);
Expand Down Expand Up @@ -205,7 +208,7 @@ public void afterTextChanged(Editable s) {}
return false;
});

deepSearchTV.setOnClickListener(
deepSearchButton.setOnClickListener(
v -> {
String s = getSearchTerm();

Expand All @@ -225,10 +228,7 @@ public void afterTextChanged(Editable s) {}

searchMode = 2;

deepSearchTV.setText(
getSpannableText(
mainActivity.getString(R.string.not_finding_what_you_re_looking_for),
mainActivity.getString(R.string.try_deep_search)));
deepSearchButton.setText(mainActivity.getString(R.string.try_deep_search));

} else if (searchMode == 2) {

Expand All @@ -240,7 +240,7 @@ public void afterTextChanged(Editable s) {}
mainActivity.getCurrentMainFragment().getViewLifecycleOwner(),
hybridFileParcelables -> updateResultList(hybridFileParcelables, s));

deepSearchTV.setVisibility(View.GONE);
deepSearchContainer.setVisibility(View.GONE);
}
});

Expand Down Expand Up @@ -272,12 +272,9 @@ private void basicSearch(String s) {
searchResultsHintTV.setVisibility(View.VISIBLE);
searchResultsSortButton.setVisibility(View.VISIBLE);
searchResultsSortHintTV.setVisibility(View.VISIBLE);
deepSearchTV.setVisibility(View.VISIBLE);
deepSearchContainer.setVisibility(View.VISIBLE);
searchMode = 1;
deepSearchTV.setText(
getSpannableText(
mainActivity.getString(R.string.not_finding_what_you_re_looking_for),
mainActivity.getString(R.string.try_indexed_search)));
deepSearchButton.setText(mainActivity.getString(R.string.try_indexed_search));

mainActivity
.getCurrentMainFragment()
Expand Down Expand Up @@ -356,11 +353,8 @@ private void initRecentSearches(Context context) {

private void resetSearchMode() {
searchMode = 0;
deepSearchTV.setText(
getSpannableText(
mainActivity.getString(R.string.not_finding_what_you_re_looking_for),
mainActivity.getString(R.string.try_indexed_search)));
deepSearchTV.setVisibility(View.GONE);
deepSearchButton.setText(mainActivity.getString(R.string.try_indexed_search));
deepSearchContainer.setVisibility(View.GONE);
}

/**
Expand Down Expand Up @@ -616,7 +610,7 @@ private void initSearchViewColor(MainActivity a) {
private void clearRecyclerView() {
searchRecyclerViewAdapter.submitList(Collections.emptyList());

deepSearchTV.setVisibility(View.GONE);
deepSearchContainer.setVisibility(View.GONE);

searchResultsHintTV.setVisibility(View.GONE);
searchResultsSortHintTV.setVisibility(View.GONE);
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/button_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@android:color/transparent" />
<stroke
android:width="1dp"
android:color="@color/primary_pink" />
<corners android:radius="24dp" />
<padding
android:bottom="4dp"
android:left="2dp"
android:right="2dp"
android:top="4dp" />
</shape>
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/ripple_button_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">

<!-- This item defines the ripple mask shape -->
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="#FFFFFF" />
<corners android:radius="24dp" />
</shape>
</item>

<item android:drawable="@drawable/button_background" />
</ripple>
67 changes: 44 additions & 23 deletions app/src/main/res/layout-v21/layout_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:scrollbars="none"
app:layout_constraintBottom_toTopOf="@id/searchDeepSearchTV"
app:layout_constraintBottom_toTopOf="@+id/deepSearchContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchRecentHintTV">
Expand All @@ -97,27 +97,48 @@
android:layout_marginStart="8dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
app:chipSpacing="4dp"
app:singleLine="true" />

</HorizontalScrollView>

<TextView
android:id="@+id/searchDeepSearchTV"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/deepSearchContainer"
Copy link
Member

@VishnuSanal VishnuSanal Apr 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would prefer the same behaviour from the tablet layout here too.

i.e, to make the whole container fill width, and align both notFindingTextView & tryDeepSearchButton at both ends where the remaining space is filled. i.e, to right-align tryDeepSearchButton.

but that's personal preference. let's wait for other maintainers to chime in :)

android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="8dp"
android:textSize="16sp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingVertical="12dp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/searchResultsHintTV"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView" />
app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView">

<TextView
android:id="@+id/notFindingTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.4"
android:text="@string/not_finding_what_you_re_looking_for"
android:textSize="15sp" />

<androidx.appcompat.widget.AppCompatButton
android:id="@+id/tryDeepSearchButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.6"
android:padding="1dp"
android:background="@drawable/ripple_button_background"
android:text="@string/try_indexed_search"
android:textAllCaps="false"
android:textColor="@color/primary_pink"
android:textSize="14sp" />

</LinearLayout>

<TextView
android:id="@+id/searchResultsHintTV"
Expand All @@ -134,7 +155,7 @@
app:layout_constraintEnd_toStartOf="@+id/searchResultsSortHintTV"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV" />
app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />

<TextView
android:id="@+id/searchResultsSortHintTV"
Expand All @@ -148,27 +169,27 @@
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/searchRecyclerView"
app:layout_constraintEnd_toStartOf="@+id/searchResultsSortButton"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@+id/searchResultsHintTV"
app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
app:layout_constraintHorizontal_bias="1" />
app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />

<Button
android:id="@+id/searchResultsSortButton"
style="@style/SearchSortButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:textColor="@color/accent_material_light"
android:textSize="12sp"
android:visibility="gone"
android:minHeight="0dp"
android:minWidth="0dp"
app:layout_constraintBottom_toTopOf="@+id/searchRecyclerView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
app:layout_constraintHorizontal_bias="1"
style="@style/SearchSortButton" />
app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/searchRecyclerView"
Expand All @@ -179,7 +200,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchResultsHintTV" />
app:layout_constraintTop_toBottomOf="@+id/searchResultsHintTV" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
75 changes: 49 additions & 26 deletions app/src/main/res/layout-w720dp/layout_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
app:layout_constraintTop_toTopOf="@id/search_edit_text"
app:srcCompat="@drawable/ic_close_black_24dp" />

<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/searchRecentHintTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -83,7 +83,7 @@
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:scrollbars="none"
app:layout_constraintBottom_toTopOf="@id/searchDeepSearchTV"
app:layout_constraintBottom_toTopOf="@+id/deepSearchContainer"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchRecentHintTV">
Expand All @@ -101,23 +101,46 @@

</HorizontalScrollView>

<TextView
android:id="@+id/searchDeepSearchTV"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/deepSearchContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="8dp"
android:textSize="16sp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/searchResultsHintTV"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0"
android:paddingVertical="16dp"
android:paddingHorizontal="12dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView" />
app:layout_constraintTop_toBottomOf="@id/searchRecentItemsScrollView">

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/notFindingTextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/not_finding_what_you_re_looking_for"
android:textSize="18sp" />

<TextView
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/tryDeepSearchButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="false"
android:textSize="16sp"
android:padding="8dp"
android:background="@drawable/button_background"
android:text="@string/try_indexed_search"
android:textColor="@color/primary_pink" />


</LinearLayout>

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/searchResultsHintTV"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -132,9 +155,9 @@
app:layout_constraintEnd_toStartOf="@+id/searchResultsSortHintTV"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV" />
app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />

<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/searchResultsSortHintTV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -146,27 +169,27 @@
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/searchRecyclerView"
app:layout_constraintEnd_toStartOf="@+id/searchResultsSortButton"
app:layout_constraintHorizontal_bias="1"
app:layout_constraintStart_toEndOf="@+id/searchResultsHintTV"
app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
app:layout_constraintHorizontal_bias="1" />
app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />

<Button
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/searchResultsSortButton"
style="@style/SearchSortButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:textColor="@color/accent_material_light"
android:textSize="12sp"
android:visibility="gone"
android:minHeight="0dp"
android:minWidth="0dp"
app:layout_constraintBottom_toTopOf="@+id/searchRecyclerView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
app:layout_constraintTop_toBottomOf="@id/searchDeepSearchTV"
app:layout_constraintHorizontal_bias="1"
style="@style/SearchSortButton" />
app:layout_constraintStart_toEndOf="@+id/searchResultsSortHintTV"
app:layout_constraintTop_toBottomOf="@+id/deepSearchContainer" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/searchRecyclerView"
Expand All @@ -176,7 +199,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/searchResultsHintTV" />
app:layout_constraintTop_toBottomOf="@+id/searchResultsHintTV" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>
Loading
Loading