Merge pull request #498 from danysantiago/room-2.1.0

Add Fts Usage to BasicSample

Author: ChrisCraik

BasicRxJavaSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

BasicRxJavaSampleKotlin/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

BasicSample/app/build.gradle

@@ -27,6 +27,10 @@ android {
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        vectorDrawables {
+            useSupportLibrary = true
+        }
     }
 
     buildTypes {

BasicSample/app/src/main/java/com/example/android/persistence/DataRepository.java

@@ -55,4 +55,8 @@ public LiveData<ProductEntity> loadProduct(final int productId) {
     public LiveData<List<CommentEntity>> loadComments(final int productId) {
         return mDatabase.commentDao().loadComments(productId);
     }
+
+    public LiveData<List<ProductEntity>> searchProducts(String query) {
+        return mDatabase.productDao().searchAllProducts(query);
+    }
 }

BasicSample/app/src/main/java/com/example/android/persistence/db/AppDatabase.java

@@ -18,6 +18,7 @@
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
+import androidx.room.migration.Migration;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 import androidx.room.Database;
 import androidx.room.Room;
@@ -33,9 +34,10 @@
 import com.example.android.persistence.db.entity.CommentEntity;
 import com.example.android.persistence.db.entity.ProductEntity;
 
+import com.example.android.persistence.db.entity.ProductFtsEntity;
 import java.util.List;
 
-@Database(entities = {ProductEntity.class, CommentEntity.class}, version = 1)
+@Database(entities = {ProductEntity.class, ProductFtsEntity.class, CommentEntity.class}, version = 2)
 @TypeConverters(DateConverter.class)
 public abstract class AppDatabase extends RoomDatabase {
 
@@ -88,7 +90,9 @@ public void onCreate(@NonNull SupportSQLiteDatabase db) {
                             database.setDatabaseCreated();
                         });
                     }
