Created layout for search bar in people drawer and refresh adapter

Author: jainkuniya

app/src/main/java/com/zulip/android/activities/ZulipActivity.java

@@ -39,7 +39,9 @@
 import android.support.v4.widget.SimpleCursorAdapter;
 import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.widget.Toolbar;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -185,6 +187,17 @@ public enum Flag {
         RESET_DATABASE,
     }
 
+    private EditText etSearchPeople;
+    private ImageView ivSearchPeopleCancel;
+    private EditText etSearchStream;
+    private ImageView ivSearchStreamCancel;
+    private ListView peopleDrawer;
+    // row number which is used to differentiate the 'All private messages'
+    // row from the people
+    final int allPeopleId = -1;
+
+    //
+    private String streamSearchFilterKeyword="";
 
     public HashMap<String, Bitmap> getGravatars() {
         return gravatars;
@@ -307,6 +320,34 @@ protected void onCreate(Bundle savedInstanceState) {
         textView = (TextView) findViewById(R.id.textView);
         sendBtn = (ImageView) findViewById(R.id.send_btn);
         appBarLayout = (AppBarLayout) findViewById(R.id.appBarLayout);
+        etSearchPeople = (EditText)findViewById(R.id.people_drawer_search);
+        ivSearchPeopleCancel = (ImageView)findViewById(R.id.iv_people__search_cancel_button);
+        onTextChangeOfPeopleSearchEditText();
+        ivSearchPeopleCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //set default people list
+                setUpPeopleList(true);
+                //set visibility of this image false
+                ivSearchPeopleCancel.setVisibility(View.GONE);
+                //set search editText text empty
+                etSearchPeople.setText("");
+            }
+        });
+        etSearchStream = (EditText)findViewById(R.id.stream_drawer_search);
+        ivSearchStreamCancel = (ImageView)findViewById(R.id.iv_stream_search_cancel_button);
+        onTextChangeOfStreamSearchEditText();
+        ivSearchStreamCancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                //set default stream list
+                setupListViewAdapter(true);
+                //set visibility of this image false
+                ivSearchStreamCancel.setVisibility(View.GONE);
+                //set search editText text empty
+                etSearchStream.setText("");
+            }
+        });
         app.setZulipActivity(this);
         togglePrivateStreamBtn = (ImageView) findViewById(R.id.togglePrivateStream_btn);
         drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -334,61 +375,11 @@ public void onDrawerOpened(View drawerView) {
         // Set the drawer toggle as the DrawerListener
         drawerLayout.setDrawerListener(drawerToggle);
 
-        ListView peopleDrawer = (ListView) findViewById(R.id.people_drawer);
-
-        // row number which is used to differentiate the 'All private messages'
-        // row from the people
-        final int allPeopleId = -1;
-        Callable<Cursor> peopleGenerator = new Callable<Cursor>() {
-
-            @Override
-            public Cursor call() throws Exception {
-                // TODO Auto-generated method stub
-                List<Person> people = app.getDao(Person.class).queryBuilder()
-                        .where().eq(Person.ISBOT_FIELD, false).and()
-                        .eq(Person.ISACTIVE_FIELD, true).query();
-
-                Person.sortByPresence(app, people);
-
-                String[] columnsWithPresence = new String[]{"_id",
-                        Person.EMAIL_FIELD, Person.NAME_FIELD};
-
-                MatrixCursor sortedPeopleCursor = new MatrixCursor(
-                        columnsWithPresence);
-                for (Person person : people) {
-                    Object[] row = new Object[]{person.getId(), person.getEmail(),
-                            person.getName()};
-                    sortedPeopleCursor.addRow(row);
-                }
-
-                // add private messages row
-                MatrixCursor allPrivateMessages = new MatrixCursor(
-                        sortedPeopleCursor.getColumnNames());
-                Object[] row = new Object[]{allPeopleId, "",
-                        "All private messages"};
-
-                allPrivateMessages.addRow(row);
-
-                return new MergeCursor(new Cursor[]{
-                        allPrivateMessages, sortedPeopleCursor});
-
-            }
 
-        };
-        try {
-            this.peopleAdapter = new RefreshableCursorAdapter(
-                    this.getApplicationContext(), R.layout.stream_tile,
-                    peopleGenerator.call(), peopleGenerator, new String[]{
-                    Person.NAME_FIELD, Person.EMAIL_FIELD}, new int[]{
-                    R.id.name, R.id.stream_dot}, 0);
-            peopleAdapter.setViewBinder(peopleBinder);
+         peopleDrawer = (ListView) findViewById(R.id.people_drawer);
 
-            peopleDrawer.setAdapter(peopleAdapter);
-        } catch (SQLException e) {
-            throw new RuntimeException(e);
-        } catch (Exception e) {
-            ZLog.logException(e);
-        }
+        //set up people list
+        setUpPeopleList(true);
 
         peopleDrawer.setOnItemClickListener(new OnItemClickListener() {
             @Override
@@ -540,6 +531,131 @@ public Cursor runQuery(CharSequence charSequence) {
         }
     }
 
+    private void onTextChangeOfStreamSearchEditText() {
+        etSearchStream.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) {
+                if (etSearchStream.getText().toString().equals("") || etSearchStream.getText().toString().isEmpty())
+                {
+                    //set default stream list
+                    setupListViewAdapter(true);
+                    //set visibility of this image false
+                    ivSearchStreamCancel.setVisibility(View.GONE);
+                }else
+                {
+                    //filter stream list
+                    streamSearchFilterKeyword = etSearchStream.getText().toString();
+                    setupListViewAdapter(false);
+                    //set visibility of this image false
+                    ivSearchStreamCancel.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+
+    private void setUpPeopleList(final boolean isDefault, final String... filterKeyWord) {
+        Callable<Cursor> peopleGenerator = new Callable<Cursor>() {
+
+            @Override
+            public Cursor call() throws Exception {
+                // TODO Auto-generated method stub
+                List<Person> people;
+                if (isDefault) {
+                    people = app.getDao(Person.class).queryBuilder()
+                            .where().eq(Person.ISBOT_FIELD, false).and()
+                            .eq(Person.ISACTIVE_FIELD, true).query();
+                }else
+                {
+                    people = app.getDao(Person.class).queryBuilder()
+                            .where().eq(Person.ISBOT_FIELD, false).and()
+                            .like(Person.NAME_FIELD,"%"+filterKeyWord[0]+"%").and()
+                            .eq(Person.ISACTIVE_FIELD, true).query();
+                }
+
+                Person.sortByPresence(app, people);
+
+                String[] columnsWithPresence = new String[]{"_id",
+                        Person.EMAIL_FIELD, Person.NAME_FIELD};
+
+                MatrixCursor sortedPeopleCursor = new MatrixCursor(
+                        columnsWithPresence);
+                for (Person person : people) {
+                    Object[] row = new Object[]{person.getId(), person.getEmail(),
+                            person.getName()};
+                    sortedPeopleCursor.addRow(row);
+                }
+
+                // add private messages row
+                MatrixCursor allPrivateMessages = new MatrixCursor(
+                        sortedPeopleCursor.getColumnNames());
+                Object[] row = new Object[]{allPeopleId, "",
+                        "All private messages"};
+
+                allPrivateMessages.addRow(row);
+
+                return new MergeCursor(new Cursor[]{
+                        allPrivateMessages, sortedPeopleCursor});
+
+            }
+
+        };
+        try {
+            this.peopleAdapter = new RefreshableCursorAdapter(
+                    this.getApplicationContext(), R.layout.stream_tile,
+                    peopleGenerator.call(), peopleGenerator, new String[]{
+                    Person.NAME_FIELD, Person.EMAIL_FIELD}, new int[]{
+                    R.id.name, R.id.stream_dot}, 0);
+            peopleAdapter.setViewBinder(peopleBinder);
+
+            peopleDrawer.setAdapter(peopleAdapter);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        } catch (Exception e) {
+            ZLog.logException(e);
+        }
+    }
+
+    private void onTextChangeOfPeopleSearchEditText() {
+        etSearchPeople.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) {
+                if (etSearchPeople.getText().toString().equals("") || etSearchPeople.getText().toString().isEmpty())
+                {
+                    //set default people list
+                    setUpPeopleList(true);
+                    //set visibility of this image false
+                    ivSearchPeopleCancel.setVisibility(View.GONE);
+                }else
+                {
+                    //filter people list
+                    setUpPeopleList(false,etSearchPeople.getText().toString());
+                    //set visibility of this image false
+                    ivSearchPeopleCancel.setVisibility(View.VISIBLE);
+                }
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+    }
+
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
@@ -835,10 +951,20 @@ public Cursor call() throws Exception {
         }
     };
 
+    Callable<Cursor> streamsGeneratorWithFilter = new Callable<Cursor>() {
+        @Override
+        public Cursor call() throws Exception {
+            int pointer = app.getPointer();
+            return ((AndroidDatabaseResults) app.getDao(Stream.class).queryRaw("SELECT s.id as _id,  s.name, s.color," +
+                    " count(case when m.id > " + pointer + " or m." + Message.MESSAGE_READ_FIELD + " = 0 then 1 end) as " + ExpandableStreamDrawerAdapter.UNREAD_TABLE_NAME
+                    + " FROM streams as s LEFT JOIN messages as m ON s.id=m.stream"+" WHERE s.name LIKE '%"+ streamSearchFilterKeyword  +"%' group by s.name order by s.name COLLATE NOCASE").closeableIterator().getRawResults()).getRawCursor();
+        }
+    };
+
     /**
      * Setup the streams Drawer which has a {@link ExpandableListView} categorizes the stream and subject
      */
-    private void setupListViewAdapter() {
+    private void setupListViewAdapter(boolean isDefault) {
         streamsDrawerAdapter = null;
         String[] groupFrom = {Stream.NAME_FIELD, Stream.COLOR_FIELD, ExpandableStreamDrawerAdapter.UNREAD_TABLE_NAME};
         int[] groupTo = {R.id.name, R.id.stream_dot, R.id.unread_group};
@@ -848,10 +974,18 @@ private void setupListViewAdapter() {
         final ExpandableListView streamsDrawer = (ExpandableListView) findViewById(R.id.streams_drawer);
         streamsDrawer.setGroupIndicator(null);
         try {
-            streamsDrawerAdapter = new ExpandableStreamDrawerAdapter(this, streamsGenerator.call(),
-                    R.layout.stream_tile_new, groupFrom,
-                    groupTo, R.layout.stream_tile_child, childFrom,
-                    childTo);
+            if (isDefault) {
+                streamsDrawerAdapter = new ExpandableStreamDrawerAdapter(this, streamsGenerator.call(),
+                        R.layout.stream_tile_new, groupFrom,
+                        groupTo, R.layout.stream_tile_child, childFrom,
+                        childTo);
+            }else
+            {
+                streamsDrawerAdapter = new ExpandableStreamDrawerAdapter(this, streamsGeneratorWithFilter.call(),
+                        R.layout.stream_tile_new, groupFrom,
+                        groupTo, R.layout.stream_tile_child, childFrom,
+                        childTo);
+            }
         } catch (Exception e) {
             ZLog.logException(e);
         }
@@ -954,7 +1088,7 @@ public void onClick(View v) {
      * Initiates the streams Drawer if the streams in the drawer is 0.
      */
     public void checkAndSetupStreamsDrawer() {
-        setupListViewAdapter();
+        setupListViewAdapter(true);
     }
 
     private void sendMessage() {