antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 17:43:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fixed search functionality

Browse source
This commit is contained in:
antonio 2023-07-18 10:37:17 +02:00
parent 260e6e9daa
commit 560ac2df68
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/cappielloantonio/tempo/database/dao/RecentSearchDao.java
View file

@ -12,7 +12,7 @@ import java.util.List;
@Dao @Dao
public interface RecentSearchDao { public interface RecentSearchDao {
@Query("SELECT * FROM recent_search ORDER BY search ASC") @Query("SELECT * FROM recent_search ORDER BY search DESC")
List<String> getRecent(); List<String> getRecent();
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)

4
app/src/main/java/com/cappielloantonio/tempo/repository/SearchingRepository.java
View file

@ -1,5 +1,7 @@
package com.cappielloantonio.tempo.repository; package com.cappielloantonio.tempo.repository;
import android.util.Log;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
@ -100,6 +102,8 @@ public class SearchingRepository {
LinkedHashSet<String> hashSet = new LinkedHashSet<>(newSuggestions); LinkedHashSet<String> hashSet = new LinkedHashSet<>(newSuggestions);
ArrayList<String> suggestionsWithoutDuplicates = new ArrayList<>(hashSet); ArrayList<String> suggestionsWithoutDuplicates = new ArrayList<>(hashSet);
Log.d("suggestionsWithoutDuplicates", suggestionsWithoutDuplicates.toString());
suggestions.setValue(suggestionsWithoutDuplicates); suggestions.setValue(suggestionsWithoutDuplicates);
} }
} }

16
app/src/main/java/com/cappielloantonio/tempo/ui/fragment/SearchFragment.java
View file

@ -4,6 +4,7 @@ import android.content.ComponentName;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -121,17 +122,11 @@ public class SearchFragment extends Fragment implements ClickCallback {
bind.searchView bind.searchView
.getEditText() .getEditText()
.setOnEditorActionListener((textView, actionId, keyEvent) -> { .setOnEditorActionListener((textView, actionId, keyEvent) -> {
String query = bind.searchView.getText().toString(); String query = bind.searchView.getText().toString();
if (actionId == EditorInfo.IME_ACTION_DONE) { if (isQueryValid(query)) {
if (isQueryValid(query)) { search(query);
search(bind.searchView.getText().toString()); return true;
return true;
} else {
Toast.makeText(requireContext(), getString(R.string.search_info_minimum_characters), Toast.LENGTH_SHORT).show();
return false;
}
} }
return false; return false;
@ -147,7 +142,7 @@ public class SearchFragment extends Fragment implements ClickCallback {
@Override @Override
public void onTextChanged(CharSequence charSequence, int start, int before, int count) { public void onTextChanged(CharSequence charSequence, int start, int before, int count) {
if (count > 1) { if (start + count > 1) {
setSearchSuggestions(charSequence.toString()); setSearchSuggestions(charSequence.toString());
} else { } else {
setRecentSuggestions(); setRecentSuggestions();
@ -247,6 +242,7 @@ public class SearchFragment extends Fragment implements ClickCallback {
} }
private boolean isQueryValid(String query) { private boolean isQueryValid(String query) {
Log.d(TAG, "isQueryValid()");
return !query.equals("") && query.trim().length() > 2; return !query.equals("") && query.trim().length() > 2;
} }

4
app/src/main/res/layout/item_search_suggestion.xml
View file

@ -36,8 +36,8 @@
<ImageView <ImageView
android:id="@+id/search_suggestion_delete_icon" android:id="@+id/search_suggestion_delete_icon"
android:layout_width="wrap_content" android:layout_width="20dp"
android:layout_height="wrap_content" android:layout_height="20dp"
android:background="?selectableItemBackgroundBorderless" android:background="?selectableItemBackgroundBorderless"
android:src="@drawable/ic_close" android:src="@drawable/ic_close"
app:layout_constraintBottom_toBottomOf="@id/search_suggestion_icon" app:layout_constraintBottom_toBottomOf="@id/search_suggestion_icon"