-                }).build();
+                })
+            .addMigrations(MIGRATION_1_2)
+            .build();
     }
 
     /**
@@ -122,4 +126,16 @@ private static void addDelay() {
     public LiveData<Boolean> getDatabaseCreated() {
         return mIsDatabaseCreated;
     }
+
+    private static final Migration MIGRATION_1_2 = new Migration(1, 2) {
+
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE VIRTUAL TABLE IF NOT EXISTS `productsFts` USING FTS4("
+                + "`name` TEXT, `description` TEXT, content=`products`)");
+            database.execSQL("INSERT INTO productsFts (`rowid`, `name`, `description`) "
+                + "SELECT `id`, `name`, `description` FROM products");
+
+        }
+    };
 }

BasicSample/app/src/main/java/com/example/android/persistence/db/dao/ProductDao.java

@@ -38,4 +38,8 @@ public interface ProductDao {
 
     @Query("select * from products where id = :productId")
     ProductEntity loadProductSync(int productId);
+
+    @Query("SELECT products.* FROM products JOIN productsFts ON (products.id = productsFts.rowid) "
+        + "WHERE productsFts MATCH :query")
+    LiveData<List<ProductEntity>> searchAllProducts(String query);
 }

BasicSample/app/src/main/java/com/example/android/persistence/db/entity/ProductFtsEntity.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018, The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.android.persistence.db.entity;
+
+import androidx.room.Entity;
+import androidx.room.Fts4;
+
+@Entity(tableName = "productsFts")
+@Fts4(contentEntity = ProductEntity.class)
+public class ProductFtsEntity {
+  private String name;
+  private String description;
+
+  public ProductFtsEntity(String name, String description) {
+    this.name = name;
+    this.description = description;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+}

BasicSample/app/src/main/java/com/example/android/persistence/ui/ProductAdapter.java

@@ -39,6 +39,7 @@ public class ProductAdapter extends RecyclerView.Adapter<ProductAdapter.ProductV
 
     public ProductAdapter(@Nullable ProductClickCallback clickCallback) {
         mProductClickCallback = clickCallback;
+        setHasStableIds(true);
     }
 
     public void setProductList(final List<? extends Product> productList) {
@@ -98,6 +99,11 @@ public int getItemCount() {
         return mProductList == null ? 0 : mProductList.size();
     }
 
+    @Override
+    public long getItemId(int position) {
+        return mProductList.get(position).getId();
+    }
+
     static class ProductViewHolder extends RecyclerView.ViewHolder {
 
         final ProductItemBinding binding;

BasicSample/app/src/main/java/com/example/android/persistence/ui/ProductListFragment.java

@@ -16,7 +16,10 @@
 
 package com.example.android.persistence.ui;
 
+import android.text.Editable;
+import android.view.View.OnClickListener;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.databinding.DataBindingUtil;
@@ -61,12 +64,24 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         final ProductListViewModel viewModel =
                 ViewModelProviders.of(this).get(ProductListViewModel.class);
 
-        subscribeUi(viewModel);
+        mBinding.productsSearchBtn.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Editable query = mBinding.productsSearchBox.getText();
+                if (query == null || query.toString().isEmpty()) {
+                    subscribeUi(viewModel.getProducts());
+                } else {
+                    subscribeUi(viewModel.searchProducts("*" + query + "*"));
+                }
+            }
+        });
+
+        subscribeUi(viewModel.getProducts());
     }
 
-    private void subscribeUi(ProductListViewModel viewModel) {
+    private void subscribeUi(LiveData<List<ProductEntity>> liveData) {
         // Update the list when the data changes
-        viewModel.getProducts().observe(this, new Observer<List<ProductEntity>>() {
+        liveData.observe(this, new Observer<List<ProductEntity>>() {
             @Override
             public void onChanged(@Nullable List<ProductEntity> myProducts) {
                 if (myProducts != null) {

BasicSample/app/src/main/java/com/example/android/persistence/viewmodel/ProductListViewModel.java

@@ -20,14 +20,15 @@
 import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MediatorLiveData;
-
 import com.example.android.persistence.BasicApp;
+import com.example.android.persistence.DataRepository;
 import com.example.android.persistence.db.entity.ProductEntity;
-
 import java.util.List;
 
 public class ProductListViewModel extends AndroidViewModel {
 
+    private final DataRepository mRepository;
+
     // MediatorLiveData can observe other LiveData objects and react on their emissions.
     private final MediatorLiveData<List<ProductEntity>> mObservableProducts;
 
@@ -38,8 +39,8 @@ public ProductListViewModel(Application application) {
         // set by default null, until we get data from the database.
         mObservableProducts.setValue(null);
 
-        LiveData<List<ProductEntity>> products = ((BasicApp) application).getRepository()
-                .getProducts();
+        mRepository = ((BasicApp) application).getRepository();
+        LiveData<List<ProductEntity>> products = mRepository.getProducts();
 
         // observe the changes of the products from the database and forward them
         mObservableProducts.addSource(products, mObservableProducts::setValue);
@@ -51,4 +52,8 @@ public ProductListViewModel(Application application) {
     public LiveData<List<ProductEntity>> getProducts() {
         return mObservableProducts;
     }
+
+    public LiveData<List<ProductEntity>> searchProducts(String query) {
+        return mRepository.searchProducts(query);
+    }
 }

BasicSample/app/src/main/res/drawable/ic_search_black_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+</vector>

BasicSample/app/src/main/res/layout/list_fragment.xml

@@ -15,7 +15,8 @@
   ~ limitations under the License.
   -->
 
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
@@ -30,6 +31,29 @@
         android:background="@color/cardview_light_background"
         android:orientation="vertical">
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/item_horizontal_margin"
+            android:layout_marginEnd="@dimen/item_horizontal_margin"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/products_search_box"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/search_products_hint"/>
+
+            <ImageButton
+                android:id="@+id/products_search_btn"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:contentDescription="@string/cd_search_products"
+                app:srcCompat="@drawable/ic_search_black_24dp"/>
+
+        </LinearLayout>
+
         <TextView
             android:id="@+id/loading_tv"
             android:layout_width="match_parent"

BasicSample/app/src/main/res/values/strings.xml

@@ -19,7 +19,9 @@
     <string name="no_comments">No comments</string>
     <string name="loading_comments">Loading comments...</string>
     <string name="loading_products">Loading products...</string>
+    <string name="search_products_hint">Search Products...</string>
     <string name="cd_products_list">Products list</string>
     <string name="cd_comments_list">Comments list</string>
     <string name="cd_product_name">Name of the product</string>
+    <string name="cd_search_products">Search products</string>
 </resources>

BasicSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

GithubBrowserSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

NavigationBasicSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

PagingSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

PagingWithNetworkSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

PersistenceContentProviderSample/versions.gradle

@@ -23,7 +23,7 @@
 ext.deps = [:]
 def versions = [:]
 versions.arch_core = "2.0.0"
-versions.room = "2.0.0"
+versions.room = "2.1.0-alpha02"
 versions.lifecycle = "2.0.0"
 versions.support = "1.0.0"
 versions.dagger = "2.16"

PersistenceMigrationsSample/app/schemas/com.example.android.persistence.migrations.UsersDatabase/5.json

@@ -0,0 +1,45 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "b2931d3e0c78dcc46b6aa80ce186b2dc",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userid` TEXT NOT NULL, `username` TEXT, `last_update` INTEGER, PRIMARY KEY(`userid`))",
+        "fields": [
+          {
+            "fieldPath": "mId",
+            "columnName": "userid",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "mUserName",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "mDate",
+            "columnName": "last_update",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "userid"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"b2931d3e0c78dcc46b6aa80ce186b2dc\")"
+    ]
+  }
+}