diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/AppDatabase.java b/Android/app/src/main/java/com/majinnaibu/monstercards/AppDatabase.java index 3d21f3f..1d50723 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/AppDatabase.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/AppDatabase.java @@ -14,9 +14,10 @@ import com.majinnaibu.monstercards.data.converters.SetOfStringConverter; import com.majinnaibu.monstercards.data.converters.SetOfTraitConverter; import com.majinnaibu.monstercards.data.converters.UUIDConverter; import com.majinnaibu.monstercards.models.Monster; +import com.majinnaibu.monstercards.models.MonsterFTS; @SuppressWarnings("unused") -@Database(entities = {Monster.class}, version = 1) +@Database(entities = {Monster.class, MonsterFTS.class}, version = 2) @TypeConverters({ ArmorTypeConverter.class, ChallengeRatingConverter.class, diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java b/Android/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java index 62d1c02..eea208e 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/MonsterCardsApplication.java @@ -4,8 +4,19 @@ import android.app.Application; import android.content.Context; import android.content.res.Configuration; +import androidx.annotation.NonNull; import androidx.room.Room; +import androidx.room.migration.Migration; +import androidx.sqlite.db.SupportSQLiteDatabase; +import com.facebook.flipper.android.AndroidFlipperClient; +import com.facebook.flipper.android.utils.FlipperUtils; +import com.facebook.flipper.core.FlipperClient; +import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin; +import com.facebook.flipper.plugins.inspector.DescriptorMapping; +import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin; +import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin; +import com.facebook.soloader.SoLoader; import com.majinnaibu.monstercards.data.MonsterRepository; public class MonsterCardsApplication extends Application { @@ -31,8 +42,20 @@ public class MonsterCardsApplication extends Application { public void onCreate() { super.onCreate(); // Required initialization logic here! + SoLoader.init(this, false); - m_db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "monsters").build(); + if (BuildConfig.DEBUG && FlipperUtils.shouldEnableFlipper(this)) { + final FlipperClient client = AndroidFlipperClient.getInstance(this); + client.addPlugin(new InspectorFlipperPlugin(this, DescriptorMapping.withDefaults())); + client.addPlugin(new DatabasesFlipperPlugin(this)); + client.addPlugin(NavigationFlipperPlugin.getInstance()); + client.start(); + } + + m_db = Room.databaseBuilder(getApplicationContext(), AppDatabase.class, "monsters") + .addMigrations(MIGRATION_1_2) + .fallbackToDestructiveMigrationOnDowngrade() + .build(); m_monsterLibraryRepository = new MonsterRepository(m_db); } @@ -50,4 +73,17 @@ public class MonsterCardsApplication extends Application { public void onLowMemory() { super.onLowMemory(); } + + private static final Migration MIGRATION_1_2 = new Migration(1, 2) { + @Override + public void migrate(@NonNull SupportSQLiteDatabase database) { + // rename table monster to monsters + database.execSQL("ALTER TABLE monster RENAME TO monsters"); + // create the fts view + database.execSQL("CREATE VIRTUAL TABLE IF NOT EXISTS `monsters_fts` USING FTS4(`name` TEXT, `size` TEXT, `type` TEXT, `subtype` TEXT, `alignment` TEXT, content=`monsters`)"); + // build the initial full text search index + database.execSQL("INSERT INTO monsters_fts(monsters_fts) VALUES('rebuild')"); + + } + }; } diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterDAO.java b/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterDAO.java index 5295e92..a622683 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterDAO.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterDAO.java @@ -15,15 +15,18 @@ import io.reactivex.rxjava3.core.Flowable; @Dao public interface MonsterDAO { - @Query("SELECT * FROM monster") + @Query("SELECT * FROM monsters") Flowable> getAll(); - @Query("SELECT * FROM monster WHERE id IN (:monsterIds)") + @Query("SELECT * FROM monsters WHERE id IN (:monsterIds)") Flowable> loadAllByIds(String[] monsterIds); - @Query("SELECT * FROM monster WHERE name LIKE :name LIMIT 1") + @Query("SELECT * FROM monsters WHERE name LIKE :name LIMIT 1") Flowable findByName(String name); + @Query("SELECT monsters.* FROM monsters JOIN monsters_fts ON monsters.oid = monsters_fts.docid WHERE monsters_fts MATCH :searchText") + Flowable> search(String searchText); + @Insert Completable insertAll(Monster... monsters); diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java b/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java index 83a1660..56383bf 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/data/MonsterRepository.java @@ -29,6 +29,13 @@ public class MonsterRepository { .observeOn(AndroidSchedulers.mainThread()); } + public Flowable> searchMonsters(String searchText) { + return m_db.monsterDAO() + .search(searchText) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()); + } + public Flowable getMonster(UUID monsterId) { return m_db.monsterDAO() .loadAllByIds(new String[]{monsterId.toString()}) diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java b/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java index 630f0ea..1634d28 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/models/Monster.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; -@Entity +@Entity(tableName = "monsters") @SuppressLint("DefaultLocale") @SuppressWarnings("unused") public class Monster { diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java index ce42921..b25276c 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchFragment.java @@ -1,47 +1,55 @@ package com.majinnaibu.monstercards.ui.search; import android.os.Bundle; +import android.text.Editable; +import android.text.TextWatcher; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.Button; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Observer; -import androidx.lifecycle.ViewModelProviders; -import androidx.navigation.NavDirections; -import androidx.navigation.Navigation; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.majinnaibu.monstercards.R; +import com.majinnaibu.monstercards.data.MonsterRepository; +import com.majinnaibu.monstercards.ui.MCFragment; -public class SearchFragment extends Fragment { +public class SearchFragment extends MCFragment { private SearchViewModel searchViewModel; public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - searchViewModel = - ViewModelProviders.of(this).get(SearchViewModel.class); View root = inflater.inflate(R.layout.fragment_search, container, false); + MonsterRepository repository = this.getMonsterRepository(); + SearchResultsRecyclerViewAdapter adapter = new SearchResultsRecyclerViewAdapter(repository, null); + final RecyclerView recyclerView = root.findViewById(R.id.monster_list); + assert recyclerView != null; + setupRecyclerView(recyclerView, adapter); + final TextView textView = root.findViewById(R.id.search_query); - searchViewModel.getSearchQuery().observe(getViewLifecycleOwner(), new Observer() { + textView.addTextChangedListener(new TextWatcher() { @Override - public void onChanged(@Nullable String s) { - textView.setText(s); + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + } + + @Override + public void afterTextChanged(Editable editable) { + adapter.doSearch(textView.getText().toString()); } }); - final Button btnSearch = root.findViewById(R.id.button_search); - btnSearch.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - NavDirections action = SearchFragmentDirections.actionNavigationSearchToNavigationMonster(); - Navigation.findNavController(view).navigate(action); - } - }); return root; } + + private void setupRecyclerView(@NonNull RecyclerView recyclerView, @NonNull SearchResultsRecyclerViewAdapter adapter) { + recyclerView.setAdapter(adapter); + recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); + } } diff --git a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java index 93c546a..c437486 100644 --- a/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java +++ b/Android/app/src/main/java/com/majinnaibu/monstercards/ui/search/SearchResultsRecyclerViewAdapter.java @@ -20,11 +20,15 @@ import io.reactivex.rxjava3.core.Flowable; import io.reactivex.rxjava3.disposables.Disposable; public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter { + public interface ItemCallback { + void onItem(Monster monster); + } + private final MonsterRepository mRepository; - private final ItemCallback mOnClickHandler; private String mSearchText; private List mValues; private Disposable mSubscriptionHandler; + private final ItemCallback mOnClickHandler; public SearchResultsRecyclerViewAdapter(MonsterRepository repository, ItemCallback onClick) { @@ -50,7 +54,6 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter Logger.logError("Error performing search", throwable)); } - @NonNull @Override public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { View view = LayoutInflater.from(parent.getContext()) @@ -59,8 +62,9 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter { @@ -75,15 +79,13 @@ public class SearchResultsRecyclerViewAdapter extends RecyclerView.Adapter -